@desplega.ai/agent-swarm 2.9.0 → 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-swxq55dr.js → acp-targets-arrwv4f0.js} +7 -7
- package/dist/{actions-pb678g3e.js → actions-y0d2n1c2.js} +102 -21
- package/dist/{agent-fs-provision-dmhnc38q.js → agent-fs-provision-tpj7sktd.js} +4 -4
- package/dist/{amp-adapter-3pa66q27.js → amp-adapter-vmmnmw8d.js} +2 -2
- package/dist/{anthropic-messages-x2cp5fvf.js → anthropic-messages-zdca3gv1.js} +22 -22
- package/dist/{app-17d12ev4.js → app-wb7w45dq.js} +6 -3
- package/dist/{approval-notifications-h7vd9pmg.js → approval-notifications-7mqr6vbd.js} +8 -5
- package/dist/{assistant-t7k39ree.js → assistant-gf60454p.js} +23 -21
- package/dist/{boot-args-schema-0gqmkfbe.js → boot-args-schema-qxmd59sr.js} +1 -1
- package/dist/{boot-reembed-f064w382.js → boot-reembed-5tmeskj2.js} +1 -1
- package/dist/{boot-reembed-n6anc01d.js → boot-reembed-wb44vc3s.js} +1 -1
- package/dist/boot-scrub-sweep-25bxhnw4.js +9 -0
- package/dist/{boot-seeds-f99fjs5q.js → boot-seeds-nj9za0vk.js} +4 -4
- package/dist/{claude-adapter-gvznwxgc.js → claude-adapter-d3krpdyb.js} +7 -7
- package/dist/{claude-managed-adapter-pbrbvc64.js → claude-managed-adapter-t8nfgcgz.js} +2 -2
- package/dist/{claude-managed-setup-kdxttvc3.js → claude-managed-setup-7y4pwd81.js} +3 -3
- package/dist/{claude-sdk-session-0t2teq6n.js → claude-sdk-session-d138zy0e.js} +7 -7
- package/dist/{cli-6dp0jkfj.js → cli-01k6wpr9.js} +4 -4
- package/dist/{cli-c07v0qfa.js → cli-124ntmf0.js} +83 -74
- package/dist/{cli-1tvdx9t5.js → cli-2rnd5j3t.js} +1 -1
- package/dist/{cli-4ghh072d.js → cli-2spnz7ye.js} +36 -36
- package/dist/{cli-dd37e0cm.js → cli-2v2zdm0a.js} +1 -1
- package/dist/{cli-aa8s22gn.js → cli-3aaeb78m.js} +195 -186
- package/dist/{cli-8x8y70av.js → cli-3caf7pmg.js} +2 -2
- package/dist/{cli-jd3kxppb.js → cli-3et6fmfe.js} +1 -1
- package/dist/{cli-kaa4bd7x.js → cli-3f8zbtqa.js} +9 -8
- package/dist/{cli-57pvhnyt.js → cli-43evxwj4.js} +1 -1
- package/dist/cli-43ms35q9.js +270 -0
- package/dist/cli-47hz21se.js +25584 -0
- package/dist/{cli-n515ex5z.js → cli-4ymxrwg5.js} +16 -16
- package/dist/{cli-2tnbc3gw.js → cli-539h29es.js} +2379 -66
- package/dist/{cli-rts1qvb4.js → cli-5qhfv9rw.js} +2 -2
- package/dist/{cli-faf46gdq.js → cli-6037prsx.js} +10 -10
- package/dist/{cli-bk9v1xrv.js → cli-6cwr32fe.js} +25 -25
- package/dist/{cli-812paz57.js → cli-6ehs4mta.js} +18 -2
- package/dist/{cli-95930z69.js → cli-6ym4jhzp.js} +2 -2
- package/dist/{cli-zg3z63x3.js → cli-7mv4h3sn.js} +1 -1
- package/dist/{cli-9a2rtd77.js → cli-7r162fxe.js} +24 -15
- package/dist/{cli-eg437b5p.js → cli-7sf9sb0w.js} +2 -1
- package/dist/{cli-vw5x18yj.js → cli-8st34zhr.js} +20 -10
- package/dist/{cli-fgphc007.js → cli-91pkxres.js} +1 -1
- package/dist/{cli-2kg31ted.js → cli-9fjr27ez.js} +11 -11
- package/dist/{cli-wr1h0k28.js → cli-9w8712tq.js} +617 -278
- package/dist/cli-aw83sr40.js +98 -0
- package/dist/{cli-ssvdrk4y.js → cli-b6px1k1q.js} +1 -1
- package/dist/{cli-w7dxb2fj.js → cli-cc93xzes.js} +6 -6
- package/dist/{cli-js8zrfyg.js → cli-fcfbct2j.js} +5 -5
- package/dist/{cli-3zxdz9r7.js → cli-fq2rr3jb.js} +6 -6
- package/dist/{boot-scrub-sweep-ejd5dnrz.js → cli-had1p04a.js} +8 -9
- package/dist/{cli-7cgf614g.js → cli-j6te8keb.js} +5 -5
- package/dist/{cli-25nstr34.js → cli-jrbq4djp.js} +1 -1
- package/dist/{cli-pz1c00aa.js → cli-k3q2va86.js} +2 -2
- package/dist/{cli-nhq5js1b.js → cli-k5yewqgd.js} +3 -3
- package/dist/cli-kbtzfrxj.js +404 -0
- package/dist/{cli-dx439zpg.js → cli-kpgcm7xy.js} +13 -1
- package/dist/{cli-mc1fx4xd.js → cli-m9cvf7vs.js} +10 -10
- package/dist/{cli-kmvcm34h.js → cli-md50mj0r.js} +2 -2
- package/dist/{cli-q8cfh1t9.js → cli-mk7c5ac4.js} +1 -1
- package/dist/cli-mys27d03.js +321 -0
- package/dist/{cli-spzkdgtg.js → cli-n3qe7tyr.js} +172 -168
- package/dist/{cli-7akn6ze9.js → cli-nh7x3133.js} +7 -28
- package/dist/{cli-fnh4b12r.js → cli-nstkanmx.js} +6 -6
- package/dist/{cli-g3zzby8t.js → cli-nv4xsvmk.js} +5 -5
- package/dist/{cli-sn4pc4qx.js → cli-p0c3vtch.js} +2 -2
- package/dist/{cli-5ntc4we6.js → cli-p0n7b5rz.js} +859 -2058
- package/dist/{cli-pn1v1pb0.js → cli-psffsanb.js} +3 -2
- package/dist/{cli-svc803vq.js → cli-q5srsxq2.js} +15 -15
- package/dist/{cli-nmcpzbty.js → cli-qrta34nb.js} +4 -4
- package/dist/{cli-k09cxm6m.js → cli-qx4f057j.js} +2 -2
- package/dist/{cli-eepnpee7.js → cli-s1khw52h.js} +12 -12
- package/dist/{cli-h474mvp5.js → cli-s1zqk1aj.js} +21 -11
- package/dist/{cli-8axx8vnw.js → cli-sb4426be.js} +10 -10
- package/dist/{cli-kqh27v2y.js → cli-th1dkc2v.js} +1 -1
- package/dist/{cli-cw7mc1je.js → cli-tr27kwyg.js} +3 -3
- package/dist/{cli-5kcmxwxv.js → cli-tvgqesec.js} +7 -5
- package/dist/{cli-a9hfzg2r.js → cli-ty3gha1p.js} +6 -6
- package/dist/{cli-fjggej24.js → cli-v46zsvqk.js} +1 -1
- package/dist/{cli-5gygrr67.js → cli-v8z0yga9.js} +4 -4
- package/dist/{cli-k7pt28ad.js → cli-vfqvrd82.js} +5 -5
- package/dist/{cli-vvgaz8t6.js → cli-vq2eg24x.js} +2 -2
- package/dist/{cli-pwsax0vp.js → cli-vsw91x06.js} +23 -22
- package/dist/{cli-7fx9jyfs.js → cli-w1q68d8x.js} +67 -11
- package/dist/{cli-c5cspahx.js → cli-wafmk3fn.js} +45 -20
- package/dist/{cli-ymct0ycy.js → cli-wwp1bd3n.js} +5495 -5095
- package/dist/{cli-me4maa4j.js → cli-y4ccxtz5.js} +45 -9
- package/dist/{cli-m1fbz2wj.js → cli-y8p78ekx.js} +178 -19
- package/dist/{cli-nr46j5pw.js → cli-z0m452jr.js} +1 -1
- package/dist/{cli-gddgcnav.js → cli-zeh2mhkg.js} +1 -1
- package/dist/{cli-e9973bf0.js → cli-zk7v5s89.js} +2 -2
- package/dist/cli.js +24 -23
- package/dist/{cloudflare-workers-ai-system-one-9y1zx3pt.js → cloudflare-workers-ai-system-one-4aysy6rh.js} +2 -2
- package/dist/{codex-adapter-44yq2fkn.js → codex-adapter-exfdbj73.js} +6 -6
- package/dist/{codex-hook-h1zb7cfk.js → codex-hook-59atdwd8.js} +1 -1
- package/dist/{codex-login-cdyrr5y1.js → codex-login-a239g1ah.js} +1 -1
- package/dist/{codex-session-runner-zbh26gbw.js → codex-session-runner-xhznc4g3.js} +6 -6
- package/dist/{commands-54f02v5b.js → commands-d8g349v4.js} +3 -3
- package/dist/{controller-9gpwcdek.js → controller-mwgdmb8y.js} +6 -3
- package/dist/{controllers-connect-61re6k1n.js → controllers-connect-5v7qx04j.js} +22 -20
- package/dist/core-sxy4epp2.js +38 -0
- package/dist/{cursor-adapter-7e4g81vd.js → cursor-adapter-p2q5h35d.js} +1 -1
- package/dist/{db-wnh0qjy1.js → db-qpganbeb.js} +3 -3
- package/dist/{db-dg2gc7fd.js → db-wcw0b2j8.js} +8 -2
- package/dist/{dispatcher-jrm24r43.js → dispatcher-8d8s49yz.js} +20 -18
- package/dist/{docker-9aq30pp2.js → docker-09tkkg0n.js} +42 -3
- package/dist/{dsh-adapter-1yqk267c.js → dsh-adapter-me0twn13.js} +1 -1
- package/dist/{easter-egg-3d-r4h9cs9m.js → easter-egg-3d-wv7w5ty6.js} +1 -1
- package/dist/{embedding-space-bafjr5f7.js → embedding-space-e48xchqa.js} +6 -6
- package/dist/{embeddings-7xmgqe0e.js → embeddings-tgq2afbq.js} +1 -1
- package/dist/{execute-d6jg5ns0.js → execute-8rhwrk7f.js} +1 -1
- package/dist/{external-channel-frq1xvq2.js → external-channel-8bt3j2pm.js} +2 -2
- package/dist/fx-adapter-adtdb3jb.js +19 -0
- package/dist/{google-generative-ai-hh7strj3.js → google-generative-ai-bh0djqjp.js} +5 -5
- package/dist/{google-vertex-fy5bw2pm.js → google-vertex-prjbw8dj.js} +9 -9
- package/dist/grok-adapter-accnn9km.js +19 -0
- package/dist/handlers-1x77561e.js +35 -0
- package/dist/{heartbeat-6bpa611t.js → heartbeat-x0056ra5.js} +23 -21
- package/dist/{hook-hvm5nf46.js → hook-a7vmn2st.js} +5 -5
- package/dist/{hook-w12k146y.js → hook-mrd2ayxv.js} +6 -6
- package/dist/{http-43tthdvs.js → http-ym9c5svp.js} +1335 -363
- package/dist/{index-fn054vsf.js → index-01ns1pkw.js} +1 -1
- package/dist/{index-1f0vypbg.js → index-0h6qd4p1.js} +34 -24
- package/dist/index-48qzcqzj.js +35 -0
- package/dist/{index-4b1q8kan.js → index-4k7m5dgj.js} +629 -354
- package/dist/index-620y7jzq.js +15 -0
- package/dist/{index-cret47a5.js → index-8p0j4h4j.js} +506 -43
- package/dist/{index-m5gx1xd6.js → index-9myfj74s.js} +40 -40
- package/dist/{index-bs7gw5fd.js → index-b5wgnm78.js} +44 -44
- package/dist/{index-ftywhyr0.js → index-ny60jcat.js} +394 -66
- package/dist/{index-tx9mc2ap.js → index-p46tvwtx.js} +24 -22
- package/dist/{index-585gyczt.js → index-pe3d8jfy.js} +3 -3
- package/dist/index-rkvaambe.js +36 -0
- package/dist/{index-mhq4sh5w.js → index-x6azjwm8.js} +1 -1
- package/dist/index-xj1mq27m.js +40 -0
- package/dist/k8s-m56sw868.js +217 -0
- package/dist/{keepalive-rk0j0jvh.js → keepalive-7yxg8z4c.js} +3 -3
- package/dist/lead-enzn86bz.js +74 -0
- package/dist/{maintenance-g6z6kaxw.js → maintenance-6tefxmk1.js} +1 -1
- package/dist/{node-jftbyawr.js → node-2wfcey7d.js} +1 -1
- package/dist/{oauth-refresh-sweep-2k3g2q4w.js → oauth-refresh-sweep-70cavc3a.js} +2 -2
- package/dist/{onboard-6fdbvh3v.js → onboard-fja65z08.js} +5 -5
- package/dist/{openai-decisions-q3hh60wr.js → openai-decisions-ytp6w6xh.js} +1 -1
- package/dist/{opencode-adapter-fdbsvts7.js → opencode-adapter-hakkm7yh.js} +6 -6
- package/dist/{otel-impl-rvwtc09q.js → otel-impl-7zhnt6gj.js} +1 -1
- package/dist/{pending-sqkrb836.js → pending-h01yzpx4.js} +21 -19
- package/dist/{pi-mono-adapter-asqayqcg.js → pi-mono-adapter-f52hz743.js} +40 -13
- package/dist/{pricing-refresh-f5tkgmw2.js → pricing-refresh-fzxvk2zf.js} +2 -2
- package/dist/{rbac-roles-06s555fa.js → rbac-roles-9v6vhgbs.js} +3 -3
- package/dist/{rbac-roles-szxsg8t1.js → rbac-roles-hfgh8sba.js} +2 -2
- package/dist/{render-v2-103p266q.js → render-v2-1rgspxzf.js} +6 -3
- package/dist/{resume-v7kjewt9.js → resume-tqy61x24.js} +10 -7
- package/dist/{runtime-f1gmk0b7.js → runtime-exkxyx5f.js} +1 -1
- package/dist/{session-access-6shev8ts.js → session-access-3act7vt4.js} +4 -4
- package/dist/{session-source-backfill-bd7spzjd.js → session-source-backfill-82qe7fqq.js} +3 -3
- package/dist/{setup-kmxmztdb.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-57eje5wy.js → virtual-modules-s0rjzcqq.js} +3 -3
- package/dist/{work-objects-zr47ygmf.js → work-objects-z2e5tv03.js} +29 -23
- package/dist/{worker-follow-up-grrr3fda.js → worker-follow-up-y3xeg89w.js} +20 -18
- package/dist/worker-zfcv2wbf.js +74 -0
- package/openapi.json +2763 -147
- package/package.json +9 -8
- package/src/apps/catalog.generated.json +43 -3
- package/src/apps/page-validator.ts +27 -0
- package/src/be/boot-seeds.ts +7 -1
- package/src/be/db/model-groups.ts +238 -0
- package/src/be/db/model-profiles.ts +28 -7
- package/src/be/db/session-costs.ts +225 -0
- package/src/be/db/session-log-reasoning.ts +36 -0
- package/src/be/db/tasks/read.ts +8 -3
- package/src/be/db/tasks/write.ts +34 -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 +232 -361
- package/src/be/key-window-usage.ts +386 -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/303_task_ui_specs.sql +28 -0
- package/src/be/migrations/306_provider_account_telemetry.sql +1 -0
- package/src/be/migrations/307_session_cost_credential_attribution.sql +23 -0
- package/src/be/migrations/310_session_logs_reasoning.sql +12 -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 +23 -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/boot-triage.inline.ts +1 -0
- package/src/be/seed-scripts/catalog/boot-triage.ts +1 -0
- package/src/be/seed-scripts/catalog/dreaming-gather.ts +165 -1
- package/src/be/seed-scripts/catalog/wait-for-task.ts +5 -1
- package/src/be/seed-skills/index.ts +3 -0
- package/src/be/swarm-config-guard.ts +58 -1
- package/src/be/task-ui-spec.ts +259 -0
- package/src/be/user-merge-jobs.ts +564 -0
- package/src/be/users.ts +41 -23
- package/src/commands/controller.ts +3 -0
- package/src/commands/credential-outcome-report.ts +13 -3
- 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/rate-limit-outcome.ts +6 -0
- package/src/commands/runner.ts +34 -53
- package/src/extensions/catalog.generated.json +3 -3
- 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/api-keys.ts +258 -30
- 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/session-data.ts +74 -23
- package/src/http/sessions.ts +6 -2
- package/src/http/tasks.ts +140 -5
- 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/integrations/chat-sdk/relay.ts +87 -0
- package/src/jira/outbound.ts +5 -3
- package/src/linear/outbound.ts +5 -1
- package/src/prompts/base-prompt.ts +8 -0
- package/src/prompts/session-templates.ts +19 -2
- package/src/providers/acp-targets.ts +2 -2
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/claude-adapter.ts +27 -4
- package/src/providers/claude-flag-settings.ts +39 -1
- package/src/providers/codex-adapter.ts +85 -3
- package/src/providers/codex-app-server.ts +9 -5
- package/src/providers/codex-oauth/auth-json.ts +1 -0
- package/src/providers/pi-mono-adapter.ts +35 -2
- package/src/providers/pricing-sources.md +41 -0
- package/src/providers/types.ts +11 -0
- package/src/rbac/legacy-policy.ts +1 -0
- package/src/rbac/permissions.ts +5 -0
- package/src/runtime-providers/docker.ts +65 -1
- package/src/runtime-providers/index.ts +7 -5
- package/src/runtime-providers/k8s.ts +250 -0
- package/src/scheduler/deferred-task-waits.ts +18 -5
- package/src/scripts-runtime/types/stdlib.d.ts +2 -0
- package/src/scripts-runtime/types/swarm-extension.d.ts +24 -9
- package/src/scripts-runtime/types/swarm-sdk.d.ts +2 -0
- package/src/slack/actions.ts +79 -0
- package/src/slack/app.ts +22 -15
- package/src/slack/blocks.ts +23 -2
- package/src/slack/inbound-files.ts +2 -0
- package/src/slack/render-v2.ts +154 -23
- package/src/slack/responses.ts +3 -2
- package/src/slack/work-objects.ts +4 -1
- package/src/tasks/errors.ts +5 -0
- package/src/tests/acp-adapter.test.ts +30 -6
- package/src/tests/api-key-tracking.test.ts +0 -72
- package/src/tests/api-keys-status-model-limits.test.ts +93 -1
- package/src/tests/api-keys-validation.test.ts +42 -0
- package/src/tests/approval-card-resolution.test.ts +7 -1
- package/src/tests/approval-requests-notifications.test.ts +11 -1
- package/src/tests/apps-catalog-page-frame.test.ts +49 -0
- package/src/tests/apps-session-thread.test.ts +79 -0
- package/src/tests/base-prompt.test.ts +111 -5
- package/src/tests/chat-sdk-relay.test.ts +170 -2
- package/src/tests/check-pr-body.test.ts +43 -0
- package/src/tests/claude-adapter-binary.test.ts +67 -6
- package/src/tests/claude-flag-settings.test.ts +29 -0
- package/src/tests/claude-sdk-lifecycle.test.ts +5 -0
- package/src/tests/codex-adapter.test.ts +340 -2
- package/src/tests/codex-app-server.test.ts +16 -0
- package/src/tests/codex-oauth.test.ts +3 -1
- package/src/tests/codex-rate-limits.test.ts +384 -0
- package/src/tests/credential-check.test.ts +14 -6
- package/src/tests/credential-outcome-report.test.ts +20 -0
- package/src/tests/db-client.test.ts +146 -0
- package/src/tests/db-task-read-contract.test.ts +3 -0
- package/src/tests/db-task-write-contract.test.ts +4 -0
- package/src/tests/deferred-task-wake.test.ts +63 -1
- package/src/tests/deploy-guard.test.ts +7 -7
- package/src/tests/deploy-select.test.ts +83 -0
- package/src/tests/docker-isolation-config-guard.test.ts +29 -0
- package/src/tests/docs-index-footprint.test.js +11 -3
- package/src/tests/dreaming-gather-corrections.test.ts +467 -0
- package/src/tests/e2e-visuals-comment.test.ts +82 -0
- package/src/tests/e2e-visuals-verify-pr.test.ts +138 -0
- package/src/tests/event-loop-lag.test.ts +9 -7
- package/src/tests/extensions-example-sql-admin-only.test.ts +7 -4
- 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/fixtures/ui-spec-slack/deploys.json +121 -0
- package/src/tests/fixtures/ui-spec-slack/incident.json +183 -0
- package/src/tests/fixtures/ui-spec-slack/three-charts-stale.json +196 -0
- package/src/tests/fixtures/ui-spec-slack/video-rejected-by-slack.json +183 -0
- package/src/tests/fixtures/ui-spec-slack/video.json +446 -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-sender-trust.test.ts +223 -0
- package/src/tests/gitleaks-download-retry.test.ts +85 -0
- package/src/tests/http-users.test.ts +142 -41
- package/src/tests/human-thread-routing.test.ts +187 -0
- package/src/tests/jira-outbound-sync.test.ts +33 -1
- package/src/tests/k8s-pool-smoke.test.ts +190 -0
- package/src/tests/key-window-usage.test.ts +846 -0
- package/src/tests/linear-outbound-sync.test.ts +30 -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/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/pi-mono-adapter.test.ts +79 -0
- package/src/tests/preload-env.test.ts +2 -0
- package/src/tests/preload.ts +3 -1
- package/src/tests/prompt-template-session.test.ts +4 -3
- package/src/tests/provider-quota-persistence.test.ts +362 -0
- package/src/tests/rate-limit-event.test.ts +22 -0
- package/src/tests/rbac-engine.test.ts +1 -0
- package/src/tests/reasoning-events.test.ts +164 -0
- package/src/tests/routing-affinity-inventory.test.ts +22 -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-docker.test.ts +91 -0
- package/src/tests/runtime-providers-k8s.test.ts +303 -0
- package/src/tests/script-connections.test.ts +18 -1
- package/src/tests/secret-canary-sweep.test.ts +41 -5
- package/src/tests/seed-scripts.test.ts +23 -0
- package/src/tests/session-cost-attribution.test.ts +748 -0
- package/src/tests/session-costs.test.ts +14 -15
- package/src/tests/session-logs.test.ts +83 -0
- package/src/tests/sessions-detail-batch.test.ts +7 -0
- 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 +411 -0
- package/src/tests/slack-start-reload-race.test.ts +67 -0
- package/src/tests/spec-base-url.test.ts +13 -1
- package/src/tests/subscription-plans.test.ts +20 -1
- package/src/tests/system-one-decide-session-cost.test.ts +196 -0
- package/src/tests/task-ui-action-route.test.ts +249 -0
- package/src/tests/task-ui-actions.test.ts +195 -0
- package/src/tests/task-ui-script-actions.test.ts +517 -0
- package/src/tests/task-ui-spec-fallback.test.ts +65 -0
- package/src/tests/task-ui-spec.test.ts +368 -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 +96 -1
- 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/defer-task.ts +1 -1
- package/src/tools/memory-search.ts +14 -3
- package/src/tools/store-progress.ts +69 -3
- 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 +93 -4
- package/src/ui-spec/actions.ts +112 -0
- package/src/ui-spec/fallback.ts +19 -0
- 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/ui-spec/slack.ts +17 -0
- package/src/ui-spec/validate.ts +169 -0
- package/src/utils/codex-rate-limits.ts +159 -0
- package/src/utils/credentials.ts +2 -0
- package/src/utils/error-tracker.ts +19 -0
- package/src/utils/provider-account-telemetry.ts +331 -0
- package/src/utils/reasoning-events.ts +107 -0
- package/src/utils/short-id.ts +20 -14
- package/src/utils/subscription-plans.ts +11 -59
- package/src/utils/task-ui-spec.ts +79 -0
- 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 +38 -13
- package/src/workflows/triggers.ts +35 -3
- package/templates/extensions/manifest.schema.json +13 -0
- package/templates/extensions/sql-admin-only/README.md +2 -1
- package/templates/extensions/sql-admin-only/hooks.ts +7 -3
- package/templates/extensions/sql-admin-only/manifest.json +1 -1
- package/templates/skills/apps/SKILL.md +32 -5
- package/templates/skills/apps/content.md +32 -5
- package/templates/skills/swarm-docs/content.md +2 -0
- package/templates/skills/ui-spec/config.json +14 -0
- package/templates/skills/ui-spec/content.md +133 -0
- package/templates/workflows/dreaming/content.md +1 -1
- package/dist/acp-adapter-jqn86aam.js +0 -16
- package/dist/cli-7831nhaw.js +0 -93
- package/dist/cli-srtkr1h2.js +0 -12078
- package/dist/fx-adapter-0zrkfbkd.js +0 -19
- package/dist/grok-adapter-3db1c538.js +0 -19
- package/dist/handlers-k22n8mnn.js +0 -33
- package/dist/index-8xcyd3mc.js +0 -33
- package/dist/index-9sy2bh6n.js +0 -38
- package/dist/index-b24j7t2m.js +0 -12797
- package/dist/index-wjd56k1v.js +0 -34
- package/dist/lead-atxf3q6e.js +0 -72
- package/dist/thread-buffer-4yz236d0.js +0 -36
- package/dist/worker-p4hbtcy3.js +0 -72
- package/dist/{azure-openai-responses-590s1eea.js → azure-openai-responses-b3y7fz36.js} +8 -8
- package/dist/{cli-j49yqpvh.js → cli-7evph51z.js} +3 -3
- package/dist/{cli-g0vv9dg4.js → cli-8y43jx2r.js} +8 -8
- package/dist/{cli-m0cy2vyf.js → cli-k6nejceb.js} +4 -4
- package/dist/{mistral-conversations-0c30em7t.js → mistral-conversations-tm2vd4gc.js} +8 -8
- 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
|
@@ -0,0 +1,680 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Background user merges (src/be/user-merge-jobs.ts) and the 202 contract of
|
|
3
|
+
* POST /api/users/:id/merge.
|
|
4
|
+
*
|
|
5
|
+
* The HTTP harness mirrors http-users.test.ts: a node http.Server running
|
|
6
|
+
* `handleCore → handleUsers`, so the bearer gate, the operator actor and the
|
|
7
|
+
* route() matching are the production ones.
|
|
8
|
+
*/
|
|
9
|
+
|
|
10
|
+
import { afterAll, beforeAll, beforeEach, describe, expect, test } from "bun:test";
|
|
11
|
+
import { unlink } from "node:fs/promises";
|
|
12
|
+
import {
|
|
13
|
+
createServer as createHttpServer,
|
|
14
|
+
type IncomingMessage,
|
|
15
|
+
type Server,
|
|
16
|
+
type ServerResponse,
|
|
17
|
+
} from "node:http";
|
|
18
|
+
import {
|
|
19
|
+
closeDb,
|
|
20
|
+
createScheduledTask,
|
|
21
|
+
createUser,
|
|
22
|
+
createWorkflow,
|
|
23
|
+
createWorkflowRun,
|
|
24
|
+
deleteUser,
|
|
25
|
+
getDbClient,
|
|
26
|
+
getScheduledTaskById,
|
|
27
|
+
getUserById,
|
|
28
|
+
getWorkflowRun,
|
|
29
|
+
initDb,
|
|
30
|
+
updateWorkflowRun,
|
|
31
|
+
} from "../be/db";
|
|
32
|
+
import {
|
|
33
|
+
assertNotLastAdmin,
|
|
34
|
+
ensureRbacSeedsSynced,
|
|
35
|
+
LastAdminError,
|
|
36
|
+
setUserRoles,
|
|
37
|
+
} from "../be/rbac-roles";
|
|
38
|
+
import {
|
|
39
|
+
clearUserMergeRetryTimersForTests,
|
|
40
|
+
createUserMergeJob,
|
|
41
|
+
getUserMergeJob,
|
|
42
|
+
listUserMergeJobs,
|
|
43
|
+
pauseUserMergeRunnerForTests,
|
|
44
|
+
resumeUserMergeJobs,
|
|
45
|
+
runUserMergeJobs,
|
|
46
|
+
USER_MERGE_MAX_ATTEMPTS,
|
|
47
|
+
} from "../be/user-merge-jobs";
|
|
48
|
+
import {
|
|
49
|
+
findUserByEmail,
|
|
50
|
+
findUserByExternalId,
|
|
51
|
+
findUsersByName,
|
|
52
|
+
fingerprintApiKey,
|
|
53
|
+
linkIdentity,
|
|
54
|
+
mintToken,
|
|
55
|
+
} from "../be/users";
|
|
56
|
+
import { handleCore } from "../http/core";
|
|
57
|
+
import { handleUsers } from "../http/users";
|
|
58
|
+
import { getPathSegments, parseQueryParams } from "../http/utils";
|
|
59
|
+
import { listenOnFreePort } from "./test-net";
|
|
60
|
+
|
|
61
|
+
const TEST_DB_PATH = `./test-user-merge-jobs-${crypto.randomUUID()}.sqlite`;
|
|
62
|
+
const API_KEY = "example-test-merge-jobs-key";
|
|
63
|
+
|
|
64
|
+
async function removeDbFiles(path: string): Promise<void> {
|
|
65
|
+
for (const suffix of ["", "-wal", "-shm"]) {
|
|
66
|
+
try {
|
|
67
|
+
await unlink(path + suffix);
|
|
68
|
+
} catch (error) {
|
|
69
|
+
if ((error as NodeJS.ErrnoException).code !== "ENOENT") throw error;
|
|
70
|
+
}
|
|
71
|
+
}
|
|
72
|
+
}
|
|
73
|
+
|
|
74
|
+
function createTestServer(apiKey: string): Server {
|
|
75
|
+
return createHttpServer(async (req: IncomingMessage, res: ServerResponse) => {
|
|
76
|
+
const myAgentId = req.headers["x-agent-id"] as string | undefined;
|
|
77
|
+
const handled = await handleCore(req, res, myAgentId, apiKey);
|
|
78
|
+
if (handled) return;
|
|
79
|
+
const pathSegments = getPathSegments(req.url || "");
|
|
80
|
+
const queryParams = parseQueryParams(req.url || "");
|
|
81
|
+
const ok = await handleUsers(req, res, pathSegments, queryParams);
|
|
82
|
+
if (!ok) {
|
|
83
|
+
res.writeHead(404);
|
|
84
|
+
res.end("Not Found");
|
|
85
|
+
}
|
|
86
|
+
});
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
let server: Server;
|
|
90
|
+
let port: number;
|
|
91
|
+
const ORIGINAL_API_KEY = process.env.AGENT_SWARM_API_KEY;
|
|
92
|
+
const OPERATOR = { kind: "operator" as const, id: fingerprintApiKey(API_KEY) };
|
|
93
|
+
|
|
94
|
+
beforeAll(async () => {
|
|
95
|
+
await removeDbFiles(TEST_DB_PATH);
|
|
96
|
+
initDb(TEST_DB_PATH);
|
|
97
|
+
process.env.AGENT_SWARM_API_KEY = API_KEY;
|
|
98
|
+
server = createTestServer(API_KEY);
|
|
99
|
+
port = await listenOnFreePort(server);
|
|
100
|
+
});
|
|
101
|
+
|
|
102
|
+
afterAll(async () => {
|
|
103
|
+
pauseUserMergeRunnerForTests(false);
|
|
104
|
+
clearUserMergeRetryTimersForTests();
|
|
105
|
+
await runUserMergeJobs();
|
|
106
|
+
await new Promise<void>((resolve) => server.close(() => resolve()));
|
|
107
|
+
closeDb();
|
|
108
|
+
await removeDbFiles(TEST_DB_PATH);
|
|
109
|
+
if (ORIGINAL_API_KEY === undefined) {
|
|
110
|
+
delete process.env.AGENT_SWARM_API_KEY;
|
|
111
|
+
} else {
|
|
112
|
+
process.env.AGENT_SWARM_API_KEY = ORIGINAL_API_KEY;
|
|
113
|
+
}
|
|
114
|
+
});
|
|
115
|
+
|
|
116
|
+
beforeEach(async () => {
|
|
117
|
+
pauseUserMergeRunnerForTests(false);
|
|
118
|
+
clearUserMergeRetryTimersForTests();
|
|
119
|
+
await runUserMergeJobs();
|
|
120
|
+
const client = getDbClient();
|
|
121
|
+
for (const table of [
|
|
122
|
+
"user_merge_jobs",
|
|
123
|
+
"user_identity_events",
|
|
124
|
+
"user_external_ids",
|
|
125
|
+
"user_tokens",
|
|
126
|
+
"workflow_run_steps",
|
|
127
|
+
"workflow_runs",
|
|
128
|
+
"workflows",
|
|
129
|
+
"scheduled_tasks",
|
|
130
|
+
"kv_entries",
|
|
131
|
+
"users",
|
|
132
|
+
]) {
|
|
133
|
+
await client.run(`DELETE FROM ${table}`);
|
|
134
|
+
}
|
|
135
|
+
});
|
|
136
|
+
|
|
137
|
+
function authedFetch(path: string, init: RequestInit = {}, bearer = API_KEY): Promise<Response> {
|
|
138
|
+
const headers: Record<string, string> = {
|
|
139
|
+
Authorization: `Bearer ${bearer}`,
|
|
140
|
+
"Content-Type": "application/json",
|
|
141
|
+
...((init.headers as Record<string, string>) ?? {}),
|
|
142
|
+
};
|
|
143
|
+
return fetch(`http://localhost:${port}${path}`, { ...init, headers });
|
|
144
|
+
}
|
|
145
|
+
|
|
146
|
+
type JobBody = {
|
|
147
|
+
job: {
|
|
148
|
+
id: string;
|
|
149
|
+
status: string;
|
|
150
|
+
sourceUserId: string;
|
|
151
|
+
targetUserId: string;
|
|
152
|
+
progress: Record<string, number>;
|
|
153
|
+
error: string | null;
|
|
154
|
+
attempts: number;
|
|
155
|
+
};
|
|
156
|
+
};
|
|
157
|
+
|
|
158
|
+
/** Poll until the job leaves the pending and running states, or give up after `ms`. */
|
|
159
|
+
async function waitForJobToSettle(jobId: string, ms = 10_000) {
|
|
160
|
+
const deadline = Date.now() + ms;
|
|
161
|
+
while (Date.now() < deadline) {
|
|
162
|
+
const job = await getUserMergeJob(jobId);
|
|
163
|
+
if (job && job.status !== "pending" && job.status !== "running") return job;
|
|
164
|
+
await new Promise((resolve) => setTimeout(resolve, 10));
|
|
165
|
+
}
|
|
166
|
+
return getUserMergeJob(jobId);
|
|
167
|
+
}
|
|
168
|
+
|
|
169
|
+
async function mergeViaRoute(targetId: string, sourceId: string): Promise<Response> {
|
|
170
|
+
return authedFetch(`/api/users/${targetId}/merge`, {
|
|
171
|
+
method: "POST",
|
|
172
|
+
body: JSON.stringify({ sourceUserId: sourceId }),
|
|
173
|
+
});
|
|
174
|
+
}
|
|
175
|
+
|
|
176
|
+
/** `count` kv rows attributed to `userId` (kv_entries is WITHOUT ROWID, so it exercises the PK batch key). */
|
|
177
|
+
async function seedKvRows(userId: string, count: number): Promise<void> {
|
|
178
|
+
const client = getDbClient();
|
|
179
|
+
for (let i = 0; i < count; i++) {
|
|
180
|
+
await client.run(
|
|
181
|
+
`INSERT INTO kv_entries (namespace, key, value, value_type, created_at, updated_at, created_by, updated_by)
|
|
182
|
+
VALUES ('merge-test', ?, '1', 'integer', 0, 0, ?, ?)`,
|
|
183
|
+
[`k${i}`, userId, userId],
|
|
184
|
+
);
|
|
185
|
+
}
|
|
186
|
+
}
|
|
187
|
+
|
|
188
|
+
async function countKvRowsOwnedBy(userId: string): Promise<number> {
|
|
189
|
+
const row = await getDbClient().get<{ n: number }>(
|
|
190
|
+
"SELECT COUNT(*) AS n FROM kv_entries WHERE created_by = ? OR updated_by = ?",
|
|
191
|
+
[userId, userId],
|
|
192
|
+
);
|
|
193
|
+
return row?.n ?? 0;
|
|
194
|
+
}
|
|
195
|
+
|
|
196
|
+
async function seedRequestedRuns(userId: string, count: number): Promise<string[]> {
|
|
197
|
+
const workflow = await createWorkflow({
|
|
198
|
+
name: `merge-jobs-${crypto.randomUUID()}`,
|
|
199
|
+
definition: { nodes: [] },
|
|
200
|
+
});
|
|
201
|
+
const ids: string[] = [];
|
|
202
|
+
for (let i = 0; i < count; i++) {
|
|
203
|
+
const runId = crypto.randomUUID();
|
|
204
|
+
await createWorkflowRun({
|
|
205
|
+
id: runId,
|
|
206
|
+
workflowId: workflow.id,
|
|
207
|
+
triggerType: "manual",
|
|
208
|
+
createdBy: userId,
|
|
209
|
+
});
|
|
210
|
+
await updateWorkflowRun(runId, {
|
|
211
|
+
status: "running",
|
|
212
|
+
context: { swarm: { requestedByUserId: userId }, input: { i } },
|
|
213
|
+
});
|
|
214
|
+
ids.push(runId);
|
|
215
|
+
}
|
|
216
|
+
return ids;
|
|
217
|
+
}
|
|
218
|
+
|
|
219
|
+
describe("runUserMergeJobs", () => {
|
|
220
|
+
test("completes the job, moves every reference and deletes the source", async () => {
|
|
221
|
+
const target = await createUser({ name: "Target", email: "target@x.com" });
|
|
222
|
+
const source = await createUser({ name: "Source", email: "source@x.com" });
|
|
223
|
+
const runIds = await seedRequestedRuns(source.id, 3);
|
|
224
|
+
await seedKvRows(source.id, 4);
|
|
225
|
+
const schedule = await createScheduledTask({
|
|
226
|
+
name: `merge-jobs-schedule-${crypto.randomUUID()}`,
|
|
227
|
+
intervalMs: 60_000,
|
|
228
|
+
taskTemplate: "Run it",
|
|
229
|
+
createdBy: source.id,
|
|
230
|
+
});
|
|
231
|
+
|
|
232
|
+
const job = await createUserMergeJob({ sourceUserId: source.id, targetUserId: target.id });
|
|
233
|
+
expect(job.status).toBe("pending");
|
|
234
|
+
await runUserMergeJobs({ pace: false });
|
|
235
|
+
|
|
236
|
+
const done = await getUserMergeJob(job.id);
|
|
237
|
+
expect(done?.status).toBe("done");
|
|
238
|
+
expect(done?.error).toBeNull();
|
|
239
|
+
expect(done?.phase).toBe("delete-user");
|
|
240
|
+
expect(done?.startedAt).not.toBeNull();
|
|
241
|
+
expect(done?.finishedAt).not.toBeNull();
|
|
242
|
+
expect(done?.progress["workflow-context"]).toBe(3);
|
|
243
|
+
expect(done?.progress["workflow_runs.created_by"]).toBe(3);
|
|
244
|
+
expect(done?.progress["kv_entries.created_by"]).toBe(4);
|
|
245
|
+
expect(done?.progress["kv_entries.updated_by"]).toBe(4);
|
|
246
|
+
expect(done?.progress["scheduled_tasks.created_by"]).toBe(1);
|
|
247
|
+
expect(done?.progress["delete-user"]).toBe(1);
|
|
248
|
+
// Columns with no rows for the source are not listed.
|
|
249
|
+
expect(done?.progress["agents.created_by"]).toBeUndefined();
|
|
250
|
+
|
|
251
|
+
expect(await getUserById(source.id)).toBeNull();
|
|
252
|
+
expect(await countKvRowsOwnedBy(source.id)).toBe(0);
|
|
253
|
+
expect(await countKvRowsOwnedBy(target.id)).toBe(4);
|
|
254
|
+
for (const runId of runIds) {
|
|
255
|
+
const run = await getWorkflowRun(runId);
|
|
256
|
+
expect(run?.createdBy).toBe(target.id);
|
|
257
|
+
expect(
|
|
258
|
+
(run?.context as { swarm: { requestedByUserId: string } }).swarm.requestedByUserId,
|
|
259
|
+
).toBe(target.id);
|
|
260
|
+
}
|
|
261
|
+
expect((await getScheduledTaskById(schedule.id))?.createdBy).toBe(target.id);
|
|
262
|
+
});
|
|
263
|
+
|
|
264
|
+
test("respects the batch size and commits one batch per transaction", async () => {
|
|
265
|
+
const target = await createUser({ name: "BatchTarget" });
|
|
266
|
+
const source = await createUser({ name: "BatchSource" });
|
|
267
|
+
await seedKvRows(source.id, 7);
|
|
268
|
+
await seedRequestedRuns(source.id, 5);
|
|
269
|
+
|
|
270
|
+
const batches: Array<{ phase: string; changes: number }> = [];
|
|
271
|
+
const job = await createUserMergeJob({ sourceUserId: source.id, targetUserId: target.id });
|
|
272
|
+
await runUserMergeJobs({
|
|
273
|
+
batchSize: 3,
|
|
274
|
+
pace: false,
|
|
275
|
+
afterBatch: ({ phase, changes }) => {
|
|
276
|
+
batches.push({ phase, changes });
|
|
277
|
+
},
|
|
278
|
+
});
|
|
279
|
+
|
|
280
|
+
expect((await getUserMergeJob(job.id))?.status).toBe("done");
|
|
281
|
+
const sizes = (phase: string) => batches.filter((b) => b.phase === phase).map((b) => b.changes);
|
|
282
|
+
expect(sizes("workflow-context")).toEqual([3, 2]);
|
|
283
|
+
expect(sizes("kv_entries.created_by")).toEqual([3, 3, 1]);
|
|
284
|
+
expect(sizes("kv_entries.updated_by")).toEqual([3, 3, 1]);
|
|
285
|
+
expect(sizes("workflow_runs.created_by")).toEqual([3, 2]);
|
|
286
|
+
expect(batches.every((b) => b.changes <= 3)).toBe(true);
|
|
287
|
+
});
|
|
288
|
+
|
|
289
|
+
test("a job interrupted mid-way waits for a retry and finishes on resume", async () => {
|
|
290
|
+
const target = await createUser({ name: "ResumeTarget" });
|
|
291
|
+
const source = await createUser({ name: "ResumeSource" });
|
|
292
|
+
await seedKvRows(source.id, 10);
|
|
293
|
+
const runIds = await seedRequestedRuns(source.id, 4);
|
|
294
|
+
|
|
295
|
+
const committed: Array<{ phase: string; changes: number }> = [];
|
|
296
|
+
const job = await createUserMergeJob({ sourceUserId: source.id, targetUserId: target.id });
|
|
297
|
+
await runUserMergeJobs({
|
|
298
|
+
batchSize: 2,
|
|
299
|
+
pace: false,
|
|
300
|
+
retryDelayMs: () => 60_000,
|
|
301
|
+
afterBatch: (info) => {
|
|
302
|
+
committed.push(info);
|
|
303
|
+
if (committed.length === 3) throw new Error("simulated crash after batch 3");
|
|
304
|
+
},
|
|
305
|
+
});
|
|
306
|
+
|
|
307
|
+
// The failed attempt goes back to pending with a backoff, not to failed.
|
|
308
|
+
const failed = await getUserMergeJob(job.id);
|
|
309
|
+
expect(failed?.status).toBe("pending");
|
|
310
|
+
expect(failed?.attempts).toBe(1);
|
|
311
|
+
expect(failed?.nextAttemptAt).not.toBeNull();
|
|
312
|
+
expect(failed?.error).toContain("simulated crash");
|
|
313
|
+
// The backoff has not passed: a plain drain leaves it alone.
|
|
314
|
+
await runUserMergeJobs({ pace: false });
|
|
315
|
+
expect((await getUserMergeJob(job.id))?.status).toBe("pending");
|
|
316
|
+
clearUserMergeRetryTimersForTests();
|
|
317
|
+
// The three committed batches stay: the 2 + 2 context runs, then the
|
|
318
|
+
// first 2 rows of whichever discovered column comes first.
|
|
319
|
+
expect(committed.slice(0, 2)).toEqual([
|
|
320
|
+
{ jobId: job.id, phase: "workflow-context", changes: 2 },
|
|
321
|
+
{ jobId: job.id, phase: "workflow-context", changes: 2 },
|
|
322
|
+
]);
|
|
323
|
+
const third = committed[2];
|
|
324
|
+
expect(third.phase).not.toBe("workflow-context");
|
|
325
|
+
expect(third.changes).toBe(2);
|
|
326
|
+
expect(failed?.progress["workflow-context"]).toBe(4);
|
|
327
|
+
expect(failed?.progress[third.phase]).toBe(2);
|
|
328
|
+
expect(await getUserById(source.id)).not.toBeNull();
|
|
329
|
+
|
|
330
|
+
// A restart re-queues it and the remaining rows move; nothing is counted twice.
|
|
331
|
+
const resumed: Array<{ phase: string; changes: number }> = [];
|
|
332
|
+
await resumeUserMergeJobs({
|
|
333
|
+
batchSize: 2,
|
|
334
|
+
pace: false,
|
|
335
|
+
afterBatch: (info) => {
|
|
336
|
+
resumed.push(info);
|
|
337
|
+
},
|
|
338
|
+
});
|
|
339
|
+
const done = await getUserMergeJob(job.id);
|
|
340
|
+
expect(done?.status).toBe("done");
|
|
341
|
+
expect(done?.error).toBeNull();
|
|
342
|
+
expect(done?.attempts).toBe(2);
|
|
343
|
+
expect(done?.nextAttemptAt).toBeNull();
|
|
344
|
+
expect(done?.progress["workflow-context"]).toBe(4);
|
|
345
|
+
expect(done?.progress["kv_entries.created_by"]).toBe(10);
|
|
346
|
+
expect(done?.progress["kv_entries.updated_by"]).toBe(10);
|
|
347
|
+
expect(resumed.filter((b) => b.phase === "workflow-context")).toEqual([]);
|
|
348
|
+
// The interrupted column continues after its committed rows.
|
|
349
|
+
const thirdTotal = resumed
|
|
350
|
+
.filter((b) => b.phase === third.phase)
|
|
351
|
+
.reduce((sum, b) => sum + b.changes, 0);
|
|
352
|
+
expect(thirdTotal + 2).toBe(done?.progress[third.phase]);
|
|
353
|
+
expect(
|
|
354
|
+
resumed.filter((b) => b.phase === "kv_entries.updated_by").map((b) => b.changes),
|
|
355
|
+
).toEqual([2, 2, 2, 2, 2]);
|
|
356
|
+
expect(await getUserById(source.id)).toBeNull();
|
|
357
|
+
expect(await countKvRowsOwnedBy(target.id)).toBe(10);
|
|
358
|
+
for (const runId of runIds) {
|
|
359
|
+
expect((await getWorkflowRun(runId))?.createdBy).toBe(target.id);
|
|
360
|
+
}
|
|
361
|
+
});
|
|
362
|
+
|
|
363
|
+
test("a job whose source is already gone completes without changes", async () => {
|
|
364
|
+
const target = await createUser({ name: "GoneTarget" });
|
|
365
|
+
const job = await createUserMergeJob({ sourceUserId: "no-such-user", targetUserId: target.id });
|
|
366
|
+
await runUserMergeJobs({ pace: false });
|
|
367
|
+
const done = await getUserMergeJob(job.id);
|
|
368
|
+
expect(done?.status).toBe("done");
|
|
369
|
+
expect(done?.progress["delete-user"]).toBe(0);
|
|
370
|
+
});
|
|
371
|
+
|
|
372
|
+
test("a job whose target is gone fails for good and is not re-queued on boot", async () => {
|
|
373
|
+
const source = await createUser({ name: "OrphanSource" });
|
|
374
|
+
const job = await createUserMergeJob({ sourceUserId: source.id, targetUserId: "no-such-user" });
|
|
375
|
+
await runUserMergeJobs({ pace: false });
|
|
376
|
+
const failed = await getUserMergeJob(job.id);
|
|
377
|
+
expect(failed?.status).toBe("failed");
|
|
378
|
+
expect(failed?.attempts).toBe(1);
|
|
379
|
+
expect(failed?.error).toBe("Target user not found");
|
|
380
|
+
expect(await getUserById(source.id)).not.toBeNull();
|
|
381
|
+
|
|
382
|
+
await resumeUserMergeJobs({ pace: false });
|
|
383
|
+
const afterBoot = await getUserMergeJob(job.id);
|
|
384
|
+
expect(afterBoot?.status).toBe("failed");
|
|
385
|
+
expect(afterBoot?.attempts).toBe(1);
|
|
386
|
+
});
|
|
387
|
+
|
|
388
|
+
test("a job that keeps failing is marked failed after the attempt cap", async () => {
|
|
389
|
+
const target = await createUser({ name: "CapTarget" });
|
|
390
|
+
const source = await createUser({ name: "CapSource" });
|
|
391
|
+
await seedKvRows(source.id, 3);
|
|
392
|
+
// The batches are idempotent, so only the final delete can fail on every
|
|
393
|
+
// attempt: block it the way a constraint would.
|
|
394
|
+
await getDbClient().run(
|
|
395
|
+
`CREATE TRIGGER merge_test_block_delete BEFORE DELETE ON users
|
|
396
|
+
BEGIN SELECT RAISE(ABORT, 'delete blocked'); END`,
|
|
397
|
+
);
|
|
398
|
+
try {
|
|
399
|
+
const job = await createUserMergeJob({ sourceUserId: source.id, targetUserId: target.id });
|
|
400
|
+
await runUserMergeJobs({ pace: false, retryDelayMs: () => 1 });
|
|
401
|
+
// The retry timers drive the later attempts.
|
|
402
|
+
const settled = await waitForJobToSettle(job.id);
|
|
403
|
+
expect(settled?.status).toBe("failed");
|
|
404
|
+
expect(settled?.attempts).toBe(USER_MERGE_MAX_ATTEMPTS);
|
|
405
|
+
expect(settled?.error).toContain("delete blocked");
|
|
406
|
+
expect(settled?.phase).toBe("delete-user");
|
|
407
|
+
expect(settled?.finishedAt).not.toBeNull();
|
|
408
|
+
// The rows moved exactly once and the source row is still there.
|
|
409
|
+
expect(settled?.progress["kv_entries.created_by"]).toBe(3);
|
|
410
|
+
expect(await countKvRowsOwnedBy(target.id)).toBe(3);
|
|
411
|
+
expect(await getUserById(source.id)).not.toBeNull();
|
|
412
|
+
} finally {
|
|
413
|
+
await getDbClient().run("DROP TRIGGER IF EXISTS merge_test_block_delete");
|
|
414
|
+
}
|
|
415
|
+
});
|
|
416
|
+
|
|
417
|
+
test("rows written while the job runs are swept before the source is deleted", async () => {
|
|
418
|
+
const target = await createUser({ name: "SweepTarget" });
|
|
419
|
+
const source = await createUser({ name: "SweepSource" });
|
|
420
|
+
await seedKvRows(source.id, 7);
|
|
421
|
+
const batchSize = 3;
|
|
422
|
+
|
|
423
|
+
// A writer that still holds the source id in memory (a running workflow,
|
|
424
|
+
// an agent task) inserts after the kv updated_by pass ends: one more kv
|
|
425
|
+
// row (both audit columns) and one more requested workflow run.
|
|
426
|
+
let lateWrite = false;
|
|
427
|
+
const job = await createUserMergeJob({ sourceUserId: source.id, targetUserId: target.id });
|
|
428
|
+
await runUserMergeJobs({
|
|
429
|
+
batchSize,
|
|
430
|
+
pace: false,
|
|
431
|
+
afterBatch: async ({ phase, changes }) => {
|
|
432
|
+
if (phase !== "kv_entries.updated_by" || changes >= batchSize || lateWrite) return;
|
|
433
|
+
lateWrite = true;
|
|
434
|
+
await getDbClient().run(
|
|
435
|
+
`INSERT INTO kv_entries (namespace, key, value, value_type, created_at, updated_at, created_by, updated_by)
|
|
436
|
+
VALUES ('merge-test', 'late', '1', 'integer', 0, 0, ?, ?)`,
|
|
437
|
+
[source.id, source.id],
|
|
438
|
+
);
|
|
439
|
+
await seedRequestedRuns(source.id, 1);
|
|
440
|
+
},
|
|
441
|
+
});
|
|
442
|
+
|
|
443
|
+
expect(lateWrite).toBe(true);
|
|
444
|
+
const done = await getUserMergeJob(job.id);
|
|
445
|
+
expect(done?.status).toBe("done");
|
|
446
|
+
expect(done?.error).toBeNull();
|
|
447
|
+
expect(done?.progress["delete-user"]).toBe(1);
|
|
448
|
+
// The pass saw 7 rows; the final sweep moved the late one.
|
|
449
|
+
expect(done?.progress["kv_entries.updated_by"]).toBe(8);
|
|
450
|
+
expect(done?.progress["kv_entries.created_by"]).toBe(8);
|
|
451
|
+
expect(done?.progress["workflow-context"]).toBe(1);
|
|
452
|
+
expect(done?.progress["workflow_runs.created_by"]).toBe(1);
|
|
453
|
+
expect(await getUserById(source.id)).toBeNull();
|
|
454
|
+
expect(await countKvRowsOwnedBy(source.id)).toBe(0);
|
|
455
|
+
expect(await countKvRowsOwnedBy(target.id)).toBe(8);
|
|
456
|
+
const lateRun = await getDbClient().get<{ created_by: string; requester: string }>(
|
|
457
|
+
`SELECT created_by, json_extract(context, '$.swarm.requestedByUserId') AS requester
|
|
458
|
+
FROM workflow_runs`,
|
|
459
|
+
);
|
|
460
|
+
expect(lateRun?.created_by).toBe(target.id);
|
|
461
|
+
expect(lateRun?.requester).toBe(target.id);
|
|
462
|
+
});
|
|
463
|
+
|
|
464
|
+
test("listUserMergeJobs filters by status", async () => {
|
|
465
|
+
const a = await createUser({ name: "ListA" });
|
|
466
|
+
const b = await createUser({ name: "ListB" });
|
|
467
|
+
pauseUserMergeRunnerForTests(true);
|
|
468
|
+
const job = await createUserMergeJob({ sourceUserId: a.id, targetUserId: b.id });
|
|
469
|
+
expect((await listUserMergeJobs({ status: "pending" })).map((j) => j.id)).toEqual([job.id]);
|
|
470
|
+
expect(await listUserMergeJobs({ status: "done" })).toEqual([]);
|
|
471
|
+
pauseUserMergeRunnerForTests(false);
|
|
472
|
+
await runUserMergeJobs({ pace: false });
|
|
473
|
+
expect((await listUserMergeJobs({ status: "done" })).map((j) => j.id)).toEqual([job.id]);
|
|
474
|
+
});
|
|
475
|
+
});
|
|
476
|
+
|
|
477
|
+
describe("POST /api/users/:id/merge", () => {
|
|
478
|
+
test("returns 202 with the job, GET returns it, and the job finishes", async () => {
|
|
479
|
+
const target = await createUser({ name: "RouteTarget", email: "route-target@x.com" });
|
|
480
|
+
const source = await createUser({ name: "RouteSource", email: "route-source@x.com" });
|
|
481
|
+
await linkIdentity(source.id, "slack", "U_ROUTE", OPERATOR);
|
|
482
|
+
|
|
483
|
+
const r = await mergeViaRoute(target.id, source.id);
|
|
484
|
+
expect(r.status).toBe(202);
|
|
485
|
+
const { job } = (await r.json()) as JobBody;
|
|
486
|
+
expect(job.sourceUserId).toBe(source.id);
|
|
487
|
+
expect(job.targetUserId).toBe(target.id);
|
|
488
|
+
|
|
489
|
+
const polled = await authedFetch(`/api/users/merge-jobs/${job.id}`);
|
|
490
|
+
expect(polled.status).toBe(200);
|
|
491
|
+
expect(((await polled.json()) as JobBody).job.id).toBe(job.id);
|
|
492
|
+
|
|
493
|
+
await runUserMergeJobs();
|
|
494
|
+
const final = await authedFetch(`/api/users/merge-jobs/${job.id}`);
|
|
495
|
+
expect(((await final.json()) as JobBody).job.status).toBe("done");
|
|
496
|
+
expect((await authedFetch(`/api/users/${source.id}`)).status).toBe(404);
|
|
497
|
+
|
|
498
|
+
const list = await authedFetch("/api/users/merge-jobs");
|
|
499
|
+
expect(list.status).toBe(200);
|
|
500
|
+
expect(
|
|
501
|
+
((await list.json()) as { jobs: Array<{ id: string }> }).jobs.map((j) => j.id),
|
|
502
|
+
).toContain(job.id);
|
|
503
|
+
expect((await authedFetch("/api/users/merge-jobs", {}, "wrong-key")).status).toBe(401);
|
|
504
|
+
});
|
|
505
|
+
|
|
506
|
+
test("while the job is pending the source resolves to the target and cannot authenticate", async () => {
|
|
507
|
+
const target = await createUser({ name: "PendingTarget", email: "pending-target@x.com" });
|
|
508
|
+
const source = await createUser({
|
|
509
|
+
name: "PendingSource",
|
|
510
|
+
email: "pending-source@x.com",
|
|
511
|
+
emailAliases: ["pending-alias@x.com"],
|
|
512
|
+
});
|
|
513
|
+
await linkIdentity(source.id, "slack", "U_PENDING", OPERATOR);
|
|
514
|
+
const { plaintext } = await mintToken(source.id, "cli", OPERATOR);
|
|
515
|
+
const before = await authedFetch("/api/whoami", {}, plaintext);
|
|
516
|
+
expect(before.status).toBe(200);
|
|
517
|
+
|
|
518
|
+
pauseUserMergeRunnerForTests(true);
|
|
519
|
+
try {
|
|
520
|
+
const r = await mergeViaRoute(target.id, source.id);
|
|
521
|
+
expect(r.status).toBe(202);
|
|
522
|
+
const { job } = (await r.json()) as JobBody;
|
|
523
|
+
expect(job.status).toBe("pending");
|
|
524
|
+
|
|
525
|
+
// The source row is still there, marked.
|
|
526
|
+
const sourceNow = await getUserById(source.id);
|
|
527
|
+
expect(sourceNow?.mergedIntoUserId).toBe(target.id);
|
|
528
|
+
const sourceR = await authedFetch(`/api/users/${source.id}`);
|
|
529
|
+
expect(sourceR.status).toBe(200);
|
|
530
|
+
expect(
|
|
531
|
+
((await sourceR.json()) as { user: { mergedIntoUserId?: string } }).user.mergedIntoUserId,
|
|
532
|
+
).toBe(target.id);
|
|
533
|
+
|
|
534
|
+
// Every identity lookup lands on the target.
|
|
535
|
+
expect((await findUserByExternalId("slack", "U_PENDING"))?.id).toBe(target.id);
|
|
536
|
+
expect((await findUserByEmail("pending-source@x.com"))?.id).toBe(target.id);
|
|
537
|
+
expect((await findUserByEmail("pending-alias@x.com"))?.id).toBe(target.id);
|
|
538
|
+
expect((await findUsersByName("PendingSource")).map((u) => u.id)).toEqual([]);
|
|
539
|
+
|
|
540
|
+
// The source's tokens were revoked by the short phase, and a token that
|
|
541
|
+
// still names the source is refused by the auth gate.
|
|
542
|
+
expect((await authedFetch("/api/whoami", {}, plaintext)).status).toBe(401);
|
|
543
|
+
const { plaintext: late } = await mintToken(source.id, "late", OPERATOR);
|
|
544
|
+
expect((await authedFetch("/api/whoami", {}, late)).status).toBe(401);
|
|
545
|
+
|
|
546
|
+
// A second merge touching either user is refused.
|
|
547
|
+
const other = await createUser({ name: "PendingOther" });
|
|
548
|
+
const again = await mergeViaRoute(other.id, source.id);
|
|
549
|
+
expect(again.status).toBe(409);
|
|
550
|
+
expect(((await again.json()) as { error: string }).error).toBe("merge_in_progress");
|
|
551
|
+
expect((await mergeViaRoute(target.id, other.id)).status).toBe(409);
|
|
552
|
+
} finally {
|
|
553
|
+
pauseUserMergeRunnerForTests(false);
|
|
554
|
+
}
|
|
555
|
+
|
|
556
|
+
await runUserMergeJobs({ pace: false });
|
|
557
|
+
expect(await getUserById(source.id)).toBeNull();
|
|
558
|
+
expect((await findUserByExternalId("slack", "U_PENDING"))?.id).toBe(target.id);
|
|
559
|
+
});
|
|
560
|
+
|
|
561
|
+
test("400 on self-merge, 404 on unknown users", async () => {
|
|
562
|
+
const u = await createUser({ name: "Self" });
|
|
563
|
+
expect((await mergeViaRoute(u.id, u.id)).status).toBe(400);
|
|
564
|
+
expect((await mergeViaRoute(u.id, "no-such-user")).status).toBe(404);
|
|
565
|
+
expect((await mergeViaRoute("no-such-user", u.id)).status).toBe(404);
|
|
566
|
+
expect(
|
|
567
|
+
(await getDbClient().get<{ n: number }>("SELECT COUNT(*) AS n FROM user_merge_jobs"))?.n,
|
|
568
|
+
).toBe(0);
|
|
569
|
+
});
|
|
570
|
+
|
|
571
|
+
test("409 last_admin when the source is the only admin, and nothing is queued", async () => {
|
|
572
|
+
ensureRbacSeedsSynced({ quiet: true });
|
|
573
|
+
const admin = await createUser({ name: "OnlyAdmin" });
|
|
574
|
+
const viewer = await createUser({ name: "Viewer" });
|
|
575
|
+
await setUserRoles(admin.id, ["admin"], null);
|
|
576
|
+
await setUserRoles(viewer.id, ["viewer"], null);
|
|
577
|
+
|
|
578
|
+
const r = await mergeViaRoute(viewer.id, admin.id);
|
|
579
|
+
expect(r.status).toBe(409);
|
|
580
|
+
expect(((await r.json()) as { error: string }).error).toBe("last_admin");
|
|
581
|
+
expect((await getUserById(admin.id))?.mergedIntoUserId).toBeUndefined();
|
|
582
|
+
expect(
|
|
583
|
+
(await getDbClient().get<{ n: number }>("SELECT COUNT(*) AS n FROM user_merge_jobs"))?.n,
|
|
584
|
+
).toBe(0);
|
|
585
|
+
});
|
|
586
|
+
|
|
587
|
+
test("a merge source never counts as a live admin while its job is pending", async () => {
|
|
588
|
+
ensureRbacSeedsSynced({ quiet: true });
|
|
589
|
+
const adminA = await createUser({ name: "AdminA" });
|
|
590
|
+
const adminB = await createUser({ name: "AdminB" });
|
|
591
|
+
await setUserRoles(adminA.id, ["admin"], null);
|
|
592
|
+
await setUserRoles(adminB.id, ["admin"], null);
|
|
593
|
+
|
|
594
|
+
pauseUserMergeRunnerForTests(true);
|
|
595
|
+
try {
|
|
596
|
+
expect((await mergeViaRoute(adminB.id, adminA.id)).status).toBe(202);
|
|
597
|
+
// A is marked and cannot authenticate, so B is the only real admin.
|
|
598
|
+
await expect(setUserRoles(adminB.id, ["viewer"], null)).rejects.toBeInstanceOf(
|
|
599
|
+
LastAdminError,
|
|
600
|
+
);
|
|
601
|
+
await expect(assertNotLastAdmin(adminB.id)).rejects.toBeInstanceOf(LastAdminError);
|
|
602
|
+
} finally {
|
|
603
|
+
pauseUserMergeRunnerForTests(false);
|
|
604
|
+
}
|
|
605
|
+
await runUserMergeJobs({ pace: false });
|
|
606
|
+
expect(await getUserById(adminA.id)).toBeNull();
|
|
607
|
+
});
|
|
608
|
+
|
|
609
|
+
test("repeating a merge whose job failed re-queues that job", async () => {
|
|
610
|
+
const target = await createUser({ name: "RetryTarget", email: "retry-target@x.com" });
|
|
611
|
+
const source = await createUser({ name: "RetrySource", email: "retry-source@x.com" });
|
|
612
|
+
await seedKvRows(source.id, 2);
|
|
613
|
+
|
|
614
|
+
pauseUserMergeRunnerForTests(true);
|
|
615
|
+
const first = await mergeViaRoute(target.id, source.id);
|
|
616
|
+
expect(first.status).toBe(202);
|
|
617
|
+
const { job } = (await first.json()) as JobBody;
|
|
618
|
+
// The runner spent its attempts (simulated): the source stays marked.
|
|
619
|
+
await getDbClient().run(
|
|
620
|
+
"UPDATE user_merge_jobs SET status = 'failed', error = 'disk full', attempts = ? WHERE id = ?",
|
|
621
|
+
[USER_MERGE_MAX_ATTEMPTS, job.id],
|
|
622
|
+
);
|
|
623
|
+
expect((await getUserById(source.id))?.mergedIntoUserId).toBe(target.id);
|
|
624
|
+
|
|
625
|
+
// The same pair answers 202 with the same job, pending again.
|
|
626
|
+
const again = await mergeViaRoute(target.id, source.id);
|
|
627
|
+
expect(again.status).toBe(202);
|
|
628
|
+
const requeued = ((await again.json()) as JobBody).job;
|
|
629
|
+
expect(requeued.id).toBe(job.id);
|
|
630
|
+
expect(requeued.status).toBe("pending");
|
|
631
|
+
expect(requeued.error).toBeNull();
|
|
632
|
+
expect(requeued.attempts).toBe(0);
|
|
633
|
+
// Only one manual_merge event: the short phase did not run twice.
|
|
634
|
+
const events = await getDbClient().get<{ n: number }>(
|
|
635
|
+
"SELECT COUNT(*) AS n FROM user_identity_events WHERE userId = ? AND eventType = 'manual_merge'",
|
|
636
|
+
[target.id],
|
|
637
|
+
);
|
|
638
|
+
expect(events?.n).toBe(1);
|
|
639
|
+
|
|
640
|
+
pauseUserMergeRunnerForTests(false);
|
|
641
|
+
await runUserMergeJobs({ pace: false });
|
|
642
|
+
expect((await getUserMergeJob(job.id))?.status).toBe("done");
|
|
643
|
+
expect(await getUserById(source.id)).toBeNull();
|
|
644
|
+
expect(await countKvRowsOwnedBy(target.id)).toBe(2);
|
|
645
|
+
});
|
|
646
|
+
|
|
647
|
+
test("a source whose target vanished can be merged into another user", async () => {
|
|
648
|
+
const target = await createUser({ name: "VanishTarget", email: "vanish-target@x.com" });
|
|
649
|
+
const source = await createUser({ name: "VanishSource", email: "vanish-source@x.com" });
|
|
650
|
+
const other = await createUser({ name: "VanishOther", email: "vanish-other@x.com" });
|
|
651
|
+
await seedKvRows(source.id, 2);
|
|
652
|
+
|
|
653
|
+
pauseUserMergeRunnerForTests(true);
|
|
654
|
+
const first = await mergeViaRoute(target.id, source.id);
|
|
655
|
+
expect(first.status).toBe(202);
|
|
656
|
+
const { job } = (await first.json()) as JobBody;
|
|
657
|
+
// The target is deleted by the synchronous path before the job runs.
|
|
658
|
+
expect(await deleteUser(target.id)).toBe(true);
|
|
659
|
+
pauseUserMergeRunnerForTests(false);
|
|
660
|
+
await runUserMergeJobs({ pace: false });
|
|
661
|
+
const failed = await getUserMergeJob(job.id);
|
|
662
|
+
expect(failed?.status).toBe("failed");
|
|
663
|
+
expect(failed?.error).toBe("Target user not found");
|
|
664
|
+
expect((await getUserById(source.id))?.mergedIntoUserId).toBe(target.id);
|
|
665
|
+
|
|
666
|
+
// The same pair cannot be re-queued (the target is gone) ...
|
|
667
|
+
expect((await mergeViaRoute(target.id, source.id)).status).toBe(404);
|
|
668
|
+
// ... but a new target goes through the short phase and a new job.
|
|
669
|
+
const moved = await mergeViaRoute(other.id, source.id);
|
|
670
|
+
expect(moved.status).toBe(202);
|
|
671
|
+
const next = ((await moved.json()) as JobBody).job;
|
|
672
|
+
expect(next.id).not.toBe(job.id);
|
|
673
|
+
expect((await getUserById(source.id))?.mergedIntoUserId).toBe(other.id);
|
|
674
|
+
await runUserMergeJobs({ pace: false });
|
|
675
|
+
expect((await getUserMergeJob(next.id))?.status).toBe("done");
|
|
676
|
+
expect(await getUserById(source.id)).toBeNull();
|
|
677
|
+
expect(await countKvRowsOwnedBy(other.id)).toBe(2);
|
|
678
|
+
expect((await findUserByEmail("vanish-source@x.com"))?.id).toBe(other.id);
|
|
679
|
+
});
|
|
680
|
+
});
|