@desplega.ai/agent-swarm 2.7.7 → 2.7.9
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-dn4gdsgr.js +16 -0
- package/dist/{actions-3tt153af.js → actions-g563mbn2.js} +19 -19
- package/dist/{amp-adapter-njpts0yr.js → amp-adapter-q61w05eb.js} +3 -3
- package/dist/{anthropic-messages-xey2skwx.js → anthropic-messages-jkva0zps.js} +68 -78
- package/dist/{app-nky4378f.js → app-a66ssc4k.js} +3 -3
- package/dist/{assistant-jnb669pa.js → assistant-p477rjwj.js} +22 -22
- package/dist/{azure-openai-responses-26t7j9ra.js → azure-openai-responses-wgtqkbr3.js} +5 -10
- package/dist/boot-args-schema-h4qj462e.js +89 -0
- package/dist/{boot-reembed-9mgvaztt.js → boot-reembed-n1ehfbsw.js} +1 -1
- package/dist/{boot-reembed-qs2djdej.js → boot-reembed-qw4mc0pt.js} +1 -1
- package/dist/{boot-scrub-sweep-yjpdj7s1.js → boot-scrub-sweep-9w9jp4sm.js} +4 -4
- package/dist/{boot-seeds-5cm6ambd.js → boot-seeds-qdaf3sdy.js} +5 -4
- package/dist/{boxd-nv507va8.js → boxd-qbkxy6ap.js} +1 -1
- package/dist/{claude-adapter-fn287zmm.js → claude-adapter-348p5hx9.js} +8 -8
- package/dist/{claude-managed-adapter-dvs2xw5n.js → claude-managed-adapter-h74d06yz.js} +4 -4
- package/dist/{claude-managed-setup-wtdz2mj2.js → claude-managed-setup-7787fxtp.js} +5 -5
- package/dist/{claude-sdk-session-x91kqyhm.js → claude-sdk-session-hbszbt8a.js} +7901 -7718
- package/dist/{cli-cb2a8pna.js → cli-09kmfkmq.js} +4 -6
- package/dist/{cli-m0da8j35.js → cli-0whpms1z.js} +15 -10
- package/dist/{cli-5zx699j9.js → cli-12xyjhws.js} +29 -12
- package/dist/{cli-snpj5zbj.js → cli-1z4qggfe.js} +9 -36
- package/dist/{cli-e0kmphd6.js → cli-21159vea.js} +35 -12
- package/dist/{cli-s0qnd4wv.js → cli-28fq781p.js} +1 -1
- package/dist/{cli-qh4d4tvk.js → cli-2a8py3sx.js} +6 -6
- package/dist/{cli-adeegh7d.js → cli-2ccpqyyf.js} +412 -116
- package/dist/{cli-1p89xny0.js → cli-2r0jcc3k.js} +1 -1
- package/dist/{cli-rvtm68yy.js → cli-2xv18ywz.js} +2 -2
- package/dist/{cli-5xaqj21p.js → cli-3kd08rej.js} +1 -1
- package/dist/{cli-1c6tzt8g.js → cli-3tqcamp6.js} +13 -13
- package/dist/{cli-ae7mrdf9.js → cli-3vjhs18n.js} +4 -6
- package/dist/{cli-vfym7wmz.js → cli-3xcwp3z8.js} +10 -12
- package/dist/{cli-az48n0nr.js → cli-4caa1x7d.js} +67 -64
- package/dist/{cli-5jnhv72d.js → cli-4t0fmf3z.js} +30 -7
- package/dist/{cli-5b456bpf.js → cli-530hkwdy.js} +7 -9
- package/dist/{cli-pz4rk021.js → cli-54vrpgm0.js} +1 -1
- package/dist/{cli-ddaanqkd.js → cli-587857ys.js} +7 -7
- package/dist/{cli-r9jqcehk.js → cli-5mpy301f.js} +38 -2
- package/dist/{cli-cppkf404.js → cli-605nn699.js} +80 -43
- package/dist/{cli-6pfd54vx.js → cli-650zv9q9.js} +10 -10
- package/dist/cli-6pzk82fd.js +778 -0
- package/dist/{cli-gz6q4eve.js → cli-715t1gx6.js} +9 -9
- package/dist/{cli-08bmz9z9.js → cli-9aezs55w.js} +10 -12
- package/dist/{cli-tgrv9cjx.js → cli-9r5gtwjr.js} +3 -3
- package/dist/{cli-pc6n7fre.js → cli-a0657jmf.js} +2 -2
- package/dist/{cli-pjctyea3.js → cli-agyaeef4.js} +3 -3
- package/dist/cli-b932gexn.js +5266 -0
- package/dist/{cli-e46hg0xw.js → cli-bc779n4v.js} +3 -3
- package/dist/{cli-jtjtabxe.js → cli-btc9cb4c.js} +78 -5
- package/dist/{cli-caj33vcq.js → cli-btf6fw39.js} +5 -5
- package/dist/{cli-q3tkegby.js → cli-cseh6f8w.js} +5 -5
- package/dist/{cli-n6bv12jn.js → cli-cvs2r2vq.js} +23 -14
- package/dist/{cli-tfyyvzx6.js → cli-cyn9v8zr.js} +17 -2
- package/dist/{cli-a22h291q.js → cli-d6521kb5.js} +1 -1
- package/dist/{cli-1b7btd38.js → cli-d84byzn8.js} +869 -5
- package/dist/{cli-wx3rhnm0.js → cli-eddnyg3t.js} +1 -1
- package/dist/{cli-nmzhp1b5.js → cli-ejkvvqbe.js} +55 -46
- package/dist/{cli-ftyxyspd.js → cli-eqtfgfr6.js} +1 -1
- package/dist/{cli-mthwvjre.js → cli-f2zenhja.js} +1 -1
- package/dist/{cli-ws19768n.js → cli-fayav105.js} +624 -227
- package/dist/{cli-ferkkrg9.js → cli-fjggej24.js} +2 -2
- package/dist/{cli-g7s47cc5.js → cli-fsgttth8.js} +123 -102
- package/dist/{cli-8305gbq0.js → cli-gce09r66.js} +5 -5
- package/dist/{cli-mkk9rnzz.js → cli-gxy8y1dt.js} +51 -4
- package/dist/{cli-fyt2g4wd.js → cli-hae9j8sv.js} +288 -76
- package/dist/{cli-agfm16v9.js → cli-hg42n3hx.js} +12 -12
- package/dist/{cli-qghe0h66.js → cli-hwprv9e4.js} +8 -10
- package/dist/{cli-yndmfxb3.js → cli-hxpyc9sn.js} +3 -3
- package/dist/{cli-72v799xn.js → cli-jfx48xrj.js} +10 -12
- package/dist/{cli-dhar9qay.js → cli-jrp1dt73.js} +2 -2
- package/dist/{cli-98rw5dt5.js → cli-jrzkw01m.js} +2 -2
- package/dist/{cli-ayayvfg4.js → cli-k70e3x9e.js} +24 -20
- package/dist/{cli-583frbyr.js → cli-kchjb7qy.js} +1 -1
- package/dist/{cli-cm5yqn35.js → cli-kf3pxxdg.js} +1 -0
- package/dist/{cli-fmjd0t1y.js → cli-m0cy2vyf.js} +2 -2
- package/dist/{cli-4zsenjhy.js → cli-m5akxq8q.js} +16 -3
- package/dist/{cli-73jzwksr.js → cli-m88rpzkh.js} +6 -3
- package/dist/{cli-95jzxcp3.js → cli-mnrkgg60.js} +4 -4
- package/dist/{cli-p82cnnjq.js → cli-ms5m5r1y.js} +1 -1
- package/dist/{cli-fy6x31ps.js → cli-n5yexkdg.js} +1 -0
- package/dist/{cli-wk5yrfwd.js → cli-neyag5p6.js} +191 -85
- package/dist/cli-p0m0p34z.js +9321 -0
- package/dist/{cli-yyj3j5m4.js → cli-p17970qv.js} +8 -10
- package/dist/{cli-6vcp76qk.js → cli-p74md7t8.js} +42 -23
- package/dist/{cli-rjcbm574.js → cli-pr0eze3x.js} +2 -2
- package/dist/{cli-35rsp8ye.js → cli-qkdmz8c8.js} +1 -1
- package/dist/{cli-rtt8g4v9.js → cli-qmd3mse0.js} +2 -2
- package/dist/{cli-je518txm.js → cli-qzt90yze.js} +20 -20
- package/dist/cli-rkc97c6a.js +39 -0
- package/dist/{cli-75gkpjvw.js → cli-rvhdmjvt.js} +8 -12
- package/dist/{cli-6g0hb4cp.js → cli-rwymrnaz.js} +18608 -9089
- package/dist/{cli-3fg0bdcv.js → cli-serm8zrx.js} +6 -6
- package/dist/{cli-g08zdaec.js → cli-sgs5k6yd.js} +1 -1
- package/dist/{cli-afkqkrtw.js → cli-sya22y84.js} +21 -9
- package/dist/{cli-318r69gq.js → cli-t73cas91.js} +440 -9
- package/dist/{cli-e5bzrn01.js → cli-tqq0hspb.js} +2 -2
- package/dist/{cli-pq73h5mz.js → cli-v3cf1ts9.js} +3 -3
- package/dist/{cli-bfv7vdg6.js → cli-varqt4d1.js} +28 -16
- package/dist/{cli-k899ehvh.js → cli-vxh6acp7.js} +6 -6
- package/dist/{cli-g83s9ewh.js → cli-xfjrc279.js} +1 -1
- package/dist/{cli-k1nje3v3.js → cli-xk879m3k.js} +129 -115
- package/dist/{cli-7cx2m6t2.js → cli-y5rbvxhc.js} +2 -2
- package/dist/{cli-8sckt74b.js → cli-y8nbefpb.js} +41 -19
- package/dist/{cli-81p9jd57.js → cli-yab6sh8p.js} +9 -3
- package/dist/{cli-srye3vdt.js → cli-ybjdc978.js} +1 -1
- package/dist/{cli-k5671be5.js → cli-zcfpsfzf.js} +5 -5
- package/dist/{cli-vf078p3e.js → cli-zfqg6fzn.js} +1 -1
- package/dist/{cli-k8196sh2.js → cli-zgv8gxgs.js} +9 -8
- package/dist/cli.js +34 -52
- package/dist/{cloudflare-workers-ai-system-one-ef2a980q.js → cloudflare-workers-ai-system-one-9y1zx3pt.js} +2 -2
- package/dist/{codex-adapter-cf2yxe9m.js → codex-adapter-ysq6bzha.js} +7 -7
- package/dist/{codex-hook-a0c6g6t6.js → codex-hook-fac6175r.js} +1 -1
- package/dist/{codex-login-y0pmff1c.js → codex-login-bcda78ge.js} +2 -2
- package/dist/{codex-session-runner-6vfzdgbd.js → codex-session-runner-qakzfx93.js} +8 -8
- package/dist/{commands-t3mfy7vn.js → commands-rs7hkv9r.js} +3 -3
- package/dist/{controller-q7xrbaz0.js → controller-r5x9bg6e.js} +4 -4
- package/dist/{controllers-connect-c6nm70kg.js → controllers-connect-498hrxvk.js} +24 -24
- package/dist/{cursor-adapter-ftd81ga8.js → cursor-adapter-d46qszer.js} +2 -2
- package/dist/{db-vemtpmcc.js → db-pm96nhdb.js} +6 -2
- package/dist/{db-dk572x25.js → db-s13dqhr6.js} +3 -3
- package/dist/{devin-adapter-r9phbnc9.js → devin-adapter-z46ep5ph.js} +1 -1
- package/dist/{dispatcher-kh7ecxh9.js → dispatcher-j3h81t7m.js} +18 -18
- package/dist/{docker-c1a3gqmf.js → docker-866qpzt9.js} +2 -2
- package/dist/{dsh-adapter-v8628r89.js → dsh-adapter-rw0d5rc4.js} +2 -2
- package/dist/{e2b-fr12yccx.js → e2b-jkwfhbcv.js} +2 -2
- package/dist/{e2b-x6ywzak3.js → e2b-s16txnpx.js} +2 -3
- package/dist/{easter-egg-3d-nenw4x63.js → easter-egg-3d-qtgfxgze.js} +1 -1
- package/dist/{embedding-space-0jepb239.js → embedding-space-xh8p4q4x.js} +6 -6
- package/dist/{embeddings-xxt49yxg.js → embeddings-wp745m91.js} +1 -1
- package/dist/{event-bus-g0ka3pbw.js → event-bus-e66gh7cc.js} +1 -1
- package/dist/{execute-1mhw6e4x.js → execute-2fzb9z74.js} +1 -1
- package/dist/{external-channel-55v12e60.js → external-channel-ys21h3sy.js} +2 -2
- package/dist/fx-adapter-vz0b9z3g.js +19 -0
- package/dist/{google-generative-ai-v94hr7h0.js → google-generative-ai-ytpgncx9.js} +7 -12
- package/dist/{google-vertex-g7vr6cf8.js → google-vertex-tqhze5j7.js} +7 -12
- package/dist/grok-adapter-spea7zkj.js +19 -0
- package/dist/handlers-crckt5dq.js +32 -0
- package/dist/{heartbeat-k42svnr0.js → heartbeat-8phn1kdq.js} +21 -21
- package/dist/{hook-6nphweh0.js → hook-amcj4s10.js} +16 -11
- package/dist/{hook-114m7hap.js → hook-bc6n49qn.js} +5 -5
- package/dist/{http-r8cc4wz7.js → http-7374brv5.js} +854 -332
- package/dist/index-4x08sjtk.js +30 -0
- package/dist/{index-6cxzwfen.js → index-5a9jtqde.js} +26 -26
- package/dist/index-8ybffts4.js +37 -0
- package/dist/{index-nh3wyqdt.js → index-c9y31ytf.js} +16 -16
- package/dist/{index-h39zbx67.js → index-hsad2t3r.js} +31 -31
- package/dist/index-nfy4kkg5.js +33 -0
- package/dist/{index-e3s8wmxy.js → index-p4hjwbvw.js} +1 -1
- package/dist/{index-k7fj52d3.js → index-q5cmtbz5.js} +6 -6
- package/dist/{index-fpk4bcd9.js → index-w4m9z29z.js} +1 -1
- package/dist/{keepalive-x060nt9p.js → keepalive-wy29kbrg.js} +4 -4
- package/dist/lead-zdqxsvjn.js +71 -0
- package/dist/{llama-cpp-classify-s5c47rwh.js → llama-cpp-classify-nfgswa1m.js} +2 -2
- package/dist/{maintenance-2xxfexhf.js → maintenance-h2ds9w6c.js} +1 -1
- package/dist/{mistral-conversations-3gjpdb4b.js → mistral-conversations-a45tx39a.js} +29 -51
- package/dist/{oauth-refresh-sweep-fckc4ar5.js → oauth-refresh-sweep-q7mtbyp3.js} +3 -3
- package/dist/{onboard-zc48j237.js → onboard-vw8r2fdw.js} +68 -16
- package/dist/{openai-codex-responses-8pbxq9h5.js → openai-codex-responses-k9gapdze.js} +7 -11
- package/dist/{openai-completions-rm00s912.js → openai-completions-xd579js7.js} +50 -58
- package/dist/{openai-decisions-8v957r2r.js → openai-decisions-q3hh60wr.js} +2 -2
- package/dist/{openai-responses-agxpf96k.js → openai-responses-4d5dx3c7.js} +5 -10
- package/dist/{opencode-adapter-r690h1cr.js → opencode-adapter-mtb0953j.js} +6 -6
- package/dist/{openrouter-images-3ecegv0d.js → openrouter-images-xr9gme9x.js} +4 -3
- package/dist/{otel-impl-r5xbh81q.js → otel-impl-j42czw3r.js} +2 -2
- package/dist/{pi-messages-pchtw4he.js → pi-messages-hjbv8v10.js} +28 -12
- package/dist/{pi-mono-adapter-c7v8sdec.js → pi-mono-adapter-zk8pg9jr.js} +30 -27
- package/dist/{pricing-refresh-3pmre11v.js → pricing-refresh-x7nhv23d.js} +3 -3
- package/dist/{rbac-roles-3vbshwsb.js → rbac-roles-9044425x.js} +16 -2
- package/dist/rbac-roles-bzvee6cf.js +37 -0
- package/dist/{render-v2-pxykkbab.js → render-v2-t7bn4skz.js} +3 -3
- package/dist/{resume-adda0bwy.js → resume-x94gemep.js} +7 -7
- package/dist/{runtime-fnbm7stk.js → runtime-breq6fmv.js} +1 -1
- package/dist/{session-access-2fvamrdc.js → session-access-q7dmqjvt.js} +7 -5
- package/dist/{session-source-backfill-08xvv0sm.js → session-source-backfill-440ysamr.js} +3 -3
- package/dist/{setup-1aqmvmh1.js → setup-07n4727s.js} +1 -1
- package/dist/{typesafe-system-one-0bmqcxfg.js → typesafe-system-one-f2en2knd.js} +2 -2
- package/dist/virtual-modules-z5h6mcyf.js +362 -0
- package/dist/{work-objects-9s0yrm5j.js → work-objects-pnq5y534.js} +21 -21
- package/dist/{worker-follow-up-3q78fqmr.js → worker-follow-up-7z1gfkr8.js} +18 -18
- package/dist/worker-y62rvvq3.js +71 -0
- package/dist/{x-vmmye1kb.js → x-2fyrt5pp.js} +2 -2
- package/openapi.json +1268 -276
- package/package.json +10 -10
- package/src/apps/catalog.generated.json +299 -82
- package/src/apps/page-validator.ts +115 -2
- package/src/be/connector-codes.ts +21 -6
- package/src/be/db/model-profiles.ts +1 -1
- package/src/be/db/session-tree.ts +9 -5
- package/src/be/db/session-visibility.ts +25 -9
- package/src/be/db/tasks/read.ts +33 -6
- package/src/be/db/tasks/write.ts +77 -7
- package/src/be/db-queries/tracker.ts +4 -2
- package/src/be/db.ts +53 -19
- package/src/be/improvements.ts +416 -0
- package/src/be/migrations/271_subscription_usage_model.sql +30 -0
- package/src/be/migrations/274_improvements.sql +27 -0
- package/src/be/migrations/275_task_dispatched_by.sql +8 -0
- package/src/be/model-validation.ts +19 -1
- package/src/be/rbac-roles.ts +144 -1
- package/src/be/runtime-pools/routing.ts +1 -1
- package/src/be/scripts/boot-args-schema.ts +95 -0
- package/src/be/scripts/extract-schema.ts +15 -10
- package/src/be/seed-scripts/catalog/boot-triage.inline.ts +1 -1
- package/src/be/seed-scripts/catalog/boot-triage.ts +1 -1
- package/src/be/seed-scripts/catalog/get-child-outputs.ts +1 -1
- package/src/be/seed-scripts/catalog/wait-for-task.ts +1 -1
- package/src/be/swarm-config-guard.ts +8 -0
- package/src/be/users.ts +64 -5
- package/src/cli.tsx +5 -25
- package/src/commands/claude-managed-setup.ts +1 -1
- package/src/commands/codex-login.ts +1 -1
- package/src/commands/e2b.ts +0 -1
- package/src/commands/onboard/agent-fs-version.ts +1 -1
- package/src/commands/onboard/compose-generator.ts +0 -1
- package/src/commands/onboard/dashboard-url.ts +31 -0
- package/src/commands/onboard/steps/generate.tsx +17 -1
- package/src/commands/onboard/steps/post-dashboard.tsx +9 -3
- package/src/commands/onboard.tsx +19 -6
- package/src/commands/runner.ts +143 -105
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/hooks/hook.ts +13 -5
- package/src/http/agents.ts +7 -1
- package/src/http/all-routes.ts +1 -0
- package/src/http/approval-requests.ts +32 -50
- package/src/http/auth.ts +5 -4
- package/src/http/codex-oauth-accounts.ts +31 -23
- package/src/http/codex-oauth-device.ts +3 -3
- package/src/http/codex-oauth-keep-warm.ts +1 -1
- package/src/http/improvements.ts +317 -0
- package/src/http/index.ts +10 -0
- package/src/http/mcp-oauth.ts +6 -0
- package/src/http/mcp-servers.ts +8 -0
- package/src/http/models-catalog.ts +1 -1
- package/src/http/operator-actor.ts +2 -1
- package/src/http/pages-public.ts +38 -1
- package/src/http/person-responder.ts +66 -0
- package/src/http/poll.ts +3 -4
- package/src/http/prompt-templates.ts +1 -1
- package/src/http/schedules.ts +4 -0
- package/src/http/script-runs.ts +6 -1
- package/src/http/session-access.ts +61 -6
- package/src/http/sessions.ts +67 -9
- package/src/http/tasks.ts +53 -9
- package/src/http/user-roles.ts +11 -2
- package/src/http/users.ts +224 -105
- package/src/http/utils.ts +2 -1
- package/src/http/workflows.ts +11 -7
- package/src/prompts/session-templates.ts +1 -0
- package/src/providers/acp-targets.ts +1 -1
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/codex-adapter.ts +17 -3
- package/src/providers/codex-models.ts +4 -3
- package/src/providers/codex-oauth/auth-json.ts +14 -18
- package/src/providers/codex-oauth/device.ts +49 -15
- package/src/providers/codex-oauth/flow.ts +2 -1
- package/src/providers/codex-oauth/storage.ts +2 -2
- package/src/providers/pi-mono-adapter.ts +8 -0
- package/src/providers/pricing-sources.md +16 -1
- package/src/providers/swarm-events-shared.ts +15 -2
- package/src/rbac/legacy-policy.ts +3 -0
- package/src/rbac/permissions.ts +15 -0
- package/src/scheduler/deferred-task-waits.ts +9 -4
- package/src/scripts-runtime/extract-args-schema.ts +3 -1
- package/src/scripts-runtime/swarm-sdk.ts +1 -1
- package/src/scripts-runtime/types/swarm-extension.d.ts +31 -28
- package/src/server-user.ts +1 -1
- package/src/server.ts +2 -0
- package/src/slack/ack.ts +68 -26
- package/src/slack/blocks.ts +1 -0
- package/src/slack/reaction-shortcode.ts +8 -2
- package/src/slack/render-v2.ts +72 -20
- package/src/slack/task-output.ts +4 -1
- package/src/slack/thread-buffer.ts +2 -2
- package/src/tasks/task-skip.ts +28 -0
- package/src/tasks/terminal-result-guard.ts +3 -2
- package/src/telemetry.ts +28 -1
- package/src/tests/agentmail-inbox-mapping.test.ts +73 -0
- package/src/tests/api-drain-worker-e2e.test.ts +69 -2
- package/src/tests/approval-requests.test.ts +58 -0
- package/src/tests/apps-catalog-drift.test.ts +35 -0
- package/src/tests/apps-catalog-table.test.ts +203 -0
- package/src/tests/apps-element-assembly.test.ts +28 -0
- package/src/tests/apps-smart-links.test.ts +151 -0
- package/src/tests/apps-table-filters-migration.test.ts +96 -0
- package/src/tests/apps-table-selection-migration.test.ts +95 -0
- package/src/tests/chatgpt-subscription-session-bench.test.ts +2 -2
- package/src/tests/claude-managed-setup.test.ts +36 -0
- package/src/tests/claude-worker-parity.test.ts +2 -2
- package/src/tests/codex-adapter.test.ts +32 -2
- package/src/tests/codex-login.test.ts +2 -2
- package/src/tests/codex-oauth-accounts.test.ts +48 -12
- package/src/tests/codex-oauth-credential-info.test.ts +77 -1
- package/src/tests/codex-oauth-device.test.ts +61 -1
- package/src/tests/codex-oauth-keep-warm.test.ts +2 -2
- package/src/tests/codex-oauth.test.ts +25 -4
- package/src/tests/codex-pool.test.ts +2 -2
- package/src/tests/codex-swarm-events.test.ts +43 -1
- package/src/tests/context-window.test.ts +14 -0
- package/src/tests/db-queries-tracker.test.ts +2 -1
- package/src/tests/db-task-read-contract.test.ts +3 -0
- package/src/tests/db-task-write-contract.test.ts +3 -0
- package/src/tests/deferred-task-wake.test.ts +7 -2
- package/src/tests/deploy-one-box.test.ts +39 -1
- package/src/tests/docs-index-footprint.test.js +3 -3
- package/src/tests/e2e-coverage-contract.test.ts +235 -0
- package/src/tests/empty-output-schema.test.ts +160 -0
- package/src/tests/env-flag.test.ts +1 -0
- package/src/tests/explicit-model-validation.test.ts +14 -0
- package/src/tests/fixtures/onboard/content.compose.yml.txt +0 -4
- package/src/tests/fixtures/onboard/dev.compose.yml.txt +0 -3
- package/src/tests/fixtures/onboard/full-all.compose.yml.txt +0 -11
- package/src/tests/fixtures/onboard/full.compose.yml.txt +0 -11
- package/src/tests/fixtures/onboard/research.compose.yml.txt +0 -3
- package/src/tests/fixtures/onboard/solo.compose.yml.txt +0 -1
- package/src/tests/fixtures/prs-app-definition.json.txt +784 -0
- package/src/tests/fixtures/prs-filters-migration.patch.json.txt +318 -0
- package/src/tests/fixtures/prs-selection-migration.patch.json.txt +373 -0
- package/src/tests/fixtures/runner-identity-refresh.ts +3 -0
- package/src/tests/fixtures/runner-legacy-resume-prompt.ts +3 -0
- package/src/tests/fixtures/runner-task-start-reads.ts +140 -0
- package/src/tests/hook-ping-me-order.test.ts +85 -0
- package/src/tests/http-api-integration.test.ts +2 -2
- package/src/tests/http-users.test.ts +63 -0
- package/src/tests/improvements-payload.test.ts +200 -0
- package/src/tests/improvements-route.test.ts +419 -0
- package/src/tests/install-sh-setup-url.test.ts +190 -0
- package/src/tests/mcp-input-caps.test.ts +4 -3
- package/src/tests/merge-gate-detect-changes.test.ts +22 -0
- package/src/tests/onboard-dashboard-output.test.ts +109 -0
- package/src/tests/onboard-dashboard-url.test.ts +83 -0
- package/src/tests/operator-granted-credentials.test.ts +561 -0
- package/src/tests/operator-granted-role-wire.test.ts +222 -0
- package/src/tests/pages-authed-mode.test.ts +13 -2
- package/src/tests/pi-mono-adapter.test.ts +39 -4
- package/src/tests/rbac-engine.test.ts +3 -0
- package/src/tests/runner-context-usage.test.ts +118 -0
- package/src/tests/runner-legacy-options.test.ts +55 -0
- package/src/tests/runner-slot-reconcile.test.ts +38 -0
- package/src/tests/runner-task-start-reads.test.ts +58 -0
- package/src/tests/script-connections.test.ts +2 -0
- package/src/tests/script-executor-quickjs.test.ts +2 -0
- package/src/tests/script-runs-http.test.ts +57 -0
- package/src/tests/scripts-boot-args-schema.test.ts +181 -0
- package/src/tests/scripts-runtime.test.ts +24 -0
- package/src/tests/sdk-store-progress-skipped.test.ts +155 -0
- package/src/tests/send-task-dispatched-by.test.ts +129 -0
- package/src/tests/session-costs-model-key-normalize.test.ts +59 -0
- package/src/tests/session-dispatched-tasks.test.ts +115 -0
- package/src/tests/session-sharing.test.ts +402 -3
- package/src/tests/slack-file-tools-attachments.test.ts +95 -3
- package/src/tests/slack-reaction-config.test.ts +40 -0
- package/src/tests/slack-render-v2.test.ts +120 -0
- package/src/tests/slack-skip-reaction.test.ts +203 -0
- package/src/tests/store-progress-skipped.test.ts +159 -0
- package/src/tests/submit-improvement-tool.test.ts +82 -0
- package/src/tests/subscription-usage-migration.test.ts +57 -0
- package/src/tests/swarm-config-reserved-keys.test.ts +3 -0
- package/src/tests/telemetry-endpoint-override.test.ts +27 -0
- package/src/tests/tool-annotations.test.ts +1 -1
- package/src/tests/trigger-claiming.test.ts +2 -0
- package/src/tests/workflow-system-one-extraction.test.ts +29 -0
- package/src/tools/create-channel.ts +1 -1
- package/src/tools/defer-task.ts +1 -1
- package/src/tools/manage-user.ts +88 -58
- package/src/tools/register-agentmail-inbox.ts +5 -0
- package/src/tools/repos/update-repo.ts +1 -1
- package/src/tools/request-human-input.ts +1 -1
- package/src/tools/send-task.ts +4 -1
- package/src/tools/slack-read.ts +61 -33
- package/src/tools/store-progress.ts +39 -8
- package/src/tools/submit-improvement.ts +68 -0
- package/src/tools/tool-config.ts +3 -0
- package/src/tools/tracker/tracker-unlink.ts +2 -1
- package/src/tools/workflows/retry-workflow-run.ts +3 -0
- package/src/types.ts +16 -2
- package/src/utils/context-window.ts +6 -1
- package/src/utils/output-schema.ts +23 -0
- package/src/utils/request-auth-context.ts +6 -1
- package/src/workflows/executors/system-one-providers.ts +25 -6
- package/src/workflows/recovery.ts +8 -4
- package/src/workflows/resume.ts +19 -0
- package/templates/skills/apps/SKILL.md +22 -11
- package/templates/skills/apps/content.md +22 -11
- package/templates/skills/swarm-scripts/SKILL.md +1 -1
- package/templates/skills/swarm-scripts/content.md +1 -1
- package/templates/skills/work-on-task/SKILL.md +1 -1
- package/templates/skills/work-on-task/content.md +1 -1
- package/dist/acp-adapter-7b4vk3h5.js +0 -16
- package/dist/cli-5c4hjzne.js +0 -873
- package/dist/cli-excnnjg2.js +0 -20222
- package/dist/cli-pc5znp64.js +0 -364
- package/dist/cli-vz22fyqv.js +0 -428
- package/dist/fx-adapter-bs8wqrk5.js +0 -19
- package/dist/grok-adapter-gpjqmkcq.js +0 -19
- package/dist/handlers-zxmp1ta4.js +0 -32
- package/dist/index-a8phxqnk.js +0 -37
- package/dist/index-k6h00t4c.js +0 -30
- package/dist/index-xrz7te8h.js +0 -33
- package/dist/lead-956sd2yc.js +0 -71
- package/dist/rbac-roles-910mmkgz.js +0 -26
- package/dist/virtual-modules-d2pjk9j1.js +0 -59
- package/dist/worker-y15hy08h.js +0 -71
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
import { describe, expect, test } from "bun:test";
|
|
2
|
+
import { parseAppDefinition } from "../apps/definition";
|
|
3
|
+
|
|
4
|
+
/**
|
|
5
|
+
* The "PRs" admin app picked rows with a persisted `selected` switch column
|
|
6
|
+
* (one server write per click, shared by every viewer). The migration swaps it
|
|
7
|
+
* for the Table's `selectable` client-side selection. The patch is an RFC 7396
|
|
8
|
+
* merge patch where a page element is atomic (it replaces whole), which is how
|
|
9
|
+
* `app-patch` applies it; this test replays that and validates the result.
|
|
10
|
+
*/
|
|
11
|
+
const before = await Bun.file(
|
|
12
|
+
new URL("./fixtures/prs-app-definition.json.txt", import.meta.url),
|
|
13
|
+
).json();
|
|
14
|
+
const patch = await Bun.file(
|
|
15
|
+
new URL("./fixtures/prs-selection-migration.patch.json.txt", import.meta.url),
|
|
16
|
+
).json();
|
|
17
|
+
|
|
18
|
+
type Json = Record<string, unknown>;
|
|
19
|
+
const isObject = (value: unknown): value is Json =>
|
|
20
|
+
typeof value === "object" && value !== null && !Array.isArray(value);
|
|
21
|
+
|
|
22
|
+
/** `pages.<p>.elements.<e>` replaces whole; everything else merges, `null` deletes. */
|
|
23
|
+
function applyMergePatch(target: unknown, patchValue: unknown, path: string[] = []): unknown {
|
|
24
|
+
const atomicElement = path.length === 4 && path[0] === "pages" && path[2] === "elements";
|
|
25
|
+
if (!isObject(patchValue) || atomicElement) return patchValue;
|
|
26
|
+
const out: Json = isObject(target) ? { ...target } : {};
|
|
27
|
+
for (const [key, value] of Object.entries(patchValue)) {
|
|
28
|
+
if (value === null) delete out[key];
|
|
29
|
+
else out[key] = applyMergePatch(out[key], value, [...path, key]);
|
|
30
|
+
}
|
|
31
|
+
return out;
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
/**
|
|
35
|
+
* `parseAppDefinition` checks `scriptId`s against the scripts table. The page
|
|
36
|
+
* is what is under test, so swap the script-backed source and actions for
|
|
37
|
+
* stand-ins of the same names; the page references them by name only.
|
|
38
|
+
*/
|
|
39
|
+
function withoutScripts(definition: typeof before) {
|
|
40
|
+
const copy = structuredClone(definition);
|
|
41
|
+
const model = copy.models.pr;
|
|
42
|
+
delete model.sources;
|
|
43
|
+
for (const column of Object.values(model.columns) as Json[]) delete column.source;
|
|
44
|
+
for (const name of Object.keys(copy.actions)) {
|
|
45
|
+
copy.actions[name] = { kind: "task", prompt: name };
|
|
46
|
+
}
|
|
47
|
+
return copy;
|
|
48
|
+
}
|
|
49
|
+
|
|
50
|
+
const after = applyMergePatch(before, patch.definition) as typeof before;
|
|
51
|
+
const elements = after.pages.main.elements as Record<string, { props: Json }>;
|
|
52
|
+
const table = elements.prTable!.props as {
|
|
53
|
+
columns: { key: string }[];
|
|
54
|
+
bulkActions: { label: string; actions: { params: { name: string } }[] }[];
|
|
55
|
+
};
|
|
56
|
+
|
|
57
|
+
describe("PRs app selection migration", () => {
|
|
58
|
+
test("the current definition and the migrated one both validate", async () => {
|
|
59
|
+
for (const definition of [before, after]) {
|
|
60
|
+
const parsed = await parseAppDefinition(withoutScripts(definition));
|
|
61
|
+
if (!parsed.success) console.error(parsed.issues);
|
|
62
|
+
expect(parsed.success).toBe(true);
|
|
63
|
+
}
|
|
64
|
+
});
|
|
65
|
+
|
|
66
|
+
test("the switch column and the toolbar's selected-row buttons are gone", () => {
|
|
67
|
+
expect(table.columns.map((column) => column.key)).not.toContain("selected");
|
|
68
|
+
expect(elements.mqBtn).toBeUndefined();
|
|
69
|
+
expect(elements.reviewBtn).toBeUndefined();
|
|
70
|
+
expect((elements.toolbar as unknown as { children: string[] }).children.sort()).toEqual([
|
|
71
|
+
"mqPreviewBtn",
|
|
72
|
+
"reviewPreviewBtn",
|
|
73
|
+
"search",
|
|
74
|
+
]);
|
|
75
|
+
});
|
|
76
|
+
|
|
77
|
+
test("selection is client state keyed by prKey, with the two bulk actions", () => {
|
|
78
|
+
expect(table).toMatchObject({ id: "prTable", rowId: "prKey", selectable: true });
|
|
79
|
+
expect(table.bulkActions.map((action) => action.actions[0]!.params.name)).toEqual([
|
|
80
|
+
"enqueue",
|
|
81
|
+
"askReview",
|
|
82
|
+
]);
|
|
83
|
+
});
|
|
84
|
+
|
|
85
|
+
test("the model keeps its `selected` column, so no migration directive is needed", () => {
|
|
86
|
+
expect(Object.keys(after.models.pr.columns)).toContain("selected");
|
|
87
|
+
expect(after.models).toEqual(before.models);
|
|
88
|
+
});
|
|
89
|
+
|
|
90
|
+
test("the patch only touches page elements", () => {
|
|
91
|
+
expect(Object.keys(patch.definition)).toEqual(["pages"]);
|
|
92
|
+
expect(Object.keys(patch.definition.pages)).toEqual(["main"]);
|
|
93
|
+
expect(Object.keys(patch.definition.pages.main)).toEqual(["elements"]);
|
|
94
|
+
});
|
|
95
|
+
});
|
|
@@ -86,7 +86,7 @@ function serveSlot(slot: number, accountId: string): string {
|
|
|
86
86
|
accountId,
|
|
87
87
|
};
|
|
88
88
|
pool = [{ slot, creds }];
|
|
89
|
-
return deriveCodexKeySuffix(creds.access, accountId);
|
|
89
|
+
return deriveCodexKeySuffix(creds.access, accountId, slot);
|
|
90
90
|
}
|
|
91
91
|
|
|
92
92
|
/** A pi adapter whose session start revalidates the slot with `getValid`. */
|
|
@@ -135,7 +135,7 @@ function startSession(
|
|
|
135
135
|
adapter: Parameters<typeof spawnProviderProcess>[0],
|
|
136
136
|
kind: "new" | "resumed",
|
|
137
137
|
) {
|
|
138
|
-
return spawnProviderProcess(adapter, startOpts(kind), logDir
|
|
138
|
+
return spawnProviderProcess(adapter, startOpts(kind), logDir);
|
|
139
139
|
}
|
|
140
140
|
|
|
141
141
|
describe("ChatGPT subscription slot bench", () => {
|
|
@@ -397,6 +397,42 @@ describe("runClaudeManagedSetup — entry point", () => {
|
|
|
397
397
|
expect(exit).not.toHaveBeenCalled();
|
|
398
398
|
});
|
|
399
399
|
|
|
400
|
+
test("--help documents AGENT_SWARM_API_KEY before API_KEY for --api-key", async () => {
|
|
401
|
+
const lines: string[] = [];
|
|
402
|
+
const origLog = console.log;
|
|
403
|
+
console.log = (...args: unknown[]) => {
|
|
404
|
+
lines.push(args.map(String).join(" "));
|
|
405
|
+
};
|
|
406
|
+
try {
|
|
407
|
+
await runClaudeManagedSetup(["--help"], {
|
|
408
|
+
log: mock(() => undefined),
|
|
409
|
+
error: mock(() => undefined),
|
|
410
|
+
exit: mock(() => {
|
|
411
|
+
throw new Error("exit was called");
|
|
412
|
+
}),
|
|
413
|
+
flow: mock(async () => {
|
|
414
|
+
throw new Error("flow should not be called");
|
|
415
|
+
}),
|
|
416
|
+
resolveConfig: mock(async () => {
|
|
417
|
+
throw new Error("resolveConfig should not be called");
|
|
418
|
+
}),
|
|
419
|
+
});
|
|
420
|
+
} finally {
|
|
421
|
+
console.log = origLog;
|
|
422
|
+
}
|
|
423
|
+
|
|
424
|
+
const text = lines.join("\n");
|
|
425
|
+
expect(text).toContain("AGENT_SWARM_API_KEY");
|
|
426
|
+
expect(text).toContain("API_KEY");
|
|
427
|
+
expect(text).toContain("123123");
|
|
428
|
+
// Prefer the namespaced key, then legacy API_KEY (same order as getApiKey / COMMAND_HELP).
|
|
429
|
+
const apiKeyLine = text
|
|
430
|
+
.split("\n")
|
|
431
|
+
.find((line) => line.includes("--api-key") && line.includes("default:"));
|
|
432
|
+
expect(apiKeyLine).toBeDefined();
|
|
433
|
+
expect(apiKeyLine!).toMatch(/AGENT_SWARM_API_KEY.*API_KEY/);
|
|
434
|
+
});
|
|
435
|
+
|
|
400
436
|
test("on error, calls error() + exit(1) without throwing", async () => {
|
|
401
437
|
const log = mock((_msg: string) => undefined);
|
|
402
438
|
const errorMessages: string[] = [];
|
|
@@ -270,7 +270,7 @@ async function runTransport(transport: "cli" | "sdk", agentId: string): Promise<
|
|
|
270
270
|
JIRA_DISABLE: "true",
|
|
271
271
|
AGENTMAIL_DISABLE: "true",
|
|
272
272
|
};
|
|
273
|
-
const worker = Bun.spawn([process.execPath, "run", "src/cli.tsx", "worker"
|
|
273
|
+
const worker = Bun.spawn([process.execPath, "run", "src/cli.tsx", "worker"], {
|
|
274
274
|
cwd: repoRoot,
|
|
275
275
|
env: workerEnv,
|
|
276
276
|
stdout: "pipe",
|
|
@@ -411,7 +411,7 @@ async function runCredentialRotation(): Promise<void> {
|
|
|
411
411
|
JIRA_DISABLE: "true",
|
|
412
412
|
AGENTMAIL_DISABLE: "true",
|
|
413
413
|
};
|
|
414
|
-
const worker = Bun.spawn([process.execPath, "run", "src/cli.tsx", "worker"
|
|
414
|
+
const worker = Bun.spawn([process.execPath, "run", "src/cli.tsx", "worker"], {
|
|
415
415
|
cwd: repoRoot,
|
|
416
416
|
env: workerEnv,
|
|
417
417
|
stdout: "pipe",
|
|
@@ -579,10 +579,10 @@ describe("Codex app-server session", () => {
|
|
|
579
579
|
expect(snapshots).toHaveLength(2);
|
|
580
580
|
expect(snapshots[0]).toMatchObject({ contextUsedTokens: 51_000, contextTotalTokens: 258_400 });
|
|
581
581
|
expect(snapshots[0]?.contextPercent).toBeCloseTo((51_000 / 258_400) * 100, 6);
|
|
582
|
-
//
|
|
582
|
+
// Missing updates retain the last window the running harness reported.
|
|
583
583
|
expect(snapshots[1]).toMatchObject({
|
|
584
584
|
contextUsedTokens: 61_000,
|
|
585
|
-
contextTotalTokens:
|
|
585
|
+
contextTotalTokens: 258_400,
|
|
586
586
|
});
|
|
587
587
|
});
|
|
588
588
|
|
|
@@ -2015,6 +2015,36 @@ describe("buildCodexConfig — context-mode + features", () => {
|
|
|
2015
2015
|
expect(merged.plugins).toEqual({ "context-mode@context-mode": { enabled: false } });
|
|
2016
2016
|
});
|
|
2017
2017
|
|
|
2018
|
+
// Production builds this config in the codex-session-runner subprocess,
|
|
2019
|
+
// whose process.env lacks swarm config rows; they arrive via config.env.
|
|
2020
|
+
test("honors CONTEXT_MODE_DISABLED from config.env when process.env lacks it", async () => {
|
|
2021
|
+
delete process.env.CONTEXT_MODE_DISABLED;
|
|
2022
|
+
globalThis.fetch = stubFetch({ servers: [], total: 0 });
|
|
2023
|
+
const merged = await buildCodexConfig(
|
|
2024
|
+
cfg({ env: { CONTEXT_MODE_DISABLED: "true" } }),
|
|
2025
|
+
"gpt-5.4",
|
|
2026
|
+
() => {},
|
|
2027
|
+
);
|
|
2028
|
+
const mcp = merged.mcp_servers as Record<string, Record<string, unknown>>;
|
|
2029
|
+
|
|
2030
|
+
expect(Object.keys(mcp)).toEqual(["agent-swarm"]);
|
|
2031
|
+
expect(merged.plugins).toEqual({ "context-mode@context-mode": { enabled: false } });
|
|
2032
|
+
});
|
|
2033
|
+
|
|
2034
|
+
test("config.env CONTEXT_MODE_DISABLED=false overrides a process.env true", async () => {
|
|
2035
|
+
process.env.CONTEXT_MODE_DISABLED = "true";
|
|
2036
|
+
globalThis.fetch = stubFetch({ servers: [], total: 0 });
|
|
2037
|
+
const merged = await buildCodexConfig(
|
|
2038
|
+
cfg({ env: { CONTEXT_MODE_DISABLED: "false" } }),
|
|
2039
|
+
"gpt-5.4",
|
|
2040
|
+
() => {},
|
|
2041
|
+
);
|
|
2042
|
+
const mcp = merged.mcp_servers as Record<string, Record<string, unknown>>;
|
|
2043
|
+
|
|
2044
|
+
expect(Object.keys(mcp).sort()).toEqual(["agent-swarm", "context-mode"]);
|
|
2045
|
+
expect(merged.plugins).toBeUndefined();
|
|
2046
|
+
});
|
|
2047
|
+
|
|
2018
2048
|
test("leaves the installed context-mode plugin alone by default", async () => {
|
|
2019
2049
|
delete process.env.CONTEXT_MODE_DISABLED;
|
|
2020
2050
|
globalThis.fetch = stubFetch({ servers: [], total: 0 });
|
|
@@ -367,9 +367,9 @@ describe("runCodexLogin", () => {
|
|
|
367
367
|
exit: () => {},
|
|
368
368
|
});
|
|
369
369
|
|
|
370
|
-
// at_test has no chatgpt_user_id claim, so the suffix
|
|
370
|
+
// at_test has no chatgpt_user_id claim, so the suffix uses the accountId tail plus the slot.
|
|
371
371
|
// The fence is read BEFORE the credential write, so failures on the fresh login survive.
|
|
372
|
-
expect(calls).toEqual(["read-fence", "store", "clear:d3Ove@2 fence 7"]);
|
|
372
|
+
expect(calls).toEqual(["read-fence", "store", "clear:d3Ove-2@2 fence 7"]);
|
|
373
373
|
});
|
|
374
374
|
|
|
375
375
|
it("skips the unfenced clear when the fence cannot be read", async () => {
|
|
@@ -7,6 +7,7 @@ import {
|
|
|
7
7
|
createUser,
|
|
8
8
|
getAvailableKeyIndices,
|
|
9
9
|
getDbClient,
|
|
10
|
+
getKv,
|
|
10
11
|
getSwarmConfigs,
|
|
11
12
|
initDb,
|
|
12
13
|
markKeyRateLimited,
|
|
@@ -124,7 +125,7 @@ describe("Codex account HTTP routes", () => {
|
|
|
124
125
|
value: JSON.stringify(credentials("agent-only")),
|
|
125
126
|
isSecret: true,
|
|
126
127
|
});
|
|
127
|
-
await recordKeyUsage("CODEX_OAUTH", "first", 2, null);
|
|
128
|
+
await recordKeyUsage("CODEX_OAUTH", "first-2", 2, null);
|
|
128
129
|
const response = await request();
|
|
129
130
|
expect(response.status).toBe(200);
|
|
130
131
|
const text = await response.text();
|
|
@@ -137,7 +138,7 @@ describe("Codex account HTTP routes", () => {
|
|
|
137
138
|
slot: 2,
|
|
138
139
|
configKey: "codex_oauth_2",
|
|
139
140
|
legacy: false,
|
|
140
|
-
suffix: "first",
|
|
141
|
+
suffix: "first-2",
|
|
141
142
|
plan: "team",
|
|
142
143
|
email: "first@example.test",
|
|
143
144
|
status: "ok",
|
|
@@ -146,7 +147,7 @@ describe("Codex account HTTP routes", () => {
|
|
|
146
147
|
slot: 10,
|
|
147
148
|
configKey: "codex_oauth_10",
|
|
148
149
|
legacy: false,
|
|
149
|
-
suffix: "tenth",
|
|
150
|
+
suffix: "tenth-10",
|
|
150
151
|
plan: "team",
|
|
151
152
|
email: null,
|
|
152
153
|
status: "unchecked",
|
|
@@ -229,16 +230,16 @@ describe("Codex account HTTP routes", () => {
|
|
|
229
230
|
await store("codex_oauth_2", credentials("grant-ratel"));
|
|
230
231
|
await upsertKv({
|
|
231
232
|
namespace: "codex-auth-watch",
|
|
232
|
-
key: "bench:bench",
|
|
233
|
+
key: "bench:bench-0",
|
|
233
234
|
valueType: "string",
|
|
234
235
|
value: "1",
|
|
235
236
|
});
|
|
236
|
-
await recordKeyAuthFailure("CODEX_OAUTH", "authf", 1);
|
|
237
|
-
await recordKeyAuthFailure("CODEX_OAUTH", "authf", 1);
|
|
238
|
-
await getDbClient().run("DELETE FROM kv_entries WHERE key = 'bench:authf'");
|
|
237
|
+
await recordKeyAuthFailure("CODEX_OAUTH", "authf-1", 1);
|
|
238
|
+
await recordKeyAuthFailure("CODEX_OAUTH", "authf-1", 1);
|
|
239
|
+
await getDbClient().run("DELETE FROM kv_entries WHERE key = 'bench:authf-1'");
|
|
239
240
|
await markKeyRateLimited(
|
|
240
241
|
"CODEX_OAUTH",
|
|
241
|
-
"ratel",
|
|
242
|
+
"ratel-2",
|
|
242
243
|
2,
|
|
243
244
|
new Date(Date.now() + 3_600_000).toISOString(),
|
|
244
245
|
);
|
|
@@ -253,12 +254,12 @@ describe("Codex account HTTP routes", () => {
|
|
|
253
254
|
await store("codex_oauth_0", credentials("grant-clear"));
|
|
254
255
|
await upsertKv({
|
|
255
256
|
namespace: "codex-auth-watch",
|
|
256
|
-
key: "bench:clear",
|
|
257
|
+
key: "bench:clear-0",
|
|
257
258
|
valueType: "string",
|
|
258
259
|
value: "1",
|
|
259
260
|
expiresAt: Date.now() - 1,
|
|
260
261
|
});
|
|
261
|
-
await recordKeyAuthFailure("CODEX_OAUTH", "clear", 0, "agent", workerId);
|
|
262
|
+
await recordKeyAuthFailure("CODEX_OAUTH", "clear-0", 0, "agent", workerId);
|
|
262
263
|
expect((await list()).accounts[0]?.status).toBe("unchecked");
|
|
263
264
|
});
|
|
264
265
|
|
|
@@ -285,10 +286,11 @@ describe("Codex account HTTP routes", () => {
|
|
|
285
286
|
test("a sign-in in a freed slot does not inherit the removed account's auth bench", async () => {
|
|
286
287
|
await store("codex_oauth_0", credentials("grant-keep0"));
|
|
287
288
|
await store("codex_oauth_1", credentials("grant-gone1"));
|
|
288
|
-
await recordKeyAuthFailure("CODEX_OAUTH", "gone1", 1);
|
|
289
|
-
await recordKeyAuthFailure("CODEX_OAUTH", "gone1", 1);
|
|
289
|
+
await recordKeyAuthFailure("CODEX_OAUTH", "gone1-1", 1);
|
|
290
|
+
await recordKeyAuthFailure("CODEX_OAUTH", "gone1-1", 1);
|
|
290
291
|
expect((await getAvailableKeyIndices("CODEX_OAUTH", 2)).availableIndices).toEqual([0]);
|
|
291
292
|
expect((await request("/1", "DELETE")).status).toBe(200);
|
|
293
|
+
expect(await getKv("codex-auth-watch", "bench:gone1-1")).toBeNull();
|
|
292
294
|
await store("codex_oauth_1", credentials("grant-fresh"));
|
|
293
295
|
expect((await getAvailableKeyIndices("CODEX_OAUTH", 2)).availableIndices).toEqual([0, 1]);
|
|
294
296
|
expect((await list()).accounts.map((account) => account.status)).toEqual([
|
|
@@ -297,6 +299,40 @@ describe("Codex account HTTP routes", () => {
|
|
|
297
299
|
]);
|
|
298
300
|
});
|
|
299
301
|
|
|
302
|
+
test("a bench stored under the pre-slot suffix format follows its slot until removal", async () => {
|
|
303
|
+
await store("codex_oauth_0", credentials("grant-keep0"));
|
|
304
|
+
await store("codex_oauth_1", credentials("grant-old01"));
|
|
305
|
+
// Rows written before suffixes carried the slot: `<last 5 of user id>`.
|
|
306
|
+
await recordKeyAuthFailure("CODEX_OAUTH", "old01", 1);
|
|
307
|
+
await recordKeyAuthFailure("CODEX_OAUTH", "old01", 1);
|
|
308
|
+
expect((await list()).accounts.map((account) => account.status)).toEqual([
|
|
309
|
+
"unchecked",
|
|
310
|
+
"needs_login",
|
|
311
|
+
]);
|
|
312
|
+
expect((await request("/1", "DELETE")).status).toBe(200);
|
|
313
|
+
expect(await getKv("codex-auth-watch", "bench:old01")).toBeNull();
|
|
314
|
+
await store("codex_oauth_1", credentials("grant-fresh"));
|
|
315
|
+
expect((await getAvailableKeyIndices("CODEX_OAUTH", 2)).availableIndices).toEqual([0, 1]);
|
|
316
|
+
});
|
|
317
|
+
|
|
318
|
+
test("two slots signed in by the same ChatGPT user keep separate health", async () => {
|
|
319
|
+
await store("codex_oauth_0", credentials("user-same-person"));
|
|
320
|
+
await store("codex_oauth_1", credentials("user-same-person"));
|
|
321
|
+
const before = await list();
|
|
322
|
+
expect(before.accounts.map((account) => account.suffix)).toEqual(["erson-0", "erson-1"]);
|
|
323
|
+
await recordKeyAuthFailure("CODEX_OAUTH", "erson-1", 1);
|
|
324
|
+
await recordKeyAuthFailure("CODEX_OAUTH", "erson-1", 1);
|
|
325
|
+
expect((await getAvailableKeyIndices("CODEX_OAUTH", 2)).availableIndices).toEqual([0]);
|
|
326
|
+
expect(await getKv("codex-auth-watch", "bench:erson-1")).not.toBeNull();
|
|
327
|
+
expect(await getKv("codex-auth-watch", "bench:erson-0")).toBeNull();
|
|
328
|
+
expect((await list()).accounts.map((account) => account.status)).toEqual([
|
|
329
|
+
"unchecked",
|
|
330
|
+
"needs_login",
|
|
331
|
+
]);
|
|
332
|
+
expect((await request("/1", "DELETE")).status).toBe(200);
|
|
333
|
+
expect((await getAvailableKeyIndices("CODEX_OAUTH", 1)).availableIndices).toEqual([0]);
|
|
334
|
+
});
|
|
335
|
+
|
|
300
336
|
test("deletes the legacy slot zero and keeps it when the numbered row exists", async () => {
|
|
301
337
|
await store("codex_oauth");
|
|
302
338
|
expect((await request("/0", "DELETE")).status).toBe(200);
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
* drift from the real implementation.
|
|
25
25
|
*/
|
|
26
26
|
|
|
27
|
-
import { afterEach, beforeEach, describe, expect, it } from "bun:test";
|
|
27
|
+
import { afterEach, beforeEach, describe, expect, it, spyOn } from "bun:test";
|
|
28
28
|
import { mkdtemp, rm } from "node:fs/promises";
|
|
29
29
|
import { tmpdir } from "node:os";
|
|
30
30
|
import { join } from "node:path";
|
|
@@ -184,3 +184,79 @@ describe("resolveCodexOAuthCredentialInfo — issue #1102 bug 1", () => {
|
|
|
184
184
|
).toBeNull();
|
|
185
185
|
});
|
|
186
186
|
});
|
|
187
|
+
|
|
188
|
+
describe("resolveCodexOAuthCredentialInfo — sparse slot availability (#1555 B1)", () => {
|
|
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: undefined, available: 2 },
|
|
194
|
+
])("honors real slot ids for $slots with $limited rate-limited", async ({
|
|
195
|
+
slots,
|
|
196
|
+
limited,
|
|
197
|
+
expected,
|
|
198
|
+
available,
|
|
199
|
+
}) => {
|
|
200
|
+
const requests: URL[] = [];
|
|
201
|
+
globalThis.fetch = (async (input: string | URL | Request) => {
|
|
202
|
+
const url = new URL(input instanceof Request ? input.url : input);
|
|
203
|
+
if (url.pathname === "/api/config/resolved") {
|
|
204
|
+
return Response.json({
|
|
205
|
+
configs: slots.map((slot) => ({
|
|
206
|
+
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
|
+
}),
|
|
213
|
+
})),
|
|
214
|
+
});
|
|
215
|
+
}
|
|
216
|
+
if (url.pathname === "/api/keys/available") {
|
|
217
|
+
requests.push(url);
|
|
218
|
+
// The index-based API returns dense positions up to totalKeys, including
|
|
219
|
+
// positions with no configured slot. Rate limits use the real slot id.
|
|
220
|
+
return Response.json({
|
|
221
|
+
availableIndices: Array.from(
|
|
222
|
+
{ length: Number(url.searchParams.get("totalKeys")) },
|
|
223
|
+
(_, i) => i,
|
|
224
|
+
).filter((i) => !limited.includes(i)),
|
|
225
|
+
});
|
|
226
|
+
}
|
|
227
|
+
return new Response("not found", { status: 404 });
|
|
228
|
+
}) as typeof fetch;
|
|
229
|
+
const random = spyOn(Math, "random");
|
|
230
|
+
const log = spyOn(console, "log").mockImplementation(() => {});
|
|
231
|
+
try {
|
|
232
|
+
for (const value of [0, 0.999]) {
|
|
233
|
+
random.mockReturnValue(value);
|
|
234
|
+
const info = await resolveCodexOAuthCredentialInfo(MOCK_API_URL, MOCK_API_KEY, {
|
|
235
|
+
poolOnly: true,
|
|
236
|
+
});
|
|
237
|
+
expect(info?.isPoolBacked).toBe(true);
|
|
238
|
+
expect(info?.selection.total).toBe(slots.length);
|
|
239
|
+
expect(slots).toContain(info!.selection.index);
|
|
240
|
+
expect(limited).not.toContain(info!.selection.index);
|
|
241
|
+
if (expected !== undefined) expect(info?.selection.index).toBe(expected);
|
|
242
|
+
}
|
|
243
|
+
expect(requests).toHaveLength(2);
|
|
244
|
+
for (const url of requests) {
|
|
245
|
+
expect(url.searchParams.get("keyType")).toBe("CODEX_OAUTH");
|
|
246
|
+
expect(url.searchParams.get("totalKeys")).toBe(String(Math.max(...slots) + 1));
|
|
247
|
+
expect(url.searchParams.has("keySuffixes")).toBe(false);
|
|
248
|
+
}
|
|
249
|
+
const availabilityLogs = log.mock.calls.flat().filter((s) => s.includes("slots available"));
|
|
250
|
+
expect(availabilityLogs).toEqual(
|
|
251
|
+
limited.length > 0
|
|
252
|
+
? Array(2).fill(
|
|
253
|
+
`[credentials] CODEX_OAUTH: ${available}/${slots.length} slots available (${limited.length} rate-limited)`,
|
|
254
|
+
)
|
|
255
|
+
: [],
|
|
256
|
+
);
|
|
257
|
+
} finally {
|
|
258
|
+
random.mockRestore();
|
|
259
|
+
log.mockRestore();
|
|
260
|
+
}
|
|
261
|
+
});
|
|
262
|
+
});
|
|
@@ -16,7 +16,9 @@ import { handleCore } from "../http/core";
|
|
|
16
16
|
import { handleOnboarding } from "../http/onboarding";
|
|
17
17
|
import { getPathSegments, parseQueryParams } from "../http/utils";
|
|
18
18
|
import {
|
|
19
|
+
codexDeviceVerificationUrl,
|
|
19
20
|
DeviceCodeNotEnabledError,
|
|
21
|
+
exchangeDeviceAuthorizationCode,
|
|
20
22
|
pollDeviceToken,
|
|
21
23
|
requestDeviceCode,
|
|
22
24
|
} from "../providers/codex-oauth/device";
|
|
@@ -170,6 +172,64 @@ describe("Codex device provider", () => {
|
|
|
170
172
|
});
|
|
171
173
|
});
|
|
172
174
|
|
|
175
|
+
describe("Codex device base URL", () => {
|
|
176
|
+
const BASE_ENV = "CODEX_OAUTH_DEVICE_BASE_URL";
|
|
177
|
+
const original = process.env[BASE_ENV];
|
|
178
|
+
afterEach(() => {
|
|
179
|
+
if (original === undefined) delete process.env[BASE_ENV];
|
|
180
|
+
else process.env[BASE_ENV] = original;
|
|
181
|
+
});
|
|
182
|
+
|
|
183
|
+
test("all device URLs follow the base read at call time", async () => {
|
|
184
|
+
process.env[BASE_ENV] = "http://127.0.0.1:9999/";
|
|
185
|
+
const seen: string[] = [];
|
|
186
|
+
fetchImpl = (async (input, init) => {
|
|
187
|
+
const url = String(input);
|
|
188
|
+
seen.push(url);
|
|
189
|
+
if (url.endsWith("/usercode")) {
|
|
190
|
+
return jsonResponse({ device_auth_id: "device-base", user_code: "BASE", interval: 5 });
|
|
191
|
+
}
|
|
192
|
+
if (url.endsWith("/deviceauth/token")) {
|
|
193
|
+
return jsonResponse({ authorization_code: "base-code", code_verifier: "base-verifier" });
|
|
194
|
+
}
|
|
195
|
+
expect(url).toBe("http://127.0.0.1:9999/oauth/token");
|
|
196
|
+
expect(new URLSearchParams(String(init?.body)).get("redirect_uri")).toBe(
|
|
197
|
+
"http://127.0.0.1:9999/deviceauth/callback",
|
|
198
|
+
);
|
|
199
|
+
return jsonResponse({
|
|
200
|
+
access_token: accountToken("account-base"),
|
|
201
|
+
refresh_token: "refresh-base",
|
|
202
|
+
expires_in: 3600,
|
|
203
|
+
});
|
|
204
|
+
}) as typeof fetch;
|
|
205
|
+
|
|
206
|
+
await requestDeviceCode();
|
|
207
|
+
await pollDeviceToken("device-base", "BASE");
|
|
208
|
+
await exchangeDeviceAuthorizationCode("base-code", "base-verifier");
|
|
209
|
+
expect(seen).toEqual([
|
|
210
|
+
"http://127.0.0.1:9999/api/accounts/deviceauth/usercode",
|
|
211
|
+
"http://127.0.0.1:9999/api/accounts/deviceauth/token",
|
|
212
|
+
"http://127.0.0.1:9999/oauth/token",
|
|
213
|
+
]);
|
|
214
|
+
expect(codexDeviceVerificationUrl()).toBe("http://127.0.0.1:9999/codex/device");
|
|
215
|
+
});
|
|
216
|
+
|
|
217
|
+
test("an unset or blank base falls back to auth.openai.com", async () => {
|
|
218
|
+
const seen: string[] = [];
|
|
219
|
+
fetchImpl = (async (input) => {
|
|
220
|
+
seen.push(String(input));
|
|
221
|
+
return new Response(null, { status: 403 });
|
|
222
|
+
}) as typeof fetch;
|
|
223
|
+
|
|
224
|
+
delete process.env[BASE_ENV];
|
|
225
|
+
await pollDeviceToken("device", "code");
|
|
226
|
+
process.env[BASE_ENV] = " ";
|
|
227
|
+
await pollDeviceToken("device", "code");
|
|
228
|
+
expect(seen).toEqual([DEVICE_TOKEN_URL, DEVICE_TOKEN_URL]);
|
|
229
|
+
expect(codexDeviceVerificationUrl()).toBe("https://auth.openai.com/codex/device");
|
|
230
|
+
});
|
|
231
|
+
});
|
|
232
|
+
|
|
173
233
|
describe("Codex device HTTP routes", () => {
|
|
174
234
|
test("completes the flow, saves the first free slot, and updates onboarding", async () => {
|
|
175
235
|
await request("/api/onboarding", "GET");
|
|
@@ -241,7 +301,7 @@ describe("Codex device HTTP routes", () => {
|
|
|
241
301
|
expect(state.steps.ai).toMatchObject({ status: "done", method: "codex_device" });
|
|
242
302
|
// The sign-in itself checks the account: the account list says "Signed in".
|
|
243
303
|
const statuses = await getKeyStatuses("CODEX_OAUTH", "global", null);
|
|
244
|
-
expect(statuses.map((s) => [s.keySuffix, s.keyIndex])).toEqual([["-full", 1]]);
|
|
304
|
+
expect(statuses.map((s) => [s.keySuffix, s.keyIndex])).toEqual([["-full-1", 1]]);
|
|
245
305
|
});
|
|
246
306
|
|
|
247
307
|
test("throttles upstream polling to the requested interval", async () => {
|
|
@@ -242,7 +242,7 @@ describe("POST /api/oauth/keep-warm/codex", () => {
|
|
|
242
242
|
});
|
|
243
243
|
|
|
244
244
|
it("skips a slot with an active codex-auth-watch bench marker", async () => {
|
|
245
|
-
const keySuffix = "c-old"; //
|
|
245
|
+
const keySuffix = "c-old-2"; // accountId tail (no chatgpt_user_id in this token) plus slot 2
|
|
246
246
|
await upsertKv({
|
|
247
247
|
namespace: "codex-auth-watch",
|
|
248
248
|
key: `bench:${keySuffix}`,
|
|
@@ -257,7 +257,7 @@ describe("POST /api/oauth/keep-warm/codex", () => {
|
|
|
257
257
|
access: "at_benched",
|
|
258
258
|
refresh: "rt_benched",
|
|
259
259
|
expires: Date.now() + 1 * 24 * 60 * 60 * 1000,
|
|
260
|
-
accountId: "acc-old", // suffix "
|
|
260
|
+
accountId: "acc-old", // suffix "c-old-2" matches the bench marker above
|
|
261
261
|
},
|
|
262
262
|
],
|
|
263
263
|
]);
|
|
@@ -3,6 +3,7 @@ import {
|
|
|
3
3
|
authJsonToCredentialSelection,
|
|
4
4
|
authJsonToCredentials,
|
|
5
5
|
credentialsToAuthJson,
|
|
6
|
+
deriveCodexKeySuffix,
|
|
6
7
|
} from "../providers/codex-oauth/auth-json.js";
|
|
7
8
|
import {
|
|
8
9
|
AUTHORIZE_URL,
|
|
@@ -410,10 +411,30 @@ describe("authJsonToCredentialSelection", () => {
|
|
|
410
411
|
expect(selection.keyType).toBe("CODEX_OAUTH");
|
|
411
412
|
expect(selection.index).toBe(0);
|
|
412
413
|
expect(selection.total).toBe(1);
|
|
413
|
-
expect(selection.keySuffix).toBe(userId.slice(-5));
|
|
414
|
+
expect(selection.keySuffix).toBe(`${userId.slice(-5)}-0`);
|
|
414
415
|
expect(selection.selected).toBe(creds.accountId);
|
|
415
416
|
});
|
|
416
417
|
|
|
418
|
+
it("two slots signed in by the same ChatGPT user get distinct suffixes", () => {
|
|
419
|
+
const access = tokenFor({
|
|
420
|
+
"https://api.openai.com/auth": {
|
|
421
|
+
chatgpt_account_id: "acc-shared",
|
|
422
|
+
chatgpt_user_id: "user-same-person",
|
|
423
|
+
},
|
|
424
|
+
});
|
|
425
|
+
const creds: CodexOAuthCredentials = {
|
|
426
|
+
access,
|
|
427
|
+
refresh: "rt_x",
|
|
428
|
+
expires: Date.now() + 3600000,
|
|
429
|
+
accountId: "acc-shared",
|
|
430
|
+
};
|
|
431
|
+
const slot0 = authJsonToCredentialSelection(credentialsToAuthJson(creds), 0, 2);
|
|
432
|
+
const slot1 = authJsonToCredentialSelection(credentialsToAuthJson(creds), 1, 2);
|
|
433
|
+
expect([slot0.keySuffix, slot1.keySuffix]).toEqual(["erson-0", "erson-1"]);
|
|
434
|
+
// Login, storage, keep-warm and the account list derive the same identity.
|
|
435
|
+
expect(deriveCodexKeySuffix(access, "acc-shared", 1)).toBe(slot1.keySuffix);
|
|
436
|
+
});
|
|
437
|
+
|
|
417
438
|
it("two slots on the same account get distinct suffixes when user_ids differ", () => {
|
|
418
439
|
const userIdDaniel = "user-MYUYWj0C9zVPo6TX2NjodCyi";
|
|
419
440
|
const userIdLorenzo = "user-5M89tz8tAYHIaByagMVd3Ove";
|
|
@@ -442,8 +463,8 @@ describe("authJsonToCredentialSelection", () => {
|
|
|
442
463
|
2,
|
|
443
464
|
);
|
|
444
465
|
|
|
445
|
-
expect(selDaniel.keySuffix).toBe(userIdDaniel.slice(-5));
|
|
446
|
-
expect(selLorenzo.keySuffix).toBe(userIdLorenzo.slice(-5));
|
|
466
|
+
expect(selDaniel.keySuffix).toBe(`${userIdDaniel.slice(-5)}-0`);
|
|
467
|
+
expect(selLorenzo.keySuffix).toBe(`${userIdLorenzo.slice(-5)}-1`);
|
|
447
468
|
expect(selDaniel.keySuffix).not.toBe(selLorenzo.keySuffix);
|
|
448
469
|
});
|
|
449
470
|
|
|
@@ -457,7 +478,7 @@ describe("authJsonToCredentialSelection", () => {
|
|
|
457
478
|
|
|
458
479
|
const selection = authJsonToCredentialSelection(credentialsToAuthJson(creds));
|
|
459
480
|
expect(selection.keyType).toBe("CODEX_OAUTH");
|
|
460
|
-
expect(selection.keySuffix).toBe("8c965");
|
|
481
|
+
expect(selection.keySuffix).toBe("8c965-0");
|
|
461
482
|
expect(selection.selected).toBe(creds.accountId);
|
|
462
483
|
expect(selection.plan).toBeNull();
|
|
463
484
|
});
|
|
@@ -172,9 +172,9 @@ describe("Scenario 1 — 3-slot round-trip with availability filter", () => {
|
|
|
172
172
|
expect(sel.index).toBe(selectedSlot);
|
|
173
173
|
expect(sel.total).toBe(3);
|
|
174
174
|
expect(sel.keyType).toBe("CODEX_OAUTH");
|
|
175
|
-
// keySuffix is
|
|
175
|
+
// keySuffix is the chatgpt_user_id tail plus the slot, so it is slot-unique.
|
|
176
176
|
const expectedUserId = `user-slot${selectedSlot}`;
|
|
177
|
-
expect(sel.keySuffix).toBe(expectedUserId.slice(-5));
|
|
177
|
+
expect(sel.keySuffix).toBe(`${expectedUserId.slice(-5)}-${selectedSlot}`);
|
|
178
178
|
});
|
|
179
179
|
});
|
|
180
180
|
|