@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
|
@@ -0,0 +1,185 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Batched access to the retained references of a user: every nullable column
|
|
3
|
+
* with a FOREIGN KEY to users(id) and no ON DELETE action, plus the requester
|
|
4
|
+
* inside the workflow_runs context JSON.
|
|
5
|
+
*
|
|
6
|
+
* deleteUser (src/be/db.ts) rewrites them in one transaction with the SQL in
|
|
7
|
+
* src/be/db/user-references.ts. The merge job (src/be/user-merge-jobs.ts)
|
|
8
|
+
* rewrites them in batches through these helpers, which are built on that
|
|
9
|
+
* same SQL (the discovery query, the whole-column UPDATE and the indexed
|
|
10
|
+
* requester expression), so the two paths cannot drift.
|
|
11
|
+
*/
|
|
12
|
+
|
|
13
|
+
import type { DbExecutor } from "../../db-client";
|
|
14
|
+
import { openSealedJson, sealJson } from "../../sealed-json";
|
|
15
|
+
import { getDbClient } from "../runtime";
|
|
16
|
+
import {
|
|
17
|
+
quoteSqlIdentifier,
|
|
18
|
+
USER_REFERENCE_COLUMNS_SQL,
|
|
19
|
+
type UserReferenceRow,
|
|
20
|
+
userReferenceRewriteSql,
|
|
21
|
+
WORKFLOW_CONTEXT_REQUESTER_SQL,
|
|
22
|
+
} from "../user-references";
|
|
23
|
+
|
|
24
|
+
/**
|
|
25
|
+
* A nullable column that references users(id) and keeps its value when the
|
|
26
|
+
* user is deleted (no ON DELETE action). `withoutRowid` tables are batched by
|
|
27
|
+
* their primary key columns (`keyColumns`) instead of rowid.
|
|
28
|
+
*/
|
|
29
|
+
export type UserReferenceColumn = UserReferenceRow & {
|
|
30
|
+
withoutRowid: boolean;
|
|
31
|
+
keyColumns: string[];
|
|
32
|
+
};
|
|
33
|
+
|
|
34
|
+
/**
|
|
35
|
+
* Discover every column deleteUser and the merge job must rewrite (the same
|
|
36
|
+
* query deleteUser runs), plus the batch key of each table: rowid, or the
|
|
37
|
+
* primary key for WITHOUT ROWID tables such as kv_entries.
|
|
38
|
+
*/
|
|
39
|
+
export async function discoverUserReferenceColumns(
|
|
40
|
+
executor: DbExecutor = getDbClient(),
|
|
41
|
+
): Promise<UserReferenceColumn[]> {
|
|
42
|
+
const rows = await executor.query<UserReferenceRow>(USER_REFERENCE_COLUMNS_SQL);
|
|
43
|
+
const withoutRowidByTable = new Map<string, boolean>();
|
|
44
|
+
const references: UserReferenceColumn[] = [];
|
|
45
|
+
for (const row of rows) {
|
|
46
|
+
let withoutRowid = withoutRowidByTable.get(row.tableName);
|
|
47
|
+
if (withoutRowid === undefined) {
|
|
48
|
+
const table = await executor.get<{ withoutRowid: number }>(
|
|
49
|
+
`SELECT instr(upper(sql), 'WITHOUT ROWID') > 0 AS withoutRowid
|
|
50
|
+
FROM sqlite_schema WHERE type = 'table' AND name = ?`,
|
|
51
|
+
[row.tableName],
|
|
52
|
+
);
|
|
53
|
+
withoutRowid = Boolean(table?.withoutRowid);
|
|
54
|
+
withoutRowidByTable.set(row.tableName, withoutRowid);
|
|
55
|
+
}
|
|
56
|
+
let keyColumns = ["rowid"];
|
|
57
|
+
if (withoutRowid) {
|
|
58
|
+
const pk = await executor.query<{ name: string }>(
|
|
59
|
+
"SELECT name FROM pragma_table_info(?) WHERE pk > 0 ORDER BY pk",
|
|
60
|
+
[row.tableName],
|
|
61
|
+
);
|
|
62
|
+
keyColumns = pk.map((column) => column.name);
|
|
63
|
+
}
|
|
64
|
+
references.push({ ...row, withoutRowid, keyColumns });
|
|
65
|
+
}
|
|
66
|
+
return references;
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
/**
|
|
70
|
+
* Move `userId` to `replacementUserId` (or NULL) in one discovered column.
|
|
71
|
+
* Without `limit` this is deleteUser's whole-column UPDATE. With `limit`,
|
|
72
|
+
* only that many rows change per call (the batch key is the rowid, or the
|
|
73
|
+
* primary key for WITHOUT ROWID tables), so a caller can loop in short
|
|
74
|
+
* transactions until a batch comes back short. Joins the ambient transaction.
|
|
75
|
+
*
|
|
76
|
+
* Migration 319 indexes every discovered column (the user-delete-perf test
|
|
77
|
+
* pins the plans), so both forms are index lookups rather than table scans.
|
|
78
|
+
*/
|
|
79
|
+
export async function rewriteUserReferenceColumn(
|
|
80
|
+
reference: UserReferenceColumn,
|
|
81
|
+
userId: string,
|
|
82
|
+
replacementUserId: string | null,
|
|
83
|
+
limit?: number,
|
|
84
|
+
): Promise<number> {
|
|
85
|
+
if (limit === undefined) {
|
|
86
|
+
const result = await getDbClient().run(userReferenceRewriteSql(reference), [
|
|
87
|
+
replacementUserId,
|
|
88
|
+
userId,
|
|
89
|
+
]);
|
|
90
|
+
return result.changes;
|
|
91
|
+
}
|
|
92
|
+
const table = quoteSqlIdentifier(reference.tableName);
|
|
93
|
+
const column = quoteSqlIdentifier(reference.columnName);
|
|
94
|
+
const keys = reference.keyColumns.map(quoteSqlIdentifier).join(", ");
|
|
95
|
+
const keyTuple = reference.keyColumns.length === 1 ? keys : `(${keys})`;
|
|
96
|
+
const result = await getDbClient().run(
|
|
97
|
+
`UPDATE ${table} SET ${column} = ?
|
|
98
|
+
WHERE ${keyTuple} IN (SELECT ${keys} FROM ${table} WHERE ${column} = ? LIMIT ?)`,
|
|
99
|
+
[replacementUserId, userId, limit],
|
|
100
|
+
);
|
|
101
|
+
return result.changes;
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
/**
|
|
105
|
+
* Ids of the workflow runs whose context names `userId` as the requester,
|
|
106
|
+
* oldest id first. Filters on the exact expression migration 319 indexes
|
|
107
|
+
* (idx_workflow_runs_context_requester), so this is an index lookup and not
|
|
108
|
+
* a JSON parse of every row (153 s on 493k prod rows).
|
|
109
|
+
*/
|
|
110
|
+
export async function selectWorkflowRunsRequestedBy(
|
|
111
|
+
userId: string,
|
|
112
|
+
executor: DbExecutor = getDbClient(),
|
|
113
|
+
limit?: number,
|
|
114
|
+
): Promise<string[]> {
|
|
115
|
+
const rows = await executor.query<{ id: string }>(
|
|
116
|
+
`SELECT id FROM workflow_runs
|
|
117
|
+
WHERE ${WORKFLOW_CONTEXT_REQUESTER_SQL} = ?
|
|
118
|
+
ORDER BY id
|
|
119
|
+
LIMIT ?`,
|
|
120
|
+
[userId, limit ?? -1],
|
|
121
|
+
);
|
|
122
|
+
return rows.map((row) => row.id);
|
|
123
|
+
}
|
|
124
|
+
|
|
125
|
+
/**
|
|
126
|
+
* Rewrite context.swarm.requestedByUserId from `userId` to
|
|
127
|
+
* `replacementUserId` (or remove it) in the given runs, in both the scrubbed
|
|
128
|
+
* context column and the sealed replay copy a resume reads. Workflow context
|
|
129
|
+
* is persisted JSON rather than a relational column, but it exposes the same
|
|
130
|
+
* requester identity to downstream interpolation, so it must follow
|
|
131
|
+
* workflow_runs.created_by. Joins the ambient transaction. Idempotent: a run
|
|
132
|
+
* whose context no longer names `userId` is left alone. Returns the number of
|
|
133
|
+
* context rows changed.
|
|
134
|
+
*/
|
|
135
|
+
export async function rewriteWorkflowRunRequester(
|
|
136
|
+
runIds: string[],
|
|
137
|
+
userId: string,
|
|
138
|
+
replacementUserId: string | null,
|
|
139
|
+
): Promise<number> {
|
|
140
|
+
if (runIds.length === 0) return 0;
|
|
141
|
+
const client = getDbClient();
|
|
142
|
+
const placeholders = runIds.map(() => "?").join(", ");
|
|
143
|
+
// The sealed replay copy is what a resume reads, so rewrite it first.
|
|
144
|
+
const sealedContexts = await client.query<{ id: string; context_replay: string }>(
|
|
145
|
+
`SELECT id, context_replay FROM workflow_runs
|
|
146
|
+
WHERE id IN (${placeholders})
|
|
147
|
+
AND context_replay IS NOT NULL
|
|
148
|
+
AND ${WORKFLOW_CONTEXT_REQUESTER_SQL} = ?`,
|
|
149
|
+
[...runIds, userId],
|
|
150
|
+
);
|
|
151
|
+
for (const row of sealedContexts) {
|
|
152
|
+
let context: Record<string, unknown>;
|
|
153
|
+
try {
|
|
154
|
+
context = openSealedJson(row.context_replay) as Record<string, unknown>;
|
|
155
|
+
} catch {
|
|
156
|
+
// Unreadable replay state fails the run on resume
|
|
157
|
+
// (WorkflowReplayStateError), so the stale id is never replayed.
|
|
158
|
+
continue;
|
|
159
|
+
}
|
|
160
|
+
const swarm = { ...(context.swarm as Record<string, unknown> | undefined) };
|
|
161
|
+
if (swarm.requestedByUserId !== userId) continue;
|
|
162
|
+
if (replacementUserId) swarm.requestedByUserId = replacementUserId;
|
|
163
|
+
else delete swarm.requestedByUserId;
|
|
164
|
+
await client.run("UPDATE workflow_runs SET context_replay = ? WHERE id = ?", [
|
|
165
|
+
sealJson({ ...context, swarm }),
|
|
166
|
+
row.id,
|
|
167
|
+
]);
|
|
168
|
+
}
|
|
169
|
+
const result = replacementUserId
|
|
170
|
+
? await client.run(
|
|
171
|
+
`UPDATE workflow_runs
|
|
172
|
+
SET context = json_set(context, '$.swarm.requestedByUserId', ?)
|
|
173
|
+
WHERE id IN (${placeholders})
|
|
174
|
+
AND ${WORKFLOW_CONTEXT_REQUESTER_SQL} = ?`,
|
|
175
|
+
[replacementUserId, ...runIds, userId],
|
|
176
|
+
)
|
|
177
|
+
: await client.run(
|
|
178
|
+
`UPDATE workflow_runs
|
|
179
|
+
SET context = json_remove(context, '$.swarm.requestedByUserId')
|
|
180
|
+
WHERE id IN (${placeholders})
|
|
181
|
+
AND ${WORKFLOW_CONTEXT_REQUESTER_SQL} = ?`,
|
|
182
|
+
[...runIds, userId],
|
|
183
|
+
);
|
|
184
|
+
return result.changes;
|
|
185
|
+
}
|
package/src/be/db-client.ts
CHANGED
|
@@ -270,6 +270,48 @@ function timedStatement<T>(sql: string, run: () => T): T {
|
|
|
270
270
|
}
|
|
271
271
|
}
|
|
272
272
|
|
|
273
|
+
/**
|
|
274
|
+
* Longest stretch of DB work (driver calls plus the JS between them) that may
|
|
275
|
+
* run without handing the event loop back. The FIFO lock hands over through
|
|
276
|
+
* microtasks, so a burst of queued statements (a dozen memory searches, one
|
|
277
|
+
* store-progress with 20 deletes) otherwise runs as ONE macrotask: measured
|
|
278
|
+
* 4-30 s in which /health, scripts and MCP calls get no turn.
|
|
279
|
+
*/
|
|
280
|
+
const SLICE_MS = 25;
|
|
281
|
+
let sliceStartedAt = 0;
|
|
282
|
+
|
|
283
|
+
function markSlice(): void {
|
|
284
|
+
if (sliceStartedAt !== 0) return;
|
|
285
|
+
sliceStartedAt = performance.now();
|
|
286
|
+
// Fires at the next macrotask boundary, whoever caused it: the slice is over.
|
|
287
|
+
// A timer, not setImmediate: the yield below owns setImmediate.
|
|
288
|
+
setTimeout(() => {
|
|
289
|
+
sliceStartedAt = 0;
|
|
290
|
+
}, 0);
|
|
291
|
+
}
|
|
292
|
+
|
|
293
|
+
/** Starts the slice if none is open; yields to timers and sockets once it is spent. */
|
|
294
|
+
async function yieldIfSliceSpent(): Promise<void> {
|
|
295
|
+
markSlice();
|
|
296
|
+
if (performance.now() - sliceStartedAt < SLICE_MS) return;
|
|
297
|
+
await new Promise<void>((resolve) => setImmediate(resolve));
|
|
298
|
+
sliceStartedAt = 0;
|
|
299
|
+
}
|
|
300
|
+
|
|
301
|
+
/**
|
|
302
|
+
* In-transaction statement: runs NOW, before any await, exactly as it did
|
|
303
|
+
* before slicing, so an interleaved rollback or commit cannot overtake it
|
|
304
|
+
* (a statement parked on a yield would resume after the transaction closed
|
|
305
|
+
* and autocommit outside it). Only the caller's continuation waits for the
|
|
306
|
+
* yield. A throw skips the yield: the caller is about to unwind anyway.
|
|
307
|
+
*/
|
|
308
|
+
async function runThenYield<T>(run: () => T): Promise<T> {
|
|
309
|
+
markSlice();
|
|
310
|
+
const result = run();
|
|
311
|
+
await yieldIfSliceSpent();
|
|
312
|
+
return result;
|
|
313
|
+
}
|
|
314
|
+
|
|
273
315
|
function sleep(ms: number): Promise<void> {
|
|
274
316
|
return new Promise((resolve) => setTimeout(resolve, ms));
|
|
275
317
|
}
|
|
@@ -600,7 +642,8 @@ class BunSqliteClient implements DbClient {
|
|
|
600
642
|
const ctx = txContext.getStore();
|
|
601
643
|
if (ctx && !ctx.closed) {
|
|
602
644
|
const db = this.getDatabase();
|
|
603
|
-
|
|
645
|
+
// The transaction holds the lock: the yield after the statement lets only timers and sockets run.
|
|
646
|
+
return runThenYield(() => timed(() => op(db)));
|
|
604
647
|
}
|
|
605
648
|
let sleptMs = 0;
|
|
606
649
|
let sawBusy = false;
|
|
@@ -610,6 +653,9 @@ class BunSqliteClient implements DbClient {
|
|
|
610
653
|
const release = await this.lock.acquire();
|
|
611
654
|
let backoff = 0;
|
|
612
655
|
try {
|
|
656
|
+
// Checked while holding the lock: waiters queued behind it passed any
|
|
657
|
+
// earlier check long ago. Other callers just wait, as behind a slow statement.
|
|
658
|
+
await yieldIfSliceSpent();
|
|
613
659
|
// A top-level single statement is atomic, so a repeat on BUSY is
|
|
614
660
|
// exact. The final attempt spins `finalAttemptSpinMs` (see
|
|
615
661
|
// transaction()).
|
|
@@ -696,26 +742,31 @@ class BunSqliteClient implements DbClient {
|
|
|
696
742
|
return this.getDatabase();
|
|
697
743
|
};
|
|
698
744
|
return {
|
|
699
|
-
query:
|
|
700
|
-
|
|
701
|
-
|
|
702
|
-
|
|
703
|
-
|
|
745
|
+
query: <T>(sql: string, params: DbParam[] = []): Promise<T[]> =>
|
|
746
|
+
runThenYield(() =>
|
|
747
|
+
timedStatement(sql, () =>
|
|
748
|
+
guard()
|
|
749
|
+
.query<T, DbParam[]>(sql)
|
|
750
|
+
.all(...params),
|
|
751
|
+
),
|
|
704
752
|
),
|
|
705
|
-
get:
|
|
706
|
-
|
|
707
|
-
|
|
708
|
-
|
|
709
|
-
|
|
753
|
+
get: <T>(sql: string, params: DbParam[] = []): Promise<T | null> =>
|
|
754
|
+
runThenYield(() =>
|
|
755
|
+
timedStatement(sql, () =>
|
|
756
|
+
guard()
|
|
757
|
+
.query<T, DbParam[]>(sql)
|
|
758
|
+
.get(...params),
|
|
759
|
+
),
|
|
710
760
|
),
|
|
711
|
-
run:
|
|
712
|
-
|
|
713
|
-
|
|
714
|
-
|
|
715
|
-
|
|
716
|
-
|
|
717
|
-
|
|
718
|
-
|
|
761
|
+
run: (sql: string, params: DbParam[] = []): Promise<{ changes: number }> =>
|
|
762
|
+
runThenYield(() => {
|
|
763
|
+
const result = timedStatement(sql, () =>
|
|
764
|
+
guard()
|
|
765
|
+
.query(sql)
|
|
766
|
+
.run(...params),
|
|
767
|
+
);
|
|
768
|
+
return { changes: result.changes };
|
|
769
|
+
}),
|
|
719
770
|
};
|
|
720
771
|
}
|
|
721
772
|
}
|
package/src/be/db.ts
CHANGED
|
@@ -256,6 +256,14 @@ import {
|
|
|
256
256
|
rowToAgentTaskSummary,
|
|
257
257
|
} from "./db/tasks/read";
|
|
258
258
|
import { configureTaskWriteDependencies, failTask } from "./db/tasks/write";
|
|
259
|
+
import {
|
|
260
|
+
USER_REFERENCE_COLUMNS_SQL,
|
|
261
|
+
type UserReferenceRow,
|
|
262
|
+
userReferenceRewriteSql,
|
|
263
|
+
WORKFLOW_CONTEXT_REMOVE_REQUESTER_SQL,
|
|
264
|
+
WORKFLOW_CONTEXT_SET_REQUESTER_SQL,
|
|
265
|
+
WORKFLOW_SEALED_CONTEXT_BY_REQUESTER_SQL,
|
|
266
|
+
} from "./db/user-references";
|
|
259
267
|
import { tombstoneWorkflowIdempotencyKeys } from "./db/workflow-idempotency";
|
|
260
268
|
import { deleteOrphanedRunDefinitions } from "./db/workflow-run-definitions";
|
|
261
269
|
import {
|
|
@@ -12426,6 +12434,7 @@ type UserRow = {
|
|
|
12426
12434
|
metadata: string | null;
|
|
12427
12435
|
dailyBudgetUsd: number | null;
|
|
12428
12436
|
status: string;
|
|
12437
|
+
mergedIntoUserId: string | null;
|
|
12429
12438
|
createdAt: string;
|
|
12430
12439
|
lastUpdatedAt: string;
|
|
12431
12440
|
};
|
|
@@ -12443,6 +12452,7 @@ function rowToUser(row: UserRow): User {
|
|
|
12443
12452
|
metadata: row.metadata ? (JSON.parse(row.metadata) as Record<string, unknown>) : undefined,
|
|
12444
12453
|
dailyBudgetUsd: row.dailyBudgetUsd ?? null,
|
|
12445
12454
|
status: (row.status as "invited" | "active" | "suspended") ?? "active",
|
|
12455
|
+
...(row.mergedIntoUserId ? { mergedIntoUserId: row.mergedIntoUserId } : {}),
|
|
12446
12456
|
createdAt: row.createdAt,
|
|
12447
12457
|
lastUpdatedAt: row.lastUpdatedAt,
|
|
12448
12458
|
};
|
|
@@ -12575,15 +12585,14 @@ export async function updateUser(
|
|
|
12575
12585
|
return row ? rowToUser(row) : null;
|
|
12576
12586
|
}
|
|
12577
12587
|
|
|
12578
|
-
|
|
12579
|
-
|
|
12580
|
-
|
|
12581
|
-
|
|
12582
|
-
|
|
12583
|
-
|
|
12584
|
-
|
|
12585
|
-
|
|
12586
|
-
|
|
12588
|
+
/**
|
|
12589
|
+
* Delete a user in one transaction, moving every retained reference to
|
|
12590
|
+
* `replacementUserId` (or clearing it). Used by the manage-user tool. The
|
|
12591
|
+
* merge route queues the same rewrite as a background job instead
|
|
12592
|
+
* (src/be/user-merge-jobs.ts, built on the same SQL from
|
|
12593
|
+
* src/be/db/user-references.ts), because on a large database this holds the
|
|
12594
|
+
* event loop for minutes.
|
|
12595
|
+
*/
|
|
12587
12596
|
export async function deleteUser(id: string, replacementUserId?: string): Promise<boolean> {
|
|
12588
12597
|
if (replacementUserId === id) {
|
|
12589
12598
|
throw new Error("Replacement user must differ from deleted user");
|
|
@@ -12613,28 +12622,7 @@ export async function deleteUser(id: string, replacementUserId?: string): Promis
|
|
|
12613
12622
|
// Migration 103 accidentally dropped the scheduled_tasks audit FKs while
|
|
12614
12623
|
// recreating that table, so discover those two known logical references as
|
|
12615
12624
|
// well until the table is next rebuilt with its original constraints.
|
|
12616
|
-
const references = await tx.query<UserReferenceRow>(
|
|
12617
|
-
`SELECT tables.name AS tableName, foreign_keys."from" AS columnName
|
|
12618
|
-
FROM sqlite_schema AS tables
|
|
12619
|
-
JOIN pragma_foreign_key_list(tables.name) AS foreign_keys
|
|
12620
|
-
JOIN pragma_table_info(tables.name) AS columns
|
|
12621
|
-
ON columns.name = foreign_keys."from"
|
|
12622
|
-
WHERE tables.type = 'table'
|
|
12623
|
-
AND foreign_keys."table" = 'users'
|
|
12624
|
-
AND foreign_keys.on_delete IN ('NO ACTION', 'RESTRICT')
|
|
12625
|
-
AND columns."notnull" = 0
|
|
12626
|
-
UNION ALL
|
|
12627
|
-
SELECT 'scheduled_tasks' AS tableName, columns.name AS columnName
|
|
12628
|
-
FROM pragma_table_info('scheduled_tasks') AS columns
|
|
12629
|
-
WHERE columns.name IN ('created_by', 'updated_by')
|
|
12630
|
-
AND columns."notnull" = 0
|
|
12631
|
-
AND NOT EXISTS (
|
|
12632
|
-
SELECT 1
|
|
12633
|
-
FROM pragma_foreign_key_list('scheduled_tasks') AS foreign_keys
|
|
12634
|
-
WHERE foreign_keys."from" = columns.name
|
|
12635
|
-
AND foreign_keys."table" = 'users'
|
|
12636
|
-
)`,
|
|
12637
|
-
);
|
|
12625
|
+
const references = await tx.query<UserReferenceRow>(USER_REFERENCE_COLUMNS_SQL);
|
|
12638
12626
|
const replacement = replacementUserId ?? null;
|
|
12639
12627
|
// The human-free rule only asks whether a task's requester or its workflow
|
|
12640
12628
|
// run's creator is NULL, so only clearing them (no replacement) can change a
|
|
@@ -12651,22 +12639,15 @@ export async function deleteUser(id: string, replacementUserId?: string): Promis
|
|
|
12651
12639
|
[id, id],
|
|
12652
12640
|
)
|
|
12653
12641
|
).map((row) => row.id);
|
|
12654
|
-
for (const reference of references) {
|
|
12655
|
-
const table = quoteSqlIdentifier(reference.tableName);
|
|
12656
|
-
const column = quoteSqlIdentifier(reference.columnName);
|
|
12657
|
-
await tx.run(`UPDATE ${table} SET ${column} = ? WHERE ${column} = ?`, [replacement, id]);
|
|
12658
|
-
}
|
|
12659
|
-
|
|
12660
12642
|
// Workflow context is persisted JSON rather than a relational column, but
|
|
12661
12643
|
// it exposes the same requester identity to downstream interpolation. Keep
|
|
12662
12644
|
// it consistent with workflow_runs.created_by inside this transaction.
|
|
12663
|
-
//
|
|
12664
|
-
//
|
|
12645
|
+
// Migration 319 indexes the context requester expression, so these passes
|
|
12646
|
+
// touch only this user's runs instead of parsing the JSON of every row
|
|
12647
|
+
// (153 s on 493k prod rows). The sealed replay copy is what a resume
|
|
12648
|
+
// reads, so rewrite it first, while the scrubbed column still matches.
|
|
12665
12649
|
const sealedContexts = await tx.query<{ id: string; context_replay: string }>(
|
|
12666
|
-
|
|
12667
|
-
WHERE context_replay IS NOT NULL
|
|
12668
|
-
AND json_valid(context)
|
|
12669
|
-
AND json_extract(context, '$.swarm.requestedByUserId') = ?`,
|
|
12650
|
+
WORKFLOW_SEALED_CONTEXT_BY_REQUESTER_SQL,
|
|
12670
12651
|
[id],
|
|
12671
12652
|
);
|
|
12672
12653
|
for (const row of sealedContexts) {
|
|
@@ -12688,21 +12669,15 @@ export async function deleteUser(id: string, replacementUserId?: string): Promis
|
|
|
12688
12669
|
]);
|
|
12689
12670
|
}
|
|
12690
12671
|
if (replacementUserId) {
|
|
12691
|
-
await tx.run(
|
|
12692
|
-
`UPDATE workflow_runs
|
|
12693
|
-
SET context = json_set(context, '$.swarm.requestedByUserId', ?)
|
|
12694
|
-
WHERE json_valid(context)
|
|
12695
|
-
AND json_extract(context, '$.swarm.requestedByUserId') = ?`,
|
|
12696
|
-
[replacementUserId, id],
|
|
12697
|
-
);
|
|
12672
|
+
await tx.run(WORKFLOW_CONTEXT_SET_REQUESTER_SQL, [replacementUserId, id]);
|
|
12698
12673
|
} else {
|
|
12699
|
-
await tx.run(
|
|
12700
|
-
|
|
12701
|
-
|
|
12702
|
-
|
|
12703
|
-
|
|
12704
|
-
|
|
12705
|
-
);
|
|
12674
|
+
await tx.run(WORKFLOW_CONTEXT_REMOVE_REQUESTER_SQL, [id]);
|
|
12675
|
+
}
|
|
12676
|
+
|
|
12677
|
+
// Migration 319 indexes every discovered column (the user-delete-perf test
|
|
12678
|
+
// pins the plans), so these are index lookups rather than table scans.
|
|
12679
|
+
for (const reference of references) {
|
|
12680
|
+
await tx.run(userReferenceRewriteSql(reference), [replacement, id]);
|
|
12706
12681
|
}
|
|
12707
12682
|
|
|
12708
12683
|
await reclassifyTaskHumanFree(reclassifySeedIds);
|
|
@@ -181,6 +181,7 @@ export const KEY_WINDOW_USAGE_SQL = `
|
|
|
181
181
|
SELECT NULL, NULL, NULL, NULL, 0, 0, NULL, NULL, 0, 0, '', NULL, 0, sc.createdAt, NULL
|
|
182
182
|
FROM session_costs sc
|
|
183
183
|
WHERE (sc.credentialKeyType IS NULL OR sc.credentialKeySuffix IS NULL)
|
|
184
|
+
AND sc.kind = 'harness'
|
|
184
185
|
AND sc.createdAt >= ? AND sc.createdAt < ?
|
|
185
186
|
LIMIT ${MAX_USAGE_ROWS + 1}`;
|
|
186
187
|
|
|
@@ -0,0 +1,34 @@
|
|
|
1
|
+
import { getDbClient } from "@/be/db";
|
|
2
|
+
import type { DemotionEvidence, MemoryCandidate } from "./types";
|
|
3
|
+
|
|
4
|
+
type EvidenceRow = DemotionEvidence & { memoryId: string };
|
|
5
|
+
|
|
6
|
+
/**
|
|
7
|
+
* Attach per-rater rating mass to candidates so rerank() can tell a memory
|
|
8
|
+
* rated wrong from one rated off-topic. Only a net-negative pooled posterior
|
|
9
|
+
* (beta > alpha) can be demoted, so only those candidates are looked up.
|
|
10
|
+
*/
|
|
11
|
+
export async function attachDemotionEvidence(
|
|
12
|
+
candidates: MemoryCandidate[],
|
|
13
|
+
): Promise<MemoryCandidate[]> {
|
|
14
|
+
const ids = [...new Set(candidates.filter((c) => c.beta > c.alpha).map((c) => c.id))];
|
|
15
|
+
if (ids.length === 0) return candidates;
|
|
16
|
+
const rows = await getDbClient().query<EvidenceRow>(
|
|
17
|
+
`SELECT memoryId,
|
|
18
|
+
SUM(CASE WHEN source = 'explicit-self' AND signal > 0 THEN signal * weight ELSE 0 END) AS selfAlpha,
|
|
19
|
+
SUM(CASE WHEN source = 'explicit-self' AND signal < 0 THEN -signal * weight ELSE 0 END) AS selfBeta,
|
|
20
|
+
SUM(CASE WHEN source = 'llm' AND signal > 0 THEN signal * weight ELSE 0 END) AS llmAlpha,
|
|
21
|
+
SUM(CASE WHEN source = 'llm' AND signal < 0 THEN -signal * weight ELSE 0 END) AS llmBeta,
|
|
22
|
+
SUM(CASE WHEN source = 'llm' THEN 1 ELSE 0 END) AS llmCount
|
|
23
|
+
FROM memory_rating
|
|
24
|
+
WHERE source IN ('explicit-self', 'llm') AND memoryId IN (${ids.map(() => "?").join(", ")})
|
|
25
|
+
GROUP BY memoryId`,
|
|
26
|
+
ids,
|
|
27
|
+
);
|
|
28
|
+
if (rows.length === 0) return candidates;
|
|
29
|
+
const byId = new Map(rows.map(({ memoryId, ...evidence }) => [memoryId, evidence]));
|
|
30
|
+
return candidates.map((c) => {
|
|
31
|
+
const demotionEvidence = byId.get(c.id);
|
|
32
|
+
return demotionEvidence ? { ...c, demotionEvidence } : c;
|
|
33
|
+
});
|
|
34
|
+
}
|
|
@@ -9,7 +9,7 @@ import {
|
|
|
9
9
|
SUPERSEDED_DECISION_WEIGHT,
|
|
10
10
|
} from "./constants";
|
|
11
11
|
import { isKeyUnderRoot, tierSource } from "./key-paths";
|
|
12
|
-
import type { MemoryCandidate, RerankOptions } from "./types";
|
|
12
|
+
import type { DemotionEvidence, MemoryCandidate, RerankOptions } from "./types";
|
|
13
13
|
|
|
14
14
|
const MS_PER_DAY = 1000 * 60 * 60 * 24;
|
|
15
15
|
const MS_PER_HOUR = 1000 * 60 * 60;
|
|
@@ -79,23 +79,45 @@ export function pathWeight(key: string | null | undefined, tags: readonly string
|
|
|
79
79
|
*
|
|
80
80
|
* Plan: thoughts/taras/plans/2026-05-05-memory-rater-v1.5/step-1.md §5
|
|
81
81
|
*
|
|
82
|
-
* At Beta(1,1) (default prior) returns 1.0 exactly
|
|
83
|
-
*
|
|
84
|
-
*
|
|
85
|
-
*
|
|
86
|
-
*
|
|
82
|
+
* At Beta(1,1) (default prior) returns 1.0 exactly. Proven memories climb up
|
|
83
|
+
* to 2.0. A net-negative posterior drops below 1.0, down to
|
|
84
|
+
* MEMORY_DEMOTION_FLOOR (default 0.5), only when `evidence` passes
|
|
85
|
+
* `hasDemotionEvidence`. Otherwise it stays at 1.0: the pooled alpha/beta is
|
|
86
|
+
* mostly "surfaced but not used here" votes (implicit-citation misses, LLM
|
|
87
|
+
* off-topic scores), which say nothing about whether the memory is wrong.
|
|
88
|
+
* MEMORY_DEMOTION_FLOOR=1.0 turns demotion off. Memories are never deleted on
|
|
89
|
+
* the reranker path.
|
|
87
90
|
*/
|
|
88
91
|
function readDemotionFloor(): number {
|
|
89
92
|
const raw = process.env.MEMORY_DEMOTION_FLOOR;
|
|
90
|
-
const n = raw == null || raw === "" ?
|
|
91
|
-
return Number.isFinite(n) ? n :
|
|
93
|
+
const n = raw == null || raw === "" ? DEFAULT_DEMOTION_FLOOR : Number(raw);
|
|
94
|
+
return Number.isFinite(n) ? n : DEFAULT_DEMOTION_FLOOR;
|
|
92
95
|
}
|
|
93
96
|
|
|
94
|
-
export
|
|
97
|
+
export const DEFAULT_DEMOTION_FLOOR = 0.5;
|
|
98
|
+
/** LLM-only demotion needs at least this many LLM ratings on the memory. */
|
|
99
|
+
export const DEMOTION_MIN_LLM_RATINGS = 10;
|
|
100
|
+
/** ...and an LLM-only Beta(1,1) posterior mean below this (net-negative about 3:1). */
|
|
101
|
+
export const DEMOTION_MAX_LLM_MEAN = 0.25;
|
|
102
|
+
|
|
103
|
+
/**
|
|
104
|
+
* Explicit-self decides when the agent's own ratings lean one way: net-negative
|
|
105
|
+
* demotes, net-positive vetoes. With no explicit-self verdict, the LLM rater
|
|
106
|
+
* demotes only with enough ratings and a clearly negative mean.
|
|
107
|
+
*/
|
|
108
|
+
export function hasDemotionEvidence(evidence: DemotionEvidence | undefined): boolean {
|
|
109
|
+
if (!evidence) return false;
|
|
110
|
+
if (evidence.selfBeta !== evidence.selfAlpha) return evidence.selfBeta > evidence.selfAlpha;
|
|
111
|
+
const llmMean = (1 + evidence.llmAlpha) / (2 + evidence.llmAlpha + evidence.llmBeta);
|
|
112
|
+
return evidence.llmCount >= DEMOTION_MIN_LLM_RATINGS && llmMean < DEMOTION_MAX_LLM_MEAN;
|
|
113
|
+
}
|
|
114
|
+
|
|
115
|
+
export function usefulness(alpha: number, beta: number, evidence?: DemotionEvidence): number {
|
|
95
116
|
const denom = alpha + beta;
|
|
96
117
|
if (denom <= 0) return 1.0;
|
|
97
|
-
const
|
|
98
|
-
|
|
118
|
+
const score = Math.min(2.0, (2 * alpha) / denom);
|
|
119
|
+
const demote = score < 1.0 && hasDemotionEvidence(evidence);
|
|
120
|
+
return Math.max(readDemotionFloor(), demote ? score : Math.max(1.0, score));
|
|
99
121
|
}
|
|
100
122
|
|
|
101
123
|
/**
|
|
@@ -112,7 +134,7 @@ export function computeScore(candidate: MemoryCandidate, now: Date): number {
|
|
|
112
134
|
accessBoost(candidate.accessedAt, candidate.accessCount, now) *
|
|
113
135
|
sourceQuality(candidate.source, candidate.key) *
|
|
114
136
|
pathWeight(candidate.key, candidate.tags) *
|
|
115
|
-
usefulness(candidate.alpha, candidate.beta)
|
|
137
|
+
usefulness(candidate.alpha, candidate.beta, candidate.demotionEvidence)
|
|
116
138
|
);
|
|
117
139
|
}
|
|
118
140
|
|
|
@@ -0,0 +1,83 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Review tasks stop recalling other review tasks' `task_completion` memories.
|
|
3
|
+
*
|
|
4
|
+
* A review task's completion memory only echoes the shared review brief, so a
|
|
5
|
+
* later review task recalls boilerplate instead of anything about its own diff.
|
|
6
|
+
* The rule uses task fields only, never the prompt text:
|
|
7
|
+
*
|
|
8
|
+
* a task is a review task when `taskType === "review"` or its tags include
|
|
9
|
+
* `re-review` (re-review and rereview-sweep tasks) or `pr-review-demo`
|
|
10
|
+
* (the batch-review workflow).
|
|
11
|
+
*
|
|
12
|
+
* When the recalling task is a review task, a candidate is dropped when its
|
|
13
|
+
* `source` is `task_completion` and its `sourceTaskId` is also a review task.
|
|
14
|
+
* Other memory sources, and non-review recallers, are untouched. A source task
|
|
15
|
+
* that no longer exists is kept: its kind is unknown.
|
|
16
|
+
*/
|
|
17
|
+
|
|
18
|
+
import type { AgentMemory } from "@/types";
|
|
19
|
+
import { getDbClient, getTaskById } from "../db";
|
|
20
|
+
|
|
21
|
+
export const REVIEW_TASK_TYPE = "review";
|
|
22
|
+
export const REVIEW_TASK_TAGS: readonly string[] = ["re-review", "pr-review-demo"];
|
|
23
|
+
|
|
24
|
+
export function isReviewTask(task: { taskType?: string | null; tags?: readonly string[] | null }) {
|
|
25
|
+
return (
|
|
26
|
+
task.taskType === REVIEW_TASK_TYPE ||
|
|
27
|
+
(task.tags ?? []).some((t) => REVIEW_TASK_TAGS.includes(t))
|
|
28
|
+
);
|
|
29
|
+
}
|
|
30
|
+
|
|
31
|
+
function parseTags(raw: string | null): string[] {
|
|
32
|
+
try {
|
|
33
|
+
const tags = JSON.parse(raw ?? "[]");
|
|
34
|
+
return Array.isArray(tags) ? tags.filter((t): t is string => typeof t === "string") : [];
|
|
35
|
+
} catch {
|
|
36
|
+
return [];
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/** True when `taskId` names a review task. Unknown or missing ids are not review tasks. */
|
|
41
|
+
export async function isReviewTaskId(taskId: string | undefined | null): Promise<boolean> {
|
|
42
|
+
if (!taskId) return false;
|
|
43
|
+
const task = await getTaskById(taskId);
|
|
44
|
+
return task ? isReviewTask(task) : false;
|
|
45
|
+
}
|
|
46
|
+
|
|
47
|
+
// Stay well under SQLite's bound-variable limit.
|
|
48
|
+
const ID_CHUNK = 500;
|
|
49
|
+
|
|
50
|
+
/** Drop review-sourced `task_completion` rows. Call only when the recaller is a review task. */
|
|
51
|
+
export async function dropReviewTaskCompletions<T extends AgentMemory>(
|
|
52
|
+
candidates: T[],
|
|
53
|
+
): Promise<T[]> {
|
|
54
|
+
const sourceIds = [
|
|
55
|
+
...new Set(
|
|
56
|
+
candidates
|
|
57
|
+
.filter((c) => c.source === "task_completion" && c.sourceTaskId)
|
|
58
|
+
.map((c) => c.sourceTaskId as string),
|
|
59
|
+
),
|
|
60
|
+
];
|
|
61
|
+
if (sourceIds.length === 0) return candidates;
|
|
62
|
+
|
|
63
|
+
const reviewIds = new Set<string>();
|
|
64
|
+
for (let i = 0; i < sourceIds.length; i += ID_CHUNK) {
|
|
65
|
+
const chunk = sourceIds.slice(i, i + ID_CHUNK);
|
|
66
|
+
const rows = await getDbClient().query<{
|
|
67
|
+
id: string;
|
|
68
|
+
taskType: string | null;
|
|
69
|
+
tags: string | null;
|
|
70
|
+
}>(
|
|
71
|
+
`SELECT id, taskType, tags FROM agent_tasks WHERE id IN (${chunk.map(() => "?").join(",")})`,
|
|
72
|
+
chunk,
|
|
73
|
+
);
|
|
74
|
+
for (const row of rows) {
|
|
75
|
+
if (isReviewTask({ taskType: row.taskType, tags: parseTags(row.tags) }))
|
|
76
|
+
reviewIds.add(row.id);
|
|
77
|
+
}
|
|
78
|
+
}
|
|
79
|
+
if (reviewIds.size === 0) return candidates;
|
|
80
|
+
return candidates.filter(
|
|
81
|
+
(c) => !(c.source === "task_completion" && c.sourceTaskId && reviewIds.has(c.sourceTaskId)),
|
|
82
|
+
);
|
|
83
|
+
}
|