@desplega.ai/agent-swarm 2.9.1 → 2.10.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-bht22g3k.js +16 -0
- package/dist/{acp-targets-ny75x1qy.js → acp-targets-arrwv4f0.js} +6 -6
- package/dist/{actions-b9qgrmeq.js → actions-y0d2n1c2.js} +49 -28
- package/dist/{agent-fs-provision-b5dhdsbd.js → agent-fs-provision-tpj7sktd.js} +4 -4
- package/dist/{amp-adapter-vtax2c9s.js → amp-adapter-vmmnmw8d.js} +1 -1
- package/dist/{anthropic-messages-r5xf5hqw.js → anthropic-messages-zdca3gv1.js} +13 -13
- package/dist/{app-g2z15hax.js → app-wb7w45dq.js} +3 -3
- package/dist/{approval-notifications-yt13wp8r.js → approval-notifications-7mqr6vbd.js} +5 -5
- package/dist/{assistant-2cgfxsgk.js → assistant-gf60454p.js} +19 -19
- package/dist/{boot-args-schema-3gwy0f60.js → boot-args-schema-qxmd59sr.js} +1 -1
- package/dist/{boot-reembed-mywmyp4s.js → boot-reembed-5tmeskj2.js} +1 -1
- package/dist/{boot-reembed-92g7s5zp.js → boot-reembed-wb44vc3s.js} +1 -1
- package/dist/boot-scrub-sweep-25bxhnw4.js +9 -0
- package/dist/{boot-seeds-ce7rvgq1.js → boot-seeds-nj9za0vk.js} +4 -4
- package/dist/{claude-adapter-3m4q7735.js → claude-adapter-d3krpdyb.js} +5 -5
- package/dist/{claude-managed-setup-c217draw.js → claude-managed-setup-7y4pwd81.js} +1 -1
- package/dist/{claude-sdk-session-7fbqm51z.js → claude-sdk-session-d138zy0e.js} +5 -5
- package/dist/{cli-tvc4jag9.js → cli-01k6wpr9.js} +3 -3
- package/dist/{cli-2xs8tsf7.js → cli-124ntmf0.js} +42 -36
- package/dist/{cli-jm0hvmz2.js → cli-2rnd5j3t.js} +1 -1
- package/dist/{cli-32djehja.js → cli-2spnz7ye.js} +8 -8
- package/dist/{cli-2dq9yv8p.js → cli-2v2zdm0a.js} +1 -1
- package/dist/{cli-fkef327x.js → cli-3caf7pmg.js} +2 -2
- package/dist/{cli-mw620q3n.js → cli-3et6fmfe.js} +1 -1
- package/dist/{cli-h9yqfzx9.js → cli-3f8zbtqa.js} +3 -3
- package/dist/{cli-mhapr559.js → cli-43evxwj4.js} +1 -1
- package/dist/{cli-pyjn0qhk.js → cli-539h29es.js} +138 -21
- package/dist/{cli-bnqncekd.js → cli-5qhfv9rw.js} +2 -2
- package/dist/{cli-p4kckx1z.js → cli-6037prsx.js} +6 -6
- package/dist/{cli-zr6qy15y.js → cli-6cwr32fe.js} +17 -17
- package/dist/{cli-1jykg0py.js → cli-7r162fxe.js} +22 -15
- package/dist/{cli-sn650d7x.js → cli-8st34zhr.js} +20 -10
- package/dist/{cli-rq5rpv6k.js → cli-91pkxres.js} +1 -1
- package/dist/{cli-m7zvgt57.js → cli-9fjr27ez.js} +10 -10
- package/dist/{cli-f8x9drqr.js → cli-aw83sr40.js} +19 -5
- package/dist/{cli-jkw6ptfw.js → cli-cc93xzes.js} +5 -5
- package/dist/{cli-gfy38pvt.js → cli-fcfbct2j.js} +5 -5
- package/dist/{cli-nafvvsp8.js → cli-fq2rr3jb.js} +5 -5
- package/dist/{boot-scrub-sweep-7dkdzqxx.js → cli-had1p04a.js} +8 -9
- package/dist/{cli-bg63qmsx.js → cli-j6te8keb.js} +4 -4
- package/dist/{cli-br0924pw.js → cli-jrbq4djp.js} +1 -1
- package/dist/{cli-kxx4k2jw.js → cli-k3q2va86.js} +2 -2
- package/dist/{cli-jaw5v1sy.js → cli-k5yewqgd.js} +3 -3
- package/dist/cli-kbtzfrxj.js +404 -0
- package/dist/{cli-td9tb872.js → cli-m9cvf7vs.js} +7 -7
- package/dist/{cli-f3jyzq4g.js → cli-md50mj0r.js} +2 -2
- package/dist/{cli-xag7btpe.js → cli-mk7c5ac4.js} +1 -1
- package/dist/cli-mys27d03.js +321 -0
- package/dist/{cli-nbt14he0.js → cli-nstkanmx.js} +5 -5
- package/dist/{cli-wn13hhdt.js → cli-nv4xsvmk.js} +4 -4
- package/dist/{cli-vyff45ve.js → cli-p0c3vtch.js} +2 -2
- package/dist/{cli-2czxfnvj.js → cli-p0n7b5rz.js} +662 -93
- package/dist/{cli-j7svy295.js → cli-q5srsxq2.js} +12 -12
- package/dist/{cli-vt89089n.js → cli-qrta34nb.js} +4 -4
- package/dist/{cli-ysvspf5e.js → cli-qx4f057j.js} +2 -2
- package/dist/{cli-zh0e5x7p.js → cli-s1khw52h.js} +11 -11
- package/dist/{cli-mkwkwq81.js → cli-s1zqk1aj.js} +18 -11
- package/dist/{cli-f9gz2vyj.js → cli-sb4426be.js} +7 -7
- package/dist/{cli-dgs10ttj.js → cli-th1dkc2v.js} +1 -1
- package/dist/{cli-3j873zxq.js → cli-tr27kwyg.js} +2 -2
- package/dist/{cli-6945ywhr.js → cli-tvgqesec.js} +6 -4
- package/dist/{cli-fjggej24.js → cli-v46zsvqk.js} +1 -1
- package/dist/{cli-67mwzr35.js → cli-v8z0yga9.js} +4 -4
- package/dist/{cli-pb2ay3sh.js → cli-vfqvrd82.js} +5 -5
- package/dist/{cli-fh97xn30.js → cli-vq2eg24x.js} +2 -2
- package/dist/{cli-v57d7fmm.js → cli-vsw91x06.js} +23 -22
- package/dist/{cli-2yjj3e31.js → cli-w1q68d8x.js} +9 -7
- package/dist/{cli-y2ewxhth.js → cli-wafmk3fn.js} +10 -10
- package/dist/{cli-ctx0b85j.js → cli-wwp1bd3n.js} +257 -101
- package/dist/{cli-bkjdknnp.js → cli-y4ccxtz5.js} +37 -5
- package/dist/{cli-w4n323t3.js → cli-y8p78ekx.js} +7 -7
- package/dist/{cli-8zh9nrew.js → cli-z0m452jr.js} +1 -1
- package/dist/{cli-mjw0yf82.js → cli-zeh2mhkg.js} +1 -1
- package/dist/{cli-jwampxxq.js → cli-zk7v5s89.js} +2 -2
- package/dist/cli.js +16 -16
- package/dist/{cloudflare-workers-ai-system-one-9y1zx3pt.js → cloudflare-workers-ai-system-one-4aysy6rh.js} +2 -2
- package/dist/{codex-adapter-n656pvb8.js → codex-adapter-exfdbj73.js} +4 -4
- package/dist/{codex-session-runner-p0fbv5y9.js → codex-session-runner-xhznc4g3.js} +4 -4
- package/dist/{commands-gwea8z5p.js → commands-d8g349v4.js} +3 -3
- package/dist/{controller-t67c3grh.js → controller-mwgdmb8y.js} +3 -3
- package/dist/{controllers-connect-ks155r0h.js → controllers-connect-5v7qx04j.js} +19 -19
- package/dist/core-sxy4epp2.js +38 -0
- package/dist/{cursor-adapter-ygwrtmkv.js → cursor-adapter-p2q5h35d.js} +1 -1
- package/dist/{db-rb2xqdb1.js → db-qpganbeb.js} +3 -3
- package/dist/{db-kpmx06s9.js → db-wcw0b2j8.js} +2 -2
- package/dist/{dispatcher-31sm0ej2.js → dispatcher-8d8s49yz.js} +17 -17
- package/dist/{dsh-adapter-qyxh0w31.js → dsh-adapter-me0twn13.js} +1 -1
- package/dist/{easter-egg-3d-00wjscn6.js → easter-egg-3d-wv7w5ty6.js} +1 -1
- package/dist/{embedding-space-qhw4g68n.js → embedding-space-e48xchqa.js} +6 -6
- package/dist/{embeddings-zdv9ke6x.js → embeddings-tgq2afbq.js} +1 -1
- package/dist/{execute-zna8wwr7.js → execute-8rhwrk7f.js} +1 -1
- package/dist/{external-channel-1ac6t56s.js → external-channel-8bt3j2pm.js} +2 -2
- package/dist/{fx-adapter-sk7n0fzc.js → fx-adapter-adtdb3jb.js} +8 -8
- package/dist/{grok-adapter-sjbcm5ew.js → grok-adapter-accnn9km.js} +8 -8
- package/dist/handlers-1x77561e.js +35 -0
- package/dist/{heartbeat-2f6z4kdx.js → heartbeat-x0056ra5.js} +20 -20
- package/dist/{hook-w1skzaqc.js → hook-a7vmn2st.js} +4 -4
- package/dist/{hook-8y0gvtp1.js → hook-mrd2ayxv.js} +5 -5
- package/dist/{http-wghxvpef.js → http-ym9c5svp.js} +676 -273
- package/dist/{index-s71ez27v.js → index-01ns1pkw.js} +1 -1
- package/dist/index-48qzcqzj.js +35 -0
- package/dist/{index-9zkchs9t.js → index-ny60jcat.js} +186 -14
- package/dist/{index-rv89fvzf.js → index-p46tvwtx.js} +21 -21
- package/dist/index-rkvaambe.js +36 -0
- package/dist/{index-8zn8nxn5.js → index-x6azjwm8.js} +1 -1
- package/dist/{index-25pvya7q.js → index-xj1mq27m.js} +17 -17
- package/dist/k8s-m56sw868.js +217 -0
- package/dist/{keepalive-sh02349h.js → keepalive-7yxg8z4c.js} +3 -3
- package/dist/lead-enzn86bz.js +74 -0
- package/dist/{maintenance-yj0dcjja.js → maintenance-6tefxmk1.js} +1 -1
- package/dist/{oauth-refresh-sweep-d9xedk66.js → oauth-refresh-sweep-70cavc3a.js} +2 -2
- package/dist/{onboard-dpgjn03r.js → onboard-fja65z08.js} +5 -5
- package/dist/{openai-decisions-q3hh60wr.js → openai-decisions-ytp6w6xh.js} +1 -1
- package/dist/{opencode-adapter-2d31cpjc.js → opencode-adapter-hakkm7yh.js} +5 -5
- package/dist/{otel-impl-1skarpfq.js → otel-impl-7zhnt6gj.js} +1 -1
- package/dist/{pending-bfmxtx0g.js → pending-h01yzpx4.js} +18 -18
- package/dist/{pi-mono-adapter-gvppnasy.js → pi-mono-adapter-f52hz743.js} +6 -6
- package/dist/{pricing-refresh-c6b325mk.js → pricing-refresh-fzxvk2zf.js} +2 -2
- package/dist/{rbac-roles-h80qbdbs.js → rbac-roles-9v6vhgbs.js} +3 -3
- package/dist/{rbac-roles-zfcx68tx.js → rbac-roles-hfgh8sba.js} +2 -2
- package/dist/{render-v2-nx20t3rb.js → render-v2-1rgspxzf.js} +3 -3
- package/dist/{resume-5ep8agan.js → resume-tqy61x24.js} +7 -7
- package/dist/{runtime-r3pj4mce.js → runtime-exkxyx5f.js} +1 -1
- package/dist/{session-access-n7p3m15b.js → session-access-3act7vt4.js} +4 -4
- package/dist/{session-source-backfill-v8mt0zwn.js → session-source-backfill-82qe7fqq.js} +2 -2
- package/dist/{setup-z1psaqhe.js → setup-ry1vfdef.js} +1 -1
- package/dist/thread-buffer-3x93yexa.js +38 -0
- package/dist/{typesafe-system-one-f2en2knd.js → typesafe-system-one-vcfj2ak8.js} +2 -2
- package/dist/user-merge-jobs-bx6bf7db.js +22 -0
- package/dist/{virtual-modules-rrbjdpxn.js → virtual-modules-s0rjzcqq.js} +3 -3
- package/dist/{work-objects-4aghh73z.js → work-objects-z2e5tv03.js} +20 -20
- package/dist/{worker-follow-up-166zmex1.js → worker-follow-up-y3xeg89w.js} +17 -17
- package/dist/worker-zfcv2wbf.js +74 -0
- package/openapi.json +1630 -388
- package/package.json +3 -3
- 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/session-costs.ts +8 -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-client.ts +70 -19
- package/src/be/db.ts +32 -57
- package/src/be/key-window-usage.ts +1 -0
- package/src/be/memory/demotion-evidence.ts +34 -0
- package/src/be/memory/reranker.ts +34 -12
- package/src/be/memory/review-recall-filter.ts +83 -0
- package/src/be/memory/search-candidates.ts +19 -6
- package/src/be/memory/types.ts +11 -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/pricing-normalize.ts +2 -0
- package/src/be/rbac-roles.ts +6 -4
- package/src/be/runtime-pools/db.ts +20 -5
- package/src/be/runtime-pools/supervisor.ts +15 -1
- 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 +34 -0
- 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/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/extensions/contract-types.generated.ts +1 -1
- package/src/extensions/contract.ts +15 -0
- package/src/extensions/dispatcher.ts +14 -4
- package/src/github/handlers.ts +57 -0
- package/src/github/types.ts +4 -0
- package/src/http/all-routes.ts +2 -0
- package/src/http/approval-requests.ts +5 -1
- package/src/http/auth.ts +3 -1
- package/src/http/config.ts +34 -1
- package/src/http/index.ts +13 -0
- 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/tasks.ts +41 -6
- package/src/http/tool-hooks.ts +140 -0
- package/src/http/users.ts +142 -19
- package/src/http/workflows.ts +19 -1
- package/src/integrations/chat-sdk/inbound.ts +8 -2
- package/src/integrations/chat-sdk/limits.ts +8 -3
- package/src/providers/acp-targets.ts +2 -2
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/pricing-sources.md +9 -0
- package/src/rbac/legacy-policy.ts +1 -0
- package/src/rbac/permissions.ts +5 -0
- package/src/runtime-providers/index.ts +7 -5
- package/src/runtime-providers/k8s.ts +250 -0
- 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/slack/actions.ts +33 -10
- package/src/slack/blocks.ts +23 -2
- package/src/slack/render-v2.ts +47 -0
- package/src/tests/acp-adapter.test.ts +26 -0
- package/src/tests/chat-sdk-relay.test.ts +21 -1
- package/src/tests/check-pr-body.test.ts +43 -0
- package/src/tests/credential-check.test.ts +14 -6
- package/src/tests/db-client.test.ts +146 -0
- package/src/tests/deploy-guard.test.ts +7 -7
- package/src/tests/deploy-select.test.ts +83 -0
- package/src/tests/dreaming-gather-corrections.test.ts +467 -0
- package/src/tests/event-loop-lag.test.ts +9 -7
- 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-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-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/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/migration-318-superseded-workflow-cut-backfill.test.ts +74 -0
- package/src/tests/model-groups-api.test.ts +415 -0
- package/src/tests/model-profiles-api.test.ts +1 -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/rbac-engine.test.ts +1 -0
- package/src/tests/runtime-k8s-pools.test.ts +142 -0
- package/src/tests/runtime-pools-db.test.ts +42 -2
- package/src/tests/runtime-pools-http.test.ts +47 -2
- package/src/tests/runtime-provider-registration.test.ts +5 -14
- package/src/tests/runtime-providers-k8s.test.ts +303 -0
- package/src/tests/script-connections.test.ts +13 -1
- package/src/tests/short-id.test.ts +23 -0
- package/src/tests/slack-blocks.test.ts +69 -0
- package/src/tests/slack-render-v2.test.ts +54 -0
- package/src/tests/spec-base-url.test.ts +13 -1
- package/src/tests/system-one-decide-session-cost.test.ts +196 -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 +321 -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/workflow-agent-task-retry.test.ts +62 -0
- package/src/tests/workflow-foreach-supersede-retry.test.ts +10 -0
- package/src/tests/workflow-http-v2.test.ts +27 -0
- package/src/tests/workflow-replay.test.ts +10 -1
- package/src/tests/workflow-triggers-v2.test.ts +128 -0
- package/src/tests/workflow-wait-event.test.ts +109 -1
- 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 +2 -0
- package/src/tools/workflows/update-workflow.ts +3 -1
- package/src/types.ts +86 -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/short-id.ts +20 -14
- package/src/utils/task-ui-spec.ts +16 -4
- package/src/vcs/index.ts +12 -2
- package/src/workflows/executors/system-one-decision.ts +2 -2
- package/src/workflows/resume.ts +3 -2
- package/src/workflows/task-step-routing.ts +30 -10
- package/src/workflows/triggers.ts +35 -3
- package/templates/extensions/manifest.schema.json +13 -0
- package/templates/skills/swarm-docs/content.md +2 -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/handlers-yzy0c87x.js +0 -35
- 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/{azure-openai-responses-590s1eea.js → azure-openai-responses-b3y7fz36.js} +8 -8
- package/dist/{cli-m7c2380k.js → cli-3aaeb78m.js} +4 -4
- package/dist/{cli-g0vv9dg4.js → cli-8y43jx2r.js} +8 -8
- package/dist/{cli-m0cy2vyf.js → cli-k6nejceb.js} +4 -4
- package/dist/{google-generative-ai-maq6c9bf.js → google-generative-ai-bh0djqjp.js} +4 -4
- package/dist/{google-vertex-2jgsw2nb.js → google-vertex-prjbw8dj.js} +8 -8
- package/dist/{mistral-conversations-0c30em7t.js → mistral-conversations-tm2vd4gc.js} +8 -8
- package/dist/{node-dqm4xgxw.js → node-2wfcey7d.js} +0 -0
- package/dist/{openai-codex-responses-bkcd8pjj.js → openai-codex-responses-sxjv60xx.js} +4 -4
- package/dist/{openai-completions-f3n69rep.js → openai-completions-0c7qnhsx.js} +20 -20
- package/dist/{openai-responses-gbh0wfqe.js → openai-responses-a7h29chp.js} +15 -15
- package/dist/{pi-messages-zebyt7gb.js → pi-messages-2j0fpqwq.js} +5 -5
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import {
|
|
2
2
|
resolveAcpTarget2
|
|
3
|
-
} from "./cli-
|
|
3
|
+
} from "./cli-01k6wpr9.js";
|
|
4
4
|
import {
|
|
5
5
|
fetchInstalledMcpServers
|
|
6
6
|
} from "./cli-5y2fvw4z.js";
|
|
@@ -34,7 +34,7 @@ import {
|
|
|
34
34
|
import {
|
|
35
35
|
init_package,
|
|
36
36
|
package_default
|
|
37
|
-
} from "./cli-
|
|
37
|
+
} from "./cli-3f8zbtqa.js";
|
|
38
38
|
import {
|
|
39
39
|
scrubSecrets,
|
|
40
40
|
init_secret_scrubber
|
|
@@ -2,20 +2,20 @@ import {
|
|
|
2
2
|
getKv2,
|
|
3
3
|
upsertKv2,
|
|
4
4
|
init_db4
|
|
5
|
-
} from "./cli-
|
|
5
|
+
} from "./cli-wwp1bd3n.js";
|
|
6
6
|
import {
|
|
7
7
|
resolveIdentity,
|
|
8
8
|
init_identity,
|
|
9
9
|
recordUnmappedIdentity,
|
|
10
10
|
init_unmapped_identities
|
|
11
|
-
} from "./cli-
|
|
11
|
+
} from "./cli-p0n7b5rz.js";
|
|
12
12
|
import {
|
|
13
13
|
findUserByExternalId,
|
|
14
14
|
findUserByEmail,
|
|
15
15
|
findOrCreateUserByEmail,
|
|
16
16
|
linkIdentity,
|
|
17
17
|
init_users
|
|
18
|
-
} from "./cli-
|
|
18
|
+
} from "./cli-vsw91x06.js";
|
|
19
19
|
import {
|
|
20
20
|
__esm
|
|
21
21
|
} from "./cli-242037k3.js";
|
|
@@ -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-wwp1bd3n.js";
|
|
17
|
+
import {
|
|
18
|
+
nextRestRatio2
|
|
19
|
+
} from "./cli-had1p04a.js";
|
|
20
|
+
import {
|
|
21
|
+
scrubSecrets,
|
|
22
|
+
init_secret_scrubber
|
|
23
|
+
} from "./cli-5a6pqy45.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 };
|
|
@@ -14,7 +14,7 @@ import {
|
|
|
14
14
|
SteeringBlockedError,
|
|
15
15
|
init_steering2,
|
|
16
16
|
init_db4
|
|
17
|
-
} from "./cli-
|
|
17
|
+
} from "./cli-wwp1bd3n.js";
|
|
18
18
|
import {
|
|
19
19
|
isBlockExternalEnabled2,
|
|
20
20
|
invalidateChannelExternality2,
|
|
@@ -22,7 +22,7 @@ import {
|
|
|
22
22
|
shouldBlockChannel2,
|
|
23
23
|
leaveExternalChannel2,
|
|
24
24
|
init_external_channel
|
|
25
|
-
} from "./cli-
|
|
25
|
+
} from "./cli-mk7c5ac4.js";
|
|
26
26
|
import {
|
|
27
27
|
workflowEventBus2,
|
|
28
28
|
init_event_bus
|
|
@@ -42,7 +42,7 @@ import {
|
|
|
42
42
|
init_render_v2,
|
|
43
43
|
registerTreeMessage,
|
|
44
44
|
init_watcher
|
|
45
|
-
} from "./cli-
|
|
45
|
+
} from "./cli-539h29es.js";
|
|
46
46
|
import {
|
|
47
47
|
dispatchPre2,
|
|
48
48
|
init_dispatcher,
|
|
@@ -60,7 +60,7 @@ import {
|
|
|
60
60
|
slackInboundMessageText,
|
|
61
61
|
collectSlackMessageFiles,
|
|
62
62
|
init_message_text
|
|
63
|
-
} from "./cli-
|
|
63
|
+
} from "./cli-p0n7b5rz.js";
|
|
64
64
|
import {
|
|
65
65
|
requestSlackThreadSteering,
|
|
66
66
|
formatSlackSteeringAck,
|
|
@@ -71,7 +71,7 @@ import {
|
|
|
71
71
|
getBufferMessageCount2,
|
|
72
72
|
instantFlush2,
|
|
73
73
|
init_thread_buffer
|
|
74
|
-
} from "./cli-
|
|
74
|
+
} from "./cli-6037prsx.js";
|
|
75
75
|
import {
|
|
76
76
|
wasEventSeen,
|
|
77
77
|
init_event_dedup
|
|
@@ -80,7 +80,7 @@ import {
|
|
|
80
80
|
enrichSlackUserEmail,
|
|
81
81
|
resolveSlackUserId,
|
|
82
82
|
init_enrich
|
|
83
|
-
} from "./cli-
|
|
83
|
+
} from "./cli-k5yewqgd.js";
|
|
84
84
|
import {
|
|
85
85
|
isSlackLeaveThreadDisabled,
|
|
86
86
|
SLACK_LEFT_THREAD_CONFIRMATION,
|
|
@@ -88,7 +88,7 @@ import {
|
|
|
88
88
|
leaveSlackThread,
|
|
89
89
|
shouldSkipLeftSlackThread,
|
|
90
90
|
init_left_threads
|
|
91
|
-
} from "./cli-
|
|
91
|
+
} from "./cli-jrbq4djp.js";
|
|
92
92
|
import {
|
|
93
93
|
init_zod
|
|
94
94
|
} from "./cli-zcfpsfzf.js";
|
|
@@ -5,7 +5,7 @@ import {
|
|
|
5
5
|
Number2,
|
|
6
6
|
String2,
|
|
7
7
|
completeStructuredWithModel
|
|
8
|
-
} from "./cli-
|
|
8
|
+
} from "./cli-fcfbct2j.js";
|
|
9
9
|
import {
|
|
10
10
|
SummaryWithRatingsSchema,
|
|
11
11
|
BASE_SUMMARIZE_PROMPT,
|
|
@@ -14,7 +14,7 @@ import {
|
|
|
14
14
|
} from "./cli-2xv18ywz.js";
|
|
15
15
|
import {
|
|
16
16
|
init_credentials
|
|
17
|
-
} from "./cli-
|
|
17
|
+
} from "./cli-6cwr32fe.js";
|
|
18
18
|
import {
|
|
19
19
|
init_models2
|
|
20
20
|
} from "./cli-82j36f2m.js";
|