@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
package/src/http/users.ts
CHANGED
|
@@ -51,15 +51,18 @@ import {
|
|
|
51
51
|
upsertBudget,
|
|
52
52
|
} from "../be/db";
|
|
53
53
|
import {
|
|
54
|
+
assertMayActOnOperatorGrantedTarget,
|
|
54
55
|
assertNotLastAdmin,
|
|
55
56
|
getUserGrant,
|
|
56
57
|
LastAdminError,
|
|
57
58
|
listUserRoles,
|
|
59
|
+
OperatorGrantedTargetError,
|
|
58
60
|
setUserRoles,
|
|
59
61
|
} from "../be/rbac-roles";
|
|
60
62
|
import {
|
|
61
63
|
findUserByEmail,
|
|
62
64
|
getUserIdentities,
|
|
65
|
+
type IdentityActor,
|
|
63
66
|
type IdentityEvent,
|
|
64
67
|
linkIdentity,
|
|
65
68
|
listUserEvents,
|
|
@@ -78,6 +81,7 @@ import { resolveAppUrl, resolveMcpBaseUrl } from "./config-values";
|
|
|
78
81
|
import { clientIp, createIpRateLimiter } from "./ip-rate-limit";
|
|
79
82
|
import { getOperatorActor } from "./operator-actor";
|
|
80
83
|
import { route } from "./route-def";
|
|
84
|
+
import { resolveSessionActor } from "./session-access";
|
|
81
85
|
import { ensureRoleManager } from "./user-roles";
|
|
82
86
|
import { jsonError } from "./utils";
|
|
83
87
|
|
|
@@ -197,6 +201,11 @@ const whoamiRoute = route({
|
|
|
197
201
|
roles: z.array(z.string()),
|
|
198
202
|
})
|
|
199
203
|
.optional(),
|
|
204
|
+
// Whether this request may opt in to the all-users read scope
|
|
205
|
+
// (`scope=all`, `X-Swarm-Session-Scope: all`). On the operator key it
|
|
206
|
+
// answers for the user picked in `X-Swarm-User-Id`. Absent on older
|
|
207
|
+
// servers.
|
|
208
|
+
sessionReadAll: z.boolean().optional(),
|
|
200
209
|
}),
|
|
201
210
|
},
|
|
202
211
|
401: { description: "Unauthorized" },
|
|
@@ -251,6 +260,7 @@ const createUserRoute = route({
|
|
|
251
260
|
},
|
|
252
261
|
400: { description: "Validation error" },
|
|
253
262
|
401: { description: "Unauthorized" },
|
|
263
|
+
409: { description: "A user with this email already exists (user_exists)" },
|
|
254
264
|
},
|
|
255
265
|
auth: { apiKey: true },
|
|
256
266
|
});
|
|
@@ -297,6 +307,10 @@ const resolveUnmapped = route({
|
|
|
297
307
|
},
|
|
298
308
|
400: { description: "Validation error" },
|
|
299
309
|
401: { description: "Unauthorized" },
|
|
310
|
+
403: {
|
|
311
|
+
description:
|
|
312
|
+
"Target holds an operator-granted role (auditor) and the caller is not the operator key",
|
|
313
|
+
},
|
|
300
314
|
404: { description: "Target user not found" },
|
|
301
315
|
},
|
|
302
316
|
auth: { apiKey: true },
|
|
@@ -363,6 +377,10 @@ const updateUserRoute = route({
|
|
|
363
377
|
},
|
|
364
378
|
400: { description: "Validation error or empty body" },
|
|
365
379
|
401: { description: "Unauthorized" },
|
|
380
|
+
403: {
|
|
381
|
+
description:
|
|
382
|
+
"Target holds an operator-granted role (auditor) and the caller is not the operator key",
|
|
383
|
+
},
|
|
366
384
|
404: { description: "User not found" },
|
|
367
385
|
},
|
|
368
386
|
auth: { apiKey: true },
|
|
@@ -390,6 +408,10 @@ const mintUserMcpTokenRoute = route({
|
|
|
390
408
|
}),
|
|
391
409
|
},
|
|
392
410
|
401: { description: "Unauthorized" },
|
|
411
|
+
403: {
|
|
412
|
+
description:
|
|
413
|
+
"Target holds an operator-granted role (auditor) and the caller is not the operator key",
|
|
414
|
+
},
|
|
393
415
|
404: { description: "User not found" },
|
|
394
416
|
},
|
|
395
417
|
auth: { apiKey: true },
|
|
@@ -436,6 +458,10 @@ const createConnectorCodeRoute = route({
|
|
|
436
458
|
},
|
|
437
459
|
400: { description: "The public API origin or CONNECTOR_CONNECT_URL is not HTTPS" },
|
|
438
460
|
401: { description: "Unauthorized" },
|
|
461
|
+
403: {
|
|
462
|
+
description:
|
|
463
|
+
"Target holds an operator-granted role (auditor) and the caller is not the operator key",
|
|
464
|
+
},
|
|
439
465
|
404: { description: "User not found" },
|
|
440
466
|
},
|
|
441
467
|
auth: { apiKey: true },
|
|
@@ -583,6 +609,10 @@ const mergeUsersRoute = route({
|
|
|
583
609
|
},
|
|
584
610
|
400: { description: "Validation error (e.g. target == source)" },
|
|
585
611
|
401: { description: "Unauthorized" },
|
|
612
|
+
403: {
|
|
613
|
+
description:
|
|
614
|
+
"Target holds an operator-granted role (auditor) and the caller is not the operator key",
|
|
615
|
+
},
|
|
586
616
|
404: { description: "Target or source user not found" },
|
|
587
617
|
409: { description: "Source is the last active admin (last_admin)" },
|
|
588
618
|
},
|
|
@@ -624,9 +654,14 @@ const addIdentityRoute = route({
|
|
|
624
654
|
description: "Updated identity list",
|
|
625
655
|
schema: z.object({ identities: z.array(UserIdentityLinkSchema) }),
|
|
626
656
|
},
|
|
627
|
-
400: { description: "Validation error
|
|
657
|
+
400: { description: "Validation error" },
|
|
628
658
|
401: { description: "Unauthorized" },
|
|
659
|
+
403: {
|
|
660
|
+
description:
|
|
661
|
+
"Target holds an operator-granted role (auditor) and the caller is not the operator key",
|
|
662
|
+
},
|
|
629
663
|
404: { description: "User not found" },
|
|
664
|
+
409: { description: "The (kind, externalId) identity is already linked (identity_taken)" },
|
|
630
665
|
},
|
|
631
666
|
auth: { apiKey: true },
|
|
632
667
|
});
|
|
@@ -651,6 +686,41 @@ const deleteIdentityRoute = route({
|
|
|
651
686
|
|
|
652
687
|
// ─── Helpers ─────────────────────────────────────────────────────────────────
|
|
653
688
|
|
|
689
|
+
/**
|
|
690
|
+
* Run `write` in one write transaction after the operator-granted check: a
|
|
691
|
+
* user actor may not get a credential for, or bind an identity to, another
|
|
692
|
+
* user holding an operator-granted role (auditor). Every new user is a
|
|
693
|
+
* grant-all admin, so without this any admin could act as an auditor. The
|
|
694
|
+
* check and the write share the write lock, so an operator grant cannot land
|
|
695
|
+
* between them. Throws OperatorGrantedTargetError when refused.
|
|
696
|
+
*/
|
|
697
|
+
function writeGuarded<T>(
|
|
698
|
+
actor: IdentityActor,
|
|
699
|
+
targetUserId: string,
|
|
700
|
+
write: () => Promise<T>,
|
|
701
|
+
): Promise<T> {
|
|
702
|
+
return getDbClient().transaction(async () => {
|
|
703
|
+
await assertMayActOnOperatorGrantedTarget(actor, targetUserId);
|
|
704
|
+
return await write();
|
|
705
|
+
});
|
|
706
|
+
}
|
|
707
|
+
|
|
708
|
+
/** Writes the 403 for an OperatorGrantedTargetError; returns true when it did. */
|
|
709
|
+
function respondOperatorGrantedRefusal(res: ServerResponse, err: unknown): boolean {
|
|
710
|
+
if (!(err instanceof OperatorGrantedTargetError)) return false;
|
|
711
|
+
jsonError(res, err.message, 403);
|
|
712
|
+
return true;
|
|
713
|
+
}
|
|
714
|
+
|
|
715
|
+
/** True when `err` is a SQLite UNIQUE violation whose message names `target` (e.g. `users.email`). */
|
|
716
|
+
function isUniqueViolation(err: unknown, target: string): boolean {
|
|
717
|
+
return (
|
|
718
|
+
err instanceof Error &&
|
|
719
|
+
err.message.includes("UNIQUE constraint") &&
|
|
720
|
+
err.message.includes(target)
|
|
721
|
+
);
|
|
722
|
+
}
|
|
723
|
+
|
|
654
724
|
const UNMAPPED_KINDS = [
|
|
655
725
|
"slack",
|
|
656
726
|
"github",
|
|
@@ -822,6 +892,8 @@ export async function handleUsers(
|
|
|
822
892
|
const parsed = await whoamiRoute.parse(req, res, pathSegments, queryParams);
|
|
823
893
|
if (!parsed) return true;
|
|
824
894
|
const user = authUser(getRequestAuth(req));
|
|
895
|
+
const scopeActor = await resolveSessionActor(req, undefined, { allUsers: true });
|
|
896
|
+
const sessionReadAll = scopeActor.kind === "bypass" || scopeActor.readAll === true;
|
|
825
897
|
if (user) {
|
|
826
898
|
const [grant, roles] = await Promise.all([getUserGrant(user.id), listUserRoles(user.id)]);
|
|
827
899
|
const grantsAll = !isRbacEnabled() || grant.grantsAll;
|
|
@@ -833,12 +905,14 @@ export async function handleUsers(
|
|
|
833
905
|
verbs: grantsAll ? [] : [...grant.verbs].sort(),
|
|
834
906
|
roles: roles.map((role) => role.name),
|
|
835
907
|
},
|
|
908
|
+
sessionReadAll,
|
|
836
909
|
});
|
|
837
910
|
} else {
|
|
838
911
|
whoamiRoute.respond(res, 200, {
|
|
839
912
|
kind: "operator",
|
|
840
913
|
user: null,
|
|
841
914
|
grants: { grantsAll: true, verbs: [], roles: [] },
|
|
915
|
+
sessionReadAll,
|
|
842
916
|
});
|
|
843
917
|
}
|
|
844
918
|
return true;
|
|
@@ -864,19 +938,29 @@ export async function handleUsers(
|
|
|
864
938
|
|
|
865
939
|
try {
|
|
866
940
|
const { identities, ...userFields } = parsed.body;
|
|
867
|
-
|
|
868
|
-
|
|
869
|
-
|
|
870
|
-
|
|
871
|
-
|
|
872
|
-
|
|
873
|
-
|
|
874
|
-
|
|
875
|
-
}
|
|
876
|
-
|
|
941
|
+
// Create and link in one write transaction: an operator grant on the new
|
|
942
|
+
// user cannot land before its identities, so the grant-time review sees
|
|
943
|
+
// them all.
|
|
944
|
+
const user = await getDbClient().transaction(async () => {
|
|
945
|
+
const created = await createUser(userFields);
|
|
946
|
+
await syncUserBudgetMirror(created.id, userFields.dailyBudgetUsd);
|
|
947
|
+
for (const ident of identities ?? []) {
|
|
948
|
+
await linkIdentity(created.id, ident.kind, ident.externalId, actor);
|
|
949
|
+
}
|
|
950
|
+
if (userFields.dailyBudgetUsd !== undefined) {
|
|
951
|
+
await recordIdentityEvent(created.id, "budget_changed", actor, null, {
|
|
952
|
+
dailyBudgetUsd: userFields.dailyBudgetUsd,
|
|
953
|
+
});
|
|
954
|
+
}
|
|
955
|
+
return created;
|
|
956
|
+
});
|
|
877
957
|
const composed = await composeUser(user.id);
|
|
878
958
|
createUserRoute.respond(res, 200, { user: composed });
|
|
879
959
|
} catch (err) {
|
|
960
|
+
if (isUniqueViolation(err, "users.email")) {
|
|
961
|
+
jsonError(res, "user_exists", 409);
|
|
962
|
+
return true;
|
|
963
|
+
}
|
|
880
964
|
jsonError(res, err instanceof Error ? err.message : "Failed to create user", 500);
|
|
881
965
|
}
|
|
882
966
|
return true;
|
|
@@ -922,15 +1006,23 @@ export async function handleUsers(
|
|
|
922
1006
|
return true;
|
|
923
1007
|
}
|
|
924
1008
|
targetUserId = existing.id;
|
|
1009
|
+
await writeGuarded(actor, targetUserId, () =>
|
|
1010
|
+
linkIdentity(targetUserId, kind, externalId, actor),
|
|
1011
|
+
);
|
|
925
1012
|
} else {
|
|
926
|
-
|
|
927
|
-
|
|
928
|
-
|
|
929
|
-
|
|
1013
|
+
// Create and link in one write transaction, so an operator grant on
|
|
1014
|
+
// the new user cannot land before the identity.
|
|
1015
|
+
const body = parsed.body;
|
|
1016
|
+
targetUserId = await getDbClient().transaction(async () => {
|
|
1017
|
+
const created = await createUser({
|
|
1018
|
+
name: body.name,
|
|
1019
|
+
email: body.email,
|
|
1020
|
+
notes: body.notes,
|
|
1021
|
+
});
|
|
1022
|
+
await linkIdentity(created.id, kind, externalId, actor);
|
|
1023
|
+
return created.id;
|
|
930
1024
|
});
|
|
931
|
-
targetUserId = created.id;
|
|
932
1025
|
}
|
|
933
|
-
await linkIdentity(targetUserId, kind, externalId, actor);
|
|
934
1026
|
// Clear both kv rows (best-effort — DELETE is idempotent).
|
|
935
1027
|
const ns = `integration:unmapped:${kind}`;
|
|
936
1028
|
await deleteKv(ns, `${externalId}:meta`);
|
|
@@ -938,6 +1030,7 @@ export async function handleUsers(
|
|
|
938
1030
|
const user = await composeUser(targetUserId);
|
|
939
1031
|
resolveUnmapped.respond(res, 200, { user });
|
|
940
1032
|
} catch (err) {
|
|
1033
|
+
if (respondOperatorGrantedRefusal(res, err)) return true;
|
|
941
1034
|
jsonError(res, err instanceof Error ? err.message : "Failed to resolve unmapped", 500);
|
|
942
1035
|
}
|
|
943
1036
|
return true;
|
|
@@ -969,12 +1062,9 @@ export async function handleUsers(
|
|
|
969
1062
|
jsonError(res, "User not found", 404);
|
|
970
1063
|
return true;
|
|
971
1064
|
}
|
|
972
|
-
|
|
973
1065
|
try {
|
|
974
|
-
const { tokenId, plaintext } = await
|
|
975
|
-
parsed.params.id,
|
|
976
|
-
parsed.body.label ?? null,
|
|
977
|
-
actor,
|
|
1066
|
+
const { tokenId, plaintext } = await writeGuarded(actor, parsed.params.id, () =>
|
|
1067
|
+
mintToken(parsed.params.id, parsed.body.label ?? null, actor),
|
|
978
1068
|
);
|
|
979
1069
|
const token = (await listUserTokens(parsed.params.id)).find((t) => t.id === tokenId);
|
|
980
1070
|
mintUserMcpTokenRoute.respond(res, 200, {
|
|
@@ -983,6 +1073,7 @@ export async function handleUsers(
|
|
|
983
1073
|
user: await composeUser(parsed.params.id),
|
|
984
1074
|
});
|
|
985
1075
|
} catch (err) {
|
|
1076
|
+
if (respondOperatorGrantedRefusal(res, err)) return true;
|
|
986
1077
|
jsonError(res, err instanceof Error ? err.message : "Failed to mint token", 500);
|
|
987
1078
|
}
|
|
988
1079
|
return true;
|
|
@@ -1026,6 +1117,8 @@ export async function handleUsers(
|
|
|
1026
1117
|
const connectUrl = connect.toString();
|
|
1027
1118
|
createConnectorCodeRoute.respond(res, 201, { code, expiresAt, connectUrl });
|
|
1028
1119
|
} catch (err) {
|
|
1120
|
+
// createConnectorCode runs the operator-granted check with its insert.
|
|
1121
|
+
if (respondOperatorGrantedRefusal(res, err)) return true;
|
|
1029
1122
|
jsonError(res, err instanceof Error ? err.message : "Failed to create connector code", 500);
|
|
1030
1123
|
}
|
|
1031
1124
|
return true;
|
|
@@ -1244,11 +1337,18 @@ export async function handleUsers(
|
|
|
1244
1337
|
return true;
|
|
1245
1338
|
}
|
|
1246
1339
|
try {
|
|
1247
|
-
await
|
|
1340
|
+
await writeGuarded(actor, parsed.params.id, () =>
|
|
1341
|
+
linkIdentity(parsed.params.id, parsed.body.kind, parsed.body.externalId, actor),
|
|
1342
|
+
);
|
|
1248
1343
|
addIdentityRoute.respond(res, 200, {
|
|
1249
1344
|
identities: await getUserIdentities(parsed.params.id),
|
|
1250
1345
|
});
|
|
1251
1346
|
} catch (err) {
|
|
1347
|
+
if (respondOperatorGrantedRefusal(res, err)) return true;
|
|
1348
|
+
if (isUniqueViolation(err, "user_external_ids")) {
|
|
1349
|
+
jsonError(res, "identity_taken", 409);
|
|
1350
|
+
return true;
|
|
1351
|
+
}
|
|
1252
1352
|
jsonError(res, err instanceof Error ? err.message : "Failed to link identity", 400);
|
|
1253
1353
|
}
|
|
1254
1354
|
return true;
|
|
@@ -1303,9 +1403,10 @@ export async function handleUsers(
|
|
|
1303
1403
|
jsonError(res, "Source user not found", 404);
|
|
1304
1404
|
return true;
|
|
1305
1405
|
}
|
|
1306
|
-
|
|
1307
1406
|
try {
|
|
1308
1407
|
const mergedUser = await getDbClient().transaction(async () => {
|
|
1408
|
+
// The source's identities and email aliases move to the target.
|
|
1409
|
+
await assertMayActOnOperatorGrantedTarget(actor, targetId);
|
|
1309
1410
|
// Move every identity from source → target.
|
|
1310
1411
|
for (const ident of sourceBefore.identities) {
|
|
1311
1412
|
await unlinkIdentity(sourceId, ident.kind, ident.externalId, actor);
|
|
@@ -1366,6 +1467,7 @@ export async function handleUsers(
|
|
|
1366
1467
|
});
|
|
1367
1468
|
mergeUsersRoute.respond(res, 200, { user: mergedUser });
|
|
1368
1469
|
} catch (err) {
|
|
1470
|
+
if (respondOperatorGrantedRefusal(res, err)) return true;
|
|
1369
1471
|
if (err instanceof LastAdminError) {
|
|
1370
1472
|
jsonError(res, "last_admin", 409);
|
|
1371
1473
|
return true;
|
|
@@ -1400,6 +1502,9 @@ export async function handleUsers(
|
|
|
1400
1502
|
jsonError(res, "User not found", 404);
|
|
1401
1503
|
return true;
|
|
1402
1504
|
}
|
|
1505
|
+
const { identities: newIdentities, email: newEmail, emailAliases: newAliases } = parsed.body;
|
|
1506
|
+
const bindsIdentity =
|
|
1507
|
+
newIdentities !== undefined || newEmail !== undefined || newAliases !== undefined;
|
|
1403
1508
|
|
|
1404
1509
|
try {
|
|
1405
1510
|
const { identities, metadata, comms, ...rest } = parsed.body;
|
|
@@ -1421,102 +1526,116 @@ export async function handleUsers(
|
|
|
1421
1526
|
} else if (metadata !== undefined) {
|
|
1422
1527
|
update.metadata = metadata as Record<string, unknown> | null;
|
|
1423
1528
|
}
|
|
1424
|
-
|
|
1425
|
-
|
|
1426
|
-
|
|
1427
|
-
|
|
1428
|
-
|
|
1429
|
-
|
|
1430
|
-
|
|
1431
|
-
|
|
1432
|
-
|
|
1433
|
-
|
|
1434
|
-
|
|
1435
|
-
|
|
1436
|
-
|
|
1437
|
-
|
|
1438
|
-
|
|
1439
|
-
|
|
1440
|
-
|
|
1441
|
-
|
|
1442
|
-
|
|
1443
|
-
|
|
1529
|
+
// One write transaction: the operator-granted check for identity, email
|
|
1530
|
+
// and alias changes, then every write, so a grant cannot land between.
|
|
1531
|
+
const found = await getDbClient().transaction(async () => {
|
|
1532
|
+
if (bindsIdentity) await assertMayActOnOperatorGrantedTarget(actor, parsed.params.id);
|
|
1533
|
+
const updated = await updateUser(parsed.params.id, update);
|
|
1534
|
+
if (!updated) return false;
|
|
1535
|
+
await syncUserBudgetMirror(parsed.params.id, parsed.body.dailyBudgetUsd);
|
|
1536
|
+
|
|
1537
|
+
// Budget event
|
|
1538
|
+
if (
|
|
1539
|
+
parsed.body.dailyBudgetUsd !== undefined &&
|
|
1540
|
+
(before.dailyBudgetUsd ?? null) !== (parsed.body.dailyBudgetUsd ?? null)
|
|
1541
|
+
) {
|
|
1542
|
+
await recordIdentityEvent(
|
|
1543
|
+
parsed.params.id,
|
|
1544
|
+
"budget_changed",
|
|
1545
|
+
actor,
|
|
1546
|
+
{ dailyBudgetUsd: before.dailyBudgetUsd ?? null },
|
|
1547
|
+
{ dailyBudgetUsd: parsed.body.dailyBudgetUsd ?? null },
|
|
1548
|
+
);
|
|
1549
|
+
}
|
|
1444
1550
|
|
|
1445
|
-
|
|
1446
|
-
|
|
1447
|
-
|
|
1448
|
-
|
|
1449
|
-
|
|
1450
|
-
|
|
1451
|
-
|
|
1452
|
-
|
|
1453
|
-
|
|
1454
|
-
|
|
1551
|
+
// Status event
|
|
1552
|
+
if (parsed.body.status !== undefined && before.status !== parsed.body.status) {
|
|
1553
|
+
await recordIdentityEvent(
|
|
1554
|
+
parsed.params.id,
|
|
1555
|
+
"status_changed",
|
|
1556
|
+
actor,
|
|
1557
|
+
{ status: before.status },
|
|
1558
|
+
{ status: parsed.body.status },
|
|
1559
|
+
);
|
|
1560
|
+
}
|
|
1455
1561
|
|
|
1456
|
-
|
|
1457
|
-
|
|
1458
|
-
|
|
1459
|
-
|
|
1460
|
-
|
|
1461
|
-
|
|
1462
|
-
|
|
1562
|
+
// Email aliases diff — emit email_added / email_removed per Q19
|
|
1563
|
+
if (parsed.body.emailAliases !== undefined) {
|
|
1564
|
+
const beforeSet = new Set((before.emailAliases ?? []).map((a) => a.toLowerCase()));
|
|
1565
|
+
const afterSet = new Set(parsed.body.emailAliases.map((a) => a.toLowerCase()));
|
|
1566
|
+
for (const a of parsed.body.emailAliases) {
|
|
1567
|
+
if (!beforeSet.has(a.toLowerCase())) {
|
|
1568
|
+
await recordIdentityEvent(parsed.params.id, "email_added", actor, null, { email: a });
|
|
1569
|
+
}
|
|
1463
1570
|
}
|
|
1464
|
-
|
|
1465
|
-
|
|
1466
|
-
|
|
1467
|
-
|
|
1571
|
+
for (const a of before.emailAliases ?? []) {
|
|
1572
|
+
if (!afterSet.has(a.toLowerCase())) {
|
|
1573
|
+
await recordIdentityEvent(
|
|
1574
|
+
parsed.params.id,
|
|
1575
|
+
"email_removed",
|
|
1576
|
+
actor,
|
|
1577
|
+
{ email: a },
|
|
1578
|
+
null,
|
|
1579
|
+
);
|
|
1580
|
+
}
|
|
1468
1581
|
}
|
|
1469
1582
|
}
|
|
1470
|
-
}
|
|
1471
1583
|
|
|
1472
|
-
|
|
1473
|
-
|
|
1474
|
-
|
|
1475
|
-
|
|
1476
|
-
|
|
1477
|
-
|
|
1478
|
-
|
|
1479
|
-
|
|
1480
|
-
|
|
1481
|
-
|
|
1482
|
-
|
|
1483
|
-
|
|
1484
|
-
|
|
1485
|
-
|
|
1486
|
-
|
|
1487
|
-
|
|
1488
|
-
|
|
1489
|
-
|
|
1490
|
-
|
|
1491
|
-
|
|
1492
|
-
|
|
1493
|
-
|
|
1494
|
-
|
|
1495
|
-
|
|
1496
|
-
|
|
1497
|
-
|
|
1584
|
+
// Profile-field diffs — emit one `profile_changed` event per field that
|
|
1585
|
+
// changed value. Status / budget / aliases / identities already emit
|
|
1586
|
+
// their own dedicated events above; skip them here to avoid double-emit.
|
|
1587
|
+
const PROFILE_FIELDS = [
|
|
1588
|
+
"name",
|
|
1589
|
+
"email",
|
|
1590
|
+
"role",
|
|
1591
|
+
"timezone",
|
|
1592
|
+
"preferredChannel",
|
|
1593
|
+
"notes",
|
|
1594
|
+
"metadata",
|
|
1595
|
+
] as const;
|
|
1596
|
+
for (const field of PROFILE_FIELDS) {
|
|
1597
|
+
if (parsed.body[field] === undefined) continue;
|
|
1598
|
+
const beforeVal = (before as Record<string, unknown>)[field] ?? null;
|
|
1599
|
+
const afterVal = parsed.body[field] ?? null;
|
|
1600
|
+
// Cheap deep-equal via JSON — fields are scalar strings or object/null.
|
|
1601
|
+
if (JSON.stringify(beforeVal) === JSON.stringify(afterVal)) continue;
|
|
1602
|
+
await recordIdentityEvent(
|
|
1603
|
+
parsed.params.id,
|
|
1604
|
+
"profile_changed",
|
|
1605
|
+
actor,
|
|
1606
|
+
{ [field]: beforeVal },
|
|
1607
|
+
{ [field]: afterVal },
|
|
1608
|
+
);
|
|
1609
|
+
}
|
|
1498
1610
|
|
|
1499
|
-
|
|
1500
|
-
|
|
1501
|
-
|
|
1502
|
-
|
|
1503
|
-
|
|
1504
|
-
|
|
1505
|
-
|
|
1506
|
-
|
|
1507
|
-
|
|
1611
|
+
// Identities diff — complete-list semantics. linkIdentity / unlinkIdentity
|
|
1612
|
+
// already emit the right event each.
|
|
1613
|
+
if (identities !== undefined) {
|
|
1614
|
+
const beforeIds = await getUserIdentities(parsed.params.id);
|
|
1615
|
+
const beforeKeys = new Set(beforeIds.map((i) => `${i.kind}:${i.externalId}`));
|
|
1616
|
+
const afterKeys = new Set(identities.map((i) => `${i.kind}:${i.externalId}`));
|
|
1617
|
+
for (const i of identities) {
|
|
1618
|
+
if (!beforeKeys.has(`${i.kind}:${i.externalId}`)) {
|
|
1619
|
+
await linkIdentity(parsed.params.id, i.kind, i.externalId, actor);
|
|
1620
|
+
}
|
|
1508
1621
|
}
|
|
1509
|
-
|
|
1510
|
-
|
|
1511
|
-
|
|
1512
|
-
|
|
1622
|
+
for (const i of beforeIds) {
|
|
1623
|
+
if (!afterKeys.has(`${i.kind}:${i.externalId}`)) {
|
|
1624
|
+
await unlinkIdentity(parsed.params.id, i.kind, i.externalId, actor);
|
|
1625
|
+
}
|
|
1513
1626
|
}
|
|
1514
1627
|
}
|
|
1628
|
+
return true;
|
|
1629
|
+
});
|
|
1630
|
+
if (!found) {
|
|
1631
|
+
jsonError(res, "User not found", 404);
|
|
1632
|
+
return true;
|
|
1515
1633
|
}
|
|
1516
1634
|
|
|
1517
1635
|
const composed = await composeUser(parsed.params.id);
|
|
1518
1636
|
updateUserRoute.respond(res, 200, { user: composed });
|
|
1519
1637
|
} catch (err) {
|
|
1638
|
+
if (respondOperatorGrantedRefusal(res, err)) return true;
|
|
1520
1639
|
jsonError(res, err instanceof Error ? err.message : "Failed to update user", 500);
|
|
1521
1640
|
}
|
|
1522
1641
|
return true;
|
package/src/http/utils.ts
CHANGED
|
@@ -136,7 +136,8 @@ export function setCorsHeaders(req: IncomingMessage, res: ServerResponse) {
|
|
|
136
136
|
const askedHeaders = Array.isArray(reqHeaders) ? reqHeaders.join(", ") : reqHeaders;
|
|
137
137
|
res.setHeader(
|
|
138
138
|
"Access-Control-Allow-Headers",
|
|
139
|
-
askedHeaders ??
|
|
139
|
+
askedHeaders ??
|
|
140
|
+
"Authorization, Content-Type, X-Agent-ID, X-Requested-With, X-Swarm-User-Id, X-Swarm-Session-Scope",
|
|
140
141
|
);
|
|
141
142
|
res.setHeader("Access-Control-Allow-Methods", "GET, POST, PUT, PATCH, DELETE, OPTIONS");
|
|
142
143
|
res.setHeader("Access-Control-Expose-Headers", "Content-Type, Content-Length, ETag, Location");
|
package/src/http/workflows.ts
CHANGED
|
@@ -430,6 +430,7 @@ const retryWorkflowRunRoute = route({
|
|
|
430
430
|
responses: {
|
|
431
431
|
200: { description: "Retry started", schema: SuccessResponseSchema },
|
|
432
432
|
400: { description: "Cannot retry" },
|
|
433
|
+
404: { description: "Run not found" },
|
|
433
434
|
},
|
|
434
435
|
});
|
|
435
436
|
|
|
@@ -788,13 +789,12 @@ export async function handleWorkflows(
|
|
|
788
789
|
res.end();
|
|
789
790
|
return true;
|
|
790
791
|
}
|
|
791
|
-
|
|
792
|
-
|
|
793
|
-
result.
|
|
794
|
-
|
|
795
|
-
|
|
796
|
-
|
|
797
|
-
);
|
|
792
|
+
// The only patch operation here is one update, so a patch error means the node is absent.
|
|
793
|
+
if (result.reason === "patch") {
|
|
794
|
+
jsonError(res, result.errors.join("; "), 404);
|
|
795
|
+
return true;
|
|
796
|
+
}
|
|
797
|
+
jsonError(res, `Invalid definition: ${result.errors.join("; ")}`, 400);
|
|
798
798
|
return true;
|
|
799
799
|
}
|
|
800
800
|
patchWorkflowNodeRoute.respond(res, 200, await withSaveWarnings(result.workflow));
|
|
@@ -1114,6 +1114,10 @@ export async function handleWorkflows(
|
|
|
1114
1114
|
if (retryWorkflowRunRoute.match(req.method, pathSegments)) {
|
|
1115
1115
|
const parsed = await retryWorkflowRunRoute.parse(req, res, pathSegments, queryParams);
|
|
1116
1116
|
if (!parsed) return true;
|
|
1117
|
+
if (!(await getWorkflowRunSummary(parsed.params.id))) {
|
|
1118
|
+
jsonError(res, `Workflow run not found: ${parsed.params.id}`, 404);
|
|
1119
|
+
return true;
|
|
1120
|
+
}
|
|
1117
1121
|
try {
|
|
1118
1122
|
await retryFailedRun(parsed.params.id, getExecutorRegistry());
|
|
1119
1123
|
} catch (err) {
|
|
@@ -312,6 +312,7 @@ registerTemplate({
|
|
|
312
312
|
|
|
313
313
|
The engine posts the thread tree and the outcome card. You post at most one message per task, and only when you have something the card will not carry. Progress, receipts, and relayed worker output stay out of Slack.
|
|
314
314
|
The outcome card publishes your \`output\` verbatim. Keep free-text \`output\` under 120 words by default, with the exceptions in How you write.
|
|
315
|
+
A thread message addressed to someone else, or not yours to handle: end with \`store-progress\` status \`skipped\` and a one-line \`failureReason\`. It posts nothing to the thread. Never skip an explicit @mention of you or work assigned to you.
|
|
315
316
|
A Slack task from an unknown user: register them with \`manage-user\` first.
|
|
316
317
|
You MUST use the \`slack-interaction\` skill before you post to Slack.
|
|
317
318
|
Call \`slack-leave-thread\` with your taskId when a thread no longer needs you: people are talking among themselves, someone tells you to stop or back off, or the thread's work is done. The swarm then ignores the thread until someone @mentions it. Leave quietly, with no goodbye message.
|
|
@@ -423,7 +423,7 @@ const copilotTargetProfile: AcpTargetProfile = {
|
|
|
423
423
|
},
|
|
424
424
|
};
|
|
425
425
|
|
|
426
|
-
/** Qwen Code's `--auth-type` choices (0.26.
|
|
426
|
+
/** Qwen Code's `--auth-type` choices (0.26.6). `qwen-oauth` needs a browser, so it is left out. */
|
|
427
427
|
const QWEN_AUTH_TYPES = ["openai", "openai-responses", "anthropic", "gemini", "vertex-ai"] as const;
|
|
428
428
|
|
|
429
429
|
// Qwen Code is a Gemini CLI fork: QWEN_SYSTEM_MD replaces its built-in prompt
|
|
@@ -45,7 +45,7 @@ import type {
|
|
|
45
45
|
* default; the image installs exactly this version and the per-task settings
|
|
46
46
|
* set `amp.updates.mode: "disabled"`. Bump it deliberately, with a live run.
|
|
47
47
|
*/
|
|
48
|
-
export const AMP_PACKAGE = "@ampcode/cli@0.0.
|
|
48
|
+
export const AMP_PACKAGE = "@ampcode/cli@0.0.1793682830-gad461e";
|
|
49
49
|
|
|
50
50
|
/** MCP server name. Amp exposes its tools as `agent_swarm` / `store_progress` (dashes become underscores). */
|
|
51
51
|
const AMP_MCP_SERVER_NAME = "agent-swarm";
|
|
@@ -573,7 +573,14 @@ export async function buildCodexConfig(
|
|
|
573
573
|
// Same entry shape as the swarm + installed-server stdio entries above.
|
|
574
574
|
// When disabled, the installed Codex plugin is turned off too: it registers
|
|
575
575
|
// its own `context-mode` MCP server, skills and hooks.
|
|
576
|
-
|
|
576
|
+
// Read `config.env` first: production builds this config inside the
|
|
577
|
+
// `codex-session-runner` subprocess, whose `process.env` is a minimal
|
|
578
|
+
// allowlist. Swarm config rows (agent-scoped included) only arrive there
|
|
579
|
+
// through `config.env`.
|
|
580
|
+
const contextModeDisabled = isEnvFlagEnabled("CONTEXT_MODE_DISABLED", false, {
|
|
581
|
+
...process.env,
|
|
582
|
+
...config.env,
|
|
583
|
+
});
|
|
577
584
|
if (!contextModeDisabled) {
|
|
578
585
|
mcpServers["context-mode"] = {
|
|
579
586
|
command: "context-mode",
|
|
@@ -978,7 +985,7 @@ export class CodexSession implements ProviderSession {
|
|
|
978
985
|
private readonly thread: CodexThread;
|
|
979
986
|
private readonly config: ProviderSessionConfig;
|
|
980
987
|
private readonly resolvedModel: string;
|
|
981
|
-
private
|
|
988
|
+
private contextWindow: number;
|
|
982
989
|
private readonly skillsDir: string;
|
|
983
990
|
private readonly summarizeDeps: SummarizeSessionForCodexDeps;
|
|
984
991
|
private readonly listeners: Array<(event: ProviderEvent) => void> = [];
|
|
@@ -1459,7 +1466,14 @@ export class CodexSession implements ProviderSession {
|
|
|
1459
1466
|
this.accountUsage(event.usage);
|
|
1460
1467
|
break;
|
|
1461
1468
|
case "context.updated":
|
|
1462
|
-
|
|
1469
|
+
if (
|
|
1470
|
+
event.contextWindow != null &&
|
|
1471
|
+
Number.isFinite(event.contextWindow) &&
|
|
1472
|
+
event.contextWindow > 0
|
|
1473
|
+
) {
|
|
1474
|
+
this.contextWindow = event.contextWindow;
|
|
1475
|
+
}
|
|
1476
|
+
this.emitContextUsage(event.usage, this.contextWindow);
|
|
1463
1477
|
// Codex input tokens already include the cached read and write subsets.
|
|
1464
1478
|
void this.observeContextBound(event.usage.input_tokens);
|
|
1465
1479
|
break;
|