@desplega.ai/agent-swarm 2.13.4 → 2.14.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-99n6z9ky.js +17 -0
- package/dist/{acp-targets-zrk9k0n7.js → acp-targets-23exz4z4.js} +10 -10
- package/dist/{actions-acqqj9jn.js → actions-zcr25x27.js} +61 -40
- package/dist/{agent-fs-provision-zmaykqnd.js → agent-fs-provision-7fa9e12e.js} +4 -4
- package/dist/{amp-adapter-a7ts8tmw.js → amp-adapter-s7ytmv6b.js} +3 -3
- package/dist/{anthropic-messages-88b7s3n9.js → anthropic-messages-vdd1zmha.js} +10 -10
- package/dist/{app-tmwa442h.js → app-5d3sz1hy.js} +7 -7
- package/dist/{approval-notifications-6psaaaye.js → approval-notifications-7qgkzkzx.js} +8 -8
- package/dist/{assistant-564v6emv.js → assistant-p2yvhc3j.js} +37 -32
- package/dist/{boot-args-schema-n099e0f2.js → boot-args-schema-ry6cb0p7.js} +1 -1
- package/dist/{boot-reembed-epvg4fp9.js → boot-reembed-2hkm3vz2.js} +1 -1
- package/dist/{boot-reembed-chx66qfk.js → boot-reembed-c9643ms3.js} +1 -1
- package/dist/{boot-scrub-sweep-dhkfp0a7.js → boot-scrub-sweep-3ycxr51t.js} +2 -2
- package/dist/{boot-seeds-m74fc07r.js → boot-seeds-2hzvvzg0.js} +4 -4
- package/dist/{boxd-451q55ys.js → boxd-9py3x0jb.js} +2 -2
- package/dist/{claude-adapter-hw63yj3j.js → claude-adapter-dnkww93e.js} +9 -9
- package/dist/{claude-managed-adapter-z5s7fx6p.js → claude-managed-adapter-yk0cr5x6.js} +4 -4
- package/dist/{claude-managed-setup-wee1762m.js → claude-managed-setup-4byxpp47.js} +5 -5
- package/dist/{claude-sdk-session-cktyqkpk.js → claude-sdk-session-4wf3dbvs.js} +13163 -12195
- package/dist/{cli-5rxsb3wq.js → cli-096aftq6.js} +12 -7
- package/dist/{cli-5rgm8p39.js → cli-0e914dp9.js} +3 -3
- package/dist/{cli-bzcwwebm.js → cli-0h6m6z5g.js} +1 -1
- package/dist/{cli-cah298e5.js → cli-0k7ppk9k.js} +231 -124
- package/dist/{cli-ja450998.js → cli-1nfabrt4.js} +8 -8
- package/dist/{cli-jzerrzgc.js → cli-2414h5r9.js} +8 -8
- package/dist/{cli-b768ek79.js → cli-24wervhz.js} +38 -0
- package/dist/{cli-93n305hm.js → cli-2ayk9gn8.js} +2 -2
- package/dist/{cli-kr0jpw9c.js → cli-2ckwgs7q.js} +1 -1
- package/dist/{cli-d5pc8ep0.js → cli-2savn6mm.js} +11 -100
- package/dist/{cli-jbrc98qb.js → cli-2zjxake1.js} +4 -4
- package/dist/{cli-4q2c8rxw.js → cli-37p61fcg.js} +15 -9
- package/dist/{cli-2vp0z049.js → cli-39t9d248.js} +1 -1
- package/dist/{cli-sa02jsqt.js → cli-3mhdmcd4.js} +1 -1
- package/dist/{cli-x2cem5vy.js → cli-3wsabyt0.js} +2 -2
- package/dist/{cli-dqgnbnxs.js → cli-466jjrwe.js} +16 -2
- package/dist/{cli-zhwjdhjr.js → cli-6ajyhxh7.js} +2 -2
- package/dist/{cli-3bxrrh53.js → cli-6yy4fepf.js} +4 -4
- package/dist/{cli-hhtbandk.js → cli-73rmgm45.js} +2 -2
- package/dist/{cli-8b4rpnwj.js → cli-7ca8hczj.js} +1 -1
- package/dist/{cli-0h8skzss.js → cli-7g5qj2ca.js} +4 -3
- package/dist/{cli-m1sns1da.js → cli-7w1fs01q.js} +2 -2
- package/dist/{cli-xwsm6xkr.js → cli-84wxwt3z.js} +1 -1
- package/dist/{cli-qzz6tz8s.js → cli-84xn7bgz.js} +1 -1
- package/dist/{cli-49aq3cyn.js → cli-879txsac.js} +5 -5
- package/dist/{cli-bv4vvnmg.js → cli-8vbxjzk0.js} +3 -3
- package/dist/{cli-7by7vp6m.js → cli-91amj3md.js} +3 -3
- package/dist/{cli-60dwk8tx.js → cli-930zbczq.js} +3 -3
- package/dist/{cli-7g3fg4gf.js → cli-9fwznq4p.js} +10 -10
- package/dist/{cli-4pbwg7sn.js → cli-9j1t3kf6.js} +2 -2
- package/dist/{cli-tzw1jr2t.js → cli-9j47sgzy.js} +2 -2
- package/dist/{cli-0fgvnb0x.js → cli-ad00h1st.js} +7 -7
- package/dist/{cli-kj84fqxz.js → cli-adzmmcvf.js} +19 -7
- package/dist/{cli-3tzmh38q.js → cli-ayxxkk3p.js} +68 -25
- package/dist/{cli-4vynxtrb.js → cli-bqfx72e6.js} +10 -3
- package/dist/{cli-8cas2xvp.js → cli-cbg0j1yt.js} +2716 -2643
- package/dist/{cli-fw67mnyc.js → cli-cg1q8ymp.js} +1 -1
- package/dist/{cli-he5nxaa8.js → cli-dw9rtjm3.js} +1 -1
- package/dist/{cli-jg5txpm6.js → cli-dy754erz.js} +83 -1
- package/dist/{cli-tsc3pdfd.js → cli-edxfzgah.js} +4 -4
- package/dist/{cli-hyqksecw.js → cli-ejnhs815.js} +15 -15
- package/dist/{cli-k0nebh10.js → cli-enavhq6r.js} +1 -1
- package/dist/{cli-ea7nz50q.js → cli-f2rwt43y.js} +14 -14
- package/dist/{cli-zjdhrzm0.js → cli-f9g96z28.js} +8 -8
- package/dist/{cli-rmgvwcmy.js → cli-fww016hh.js} +534 -70
- package/dist/{cli-rv3y60bt.js → cli-g6a696c0.js} +4 -4
- package/dist/{cli-z1vam71h.js → cli-gc6b94tj.js} +2 -2
- package/dist/{cli-p436yrzp.js → cli-gcyws2bp.js} +2 -2
- package/dist/{cli-srktrbby.js → cli-hzhv7yac.js} +1 -1
- package/dist/{cli-0p76my9q.js → cli-jcnc5ret.js} +44 -32
- package/dist/{cli-tr19nyn9.js → cli-jgq9xptq.js} +7 -7
- package/dist/{cli-pz1dp12c.js → cli-jwnac23b.js} +1 -1
- package/dist/{cli-904wk98s.js → cli-kc7vd07m.js} +917 -350
- package/dist/{cli-t0jmkcah.js → cli-kg63yp1r.js} +14 -14
- package/dist/{cli-ts5yv7dn.js → cli-krk8y8c7.js} +835 -157
- package/dist/{cli-jyhbvdga.js → cli-m0ea8ggd.js} +8 -10
- package/dist/{cli-944w9wb4.js → cli-md4tn21h.js} +20 -15
- package/dist/{cli-zexwhj3f.js → cli-mv8ft7b0.js} +10 -9
- package/dist/{cli-phdzn699.js → cli-mw1tmn3x.js} +217 -27
- package/dist/{cli-5ashycw3.js → cli-njvpngc6.js} +3 -3
- package/dist/{cli-9ah37a8a.js → cli-phe2vcw5.js} +10 -7
- package/dist/{cli-eds5xnsz.js → cli-phmy14hb.js} +2 -2
- package/dist/{cli-n1kjs58m.js → cli-pq0kv31y.js} +5 -5
- package/dist/{cli-pz1nq5xm.js → cli-q457ga28.js} +6 -6
- package/dist/{cli-s33bzmk0.js → cli-q5n3deaf.js} +1 -1
- package/dist/{cli-4fpa0zns.js → cli-qkbevqer.js} +3 -3
- package/dist/{cli-29h5239w.js → cli-qrwjk4xy.js} +5 -5
- package/dist/{cli-kezzteka.js → cli-r04ve9xw.js} +1 -1
- package/dist/{cli-3xqad83h.js → cli-r495stwd.js} +2 -2
- package/dist/{cli-1kvcsd2f.js → cli-r9d2tya0.js} +71 -3
- package/dist/{cli-ybte1fqc.js → cli-rp1n2xpd.js} +1 -1
- package/dist/{cli-fkpnx3vf.js → cli-rs1rzwp4.js} +3 -2
- package/dist/{cli-h9d3sdnc.js → cli-rzbsh6bw.js} +1 -1
- package/dist/{cli-94gx6ze9.js → cli-s4pccby1.js} +1 -1
- package/dist/{cli-cq4am6vg.js → cli-shyhb4t5.js} +10 -10
- package/dist/{cli-gtj12v95.js → cli-srq69pn1.js} +1 -1
- package/dist/{cli-azj9t1f9.js → cli-tc165vrb.js} +48 -5
- package/dist/{cli-gse7bp3z.js → cli-v4z5v3jd.js} +300 -81
- package/dist/{cli-p3knvk62.js → cli-vxmmttmt.js} +132 -53
- package/dist/{cli-404am6f3.js → cli-w4bvtxet.js} +7 -7
- package/dist/{cli-gkv0r2hq.js → cli-wd7b5hgc.js} +71 -9
- package/dist/{cli-akm6y2a8.js → cli-wvbaq052.js} +1 -1
- package/dist/{cli-ywy8yz6t.js → cli-wvgg7r4j.js} +2 -2
- package/dist/{cli-ka48vpev.js → cli-wym6rxgt.js} +165 -6
- package/dist/{cli-nc4pbwmp.js → cli-yd7e590v.js} +12 -12
- package/dist/{cli-3zrwrnz7.js → cli-yjb3cddd.js} +1 -1
- package/dist/{cli-7gbff32z.js → cli-z8t4485r.js} +2 -2
- package/dist/{cli-hdhpdrka.js → cli-ze1ndjs4.js} +4 -6
- package/dist/{cli-50wa8k4h.js → cli-zy9bb22b.js} +1 -2
- package/dist/cli.js +28 -28
- package/dist/{codex-adapter-2fs2c0n6.js → codex-adapter-eq61radw.js} +8 -8
- package/dist/{codex-hook-jxjv6dy5.js → codex-hook-8nmepvz6.js} +3 -3
- package/dist/{codex-login-ktfg1cxk.js → codex-login-vbd9707w.js} +1 -1
- package/dist/{codex-session-runner-r55tmx4c.js → codex-session-runner-rfx355h4.js} +9 -9
- package/dist/{commands-0mxdy9x8.js → commands-d1z0sx62.js} +3 -3
- package/dist/{controller-g3vkfhr4.js → controller-9hz6d8x3.js} +4 -4
- package/dist/{controllers-connect-4wdmncqt.js → controllers-connect-tz07d2xr.js} +24 -25
- package/dist/core-dynsv289.js +41 -0
- package/dist/{cursor-adapter-t9qb96q2.js → cursor-adapter-ef22ze3j.js} +2 -2
- package/dist/{db-487vvyv9.js → db-gd81d68c.js} +3 -3
- package/dist/{db-76p7w3gr.js → db-vrckks6q.js} +4 -2
- package/dist/{devin-adapter-3bp6rape.js → devin-adapter-kdt6a2bh.js} +1 -1
- package/dist/{dispatcher-64rp6w67.js → dispatcher-76as8w2t.js} +21 -22
- package/dist/{docker-a59g3ebm.js → docker-51ta7jsh.js} +2 -2
- package/dist/dsh-adapter-ypfvcdyz.js +11 -0
- package/dist/{e2b-dc8f6ctq.js → e2b-05kn3kpq.js} +16 -5
- package/dist/{e2b-3ykbe805.js → e2b-dm9r8hpy.js} +3 -3
- package/dist/{easter-egg-3d-jrrwyf55.js → easter-egg-3d-sg21j15g.js} +1 -1
- package/dist/{embedding-space-001hhhpk.js → embedding-space-zsdw37bb.js} +13 -23
- package/dist/{embeddings-esj19cnw.js → embeddings-p4e3e1m6.js} +1 -1
- package/dist/{event-bus-7gbsr0g4.js → event-bus-tvf2grf4.js} +1 -1
- package/dist/{execute-301hkxqg.js → execute-nztd0af0.js} +1 -1
- package/dist/{external-channel-w10e2j05.js → external-channel-717yzn4d.js} +2 -2
- package/dist/fx-adapter-9k0hptnz.js +20 -0
- package/dist/grok-adapter-skdj2pce.js +20 -0
- package/dist/handlers-5btjqkz6.js +39 -0
- package/dist/{heartbeat-tbrj7vhq.js → heartbeat-vfb1gy84.js} +24 -25
- package/dist/{hook-tx917rqw.js → hook-ctz0xmp3.js} +11 -11
- package/dist/{hook-3am1sq68.js → hook-eh52p7yd.js} +6 -6
- package/dist/{http-3rmemtqy.js → http-zregegrx.js} +902 -198
- package/dist/{index-s7xtvc0f.js → index-5kx15d19.js} +1 -1
- package/dist/index-7w8p6em0.js +41 -0
- package/dist/index-evay0xyk.js +17 -0
- package/dist/{index-2jw11t8s.js → index-fdym6ryb.js} +25 -26
- package/dist/{index-3j803vnb.js → index-mtnbhe12.js} +20533 -19786
- package/dist/index-vz4semsx.js +38 -0
- package/dist/{index-gfnq66t1.js → index-x9qf8dg7.js} +294 -29
- package/dist/index-y3s0xp2v.js +43 -0
- package/dist/{k8s-36gfn847.js → k8s-ejkk0aw7.js} +2 -2
- package/dist/{keepalive-9px3t7qj.js → keepalive-zdqay870.js} +4 -5
- package/dist/lead-6cscw8a5.js +82 -0
- package/dist/{maintenance-vwqjwst6.js → maintenance-t5ndg11m.js} +1 -1
- package/dist/{node-2wfcey7d.js → node-0as4n1ef.js} +3 -3
- package/dist/{node-zd6shky9.js → node-dhxbt01p.js} +3 -3
- package/dist/{node-z67yjre7.js → node-jkdd5w7m.js} +290 -70
- package/dist/{node-hjn5n1yp.js → node-t0ct2zpw.js} +3 -5
- package/dist/{oauth-refresh-sweep-yqry3wn4.js → oauth-refresh-sweep-y9zyd7t6.js} +3 -4
- package/dist/{object-webhooks-8s1wtths.js → object-webhooks-mkca91s0.js} +7 -7
- package/dist/{onboard-hb8czx0p.js → onboard-ss995244.js} +11 -9
- package/dist/{opencode-adapter-djd6m6dk.js → opencode-adapter-mwpz0278.js} +8 -8
- package/dist/{otel-impl-2ymwyczz.js → otel-impl-6n6vva3x.js} +2 -2
- package/dist/{pending-nxavtvx7.js → pending-2sxh1t6j.js} +22 -23
- package/dist/{pi-mono-adapter-d2cpmcy4.js → pi-mono-adapter-sfb7zy43.js} +13 -13
- package/dist/{pricing-refresh-1yz8jkqv.js → pricing-refresh-h79bg4cf.js} +2 -2
- package/dist/{rbac-roles-7s6m31xw.js → rbac-roles-ckq0czp4.js} +2 -2
- package/dist/{rbac-roles-dbpx0x9v.js → rbac-roles-jg2e260w.js} +3 -3
- package/dist/{render-v2-7y20rjrn.js → render-v2-ymbshmn0.js} +7 -7
- package/dist/{resume-wz546x47.js → resume-jdhnt4jk.js} +10 -10
- package/dist/{runtime-cb5bd9tz.js → runtime-y28jhhnf.js} +1 -1
- package/dist/{session-access-4vcft8kq.js → session-access-k4ta5hvp.js} +5 -5
- package/dist/{session-source-backfill-57b50tpw.js → session-source-backfill-528j4s8j.js} +3 -3
- package/dist/{setup-e1tevjyj.js → setup-d6pj82fr.js} +15 -6
- package/dist/thread-buffer-9w6x5zec.js +40 -0
- package/dist/{tree-visibility-07wf1nct.js → tree-visibility-kjxv3nxk.js} +2 -2
- package/dist/{user-merge-jobs-n20qpv6s.js → user-merge-jobs-rabbncf6.js} +3 -3
- package/dist/{virtual-modules-6fxmn1yv.js → virtual-modules-22k51txd.js} +3 -3
- package/dist/{work-objects-eg7y48pe.js → work-objects-xtjbar3r.js} +26 -30
- package/dist/{worker-follow-up-jnvnnf2b.js → worker-follow-up-fg48vk6d.js} +21 -22
- package/dist/worker-g4aj93dt.js +82 -0
- package/dist/{x-d27jj7z7.js → x-vfsqypht.js} +2 -2
- package/openapi.json +633 -25
- package/package.json +10 -10
- package/src/apps/definition.ts +76 -24
- package/src/apps/row-store.ts +67 -0
- package/src/apps/script-types.ts +131 -21
- package/src/apps/store.ts +4 -1
- package/src/apps/sync.ts +20 -5
- package/src/azure-devops/boards-sync.ts +1 -1
- package/src/be/db/script-runs.ts +33 -0
- package/src/be/db/slack-card-groups.ts +147 -0
- package/src/be/db/slack-trees.ts +38 -1
- package/src/be/db/task-idempotency.ts +63 -0
- package/src/be/db/tasks/read.ts +27 -1
- package/src/be/db/tasks/write.ts +51 -14
- package/src/be/db/users/avatar.ts +12 -0
- package/src/be/db/workflow-idempotency.ts +6 -1
- package/src/be/db/workflows/read.ts +79 -0
- package/src/be/db.ts +129 -152
- package/src/be/improvements.ts +24 -2
- package/src/be/mcp-proxy.ts +45 -11
- package/src/be/memory/embedding-space.ts +10 -20
- package/src/be/memory/index.ts +35 -0
- package/src/be/memory/providers/openai-embedding.ts +10 -0
- package/src/be/migrations/344_user_avatar.sql +4 -0
- package/src/be/migrations/345_task_status_kind.sql +6 -0
- package/src/be/migrations/348_task_deferred_until.sql +4 -0
- package/src/be/migrations/354_durable_objects.sql +9 -0
- package/src/be/migrations/356_slack_outcome_card_groups.sql +14 -0
- package/src/be/migrations/357_task_idempotency_keys.sql +27 -0
- package/src/be/migrations/362_favorites_app.sql +36 -0
- package/src/be/primitives/object-embed.ts +2 -2
- package/src/be/primitives/objects.ts +2 -2
- package/src/be/repo-checked-update.ts +58 -5
- package/src/be/requester-timezone.ts +10 -0
- package/src/be/runtime-pools/supervisor.ts +1 -0
- package/src/be/script-connections.ts +5 -1
- package/src/be/script-credential-broker.ts +29 -2
- package/src/be/scripts/durable.ts +204 -0
- package/src/be/scripts/extract-schema.ts +29 -4
- package/src/be/scripts/run-credential.ts +1 -8
- package/src/be/scripts/typecheck.ts +33 -8
- package/src/be/seed-scripts/catalog/memory-eval.ts +11 -2
- package/src/be/seed-scripts/catalog/tool-usage.ts +27 -8
- package/src/be/swarm-config-guard.ts +91 -7
- package/src/be/users.ts +33 -12
- package/src/bitbucket/handlers.ts +1 -1
- package/src/comb/review-batch.ts +16 -5
- package/src/commands/context-preamble.ts +237 -0
- package/src/commands/credential-outcome-report.ts +96 -0
- package/src/commands/e2b.ts +14 -0
- package/src/commands/entrypoint-mcp-config.ts +231 -0
- package/src/commands/onboard/agent-fs-version.ts +1 -1
- package/src/commands/onboard/compose-generator.ts +2 -1
- package/src/commands/onboard/env-generator.ts +16 -7
- package/src/commands/runner.ts +72 -10
- package/src/commands/setup.tsx +17 -3
- package/src/event-waits/github.ts +39 -6
- package/src/event-waits/index.ts +4 -2
- package/src/event-waits/types.ts +10 -3
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/github/app.ts +177 -13
- package/src/github/handlers.ts +7 -2
- package/src/github/pull-request-state.ts +100 -11
- package/src/gitlab/handlers.ts +2 -2
- package/src/heartbeat/heartbeat.ts +6 -1
- package/src/hooks/hook.ts +8 -2
- package/src/hooks/native-tool-hooks.ts +4 -2
- package/src/http/api-keys.ts +26 -0
- package/src/http/apps.ts +82 -42
- package/src/http/asset-key-write.ts +45 -0
- package/src/http/assets.ts +4 -3
- package/src/http/comb.ts +21 -5
- package/src/http/config.ts +8 -4
- package/src/http/github-token.ts +27 -6
- package/src/http/heartbeat.ts +5 -0
- package/src/http/index.ts +12 -6
- package/src/http/kv.ts +7 -5
- package/src/http/mcp-oauth.ts +16 -0
- package/src/http/mcp-servers.ts +43 -3
- package/src/http/memory.ts +28 -1
- package/src/http/metrics.ts +11 -4
- package/src/http/onboarding.ts +12 -1
- package/src/http/pages.ts +4 -10
- package/src/http/repos.ts +27 -11
- package/src/http/request-principal.ts +27 -1
- package/src/http/schedules.ts +42 -14
- package/src/http/script-connection-proxy.ts +3 -1
- package/src/http/script-runs.ts +21 -10
- package/src/http/scripts.ts +177 -26
- package/src/http/session-cost-recompute.ts +9 -4
- package/src/http/sessions.ts +7 -2
- package/src/http/skills.ts +70 -0
- package/src/http/status.ts +2 -0
- package/src/http/tasks.ts +115 -19
- package/src/http/trackers/jira.ts +18 -3
- package/src/http/trackers/linear.ts +3 -0
- package/src/http/users.ts +5 -0
- package/src/http/webhooks.ts +19 -1
- package/src/http/workflows.ts +5 -10
- package/src/integrations/chat-sdk/commands.ts +3 -1
- package/src/jira/sync.ts +1 -1
- package/src/kv-limits.ts +2 -0
- package/src/kv-reserved-namespaces.ts +25 -2
- package/src/linear/sync.ts +5 -3
- package/src/prompts/session-templates.ts +50 -0
- package/src/prompts/session-turns.ts +30 -0
- package/src/providers/acp-targets.ts +2 -2
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/claude-adapter.ts +5 -0
- package/src/providers/claude-managed-adapter.ts +14 -0
- package/src/providers/claude-sdk-session.ts +19 -1
- package/src/providers/cursor-adapter.ts +1 -1
- package/src/providers/dsh-adapter.ts +1 -1
- package/src/providers/opencode-adapter.ts +3 -5
- package/src/providers/runtime-dependencies.ts +11 -8
- package/src/rbac/legacy-policy.ts +7 -0
- package/src/rbac/permissions.ts +27 -0
- package/src/scheduler/deferred-task-waits.ts +74 -13
- package/src/scheduler/scheduler.ts +36 -18
- package/src/script-workflows/executor.ts +37 -8
- package/src/script-workflows/supervisor.ts +14 -0
- package/src/scripts-runtime/ctx.ts +5 -1
- package/src/scripts-runtime/durable-object-base.ts +19 -0
- package/src/scripts-runtime/eval-harness.ts +46 -1
- package/src/scripts-runtime/executors/native.ts +13 -1
- package/src/scripts-runtime/executors/quickjs-bundle.ts +20 -1
- package/src/scripts-runtime/executors/quickjs-prelude.ts +40 -1
- package/src/scripts-runtime/executors/quickjs-runner.ts +26 -3
- package/src/scripts-runtime/executors/quickjs-worker.ts +2 -1
- package/src/scripts-runtime/executors/types.ts +26 -0
- package/src/scripts-runtime/extract-signature.ts +96 -1
- package/src/scripts-runtime/loader.ts +11 -5
- package/src/scripts-runtime/mcp-client.ts +1 -1
- package/src/scripts-runtime/sdk-allowlist.ts +1 -0
- package/src/scripts-runtime/swarm-config.ts +7 -0
- package/src/scripts-runtime/swarm-sdk.ts +12 -2
- package/src/scripts-runtime/types/stdlib.d.ts +27 -1
- package/src/scripts-runtime/types/swarm-extension.d.ts +20 -2
- package/src/scripts-runtime/types/swarm-sdk.d.ts +27 -1
- package/src/slack/actions.ts +25 -1
- package/src/slack/assistant.ts +8 -0
- package/src/slack/blocks.ts +35 -0
- package/src/slack/channel-activity.ts +7 -0
- package/src/slack/enrich.ts +46 -54
- package/src/slack/files.ts +173 -23
- package/src/slack/handlers.test.ts +17 -19
- package/src/slack/handlers.ts +15 -14
- package/src/slack/render-v2.ts +403 -17
- package/src/slack/responses.ts +61 -5
- package/src/slack/session-mirror.ts +10 -5
- package/src/slack/task-output.ts +25 -14
- package/src/slack/templates.ts +9 -0
- package/src/slack/thread-participants.ts +64 -24
- package/src/slack/watcher.ts +4 -4
- package/src/slack/work-objects.ts +1 -1
- package/src/stdio.ts +5 -0
- package/src/tests/agents-list-model-display.test.ts +4 -0
- package/src/tests/api-drain-worker-e2e.test.ts +0 -2
- package/src/tests/approval-auto-cancellation-migration.test.ts +8 -19
- package/src/tests/approval-card-resolution.test.ts +2 -17
- package/src/tests/approval-requests-notifications.test.ts +41 -27
- package/src/tests/approval-requests.test.ts +137 -369
- package/src/tests/apps-script-types.test.ts +63 -16
- package/src/tests/apps-sort-order.test.ts +87 -0
- package/src/tests/apps-sync-engine.test.ts +5 -3
- package/src/tests/apps-table-filters-migration.test.ts +44 -25
- package/src/tests/bedrock-model-groups.test.ts +4 -0
- package/src/tests/bitbucket-handlers.test.ts +2 -0
- package/src/tests/channel-activity.test.ts +9 -0
- package/src/tests/chat-sdk-commands.test.ts +1 -0
- package/src/tests/chatgpt-subscription-model-groups.test.ts +4 -0
- package/src/tests/claude-adapter.test.ts +35 -0
- package/src/tests/claude-hook-output.test.ts +2 -0
- package/src/tests/claude-managed-adapter.test.ts +15 -3
- package/src/tests/claude-sdk-stderr.test.ts +28 -0
- package/src/tests/codex-adapter.test.ts +3 -92
- package/src/tests/codex-gpt6-release.test.ts +4 -9
- package/src/tests/codex-oauth-credential-info.test.ts +35 -18
- package/src/tests/codex-oauth.test.ts +0 -6
- package/src/tests/codex-pool.test.ts +5 -214
- package/src/tests/codex-rate-limit-parse.test.ts +0 -7
- package/src/tests/codex-swarm-events.test.ts +11 -54
- package/src/tests/comb-review-batch.test.ts +17 -4
- package/src/tests/comb-status.test.ts +1 -0
- package/src/tests/db-client-busy-retry.test.ts +49 -16
- package/src/tests/db-client.test.ts +11 -5
- package/src/tests/db-task-read-contract.test.ts +1 -0
- package/src/tests/db-task-write-contract.test.ts +2 -2
- package/src/tests/defer-task.test.ts +24 -1
- package/src/tests/dsh-adapter.test.ts +1 -1
- package/src/tests/e2b-dispatch.test.ts +13 -1
- package/src/tests/e2e-shards.test.ts +9 -9
- package/src/tests/enabled-tools.test.ts +0 -2
- package/src/tests/entrypoint-mcp-config.test.ts +642 -0
- package/src/tests/fixtures/base-prompt-baseline.json +6 -6
- package/src/tests/fixtures/onboard/content.env.txt +2 -2
- package/src/tests/fixtures/onboard/dev.env.txt +2 -2
- package/src/tests/fixtures/onboard/full-all.env.txt +2 -2
- package/src/tests/fixtures/onboard/full.env.txt +2 -2
- package/src/tests/fixtures/onboard/research.env.txt +2 -2
- package/src/tests/fixtures/onboard/solo.env.txt +2 -2
- package/src/tests/fixtures/runner-missing-dependency.ts +2 -1
- package/src/tests/fx-adapter.test.ts +4 -5
- package/src/tests/github-app-worker-auth-helper.test.ts +147 -1
- package/src/tests/gitlab-handlers.test.ts +2 -0
- package/src/tests/heartbeat-jev-gate.test.ts +9 -241
- package/src/tests/heartbeat-reroute-decision.test.ts +2 -0
- package/src/tests/heartbeat-supersede-resume.test.ts +2 -0
- package/src/tests/heartbeat.test.ts +1 -0
- package/src/tests/hook-mcp-config-precedence.test.ts +59 -0
- package/src/tests/hook-ping-me-order.test.ts +1 -0
- package/src/tests/hook-runtime-close.test.ts +1 -0
- package/src/tests/improvements-payload.test.ts +2 -2
- package/src/tests/key-usage-selection.test.ts +302 -0
- package/src/tests/memory-e2e.test.ts +34 -103
- package/src/tests/memory-key-paths.test.ts +5 -0
- package/src/tests/memory-rater-llm.test.ts +33 -149
- package/src/tests/memory-store.test.ts +24 -125
- package/src/tests/memory.test.ts +31 -100
- package/src/tests/merge-gate-detect-changes.test.ts +108 -2
- package/src/tests/model-groups-live-catalog.test.ts +4 -0
- package/src/tests/oauth-credential-bindings.test.ts +8 -3
- package/src/tests/oauth-refresh-failure.test.ts +15 -3
- package/src/tests/onboard-env.test.ts +1 -1
- package/src/tests/openai-compatible-providers.test.ts +5 -0
- package/src/tests/openapi-route-headers.test.ts +2 -1
- package/src/tests/opus-5-5-registry.test.ts +4 -0
- package/src/tests/otel-service-name.test.ts +0 -9
- package/src/tests/otel-session-cost-metrics.test.ts +1 -38
- package/src/tests/pool-session-logs.test.ts +8 -42
- package/src/tests/pre-push-affected-tests.test.ts +106 -0
- package/src/tests/prompt-template-session.test.ts +3 -0
- package/src/tests/provider-runtime-dependencies.test.ts +26 -15
- package/src/tests/routing-affinity-inventory.test.ts +11 -0
- package/src/tests/runner-api-drain.test.ts +2 -17
- package/src/tests/runner-context-preamble.test.ts +202 -0
- package/src/tests/runner-repo-clone-args.test.ts +116 -0
- package/src/tests/runner-terminal-window-report.test.ts +132 -0
- package/src/tests/runtime-supervisor-failures.test.ts +1 -0
- package/src/tests/sandboxed-process.test.ts +26 -21
- package/src/tests/schedule-http-triage-tools.test.ts +12 -9
- package/src/tests/scheduled-tasks.test.ts +14 -51
- package/src/tests/scheduler-occurrence.test.ts +60 -9
- package/src/tests/script-connections-mcp.test.ts +6 -3
- package/src/tests/script-connections.test.ts +4 -0
- package/src/tests/script-executor-conformance.test.ts +4 -48
- package/src/tests/script-executor-quickjs-pool.test.ts +9 -7
- package/src/tests/script-native-startup.test.ts +21 -25
- package/src/tests/scripts-namespaces.test.ts +3 -1
- package/src/tests/secret-rules.test.ts +4 -2
- package/src/tests/secret-scrubber.test.ts +8 -2
- package/src/tests/session-cost-recompute-unit.test.ts +39 -0
- package/src/tests/session-costs-recompute-all-providers.test.ts +6 -3
- package/src/tests/session-logs.test.ts +1 -260
- package/src/tests/session-route-posture.test.ts +7 -1
- package/src/tests/slack-file-tools-attachments.test.ts +14 -9
- package/src/tests/slack-identity-resolution.test.ts +10 -3
- package/src/tests/slack-inline-output.test.ts +10 -8
- package/src/tests/slack-render-v2.test.ts +14 -152
- package/src/tests/slack-steering.test.ts +8 -2
- package/src/tests/slack-thread-participants.test.ts +11 -1
- package/src/tests/sonnet-5-5-registry.test.ts +4 -0
- package/src/tests/swarm-config-encryption.test.ts +5 -8
- package/src/tests/task-cascade-fail.test.ts +1 -0
- package/src/tests/task-supersede-resume.test.ts +1 -0
- package/src/tests/test-proc.ts +5 -2
- package/src/tests/ui-spec-script-actions-config.test.ts +7 -3
- package/src/tests/window-stream-reporter.test.ts +122 -0
- package/src/tests/workflow-agent-task-retry.test.ts +1 -3
- package/src/tests/workflow-cascade-cancel.test.ts +1 -0
- package/src/tests/workflow-retry-v2.test.ts +34 -43
- package/src/tests/workflow-retry-validation.test.ts +8 -48
- package/src/tests/workflow-triggers-v2.test.ts +35 -11
- package/src/tests/worktree-reaper.test.ts +2 -2
- package/src/tools/app-patch.ts +6 -2
- package/src/tools/app-upsert.ts +8 -4
- package/src/tools/cancel-task.ts +2 -2
- package/src/tools/defer-task.ts +24 -79
- package/src/tools/get-task-details.ts +8 -4
- package/src/tools/get-tasks.ts +13 -2
- package/src/tools/kv/kv-get.ts +2 -0
- package/src/tools/kv/kv-list.ts +11 -5
- package/src/tools/kv/kv-set.ts +1 -3
- package/src/tools/manage-user.ts +9 -0
- package/src/tools/repos/update-repo.ts +37 -19
- package/src/tools/schedules/run-schedule-now.ts +21 -1
- package/src/tools/script-apis.ts +9 -4
- package/src/tools/script-common.ts +2 -2
- package/src/tools/script-run.ts +8 -0
- package/src/tools/script-upsert.ts +1 -1
- package/src/tools/slack-download-file.ts +15 -12
- package/src/tools/slack-post.ts +7 -1
- package/src/tools/slack-read.ts +3 -1
- package/src/tools/slack-reply.ts +16 -0
- package/src/tools/slack-start-thread.ts +8 -1
- package/src/tools/slack-upload-file.ts +99 -96
- package/src/tools/store-progress.ts +5 -3
- package/src/tools/swarm-config/set-config.ts +3 -1
- package/src/tools/swarm-x.ts +0 -2
- package/src/tools/utils.ts +3 -0
- package/src/types.ts +101 -2
- package/src/utils/constants.ts +32 -0
- package/src/utils/credentials.ts +42 -5
- package/src/utils/deferral-time.ts +61 -0
- package/src/utils/error-tracker.ts +6 -0
- package/src/utils/key-usage.ts +114 -0
- package/src/utils/request-auth-context.ts +15 -16
- package/src/utils/sandboxed-process.ts +1 -0
- package/src/utils/secret-scrubber.ts +1 -1
- package/src/workflows/engine.ts +6 -11
- package/src/workflows/executors/swarm-script.ts +0 -2
- package/src/workflows/foreach-driver.ts +6 -12
- package/src/workflows/input.ts +24 -1
- package/src/workflows/node-timeout.ts +18 -0
- package/src/workflows/resume.ts +5 -2
- package/src/workflows/retry-poller.ts +2 -1
- package/src/workflows/triggers.ts +21 -11
- package/src/x/composio.ts +10 -1
- package/templates/skills/apps/SKILL.md +6 -2
- package/templates/skills/apps/content.md +6 -2
- package/templates/skills/boards-and-sheets/content.md +4 -2
- package/templates/skills/code-quality/content.md +4 -4
- package/templates/skills/pages/content.md +7 -0
- package/templates/skills/scheduled-task-resilience/SKILL.md +2 -0
- package/templates/skills/scheduled-task-resilience/content.md +2 -0
- package/templates/skills/swarm-docs/content.md +8 -0
- package/templates/skills/swarm-scripts/SKILL.md +45 -0
- package/templates/skills/swarm-scripts/content.md +45 -0
- package/dist/acp-adapter-mr4temec.js +0 -17
- package/dist/cli-1vmhnncj.js +0 -173
- package/dist/cli-kj0hyr43.js +0 -51
- package/dist/cli-ysv0k1we.js +0 -459
- package/dist/core-gsvj5f3z.js +0 -42
- package/dist/dsh-adapter-8abzqk5c.js +0 -9
- package/dist/fx-adapter-4sjrbdne.js +0 -20
- package/dist/grok-adapter-3a0ezfee.js +0 -20
- package/dist/handlers-ef3k11hb.js +0 -41
- package/dist/index-aetfyx6p.js +0 -13
- package/dist/index-e6bq0exk.js +0 -42
- package/dist/index-hf2k1vge.js +0 -39
- package/dist/index-taxmejj3.js +0 -44
- package/dist/lead-5vt6f174.js +0 -83
- package/dist/thread-buffer-686pa1p1.js +0 -42
- package/dist/worker-4vp616ms.js +0 -83
- package/src/tests/apps-table-selection-migration.test.ts +0 -95
- package/src/tests/extensions-example-heartbeat-remediate.test.ts +0 -69
- package/src/tests/extensions-example-rewrite-and-suppress.test.ts +0 -70
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { describe, expect, test } from "bun:test";
|
|
2
2
|
import { modelGroupsForHarness } from "../../apps/ui/src/lib/agent-runtime-models";
|
|
3
|
+
import { loadModelsSnapshot } from "../../apps/ui/src/lib/models-snapshot";
|
|
3
4
|
import { buildModelsCatalog } from "../be/models-catalog";
|
|
4
5
|
import cache from "../be/modelsdev-cache.json";
|
|
5
6
|
import { buildModelsDevSeedRows } from "../be/seed-pricing";
|
|
6
7
|
import {
|
|
7
8
|
CODEX_DEFAULT_MODEL,
|
|
8
|
-
computeCodexCostUsd,
|
|
9
9
|
getCodexContextWindow,
|
|
10
10
|
getCodexModelPricing,
|
|
11
11
|
listCodexModels,
|
|
@@ -13,6 +13,9 @@ import {
|
|
|
13
13
|
} from "../providers/codex-models";
|
|
14
14
|
import { applyReasoningEffort, reasoningCapability } from "../providers/reasoning-effort";
|
|
15
15
|
|
|
16
|
+
// The UI loads the models.dev snapshot lazily; these assertions read it.
|
|
17
|
+
await loadModelsSnapshot();
|
|
18
|
+
|
|
16
19
|
const releases = [
|
|
17
20
|
{ id: "gpt-6-sol", label: "GPT-6 Sol", input: 2, output: 10, read: 0.2, write: 2.5 },
|
|
18
21
|
{ id: "gpt-6-luna", label: "GPT-6 Luna", input: 0.1, output: 0.5, read: 0.01, write: 0.125 },
|
|
@@ -30,10 +33,6 @@ for (const release of releases) {
|
|
|
30
33
|
cachedInputPerMillion: release.read,
|
|
31
34
|
outputPerMillion: release.output,
|
|
32
35
|
});
|
|
33
|
-
expect(computeCodexCostUsd(release.id, 1_000_000, 250_000, 100_000)).toBeCloseTo(
|
|
34
|
-
release.input * 0.75 + release.read * 0.25 + release.output * 0.1,
|
|
35
|
-
8,
|
|
36
|
-
);
|
|
37
36
|
});
|
|
38
37
|
|
|
39
38
|
test("exposes the full reasoning range and transports none/max correctly", () => {
|
|
@@ -109,10 +108,6 @@ describe("gpt-6.1-sol", () => {
|
|
|
109
108
|
cachedInputPerMillion: 0.1,
|
|
110
109
|
outputPerMillion: 10,
|
|
111
110
|
});
|
|
112
|
-
expect(computeCodexCostUsd(id, 1_000_000, 250_000, 100_000)).toBeCloseTo(
|
|
113
|
-
2 * 0.75 + 0.1 * 0.25 + 10 * 0.1,
|
|
114
|
-
8,
|
|
115
|
-
);
|
|
116
111
|
});
|
|
117
112
|
|
|
118
113
|
test("exposes low through max without an off level", () => {
|
|
@@ -187,10 +187,11 @@ describe("resolveCodexOAuthCredentialInfo — issue #1102 bug 1", () => {
|
|
|
187
187
|
|
|
188
188
|
describe("resolveCodexOAuthCredentialInfo — sparse slot availability (#1555 B1)", () => {
|
|
189
189
|
it.each([
|
|
190
|
-
{ slots: [1, 2], limited: [1], expected: 2, available: 1 },
|
|
191
|
-
{ slots: [0, 2], limited: [2], expected: 0, available: 1 },
|
|
192
|
-
{ slots: [0, 1, 2], limited: [0, 2], expected: 1, available: 1 },
|
|
193
|
-
{ slots: [1, 2], limited: [], expected:
|
|
190
|
+
{ slots: [1, 2], limited: [1], expected: [2, 2], available: 1 },
|
|
191
|
+
{ slots: [0, 2], limited: [2], expected: [0, 0], available: 1 },
|
|
192
|
+
{ slots: [0, 1, 2], limited: [0, 2], expected: [1, 1], available: 1 },
|
|
193
|
+
{ slots: [1, 2], limited: [], expected: [1, 2], available: 2 },
|
|
194
|
+
{ slots: [0, 1, 2], limited: [0, 1, 2], expected: [0, 2], available: 0 },
|
|
194
195
|
])("honors real slot ids for $slots with $limited rate-limited", async ({
|
|
195
196
|
slots,
|
|
196
197
|
limited,
|
|
@@ -198,18 +199,22 @@ describe("resolveCodexOAuthCredentialInfo — sparse slot availability (#1555 B1
|
|
|
198
199
|
available,
|
|
199
200
|
}) => {
|
|
200
201
|
const requests: URL[] = [];
|
|
202
|
+
const credentials = (slot: number) => ({
|
|
203
|
+
access: `header.${btoa(
|
|
204
|
+
JSON.stringify({ "https://api.openai.com/auth": { chatgpt_user_id: `user-slot${slot}` } }),
|
|
205
|
+
)}.signature`,
|
|
206
|
+
refresh: `example-refresh-pool-${slot}`,
|
|
207
|
+
expires: Date.now() + 3_600_000,
|
|
208
|
+
accountId: `acc-pool-${slot}`,
|
|
209
|
+
});
|
|
210
|
+
const authFile = Bun.file(join(tmpHome, ".codex", "auth.json"));
|
|
201
211
|
globalThis.fetch = (async (input: string | URL | Request) => {
|
|
202
212
|
const url = new URL(input instanceof Request ? input.url : input);
|
|
203
213
|
if (url.pathname === "/api/config/resolved") {
|
|
204
214
|
return Response.json({
|
|
205
215
|
configs: slots.map((slot) => ({
|
|
206
216
|
key: `codex_oauth_${slot}`,
|
|
207
|
-
value: JSON.stringify(
|
|
208
|
-
access: "example-access-pool",
|
|
209
|
-
refresh: "example-refresh-pool",
|
|
210
|
-
expires: Date.now() + 3_600_000,
|
|
211
|
-
accountId: "acc-pool",
|
|
212
|
-
}),
|
|
217
|
+
value: JSON.stringify(credentials(slot)),
|
|
213
218
|
})),
|
|
214
219
|
});
|
|
215
220
|
}
|
|
@@ -229,16 +234,28 @@ describe("resolveCodexOAuthCredentialInfo — sparse slot availability (#1555 B1
|
|
|
229
234
|
const random = spyOn(Math, "random");
|
|
230
235
|
const log = spyOn(console, "log").mockImplementation(() => {});
|
|
231
236
|
try {
|
|
232
|
-
for (const value of [0, 0.999]) {
|
|
237
|
+
for (const [draw, value] of [0, 0.999].entries()) {
|
|
233
238
|
random.mockReturnValue(value);
|
|
234
|
-
const info = await resolveCodexOAuthCredentialInfo(MOCK_API_URL, MOCK_API_KEY
|
|
235
|
-
|
|
236
|
-
|
|
239
|
+
const info = await resolveCodexOAuthCredentialInfo(MOCK_API_URL, MOCK_API_KEY);
|
|
240
|
+
const slot = expected[draw]!;
|
|
241
|
+
const creds = credentials(slot);
|
|
237
242
|
expect(info?.isPoolBacked).toBe(true);
|
|
238
|
-
expect(info?.selection
|
|
239
|
-
|
|
240
|
-
|
|
241
|
-
|
|
243
|
+
expect(info?.selection).toMatchObject({
|
|
244
|
+
index: slot,
|
|
245
|
+
total: slots.length,
|
|
246
|
+
selected: creds.accountId,
|
|
247
|
+
keyType: "CODEX_OAUTH",
|
|
248
|
+
keySuffix: `slot${slot}-${slot}`,
|
|
249
|
+
});
|
|
250
|
+
expect(await authFile.json()).toMatchObject({
|
|
251
|
+
auth_mode: "chatgpt",
|
|
252
|
+
tokens: {
|
|
253
|
+
access_token: creds.access,
|
|
254
|
+
refresh_token: "",
|
|
255
|
+
account_id: creds.accountId,
|
|
256
|
+
},
|
|
257
|
+
});
|
|
258
|
+
await authFile.delete();
|
|
242
259
|
}
|
|
243
260
|
expect(requests).toHaveLength(2);
|
|
244
261
|
for (const url of requests) {
|
|
@@ -514,9 +514,3 @@ describe("codexPlanFromClaim", () => {
|
|
|
514
514
|
expect(codexPlanFromClaim(null)).toBeNull();
|
|
515
515
|
});
|
|
516
516
|
});
|
|
517
|
-
|
|
518
|
-
describe("no secrets in source", () => {
|
|
519
|
-
it("CLIENT_ID is the public OpenAI client id", () => {
|
|
520
|
-
expect(CLIENT_ID).toBe("app_EMoamEEZ73f0CkXaXp7hrann");
|
|
521
|
-
});
|
|
522
|
-
});
|
|
@@ -1,30 +1,7 @@
|
|
|
1
|
-
/**
|
|
2
|
-
* E2E integration tests for the Codex OAuth multi-credential pool (CAI-1280).
|
|
3
|
-
*
|
|
4
|
-
* These tests cover the full round-trip that the runner assembles at task-spawn
|
|
5
|
-
* time and are intentionally focused on the *integration* between the storage
|
|
6
|
-
* layer, the availability-filter, and the materialise-to-disk step — not on
|
|
7
|
-
* the individual function contracts that the unit-test files already cover
|
|
8
|
-
* (codex-oauth-storage.test.ts, codex-oauth-auth-json-fs.test.ts,
|
|
9
|
-
* codex-oauth-adapter.test.ts).
|
|
10
|
-
*
|
|
11
|
-
* Three scenarios:
|
|
12
|
-
* 1. Normal selection — slots 1 + 2 available, slot 0 rate-limited → only
|
|
13
|
-
* one of slots 1/2 is materialised into auth.json.
|
|
14
|
-
* 2. Refresh-back slot isolation — after picking slot 2, token refresh must
|
|
15
|
-
* write back to `codex_oauth_2`, NOT to slot 0 or the legacy key.
|
|
16
|
-
* 3. Exhaustion — all three slots rate-limited → runner falls back to
|
|
17
|
-
* random best-effort selection and still materialises *some* slot's
|
|
18
|
-
* creds (does not return null / abort the spawn).
|
|
19
|
-
*/
|
|
1
|
+
/** Regression coverage for nonzero-slot forwarding through persistCodexOAuth. */
|
|
20
2
|
|
|
21
3
|
import { afterEach, describe, expect, it } from "bun:test";
|
|
22
|
-
import {
|
|
23
|
-
authJsonToCredentialSelection,
|
|
24
|
-
credentialsToAuthJson,
|
|
25
|
-
} from "../providers/codex-oauth/auth-json.js";
|
|
26
|
-
import { materializeCodexAuthJson } from "../providers/codex-oauth/auth-json-fs.js";
|
|
27
|
-
import { loadAllCodexOAuthSlots, persistCodexOAuth } from "../providers/codex-oauth/storage.js";
|
|
4
|
+
import { persistCodexOAuth } from "../providers/codex-oauth/storage.js";
|
|
28
5
|
import type { CodexOAuthCredentials } from "../providers/codex-oauth/types.js";
|
|
29
6
|
|
|
30
7
|
// ─── Fixtures ────────────────────────────────────────────────────────────────
|
|
@@ -33,154 +10,22 @@ const MOCK_API_URL = "http://localhost:3013";
|
|
|
33
10
|
const MOCK_API_KEY = "example-test-api-key";
|
|
34
11
|
const FUTURE = Date.now() + 3_600_000;
|
|
35
12
|
|
|
36
|
-
function makeJwt(userId: string, accountId: string): string {
|
|
37
|
-
const payload = {
|
|
38
|
-
"https://api.openai.com/auth": {
|
|
39
|
-
chatgpt_account_id: accountId,
|
|
40
|
-
chatgpt_user_id: userId,
|
|
41
|
-
},
|
|
42
|
-
};
|
|
43
|
-
return `header.${btoa(JSON.stringify(payload))}.signature`;
|
|
44
|
-
}
|
|
45
|
-
|
|
46
13
|
function makeCreds(suffix: string): CodexOAuthCredentials {
|
|
47
14
|
return {
|
|
48
|
-
access:
|
|
15
|
+
access: `example-access-${suffix}`,
|
|
49
16
|
refresh: `rt_${suffix}`,
|
|
50
17
|
expires: FUTURE,
|
|
51
18
|
accountId: `acc-${suffix}`,
|
|
52
19
|
};
|
|
53
20
|
}
|
|
54
21
|
|
|
55
|
-
const slotCreds: Record<number, CodexOAuthCredentials> = {
|
|
56
|
-
0: makeCreds("slot0"),
|
|
57
|
-
1: makeCreds("slot1"),
|
|
58
|
-
2: makeCreds("slot2"),
|
|
59
|
-
};
|
|
60
|
-
|
|
61
|
-
/**
|
|
62
|
-
* Build a mock config-store GET response containing the three credential slots.
|
|
63
|
-
* Mirrors the shape `loadAllCodexOAuthSlots` and `loadCodexOAuth` parse.
|
|
64
|
-
*/
|
|
65
|
-
function makeConfigResponse(slots: number[] = [0, 1, 2]): Response {
|
|
66
|
-
return new Response(
|
|
67
|
-
JSON.stringify({
|
|
68
|
-
configs: slots.map((s) => ({
|
|
69
|
-
id: `cfg-${s}`,
|
|
70
|
-
key: `codex_oauth_${s}`,
|
|
71
|
-
value: JSON.stringify(slotCreds[s]),
|
|
72
|
-
})),
|
|
73
|
-
}),
|
|
74
|
-
{ status: 200, headers: { "Content-Type": "application/json" } },
|
|
75
|
-
);
|
|
76
|
-
}
|
|
77
|
-
|
|
78
|
-
/**
|
|
79
|
-
* Replicate the runner's slot-selection algorithm (runner.ts ~line 830-895)
|
|
80
|
-
* so tests can exercise the full chain without importing the unexported
|
|
81
|
-
* `resolveCodexOAuthCredentialInfo` function.
|
|
82
|
-
*
|
|
83
|
-
* Returns `{ selectedSlot, slotEntry }`.
|
|
84
|
-
*/
|
|
85
|
-
async function runnerSlotSelection(
|
|
86
|
-
slots: Array<{ slot: number; creds: CodexOAuthCredentials }>,
|
|
87
|
-
availableIndices: number[] | undefined,
|
|
88
|
-
): Promise<{ selectedSlot: number; slotEntry: { slot: number; creds: CodexOAuthCredentials } }> {
|
|
89
|
-
const allSlotIndices = slots.map((s) => s.slot);
|
|
90
|
-
let selectedSlot: number;
|
|
91
|
-
|
|
92
|
-
if (availableIndices && availableIndices.length > 0) {
|
|
93
|
-
const eligible = allSlotIndices.filter((i) => availableIndices.includes(i));
|
|
94
|
-
const pool = eligible.length > 0 ? eligible : allSlotIndices;
|
|
95
|
-
selectedSlot = pool[Math.floor(Math.random() * pool.length)]!;
|
|
96
|
-
} else {
|
|
97
|
-
// No availability info OR all rate-limited — pick randomly (best effort).
|
|
98
|
-
selectedSlot = allSlotIndices[Math.floor(Math.random() * allSlotIndices.length)]!;
|
|
99
|
-
}
|
|
100
|
-
|
|
101
|
-
const slotEntry = slots.find((s) => s.slot === selectedSlot)!;
|
|
102
|
-
return { selectedSlot, slotEntry };
|
|
103
|
-
}
|
|
104
|
-
|
|
105
22
|
const originalFetch = globalThis.fetch;
|
|
106
23
|
|
|
107
24
|
afterEach(() => {
|
|
108
25
|
globalThis.fetch = originalFetch;
|
|
109
26
|
});
|
|
110
27
|
|
|
111
|
-
|
|
112
|
-
|
|
113
|
-
describe("Scenario 1 — 3-slot round-trip with availability filter", () => {
|
|
114
|
-
it("selects from available slots [1,2] and materialises the correct creds into auth.json", async () => {
|
|
115
|
-
// Mock API: three slots in config store.
|
|
116
|
-
globalThis.fetch = async (_url: string | URL | Request) => {
|
|
117
|
-
return makeConfigResponse();
|
|
118
|
-
// (available-indices endpoint not called by loadAllCodexOAuthSlots)
|
|
119
|
-
};
|
|
120
|
-
|
|
121
|
-
const slots = await loadAllCodexOAuthSlots(MOCK_API_URL, MOCK_API_KEY);
|
|
122
|
-
expect(slots).toHaveLength(3);
|
|
123
|
-
|
|
124
|
-
// Simulate the runner calling /api/keys/available → [1, 2] (slot 0 rate-limited).
|
|
125
|
-
const availableIndices = [1, 2];
|
|
126
|
-
const { selectedSlot, slotEntry } = await runnerSlotSelection(slots, availableIndices);
|
|
127
|
-
|
|
128
|
-
// Must NOT pick the rate-limited slot 0.
|
|
129
|
-
expect(availableIndices).toContain(selectedSlot);
|
|
130
|
-
expect(selectedSlot).not.toBe(0);
|
|
131
|
-
|
|
132
|
-
// Materialise auth.json with an injected fs so we can inspect the write.
|
|
133
|
-
let writtenContent = "";
|
|
134
|
-
let writtenPath = "";
|
|
135
|
-
await materializeCodexAuthJson(selectedSlot, slotEntry.creds, {
|
|
136
|
-
homedir: () => "/home/testworker",
|
|
137
|
-
fs: {
|
|
138
|
-
mkdir: async () => undefined,
|
|
139
|
-
writeFile: async (path, data) => {
|
|
140
|
-
writtenPath = path;
|
|
141
|
-
writtenContent = data;
|
|
142
|
-
},
|
|
143
|
-
rename: async () => {},
|
|
144
|
-
},
|
|
145
|
-
});
|
|
146
|
-
|
|
147
|
-
// The tmp file is written (atomic pattern).
|
|
148
|
-
expect(writtenPath).toBe("/home/testworker/.codex/auth.json.tmp");
|
|
149
|
-
|
|
150
|
-
// auth.json content must reflect the SELECTED slot's credentials.
|
|
151
|
-
const parsed = JSON.parse(writtenContent) as {
|
|
152
|
-
auth_mode: string;
|
|
153
|
-
tokens: { access_token: string; refresh_token: string; account_id: string };
|
|
154
|
-
};
|
|
155
|
-
expect(parsed.auth_mode).toBe("chatgpt");
|
|
156
|
-
expect(parsed.tokens.access_token).toBe(slotEntry.creds.access);
|
|
157
|
-
expect(parsed.tokens.account_id).toBe(slotEntry.creds.accountId);
|
|
158
|
-
|
|
159
|
-
// Verify it is definitely NOT slot 0's creds.
|
|
160
|
-
expect(parsed.tokens.access_token).not.toBe(slotCreds[0]!.access);
|
|
161
|
-
});
|
|
162
|
-
|
|
163
|
-
it("builds a CredentialSelection with the correct slot index", async () => {
|
|
164
|
-
globalThis.fetch = async () => makeConfigResponse();
|
|
165
|
-
const slots = await loadAllCodexOAuthSlots(MOCK_API_URL, MOCK_API_KEY);
|
|
166
|
-
|
|
167
|
-
const { selectedSlot, slotEntry } = await runnerSlotSelection(slots, [1, 2]);
|
|
168
|
-
|
|
169
|
-
const authJson = credentialsToAuthJson(slotEntry.creds);
|
|
170
|
-
const sel = authJsonToCredentialSelection(authJson, selectedSlot, slots.length);
|
|
171
|
-
|
|
172
|
-
expect(sel.index).toBe(selectedSlot);
|
|
173
|
-
expect(sel.total).toBe(3);
|
|
174
|
-
expect(sel.keyType).toBe("CODEX_OAUTH");
|
|
175
|
-
// keySuffix is the chatgpt_user_id tail plus the slot, so it is slot-unique.
|
|
176
|
-
const expectedUserId = `user-slot${selectedSlot}`;
|
|
177
|
-
expect(sel.keySuffix).toBe(`${expectedUserId.slice(-5)}-${selectedSlot}`);
|
|
178
|
-
});
|
|
179
|
-
});
|
|
180
|
-
|
|
181
|
-
// ─── Scenario 2: Refresh-back writes to the picked slot, not slot 0 ──────────
|
|
182
|
-
|
|
183
|
-
describe("Scenario 2 — refresh-back slot isolation", () => {
|
|
28
|
+
describe("persistCodexOAuth slot isolation", () => {
|
|
184
29
|
it("persists refreshed credentials to codex_oauth_2, not codex_oauth_0 or legacy", async () => {
|
|
185
30
|
const capturedPuts: Array<{ key: string; value: unknown }> = [];
|
|
186
31
|
|
|
@@ -196,7 +41,7 @@ describe("Scenario 2 — refresh-back slot isolation", () => {
|
|
|
196
41
|
access: "at_refreshed",
|
|
197
42
|
refresh: "rt_refreshed",
|
|
198
43
|
expires: FUTURE,
|
|
199
|
-
accountId:
|
|
44
|
+
accountId: "acc-slot2",
|
|
200
45
|
};
|
|
201
46
|
|
|
202
47
|
// Simulate the adapter calling persistCodexOAuth after a token rotation
|
|
@@ -235,57 +80,3 @@ describe("Scenario 2 — refresh-back slot isolation", () => {
|
|
|
235
80
|
expect(capturedKeys).toEqual(["codex_oauth_1"]);
|
|
236
81
|
});
|
|
237
82
|
});
|
|
238
|
-
|
|
239
|
-
// ─── Scenario 3: All slots rate-limited — runner falls back to random pick ────
|
|
240
|
-
|
|
241
|
-
describe("Scenario 3 — slot exhaustion (all rate-limited)", () => {
|
|
242
|
-
it("returns a valid slot when availableIndices is empty (best-effort random pick)", async () => {
|
|
243
|
-
globalThis.fetch = async () => makeConfigResponse();
|
|
244
|
-
const slots = await loadAllCodexOAuthSlots(MOCK_API_URL, MOCK_API_KEY);
|
|
245
|
-
expect(slots).toHaveLength(3);
|
|
246
|
-
|
|
247
|
-
// availableIndices = [] simulates /api/keys/available responding that
|
|
248
|
-
// all 3 slots are currently rate-limited.
|
|
249
|
-
const availableIndices: number[] = [];
|
|
250
|
-
const { selectedSlot, slotEntry } = await runnerSlotSelection(slots, availableIndices);
|
|
251
|
-
|
|
252
|
-
// Runner picks randomly — must be one of the three known slots.
|
|
253
|
-
expect([0, 1, 2]).toContain(selectedSlot);
|
|
254
|
-
expect(slotEntry).toBeDefined();
|
|
255
|
-
expect(slotEntry.creds).toBeDefined();
|
|
256
|
-
});
|
|
257
|
-
|
|
258
|
-
it("materialises auth.json even when all slots are rate-limited", async () => {
|
|
259
|
-
globalThis.fetch = async () => makeConfigResponse();
|
|
260
|
-
const slots = await loadAllCodexOAuthSlots(MOCK_API_URL, MOCK_API_KEY);
|
|
261
|
-
|
|
262
|
-
const { selectedSlot, slotEntry } = await runnerSlotSelection(slots, []);
|
|
263
|
-
|
|
264
|
-
let materialised = false;
|
|
265
|
-
await materializeCodexAuthJson(selectedSlot, slotEntry.creds, {
|
|
266
|
-
homedir: () => "/home/testworker",
|
|
267
|
-
fs: {
|
|
268
|
-
mkdir: async () => undefined,
|
|
269
|
-
writeFile: async () => {
|
|
270
|
-
materialised = true;
|
|
271
|
-
},
|
|
272
|
-
rename: async () => {},
|
|
273
|
-
},
|
|
274
|
-
});
|
|
275
|
-
|
|
276
|
-
// The runner does NOT abort the spawn when all slots are exhausted —
|
|
277
|
-
// it materialises a randomly-chosen slot and lets the task attempt proceed.
|
|
278
|
-
expect(materialised).toBe(true);
|
|
279
|
-
});
|
|
280
|
-
|
|
281
|
-
it("does not select a slot outside the 3-slot pool", async () => {
|
|
282
|
-
globalThis.fetch = async () => makeConfigResponse();
|
|
283
|
-
const slots = await loadAllCodexOAuthSlots(MOCK_API_URL, MOCK_API_KEY);
|
|
284
|
-
|
|
285
|
-
// Run selection 20 times; with 3 slots any out-of-range pick would be a bug.
|
|
286
|
-
for (let i = 0; i < 20; i++) {
|
|
287
|
-
const { selectedSlot } = await runnerSlotSelection(slots, []);
|
|
288
|
-
expect([0, 1, 2]).toContain(selectedSlot);
|
|
289
|
-
}
|
|
290
|
-
});
|
|
291
|
-
});
|
|
@@ -50,13 +50,6 @@ describe("parseCodexRateLimitResetTime — same-day format variants", () => {
|
|
|
50
50
|
const msg = `You've hit your usage limit. Try again at ${time}.`;
|
|
51
51
|
expect(parseCodexRateLimitResetTime(msg, now)).toBe(expected);
|
|
52
52
|
});
|
|
53
|
-
|
|
54
|
-
test("'or try again at' prefix (lowercase) also parses", () => {
|
|
55
|
-
const now = new Date("2026-05-25T18:00:00Z");
|
|
56
|
-
const msg =
|
|
57
|
-
"You've hit your usage limit. To get more access now, send a request to your admin or try again at 8:35 PM.";
|
|
58
|
-
expect(parseCodexRateLimitResetTime(msg, now)).toBe("2026-05-25T20:35:00.000Z");
|
|
59
|
-
});
|
|
60
53
|
});
|
|
61
54
|
|
|
62
55
|
describe("parseCodexRateLimitResetTime — different-day format", () => {
|
|
@@ -15,6 +15,7 @@ interface FetchCall {
|
|
|
15
15
|
}
|
|
16
16
|
|
|
17
17
|
const originalFetch = globalThis.fetch;
|
|
18
|
+
const originalLog = console.log;
|
|
18
19
|
|
|
19
20
|
function buildOpts(override: Partial<CodexSwarmEventHandlerOpts> = {}): CodexSwarmEventHandlerOpts {
|
|
20
21
|
return {
|
|
@@ -41,6 +42,7 @@ function installFetchStub(responder: (url: string, init: RequestInit | undefined
|
|
|
41
42
|
|
|
42
43
|
afterEach(() => {
|
|
43
44
|
globalThis.fetch = originalFetch;
|
|
45
|
+
console.log = originalLog;
|
|
44
46
|
});
|
|
45
47
|
|
|
46
48
|
describe("createCodexSwarmEventHandler", () => {
|
|
@@ -73,55 +75,7 @@ describe("createCodexSwarmEventHandler", () => {
|
|
|
73
75
|
expect(urls.some((u) => u.includes("/api/agents/agent-1/activity"))).toBe(true);
|
|
74
76
|
});
|
|
75
77
|
|
|
76
|
-
test("aborts the
|
|
77
|
-
installFetchStub((url) => {
|
|
78
|
-
if (url.includes("/cancelled-tasks")) {
|
|
79
|
-
return new Response(
|
|
80
|
-
JSON.stringify({ cancelled: [{ id: "task-1", failureReason: "user request" }] }),
|
|
81
|
-
{ status: 200 },
|
|
82
|
-
);
|
|
83
|
-
}
|
|
84
|
-
return new Response("{}", { status: 200 });
|
|
85
|
-
});
|
|
86
|
-
const controller = new AbortController();
|
|
87
|
-
const opts = buildOpts({ abortRef: { current: controller } });
|
|
88
|
-
const handler = createCodexSwarmEventHandler(opts);
|
|
89
|
-
handler({
|
|
90
|
-
type: "tool_start",
|
|
91
|
-
toolCallId: "call-1",
|
|
92
|
-
toolName: "bash",
|
|
93
|
-
args: { command: "sleep 9999" },
|
|
94
|
-
});
|
|
95
|
-
// Wait for the async cancellation poll to resolve and call abort().
|
|
96
|
-
await new Promise((resolve) => setTimeout(resolve, 30));
|
|
97
|
-
expect(controller.signal.aborted).toBe(true);
|
|
98
|
-
});
|
|
99
|
-
|
|
100
|
-
test("sets abort signal reason to 'cancelled' on cancel-poll abort", async () => {
|
|
101
|
-
installFetchStub((url) => {
|
|
102
|
-
if (url.includes("/cancelled-tasks")) {
|
|
103
|
-
return new Response(
|
|
104
|
-
JSON.stringify({ cancelled: [{ id: "task-1", failureReason: "user request" }] }),
|
|
105
|
-
{ status: 200 },
|
|
106
|
-
);
|
|
107
|
-
}
|
|
108
|
-
return new Response("{}", { status: 200 });
|
|
109
|
-
});
|
|
110
|
-
const controller = new AbortController();
|
|
111
|
-
const opts = buildOpts({ abortRef: { current: controller } });
|
|
112
|
-
const handler = createCodexSwarmEventHandler(opts);
|
|
113
|
-
handler({
|
|
114
|
-
type: "tool_start",
|
|
115
|
-
toolCallId: "call-1",
|
|
116
|
-
toolName: "bash",
|
|
117
|
-
args: { command: "sleep 9999" },
|
|
118
|
-
});
|
|
119
|
-
await new Promise((resolve) => setTimeout(resolve, 30));
|
|
120
|
-
expect(controller.signal.aborted).toBe(true);
|
|
121
|
-
expect(controller.signal.reason).toBe("cancelled");
|
|
122
|
-
});
|
|
123
|
-
|
|
124
|
-
test("logs the abort reason when /cancelled-tasks reports the task", async () => {
|
|
78
|
+
test("aborts with cancelled reason and logs the task ID when the poll reports cancellation", async () => {
|
|
125
79
|
installFetchStub((url) => {
|
|
126
80
|
if (url.includes("/cancelled-tasks")) {
|
|
127
81
|
return new Response(
|
|
@@ -136,6 +90,9 @@ describe("createCodexSwarmEventHandler", () => {
|
|
|
136
90
|
console.log = (...args: unknown[]) => logs.push(args.map(String).join(" "));
|
|
137
91
|
try {
|
|
138
92
|
const controller = new AbortController();
|
|
93
|
+
const aborted = new Promise<void>((resolve) => {
|
|
94
|
+
controller.signal.addEventListener("abort", () => resolve(), { once: true });
|
|
95
|
+
});
|
|
139
96
|
const handler = createCodexSwarmEventHandler(
|
|
140
97
|
buildOpts({ abortRef: { current: controller }, taskId: "task-1" }),
|
|
141
98
|
);
|
|
@@ -145,15 +102,15 @@ describe("createCodexSwarmEventHandler", () => {
|
|
|
145
102
|
toolName: "bash",
|
|
146
103
|
args: { command: "sleep 9999" },
|
|
147
104
|
});
|
|
148
|
-
await
|
|
105
|
+
await aborted;
|
|
106
|
+
expect(controller.signal.aborted).toBe(true);
|
|
107
|
+
expect(controller.signal.reason).toBe("cancelled");
|
|
149
108
|
} finally {
|
|
150
109
|
console.log = origLog;
|
|
151
110
|
}
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
l.includes("aborting task task-1: cancelled via /cancelled-tasks poll"),
|
|
111
|
+
expect(logs).toContain(
|
|
112
|
+
"[swarm-events] aborting task task-1: cancelled via /cancelled-tasks poll",
|
|
155
113
|
);
|
|
156
|
-
expect(abortLog).toBeDefined();
|
|
157
114
|
});
|
|
158
115
|
|
|
159
116
|
test("throttles the cancellation check across rapid tool_start events", async () => {
|
|
@@ -844,16 +844,29 @@ describe("POST /api/comb/review-batches", () => {
|
|
|
844
844
|
expect(COMB_NOTE_MAX).toBe(REVIEW_NOTE_MAX);
|
|
845
845
|
});
|
|
846
846
|
|
|
847
|
-
test("
|
|
847
|
+
test("keeps a follow-up on the parent agent and answers 409 on a repeat", async () => {
|
|
848
848
|
const ids = [fake.add({ body: "@swarm a" }).id, fake.add({ body: "@swarm b" }).id];
|
|
849
849
|
|
|
850
|
-
const
|
|
850
|
+
const worker = await createAgent({ name: "review-author", status: "idle" });
|
|
851
|
+
await db.updateAgentProfile(worker.id, { capabilities: ["review"] });
|
|
852
|
+
const parent = await createTaskWithSiblingAwareness("Write a review", {
|
|
853
|
+
agentId: worker.id,
|
|
854
|
+
routingAffinity: { capabilities: ["review"] },
|
|
855
|
+
});
|
|
856
|
+
const input = { ...batch(ids, "/comb-qa/"), parentTaskId: parent.id };
|
|
857
|
+
const other = await createAgent({ name: "other-worker", status: "idle" });
|
|
858
|
+
expect((await post(input, { "X-Agent-ID": other.id })).status).toBe(403);
|
|
859
|
+
const created = await post(input);
|
|
851
860
|
expect(created.status).toBe(201);
|
|
852
861
|
const result = (await created.json()) as ReviewBatchResult;
|
|
853
862
|
expect(result.sent).toEqual(ids);
|
|
854
|
-
|
|
863
|
+
const child = await getTaskById(result.taskId as string);
|
|
864
|
+
expect(child?.task).toContain("Scope: /comb-qa/ (");
|
|
865
|
+
expect(child?.parentTaskId).toBe(parent.id);
|
|
866
|
+
expect(child?.agentId).toBe(worker.id);
|
|
867
|
+
expect(child?.routingAffinity?.capabilities).toEqual([]);
|
|
855
868
|
|
|
856
|
-
const again = await
|
|
869
|
+
const again = await post(input);
|
|
857
870
|
expect(again.status).toBe(409);
|
|
858
871
|
expect(((await again.json()) as { skipped: unknown[] }).skipped).toEqual(
|
|
859
872
|
ids.map((id) => ({ id, reason: "already-sent", taskId: result.taskId })),
|
|
@@ -2,6 +2,7 @@ import { Database } from "bun:sqlite";
|
|
|
2
2
|
import { afterEach, beforeEach, describe, expect, spyOn, test } from "bun:test";
|
|
3
3
|
import { unlink } from "node:fs/promises";
|
|
4
4
|
import { createBunSqliteClient, type DbClient, DbTransactionDeadlineError } from "../be/db-client";
|
|
5
|
+
import * as loopLag from "../be/event-loop-lag";
|
|
5
6
|
|
|
6
7
|
// Cross-process SQLITE_BUSY retry: a second connection on the same file plays
|
|
7
8
|
// the external lock holder (litestream checkpoint, CLI access). The client's
|
|
@@ -85,22 +86,54 @@ describe("db-client SQLITE_BUSY retry", () => {
|
|
|
85
86
|
expect(rows.map((r) => r.name)).toEqual(["bridged", "locker"]);
|
|
86
87
|
});
|
|
87
88
|
|
|
88
|
-
test("runTimed
|
|
89
|
-
|
|
90
|
-
|
|
91
|
-
|
|
92
|
-
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
97
|
-
const
|
|
98
|
-
|
|
99
|
-
|
|
100
|
-
|
|
101
|
-
|
|
102
|
-
|
|
103
|
-
|
|
89
|
+
test("runTimed counts failed driver attempts and excludes async backoff", async () => {
|
|
90
|
+
const timedClient = createBunSqliteClient(() => main, {
|
|
91
|
+
maxWaitMs: 400,
|
|
92
|
+
backoffMs: [400],
|
|
93
|
+
attemptSpinMs: 25,
|
|
94
|
+
});
|
|
95
|
+
locker.run("BEGIN IMMEDIATE");
|
|
96
|
+
let attemptMs = 0;
|
|
97
|
+
let sawBusy = false;
|
|
98
|
+
const recorded = spyOn(loopLag, "recordStatement");
|
|
99
|
+
const query = main.query.bind(main);
|
|
100
|
+
const queries = spyOn(main, "query").mockImplementation(((sql: string) => {
|
|
101
|
+
const stmt = query(sql);
|
|
102
|
+
if (!sql.startsWith("INSERT INTO items")) return stmt;
|
|
103
|
+
return {
|
|
104
|
+
run: (...params: unknown[]) => {
|
|
105
|
+
const startedAt = performance.now();
|
|
106
|
+
try {
|
|
107
|
+
return stmt.run(...(params as never[]));
|
|
108
|
+
} catch (err) {
|
|
109
|
+
if ((err as { code?: string }).code === "SQLITE_BUSY") {
|
|
110
|
+
sawBusy = true;
|
|
111
|
+
locker.run("COMMIT");
|
|
112
|
+
}
|
|
113
|
+
throw err;
|
|
114
|
+
} finally {
|
|
115
|
+
attemptMs += performance.now() - startedAt;
|
|
116
|
+
}
|
|
117
|
+
},
|
|
118
|
+
};
|
|
119
|
+
}) as unknown as typeof main.query);
|
|
120
|
+
try {
|
|
121
|
+
const startedAt = performance.now();
|
|
122
|
+
const timed = await timedClient.runTimed("INSERT INTO items (name) VALUES (?)", [
|
|
123
|
+
"bridged-timed",
|
|
124
|
+
]);
|
|
125
|
+
const wallMs = performance.now() - startedAt;
|
|
126
|
+
expect(timed.changes).toBe(1);
|
|
127
|
+
expect(sawBusy).toBe(true);
|
|
128
|
+
expect(timed.executionMs).toBeGreaterThanOrEqual(attemptMs);
|
|
129
|
+
// Successful-attempt overhead must not hide an omitted BUSY attempt.
|
|
130
|
+
expect(timed.executionMs).toBeGreaterThan(recorded.mock.calls.at(-1)![1]);
|
|
131
|
+
expect(wallMs - timed.executionMs).toBeGreaterThanOrEqual(200);
|
|
132
|
+
} finally {
|
|
133
|
+
queries.mockRestore();
|
|
134
|
+
recorded.mockRestore();
|
|
135
|
+
if (locker.inTransaction) locker.run("ROLLBACK");
|
|
136
|
+
}
|
|
104
137
|
});
|
|
105
138
|
|
|
106
139
|
test("transaction BEGIN IMMEDIATE bridges an external write lock", async () => {
|
|
@@ -40,22 +40,28 @@ describe("db-client basics", () => {
|
|
|
40
40
|
// cannot begin executing until it commits. Wall time around the call
|
|
41
41
|
// therefore includes that queueing — which is what made a caller-side
|
|
42
42
|
// measurement report a responsive process as stalled for multiple seconds.
|
|
43
|
+
let holderDoneAt = 0;
|
|
43
44
|
const holding = client.transaction(async (tx) => {
|
|
44
45
|
await tx.run("INSERT INTO items (name) VALUES (?)", ["holder"]);
|
|
45
46
|
await Bun.sleep(250);
|
|
47
|
+
holderDoneAt = performance.now();
|
|
46
48
|
});
|
|
47
49
|
const startedAt = performance.now();
|
|
48
50
|
const timed = await client.runTimed("INSERT INTO items (name) VALUES (?)", ["queued"]);
|
|
49
|
-
const
|
|
51
|
+
const endedAt = performance.now();
|
|
50
52
|
await holding;
|
|
51
53
|
|
|
52
54
|
expect(timed.changes).toBe(1);
|
|
53
55
|
// It really did wait out the holder...
|
|
54
|
-
expect(
|
|
55
|
-
// ...but only the driver call itself is charged to the statement.
|
|
56
|
-
//
|
|
56
|
+
expect(endedAt - startedAt).toBeGreaterThan(200);
|
|
57
|
+
// ...but only the driver call itself is charged to the statement. The
|
|
58
|
+
// driver call cannot start before the holder's callback returns, so it
|
|
59
|
+
// fits inside [holderDoneAt, endedAt]; charging the queueing would exceed
|
|
60
|
+
// that window by the ~250ms wait. Not an absolute bound: a GC pause or a
|
|
61
|
+
// starved CI runner can make one INSERT take tens of ms.
|
|
62
|
+
expect(holderDoneAt).toBeGreaterThan(startedAt);
|
|
57
63
|
expect(timed.executionMs).toBeGreaterThan(0);
|
|
58
|
-
expect(timed.executionMs).
|
|
64
|
+
expect(timed.executionMs).toBeLessThanOrEqual(endedAt - holderDoneAt);
|
|
59
65
|
});
|
|
60
66
|
|
|
61
67
|
test("get supports RETURNING", async () => {
|