@desplega.ai/agent-swarm 2.7.8 → 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-4m1ct4nh.js → actions-g563mbn2.js} +19 -19
- package/dist/{amp-adapter-txqh7eqj.js → amp-adapter-q61w05eb.js} +3 -3
- package/dist/{anthropic-messages-xey2skwx.js → anthropic-messages-jkva0zps.js} +68 -78
- package/dist/{app-e00m45gn.js → app-a66ssc4k.js} +3 -3
- package/dist/{assistant-gd08kr9e.js → assistant-p477rjwj.js} +21 -21
- package/dist/{azure-openai-responses-26t7j9ra.js → azure-openai-responses-wgtqkbr3.js} +5 -10
- package/dist/{boot-args-schema-tjrkpbvm.js → boot-args-schema-h4qj462e.js} +1 -1
- package/dist/{boot-reembed-21hbck22.js → boot-reembed-n1ehfbsw.js} +1 -1
- package/dist/{boot-reembed-mdxd3wgp.js → boot-reembed-qw4mc0pt.js} +1 -1
- package/dist/{boot-scrub-sweep-qy0zr9t2.js → boot-scrub-sweep-9w9jp4sm.js} +4 -4
- package/dist/{boot-seeds-n46eaxdv.js → boot-seeds-qdaf3sdy.js} +5 -4
- package/dist/{boxd-nv507va8.js → boxd-qbkxy6ap.js} +1 -1
- package/dist/{claude-adapter-j37w2eds.js → claude-adapter-348p5hx9.js} +8 -8
- package/dist/{claude-managed-adapter-8jvcma9a.js → claude-managed-adapter-h74d06yz.js} +4 -4
- package/dist/{claude-managed-setup-rzkjmgc1.js → claude-managed-setup-7787fxtp.js} +4 -4
- package/dist/{claude-sdk-session-4k7w73t0.js → claude-sdk-session-hbszbt8a.js} +7901 -7718
- package/dist/{cli-sq4n7af4.js → cli-09kmfkmq.js} +4 -6
- package/dist/{cli-p3vsj0d3.js → cli-0whpms1z.js} +15 -10
- package/dist/{cli-4t50yq3j.js → cli-12xyjhws.js} +29 -12
- package/dist/{cli-snpj5zbj.js → cli-1z4qggfe.js} +9 -36
- package/dist/{cli-bb0mmdk8.js → cli-21159vea.js} +35 -12
- package/dist/{cli-s0qnd4wv.js → cli-28fq781p.js} +1 -1
- package/dist/{cli-rjknb2ae.js → cli-2a8py3sx.js} +6 -6
- package/dist/{cli-tpksw2nr.js → cli-2ccpqyyf.js} +397 -105
- 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-bbw9wj9m.js → cli-3tqcamp6.js} +12 -12
- package/dist/{cli-ae7mrdf9.js → cli-3vjhs18n.js} +4 -6
- package/dist/{cli-ssnjfg5p.js → cli-3xcwp3z8.js} +8 -10
- package/dist/{cli-az48n0nr.js → cli-4caa1x7d.js} +67 -64
- package/dist/{cli-269q28a1.js → cli-4t0fmf3z.js} +27 -6
- package/dist/{cli-1cxrbkk6.js → cli-530hkwdy.js} +7 -9
- package/dist/{cli-pz4rk021.js → cli-54vrpgm0.js} +1 -1
- package/dist/{cli-eyg1pa00.js → cli-587857ys.js} +7 -7
- package/dist/{cli-r9jqcehk.js → cli-5mpy301f.js} +38 -2
- package/dist/{cli-xq9r2wtt.js → cli-605nn699.js} +47 -34
- package/dist/{cli-msg9m2ny.js → cli-650zv9q9.js} +8 -10
- package/dist/cli-6pzk82fd.js +778 -0
- package/dist/{cli-84rj785g.js → cli-715t1gx6.js} +9 -9
- package/dist/{cli-btfsp3mv.js → cli-9aezs55w.js} +9 -11
- package/dist/{cli-dq8x79v8.js → cli-9r5gtwjr.js} +2 -2
- package/dist/{cli-jdv6ypxs.js → cli-a0657jmf.js} +2 -2
- package/dist/{cli-bshb7jas.js → cli-agyaeef4.js} +3 -3
- package/dist/cli-b932gexn.js +5266 -0
- package/dist/{cli-gvx71kqv.js → cli-bc779n4v.js} +3 -3
- package/dist/{cli-z1srzaf6.js → cli-btc9cb4c.js} +70 -5
- package/dist/{cli-s4ss5g59.js → cli-btf6fw39.js} +5 -5
- package/dist/{cli-fzachfnf.js → cli-cseh6f8w.js} +5 -5
- package/dist/{cli-5j0m12ns.js → cli-cvs2r2vq.js} +13 -11
- package/dist/{cli-njwac61j.js → cli-cyn9v8zr.js} +12 -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-7axf41jq.js → cli-ejkvvqbe.js} +40 -42
- package/dist/{cli-mthwvjre.js → cli-f2zenhja.js} +1 -1
- package/dist/{cli-8sdejs1f.js → cli-fayav105.js} +538 -205
- package/dist/{cli-ferkkrg9.js → cli-fjggej24.js} +2 -2
- package/dist/{cli-g7s47cc5.js → cli-fsgttth8.js} +123 -102
- package/dist/{cli-9m8hdawy.js → cli-gce09r66.js} +4 -4
- package/dist/{cli-mkk9rnzz.js → cli-gxy8y1dt.js} +51 -4
- package/dist/{cli-85gzce7b.js → cli-hae9j8sv.js} +287 -75
- package/dist/{cli-agfm16v9.js → cli-hg42n3hx.js} +12 -12
- package/dist/{cli-8rpcng8j.js → cli-hwprv9e4.js} +8 -10
- package/dist/{cli-yndmfxb3.js → cli-hxpyc9sn.js} +3 -3
- package/dist/{cli-ppjxh6ah.js → cli-jfx48xrj.js} +10 -12
- package/dist/{cli-5ja3b75e.js → cli-jrp1dt73.js} +1 -1
- package/dist/{cli-98rw5dt5.js → cli-jrzkw01m.js} +2 -2
- package/dist/{cli-ga786dzg.js → cli-k70e3x9e.js} +18 -17
- package/dist/{cli-583frbyr.js → cli-kchjb7qy.js} +1 -1
- package/dist/{cli-fmjd0t1y.js → cli-m0cy2vyf.js} +2 -2
- package/dist/{cli-c0kqky8y.js → cli-m5akxq8q.js} +1 -1
- package/dist/{cli-ycscb2ar.js → cli-m88rpzkh.js} +2 -2
- package/dist/{cli-m0hmeqma.js → cli-mnrkgg60.js} +4 -4
- package/dist/{cli-yqefz277.js → cli-ms5m5r1y.js} +1 -1
- package/dist/{cli-fy6x31ps.js → cli-n5yexkdg.js} +1 -0
- package/dist/{cli-w4xnbm46.js → cli-neyag5p6.js} +53 -39
- package/dist/cli-p0m0p34z.js +9321 -0
- package/dist/{cli-gazw7kpa.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-3e4snnzf.js → cli-qkdmz8c8.js} +1 -1
- package/dist/{cli-0ykgn1h5.js → cli-qmd3mse0.js} +2 -2
- package/dist/{cli-t60ajbbp.js → cli-qzt90yze.js} +20 -20
- package/dist/cli-rkc97c6a.js +39 -0
- package/dist/{cli-qd57hhhh.js → cli-rvhdmjvt.js} +6 -10
- package/dist/{cli-kyr67fgx.js → cli-rwymrnaz.js} +18608 -9089
- package/dist/{cli-8h0ayw8c.js → cli-serm8zrx.js} +6 -6
- package/dist/{cli-66ww7fer.js → cli-sgs5k6yd.js} +1 -1
- package/dist/{cli-nbsf8yvn.js → cli-sya22y84.js} +9 -9
- package/dist/{cli-318r69gq.js → cli-t73cas91.js} +440 -9
- package/dist/{cli-zkky4t5g.js → cli-tqq0hspb.js} +2 -2
- package/dist/{cli-z75yxkjh.js → cli-v3cf1ts9.js} +3 -3
- package/dist/{cli-xr8908my.js → cli-varqt4d1.js} +26 -14
- package/dist/{cli-q4ebh7h7.js → cli-vxh6acp7.js} +6 -6
- package/dist/{cli-g83s9ewh.js → cli-xfjrc279.js} +1 -1
- package/dist/{cli-32m9eda8.js → cli-xk879m3k.js} +111 -109
- package/dist/{cli-7cx2m6t2.js → cli-y5rbvxhc.js} +2 -2
- package/dist/{cli-fyhr5h4s.js → cli-y8nbefpb.js} +13 -13
- 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-wemma3jd.js → cli-zgv8gxgs.js} +7 -7
- package/dist/cli.js +31 -51
- package/dist/{cloudflare-workers-ai-system-one-ef2a980q.js → cloudflare-workers-ai-system-one-9y1zx3pt.js} +2 -2
- package/dist/{codex-adapter-88z6psm4.js → codex-adapter-ysq6bzha.js} +7 -7
- package/dist/{codex-login-74wa4hmq.js → codex-login-bcda78ge.js} +2 -2
- package/dist/{codex-session-runner-zwbcwzvx.js → codex-session-runner-qakzfx93.js} +8 -8
- package/dist/{commands-7amxs716.js → commands-rs7hkv9r.js} +3 -3
- package/dist/{controller-5rkkc37m.js → controller-r5x9bg6e.js} +4 -4
- package/dist/{controllers-connect-m7d4vxxb.js → controllers-connect-498hrxvk.js} +24 -24
- package/dist/{cursor-adapter-x1q18693.js → cursor-adapter-d46qszer.js} +2 -2
- package/dist/{db-athc68zt.js → db-pm96nhdb.js} +4 -2
- package/dist/{db-h2fsfve3.js → db-s13dqhr6.js} +3 -3
- package/dist/{devin-adapter-r9phbnc9.js → devin-adapter-z46ep5ph.js} +1 -1
- package/dist/{dispatcher-b1yz2bnn.js → dispatcher-j3h81t7m.js} +18 -18
- package/dist/{docker-c1a3gqmf.js → docker-866qpzt9.js} +2 -2
- package/dist/{dsh-adapter-e33bkxq9.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-pv5qnzc8.js → easter-egg-3d-qtgfxgze.js} +1 -1
- package/dist/{embedding-space-b4txbwrk.js → embedding-space-xh8p4q4x.js} +6 -6
- package/dist/{embeddings-m6zn6tad.js → embeddings-wp745m91.js} +1 -1
- package/dist/{event-bus-g0ka3pbw.js → event-bus-e66gh7cc.js} +1 -1
- package/dist/{execute-68nwny8m.js → execute-2fzb9z74.js} +1 -1
- package/dist/{external-channel-gkckmhzh.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-6c2y3267.js → heartbeat-8phn1kdq.js} +21 -21
- package/dist/{hook-q5fv0jy2.js → hook-amcj4s10.js} +16 -11
- package/dist/{hook-w0q2wcrv.js → hook-bc6n49qn.js} +5 -5
- package/dist/{http-bxat8dg3.js → http-7374brv5.js} +642 -260
- 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-bxrexmfy.js → index-c9y31ytf.js} +13 -13
- package/dist/{index-h39zbx67.js → index-hsad2t3r.js} +31 -31
- package/dist/index-nfy4kkg5.js +33 -0
- package/dist/{index-cqhqpgrv.js → index-p4hjwbvw.js} +1 -1
- package/dist/{index-k7fj52d3.js → index-q5cmtbz5.js} +6 -6
- package/dist/{index-fm0czesf.js → index-w4m9z29z.js} +1 -1
- package/dist/{keepalive-qnt21cv0.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-btdr68y4.js → maintenance-h2ds9w6c.js} +1 -1
- package/dist/{mistral-conversations-3gjpdb4b.js → mistral-conversations-a45tx39a.js} +29 -51
- package/dist/{oauth-refresh-sweep-vczabeh4.js → oauth-refresh-sweep-q7mtbyp3.js} +3 -3
- package/dist/{onboard-k33ezyq8.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-3dst2ka7.js → opencode-adapter-mtb0953j.js} +6 -6
- package/dist/{openrouter-images-3ecegv0d.js → openrouter-images-xr9gme9x.js} +4 -3
- package/dist/{otel-impl-13am7a65.js → otel-impl-j42czw3r.js} +2 -2
- package/dist/{pi-messages-pchtw4he.js → pi-messages-hjbv8v10.js} +28 -12
- package/dist/{pi-mono-adapter-c53de1gd.js → pi-mono-adapter-zk8pg9jr.js} +23 -26
- package/dist/{pricing-refresh-9fcbnq3f.js → pricing-refresh-x7nhv23d.js} +3 -3
- package/dist/{rbac-roles-gw0p9h3j.js → rbac-roles-9044425x.js} +16 -2
- package/dist/{rbac-roles-66j5h4y5.js → rbac-roles-bzvee6cf.js} +12 -3
- package/dist/{render-v2-fg8bmdn4.js → render-v2-t7bn4skz.js} +3 -3
- package/dist/{resume-1c8kr3nh.js → resume-x94gemep.js} +7 -7
- package/dist/{runtime-tzf9j7tc.js → runtime-breq6fmv.js} +1 -1
- package/dist/{session-access-d0atq10j.js → session-access-q7dmqjvt.js} +4 -4
- package/dist/{session-source-backfill-0vscqmsa.js → session-source-backfill-440ysamr.js} +3 -3
- package/dist/{setup-tvfa7rwe.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-ks71xqeb.js → work-objects-pnq5y534.js} +21 -21
- package/dist/{worker-follow-up-bfx0h9hg.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 +1169 -257
- package/package.json +8 -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/tasks/read.ts +22 -0
- package/src/be/db.ts +4 -2
- package/src/be/improvements.ts +416 -0
- package/src/be/migrations/274_improvements.sql +27 -0
- package/src/be/migrations/275_task_dispatched_by.sql +8 -0
- package/src/be/rbac-roles.ts +123 -1
- package/src/be/swarm-config-guard.ts +1 -0
- package/src/be/users.ts +58 -1
- package/src/cli.tsx +5 -25
- 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 +117 -96
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/hooks/hook.ts +13 -5
- package/src/http/all-routes.ts +1 -0
- package/src/http/approval-requests.ts +2 -44
- package/src/http/auth.ts +5 -4
- package/src/http/codex-oauth-accounts.ts +31 -23
- package/src/http/codex-oauth-device.ts +1 -1
- package/src/http/codex-oauth-keep-warm.ts +1 -1
- package/src/http/improvements.ts +317 -0
- package/src/http/index.ts +2 -0
- package/src/http/operator-actor.ts +2 -1
- package/src/http/person-responder.ts +66 -0
- package/src/http/sessions.ts +49 -7
- package/src/http/tasks.ts +1 -1
- package/src/http/user-roles.ts +11 -2
- package/src/http/users.ts +194 -104
- package/src/providers/acp-targets.ts +1 -1
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/codex-adapter.ts +8 -1
- package/src/providers/codex-models.ts +4 -3
- package/src/providers/codex-oauth/auth-json.ts +14 -18
- package/src/providers/codex-oauth/storage.ts +2 -2
- package/src/rbac/legacy-policy.ts +2 -0
- package/src/rbac/permissions.ts +10 -0
- package/src/scripts-runtime/types/swarm-extension.d.ts +2 -0
- package/src/server.ts +2 -0
- package/src/slack/ack.ts +20 -14
- package/src/slack/render-v2.ts +42 -17
- package/src/tests/api-drain-worker-e2e.test.ts +69 -2
- 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-worker-parity.test.ts +2 -2
- package/src/tests/codex-adapter.test.ts +30 -0
- 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 +1 -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/db-task-read-contract.test.ts +2 -0
- package/src/tests/db-task-write-contract.test.ts +1 -0
- package/src/tests/deploy-one-box.test.ts +39 -1
- package/src/tests/docs-index-footprint.test.js +3 -3
- 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/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/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/rbac-engine.test.ts +2 -0
- package/src/tests/runner-context-usage.test.ts +0 -1
- 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/send-task-dispatched-by.test.ts +129 -0
- package/src/tests/session-dispatched-tasks.test.ts +115 -0
- package/src/tests/session-sharing.test.ts +198 -9
- package/src/tests/slack-file-tools-attachments.test.ts +95 -3
- package/src/tests/slack-reaction-config.test.ts +39 -0
- package/src/tests/slack-render-v2.test.ts +47 -0
- package/src/tests/submit-improvement-tool.test.ts +82 -0
- package/src/tests/tool-annotations.test.ts +1 -1
- package/src/tools/manage-user.ts +88 -58
- package/src/tools/send-task.ts +3 -0
- package/src/tools/slack-read.ts +61 -33
- package/src/tools/submit-improvement.ts +68 -0
- package/src/tools/tool-config.ts +3 -0
- package/src/types.ts +5 -0
- package/src/utils/request-auth-context.ts +6 -1
- 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-vg5hqkvj.js +0 -16
- package/dist/cli-5c4hjzne.js +0 -873
- package/dist/cli-ae0dnfee.js +0 -20222
- package/dist/cli-nn3ysbqk.js +0 -428
- package/dist/cli-pc5znp64.js +0 -364
- package/dist/fx-adapter-m5jbgd5q.js +0 -19
- package/dist/grok-adapter-csvv7sac.js +0 -19
- package/dist/handlers-8x5gfbzx.js +0 -32
- package/dist/index-hpfte8jd.js +0 -33
- package/dist/index-ncf7yb5s.js +0 -30
- package/dist/index-vte6dyeh.js +0 -37
- package/dist/lead-4bvftzm6.js +0 -71
- package/dist/virtual-modules-efxcp740.js +0 -59
- package/dist/worker-e7v2bvm9.js +0 -71
|
@@ -0,0 +1,27 @@
|
|
|
1
|
+
-- Product improvements an install sends to desplega. An agent may only draft
|
|
2
|
+
-- one (pending_approval); a person approves it, and approved_by records that
|
|
3
|
+
-- person from the credential (a user id or 'operator'). Only text, email and
|
|
4
|
+
-- the install id ever leave the install.
|
|
5
|
+
CREATE TABLE improvements (
|
|
6
|
+
id TEXT PRIMARY KEY,
|
|
7
|
+
text TEXT NOT NULL,
|
|
8
|
+
email TEXT,
|
|
9
|
+
status TEXT NOT NULL
|
|
10
|
+
CHECK (status IN ('pending_approval', 'sending', 'sent', 'failed', 'discarded')),
|
|
11
|
+
source TEXT NOT NULL CHECK (source IN ('mcp', 'api', 'ui')),
|
|
12
|
+
-- Local only, never sent.
|
|
13
|
+
requested_by_agent_id TEXT,
|
|
14
|
+
approved_by TEXT,
|
|
15
|
+
approved_at TEXT,
|
|
16
|
+
sent_at TEXT,
|
|
17
|
+
proxy_status INTEGER,
|
|
18
|
+
proxy_id TEXT,
|
|
19
|
+
proxy_error TEXT,
|
|
20
|
+
created_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')),
|
|
21
|
+
updated_at TEXT NOT NULL DEFAULT (strftime('%Y-%m-%dT%H:%M:%fZ', 'now')),
|
|
22
|
+
created_by TEXT REFERENCES users(id) ON DELETE SET NULL,
|
|
23
|
+
updated_by TEXT REFERENCES users(id) ON DELETE SET NULL,
|
|
24
|
+
CHECK (status NOT IN ('sending', 'sent') OR approved_by IS NOT NULL)
|
|
25
|
+
);
|
|
26
|
+
|
|
27
|
+
CREATE INDEX idx_improvements_status_created ON improvements(status, created_at);
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
-- The task whose session called send-task to create this one. parentTaskId
|
|
2
|
+
-- means context continuity (a continuation can point at an earlier worker
|
|
3
|
+
-- task), so it cannot say which lead turn dispatched the work. Nullable, no
|
|
4
|
+
-- backfill: older rows fall back to parentTaskId in the dashboard.
|
|
5
|
+
ALTER TABLE agent_tasks ADD COLUMN dispatchedByTaskId TEXT;
|
|
6
|
+
|
|
7
|
+
-- GET /api/sessions/{id} looks up the tasks a chain dispatched.
|
|
8
|
+
CREATE INDEX IF NOT EXISTS idx_agent_tasks_dispatchedByTaskId ON agent_tasks(dispatchedByTaskId);
|
package/src/be/rbac-roles.ts
CHANGED
|
@@ -3,6 +3,8 @@ import { PermissionVerbSchema } from "../rbac";
|
|
|
3
3
|
import { invalidateTelemetryUserRole } from "../telemetry-identity";
|
|
4
4
|
import { isEnvFlagEnabled } from "../utils/env-flag";
|
|
5
5
|
import { getDb, getDbClient } from "./db";
|
|
6
|
+
import { isInTransaction } from "./db-client";
|
|
7
|
+
import { isLiveUserToken, revokeAllUserCredentials } from "./users";
|
|
6
8
|
|
|
7
9
|
export const DEFAULT_ROLE_ID = "rbac-role-admin";
|
|
8
10
|
|
|
@@ -51,8 +53,26 @@ export const BUILTIN_ROLES = [
|
|
|
51
53
|
grantsAll: false,
|
|
52
54
|
verbs: ["favorite.write.own", "session.presence", "comb.presence", "fs.join.own"],
|
|
53
55
|
},
|
|
56
|
+
{
|
|
57
|
+
// An extra role, never a primary one and never assigned by default. It is
|
|
58
|
+
// the supported way to grant `session.read.all`, which `grantsAll` does
|
|
59
|
+
// not imply (see `userHoldsExplicitVerb`).
|
|
60
|
+
id: "rbac-role-auditor",
|
|
61
|
+
name: "auditor",
|
|
62
|
+
description: "Extra role: opt in to every user's tasks and sessions, read-only.",
|
|
63
|
+
isBuiltin: true,
|
|
64
|
+
grantsAll: false,
|
|
65
|
+
verbs: ["session.read.all"],
|
|
66
|
+
},
|
|
54
67
|
] satisfies (BuiltinRoleDefinition & { isBuiltin: true })[];
|
|
55
68
|
|
|
69
|
+
/**
|
|
70
|
+
* Verbs only the operator key may grant. Every new user is a grant-all admin,
|
|
71
|
+
* so letting a grant-all user add a role with one of these would let any user
|
|
72
|
+
* grant it to itself.
|
|
73
|
+
*/
|
|
74
|
+
export const OPERATOR_GRANTED_VERBS: readonly PermissionVerb[] = ["session.read.all"];
|
|
75
|
+
|
|
56
76
|
/** A person holds exactly one of these; other roles are extras on top. */
|
|
57
77
|
export const PRIMARY_ROLE_NAMES: readonly string[] = ["admin", "requester", "viewer"];
|
|
58
78
|
|
|
@@ -206,6 +226,73 @@ export async function userHoldsExplicitVerb(
|
|
|
206
226
|
return row != null;
|
|
207
227
|
}
|
|
208
228
|
|
|
229
|
+
/**
|
|
230
|
+
* Whether one of the user's roles lists an operator-granted verb. Minting a
|
|
231
|
+
* credential for such a user, or binding another identity to it, hands the
|
|
232
|
+
* caller that verb, so only the operator key may do it.
|
|
233
|
+
*/
|
|
234
|
+
export async function userHoldsOperatorGrantedRole(userId: string): Promise<boolean> {
|
|
235
|
+
const row = await getDbClient().get<{ found: number }>(
|
|
236
|
+
`SELECT 1 AS found
|
|
237
|
+
FROM principal_roles pr
|
|
238
|
+
JOIN role_permissions rp ON rp.roleId = pr.roleId
|
|
239
|
+
WHERE pr.principalType = 'user' AND pr.principalId = ?
|
|
240
|
+
AND rp.verb IN (${OPERATOR_GRANTED_VERBS.map(() => "?").join(", ")})
|
|
241
|
+
LIMIT 1`,
|
|
242
|
+
[userId, ...OPERATOR_GRANTED_VERBS],
|
|
243
|
+
);
|
|
244
|
+
return row != null;
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
/** A caller tried to credential, or bind an identity to, a user holding an operator-granted role. */
|
|
248
|
+
export class OperatorGrantedTargetError extends Error {
|
|
249
|
+
constructor() {
|
|
250
|
+
super(
|
|
251
|
+
"This user holds an operator-granted role (auditor); this change requires the operator key",
|
|
252
|
+
);
|
|
253
|
+
}
|
|
254
|
+
}
|
|
255
|
+
|
|
256
|
+
/**
|
|
257
|
+
* Who asks for a credential or identity write on a user. `agent` is an agent
|
|
258
|
+
* caller (the Lead's `manage-user` tool), keyed on the agent rather than the
|
|
259
|
+
* operator actor it records in the audit log.
|
|
260
|
+
*/
|
|
261
|
+
export type CredentialCaller = {
|
|
262
|
+
kind: "operator" | "user" | "system" | "agent";
|
|
263
|
+
id: string;
|
|
264
|
+
/** For a user caller: the `user_tokens` row the request authenticated with. */
|
|
265
|
+
tokenId?: string;
|
|
266
|
+
};
|
|
267
|
+
|
|
268
|
+
/**
|
|
269
|
+
* Throws OperatorGrantedTargetError when `caller` would get a credential for,
|
|
270
|
+
* or bind an identity to, another user holding an operator-granted role.
|
|
271
|
+
* The operator key passes. The user itself passes only with a token that is
|
|
272
|
+
* still live: the grant revokes every token issued before it, and a request
|
|
273
|
+
* authenticated with one of them may still be in flight. A page session
|
|
274
|
+
* (no `tokenId`) cannot be revoked, so it does not pass. `system` callers
|
|
275
|
+
* (integration webhooks attributing their own events by email or external
|
|
276
|
+
* id) pass too: they hand no credential to a caller.
|
|
277
|
+
*
|
|
278
|
+
* Call it inside the write transaction that issues the credential or binds
|
|
279
|
+
* the identity. Adding an operator-granted role takes the same write lock
|
|
280
|
+
* (`setUserRoles`), so a grant cannot land between this check and the write.
|
|
281
|
+
*/
|
|
282
|
+
export async function assertMayActOnOperatorGrantedTarget(
|
|
283
|
+
caller: CredentialCaller,
|
|
284
|
+
targetUserId: string,
|
|
285
|
+
): Promise<void> {
|
|
286
|
+
if (caller.kind === "operator" || caller.kind === "system") return;
|
|
287
|
+
if (!isInTransaction()) {
|
|
288
|
+
throw new Error("assertMayActOnOperatorGrantedTarget must run inside the write transaction");
|
|
289
|
+
}
|
|
290
|
+
if (!(await userHoldsOperatorGrantedRole(targetUserId))) return;
|
|
291
|
+
const self = caller.kind === "user" && caller.id === targetUserId;
|
|
292
|
+
if (self && caller.tokenId && (await isLiveUserToken(caller.tokenId, caller.id))) return;
|
|
293
|
+
throw new OperatorGrantedTargetError();
|
|
294
|
+
}
|
|
295
|
+
|
|
209
296
|
export async function getUserGrant(userId: string): Promise<EffectiveGrant> {
|
|
210
297
|
const rows = await getDbClient().query<GrantRow>(
|
|
211
298
|
`SELECT r.id AS roleId, r.grantsAll, rp.verb
|
|
@@ -291,6 +378,13 @@ export async function listRbacRoles(): Promise<RbacRoleCatalogEntry[]> {
|
|
|
291
378
|
|
|
292
379
|
export class InvalidRoleSetError extends Error {}
|
|
293
380
|
|
|
381
|
+
/** A user actor tried to add a role that lists an operator-granted verb. */
|
|
382
|
+
export class OperatorGrantedRoleError extends Error {
|
|
383
|
+
constructor(readonly roles: string[]) {
|
|
384
|
+
super(`Adding ${roles.join(", ")} requires the operator key`);
|
|
385
|
+
}
|
|
386
|
+
}
|
|
387
|
+
|
|
294
388
|
export class LastAdminError extends Error {
|
|
295
389
|
constructor() {
|
|
296
390
|
super("last_admin");
|
|
@@ -326,7 +420,9 @@ export async function assertNotLastAdmin(userId: string): Promise<void> {
|
|
|
326
420
|
/**
|
|
327
421
|
* Replace a user's RBAC roles. The set holds exactly one primary role
|
|
328
422
|
* (admin, requester or viewer) plus any extra roles. Refuses to leave the
|
|
329
|
-
* swarm without an active grant-all user.
|
|
423
|
+
* swarm without an active grant-all user. `actorUserId` is the acting user,
|
|
424
|
+
* or null for the operator key: a user actor gets OperatorGrantedRoleError
|
|
425
|
+
* when the set adds a role with an operator-granted verb.
|
|
330
426
|
*/
|
|
331
427
|
export async function setUserRoles(
|
|
332
428
|
userId: string,
|
|
@@ -356,6 +452,25 @@ export async function setUserRoles(
|
|
|
356
452
|
ORDER BY r.name`,
|
|
357
453
|
[userId],
|
|
358
454
|
);
|
|
455
|
+
// A user actor may keep or drop a role with an operator-granted verb but
|
|
456
|
+
// never add one. Checked against `current` inside this transaction, so a
|
|
457
|
+
// concurrent revoke cannot slip between the check and the write.
|
|
458
|
+
const heldIds = new Set(current.map((r) => r.id));
|
|
459
|
+
const added = wanted.filter((r) => !heldIds.has(r.id));
|
|
460
|
+
const gated =
|
|
461
|
+
added.length === 0
|
|
462
|
+
? []
|
|
463
|
+
: await tx.query<{ name: string }>(
|
|
464
|
+
`SELECT DISTINCT r.name
|
|
465
|
+
FROM roles r JOIN role_permissions rp ON rp.roleId = r.id
|
|
466
|
+
WHERE r.id IN (${added.map(() => "?").join(", ")})
|
|
467
|
+
AND rp.verb IN (${OPERATOR_GRANTED_VERBS.map(() => "?").join(", ")})
|
|
468
|
+
ORDER BY r.name`,
|
|
469
|
+
[...added.map((r) => r.id), ...OPERATOR_GRANTED_VERBS],
|
|
470
|
+
);
|
|
471
|
+
if (actorUserId !== null && gated.length > 0) {
|
|
472
|
+
throw new OperatorGrantedRoleError(gated.map((r) => r.name));
|
|
473
|
+
}
|
|
359
474
|
const wantsAll = wanted.some((r) => r.grantsAll === 1);
|
|
360
475
|
if (current.some((r) => r.grantsAll === 1) && !wantsAll) {
|
|
361
476
|
const user = await tx.get<{ status: string }>("SELECT status FROM users WHERE id = ?", [
|
|
@@ -390,6 +505,13 @@ export async function setUserRoles(
|
|
|
390
505
|
[userId, row.id, actorUserId],
|
|
391
506
|
);
|
|
392
507
|
}
|
|
508
|
+
// Any credential issued before the grant may sit with someone other than
|
|
509
|
+
// the user (an admin could mint a token or code for any user), so adding
|
|
510
|
+
// an operator-granted role revokes them all in this transaction. The user
|
|
511
|
+
// or the operator issues fresh ones; other users are refused from now on.
|
|
512
|
+
if (gated.length > 0) {
|
|
513
|
+
await revokeAllUserCredentials(userId, { kind: "system", id: "operator-granted-role" });
|
|
514
|
+
}
|
|
393
515
|
getDbClient().afterCommit(() => invalidateTelemetryUserRole(userId));
|
|
394
516
|
return { before: current.map((r) => r.name), after: wanted.map((r) => r.name).sort() };
|
|
395
517
|
});
|
|
@@ -554,6 +554,7 @@ const VALIDATED_KEYS: Record<string, ConfigValidator> = {
|
|
|
554
554
|
"OTEL_TRACE_POLL",
|
|
555
555
|
"OTEL_EXPORT_API_LOGS",
|
|
556
556
|
"ANONYMIZED_TELEMETRY",
|
|
557
|
+
"IMPROVEMENTS_ENABLED",
|
|
557
558
|
"SWARM_HIDE_CLOUD_PROMO",
|
|
558
559
|
"DB_QUERY_BOUNDED_ENABLED",
|
|
559
560
|
"CLAUDE_TRUST_PRESEED",
|
package/src/be/users.ts
CHANGED
|
@@ -41,6 +41,11 @@ import { validateRuntimeTokenTtlHours } from "./swarm-config-guard";
|
|
|
41
41
|
export type IdentityActor = {
|
|
42
42
|
kind: "system" | "operator" | "user";
|
|
43
43
|
id: string;
|
|
44
|
+
/**
|
|
45
|
+
* For a user actor: the `user_tokens` row the request authenticated with.
|
|
46
|
+
* Unset for a page session. Not recorded in events.
|
|
47
|
+
*/
|
|
48
|
+
tokenId?: string;
|
|
44
49
|
};
|
|
45
50
|
|
|
46
51
|
function actorString(actor: IdentityActor): string {
|
|
@@ -515,12 +520,51 @@ export async function revokeToken(tokenId: string, actor: IdentityActor): Promis
|
|
|
515
520
|
});
|
|
516
521
|
}
|
|
517
522
|
|
|
523
|
+
/**
|
|
524
|
+
* Revoke every live MCP token of a user and spend every unspent connector and
|
|
525
|
+
* invite code for it, with one `token_revoked` event per token. Joins the
|
|
526
|
+
* caller's transaction when there is one.
|
|
527
|
+
*/
|
|
528
|
+
export async function revokeAllUserCredentials(
|
|
529
|
+
userId: string,
|
|
530
|
+
actor: IdentityActor,
|
|
531
|
+
): Promise<void> {
|
|
532
|
+
await getDbClient().transaction(async (tx) => {
|
|
533
|
+
const now = new Date().toISOString();
|
|
534
|
+
const live = await tx.query<{ id: string; label: string | null; tokenPreview: string }>(
|
|
535
|
+
"SELECT id, label, tokenPreview FROM user_tokens WHERE userId = ? AND revokedAt IS NULL",
|
|
536
|
+
[userId],
|
|
537
|
+
);
|
|
538
|
+
for (const token of live) {
|
|
539
|
+
await tx.run("UPDATE user_tokens SET revokedAt = ? WHERE id = ?", [now, token.id]);
|
|
540
|
+
await recordIdentityEvent(
|
|
541
|
+
userId,
|
|
542
|
+
"token_revoked",
|
|
543
|
+
actor,
|
|
544
|
+
{ tokenId: token.id, label: token.label, preview: token.tokenPreview },
|
|
545
|
+
null,
|
|
546
|
+
);
|
|
547
|
+
}
|
|
548
|
+
await tx.run("UPDATE connector_codes SET used_at = ? WHERE user_id = ? AND used_at IS NULL", [
|
|
549
|
+
now,
|
|
550
|
+
userId,
|
|
551
|
+
]);
|
|
552
|
+
});
|
|
553
|
+
}
|
|
554
|
+
|
|
518
555
|
/**
|
|
519
556
|
* Resolve a plaintext token to its owning user. Returns null if the token
|
|
520
557
|
* is unknown or revoked. On a successful hit, updates `lastUsedAt` so the
|
|
521
558
|
* People page can surface "last seen".
|
|
522
559
|
*/
|
|
523
560
|
export async function resolveUserByToken(plaintext: string): Promise<User | null> {
|
|
561
|
+
return (await resolveUserToken(plaintext))?.user ?? null;
|
|
562
|
+
}
|
|
563
|
+
|
|
564
|
+
/** Like `resolveUserByToken`, plus the id of the `user_tokens` row that matched. */
|
|
565
|
+
export async function resolveUserToken(
|
|
566
|
+
plaintext: string,
|
|
567
|
+
): Promise<{ user: User | null; tokenId: string } | null> {
|
|
524
568
|
const hash = sha256Hex(plaintext);
|
|
525
569
|
const client = getDbClient();
|
|
526
570
|
|
|
@@ -541,7 +585,20 @@ export async function resolveUserByToken(plaintext: string): Promise<User | null
|
|
|
541
585
|
// Never let a `lastUsedAt` update failure leak to the caller.
|
|
542
586
|
}
|
|
543
587
|
|
|
544
|
-
return findUserById(row.userId);
|
|
588
|
+
return { user: await findUserById(row.userId), tokenId: row.id };
|
|
589
|
+
}
|
|
590
|
+
|
|
591
|
+
/**
|
|
592
|
+
* Whether `tokenId` is an unrevoked token of `userId`. Run it inside the
|
|
593
|
+
* write transaction it guards: `setUserRoles` revokes tokens under the same
|
|
594
|
+
* write lock.
|
|
595
|
+
*/
|
|
596
|
+
export async function isLiveUserToken(tokenId: string, userId: string): Promise<boolean> {
|
|
597
|
+
const row = await getDbClient().get<{ found: number }>(
|
|
598
|
+
"SELECT 1 AS found FROM user_tokens WHERE id = ? AND userId = ? AND revokedAt IS NULL",
|
|
599
|
+
[tokenId, userId],
|
|
600
|
+
);
|
|
601
|
+
return row != null;
|
|
545
602
|
}
|
|
546
603
|
|
|
547
604
|
// ---------------------------------------------------------------------------
|
package/src/cli.tsx
CHANGED
|
@@ -33,7 +33,6 @@ interface ParsedArgs {
|
|
|
33
33
|
dryRun: boolean;
|
|
34
34
|
restore: boolean;
|
|
35
35
|
yes: boolean;
|
|
36
|
-
yolo: boolean;
|
|
37
36
|
systemPrompt: string;
|
|
38
37
|
systemPromptFile: string;
|
|
39
38
|
additionalArgs: string[];
|
|
@@ -56,7 +55,6 @@ function parseArgs(args: string[]): ParsedArgs {
|
|
|
56
55
|
let dryRun = false;
|
|
57
56
|
let restore = false;
|
|
58
57
|
let yes = false;
|
|
59
|
-
let yolo = false;
|
|
60
58
|
let systemPrompt = "";
|
|
61
59
|
let systemPromptFile = "";
|
|
62
60
|
let additionalArgs: string[] = [];
|
|
@@ -93,8 +91,6 @@ function parseArgs(args: string[]): ParsedArgs {
|
|
|
93
91
|
restore = true;
|
|
94
92
|
} else if (arg === "-y" || arg === "--yes") {
|
|
95
93
|
yes = true;
|
|
96
|
-
} else if (arg === "--yolo") {
|
|
97
|
-
yolo = true;
|
|
98
94
|
} else if (arg === "--system-prompt") {
|
|
99
95
|
systemPrompt = mainArgs[i + 1] || systemPrompt;
|
|
100
96
|
i++;
|
|
@@ -145,7 +141,6 @@ function parseArgs(args: string[]): ParsedArgs {
|
|
|
145
141
|
dryRun,
|
|
146
142
|
restore,
|
|
147
143
|
yes,
|
|
148
|
-
yolo,
|
|
149
144
|
systemPrompt,
|
|
150
145
|
systemPromptFile,
|
|
151
146
|
additionalArgs,
|
|
@@ -255,7 +250,6 @@ const COMMAND_HELP: Record<
|
|
|
255
250
|
description: "Run Claude in headless loop mode as a worker agent.",
|
|
256
251
|
options: [
|
|
257
252
|
" -m, --msg <prompt> Custom prompt (default: /agent-swarm:start-worker)",
|
|
258
|
-
" --yolo Continue on errors instead of stopping",
|
|
259
253
|
" --system-prompt <text> Custom system prompt (appended to Claude)",
|
|
260
254
|
" --system-prompt-file <path> Read system prompt from file",
|
|
261
255
|
" -- <args...> Additional arguments to pass to Claude CLI",
|
|
@@ -263,7 +257,6 @@ const COMMAND_HELP: Record<
|
|
|
263
257
|
].join("\n"),
|
|
264
258
|
examples: [
|
|
265
259
|
` ${binName} worker`,
|
|
266
|
-
` ${binName} worker --yolo`,
|
|
267
260
|
` ${binName} worker -m "Custom prompt"`,
|
|
268
261
|
` ${binName} worker --system-prompt "You are a Python specialist"`,
|
|
269
262
|
].join("\n"),
|
|
@@ -273,13 +266,12 @@ const COMMAND_HELP: Record<
|
|
|
273
266
|
description: "Run Claude as lead agent in headless loop mode.\nSame options as worker.",
|
|
274
267
|
options: [
|
|
275
268
|
" -m, --msg <prompt> Custom prompt",
|
|
276
|
-
" --yolo Continue on errors instead of stopping",
|
|
277
269
|
" --system-prompt <text> Custom system prompt",
|
|
278
270
|
" --system-prompt-file <path> Read system prompt from file",
|
|
279
271
|
" -- <args...> Additional arguments to pass to Claude CLI",
|
|
280
272
|
" -h, --help Show this help",
|
|
281
273
|
].join("\n"),
|
|
282
|
-
examples: [` ${binName} lead
|
|
274
|
+
examples: [` ${binName} lead`].join("\n"),
|
|
283
275
|
},
|
|
284
276
|
docs: {
|
|
285
277
|
usage: `${binName} docs [--open]`,
|
|
@@ -563,19 +555,12 @@ function ClaudeRunner({ msg, headless, additionalArgs }: ClaudeRunnerProps) {
|
|
|
563
555
|
|
|
564
556
|
interface RunnerProps {
|
|
565
557
|
prompt: string;
|
|
566
|
-
yolo: boolean;
|
|
567
558
|
systemPrompt: string;
|
|
568
559
|
systemPromptFile: string;
|
|
569
560
|
additionalArgs: string[];
|
|
570
561
|
}
|
|
571
562
|
|
|
572
|
-
function WorkerRunner({
|
|
573
|
-
prompt,
|
|
574
|
-
yolo,
|
|
575
|
-
systemPrompt,
|
|
576
|
-
systemPromptFile,
|
|
577
|
-
additionalArgs,
|
|
578
|
-
}: RunnerProps) {
|
|
563
|
+
function WorkerRunner({ prompt, systemPrompt, systemPromptFile, additionalArgs }: RunnerProps) {
|
|
579
564
|
const { exit } = useApp();
|
|
580
565
|
|
|
581
566
|
useEffect(() => {
|
|
@@ -586,7 +571,6 @@ function WorkerRunner({
|
|
|
586
571
|
.then(({ runWorker }) =>
|
|
587
572
|
runWorker({
|
|
588
573
|
prompt: prompt || undefined,
|
|
589
|
-
yolo,
|
|
590
574
|
systemPrompt: systemPrompt || undefined,
|
|
591
575
|
systemPromptFile: systemPromptFile || undefined,
|
|
592
576
|
additionalArgs,
|
|
@@ -598,12 +582,12 @@ function WorkerRunner({
|
|
|
598
582
|
exit(err);
|
|
599
583
|
});
|
|
600
584
|
// Note: runWorker runs indefinitely, so we don't call exit() on success
|
|
601
|
-
}, [prompt,
|
|
585
|
+
}, [prompt, systemPrompt, systemPromptFile, additionalArgs, exit]);
|
|
602
586
|
|
|
603
587
|
return null;
|
|
604
588
|
}
|
|
605
589
|
|
|
606
|
-
function LeadRunner({ prompt,
|
|
590
|
+
function LeadRunner({ prompt, systemPrompt, systemPromptFile, additionalArgs }: RunnerProps) {
|
|
607
591
|
const { exit } = useApp();
|
|
608
592
|
|
|
609
593
|
useEffect(() => {
|
|
@@ -614,7 +598,6 @@ function LeadRunner({ prompt, yolo, systemPrompt, systemPromptFile, additionalAr
|
|
|
614
598
|
.then(({ runLead }) =>
|
|
615
599
|
runLead({
|
|
616
600
|
prompt: prompt || undefined,
|
|
617
|
-
yolo,
|
|
618
601
|
systemPrompt: systemPrompt || undefined,
|
|
619
602
|
systemPromptFile: systemPromptFile || undefined,
|
|
620
603
|
additionalArgs,
|
|
@@ -626,7 +609,7 @@ function LeadRunner({ prompt, yolo, systemPrompt, systemPromptFile, additionalAr
|
|
|
626
609
|
exit(err);
|
|
627
610
|
});
|
|
628
611
|
// Note: runLead runs indefinitely, so we don't call exit() on success
|
|
629
|
-
}, [prompt,
|
|
612
|
+
}, [prompt, systemPrompt, systemPromptFile, additionalArgs, exit]);
|
|
630
613
|
|
|
631
614
|
return null;
|
|
632
615
|
}
|
|
@@ -693,7 +676,6 @@ function App({ args }: { args: ParsedArgs }) {
|
|
|
693
676
|
dryRun,
|
|
694
677
|
restore,
|
|
695
678
|
yes,
|
|
696
|
-
yolo,
|
|
697
679
|
systemPrompt,
|
|
698
680
|
systemPromptFile,
|
|
699
681
|
additionalArgs,
|
|
@@ -730,7 +712,6 @@ function App({ args }: { args: ParsedArgs }) {
|
|
|
730
712
|
return (
|
|
731
713
|
<WorkerRunner
|
|
732
714
|
prompt={msg}
|
|
733
|
-
yolo={yolo}
|
|
734
715
|
systemPrompt={systemPrompt}
|
|
735
716
|
systemPromptFile={systemPromptFile}
|
|
736
717
|
additionalArgs={additionalArgs}
|
|
@@ -740,7 +721,6 @@ function App({ args }: { args: ParsedArgs }) {
|
|
|
740
721
|
return (
|
|
741
722
|
<LeadRunner
|
|
742
723
|
prompt={msg}
|
|
743
|
-
yolo={yolo}
|
|
744
724
|
systemPrompt={systemPrompt}
|
|
745
725
|
systemPromptFile={systemPromptFile}
|
|
746
726
|
additionalArgs={additionalArgs}
|
|
@@ -368,7 +368,7 @@ export async function runCodexLogin(args: string[], deps: RunCodexLoginDeps = {}
|
|
|
368
368
|
|
|
369
369
|
// A re-login returns an auth-benched slot to the pool right away.
|
|
370
370
|
// Non-fatal: the credentials are stored; a later re-login also lifts it.
|
|
371
|
-
const keySuffix = deriveCodexKeySuffix(creds.access, creds.accountId);
|
|
371
|
+
const keySuffix = deriveCodexKeySuffix(creds.access, creds.accountId, slot);
|
|
372
372
|
try {
|
|
373
373
|
if (typeof authFence !== "number") throw authFence;
|
|
374
374
|
if (await clearAuthBench(apiUrl, apiKey, keySuffix, slot, authFence)) {
|
package/src/commands/e2b.ts
CHANGED
|
@@ -428,7 +428,6 @@ export async function loadRuntimeEnv(
|
|
|
428
428
|
// --agent-role flag, keeping start-worker byte-identical to before.
|
|
429
429
|
runtime.AGENT_ROLE = spec.agentRole ?? value(flags, "agent-role", "worker");
|
|
430
430
|
runtime.HARNESS_PROVIDER = value(flags, "provider", runtime.HARNESS_PROVIDER || "claude");
|
|
431
|
-
runtime.WORKER_YOLO = value(flags, "worker-yolo", "false");
|
|
432
431
|
runtime.WORKER_LOG_DIR = value(flags, "worker-log-dir", "/logs");
|
|
433
432
|
runtime.LEAD_LOG_DIR = value(flags, "lead-log-dir", "/logs");
|
|
434
433
|
runtime.HOME = value(flags, "home", runtime.HOME || "/home/worker");
|
|
@@ -326,7 +326,6 @@ export function generateCompose(state: OnboardState): string {
|
|
|
326
326
|
lines.push(` - AGENT_ROLE=${agentRole}`);
|
|
327
327
|
lines.push(` - TEMPLATE_ID=${svc.entry.template}`);
|
|
328
328
|
lines.push(" - MCP_BASE_URL=http://swarm-api:3013");
|
|
329
|
-
lines.push(" - YOLO=true");
|
|
330
329
|
lines.push(" - SWARM_URL=http://swarm-api:3013");
|
|
331
330
|
|
|
332
331
|
const maxConcurrentTasks =
|
|
@@ -8,7 +8,11 @@
|
|
|
8
8
|
* camelCase.
|
|
9
9
|
*/
|
|
10
10
|
|
|
11
|
+
import { mkdir, open, rename } from "node:fs/promises";
|
|
12
|
+
import { dirname, join } from "node:path";
|
|
13
|
+
|
|
11
14
|
const DEFAULT_DASHBOARD_BASE = "https://app.agent-swarm.dev";
|
|
15
|
+
export const SETUP_URL_PATH = ".agent-swarm/setup-url";
|
|
12
16
|
|
|
13
17
|
export type DashboardUrlParts = {
|
|
14
18
|
apiUrl: string;
|
|
@@ -27,3 +31,30 @@ export function buildOnboardDashboardUrl(parts: DashboardUrlParts): string {
|
|
|
27
31
|
const base = (parts.base ?? DEFAULT_DASHBOARD_BASE).replace(/\/+$/, "");
|
|
28
32
|
return `${base}?${params.toString()}`;
|
|
29
33
|
}
|
|
34
|
+
|
|
35
|
+
/** Generated keys may not be in the scrubber's environment, or may be URL-encoded. */
|
|
36
|
+
export function maskDashboardUrlApiKey(url: string): string {
|
|
37
|
+
return url.replace(/([?&]apiKey=)[^&#]*/g, "$1[REDACTED:apiKey]");
|
|
38
|
+
}
|
|
39
|
+
|
|
40
|
+
/** Save the credential-bearing link without exposing it to terminal output. */
|
|
41
|
+
export async function writeDashboardSetupUrl(outputDir: string, url: string): Promise<void> {
|
|
42
|
+
const path = join(outputDir, SETUP_URL_PATH);
|
|
43
|
+
const tmp = `${path}.${crypto.randomUUID()}.tmp`;
|
|
44
|
+
// A private temporary file plus rename also fixes permissions on an existing
|
|
45
|
+
// file and replaces a symlink instead of writing through it.
|
|
46
|
+
await mkdir(dirname(path), { recursive: true });
|
|
47
|
+
try {
|
|
48
|
+
const file = await open(tmp, "wx", 0o600);
|
|
49
|
+
try {
|
|
50
|
+
await Bun.write(Bun.file(file.fd), `${url}\n`);
|
|
51
|
+
} finally {
|
|
52
|
+
await file.close();
|
|
53
|
+
}
|
|
54
|
+
await rename(tmp, path);
|
|
55
|
+
} finally {
|
|
56
|
+
await Bun.file(tmp)
|
|
57
|
+
.delete()
|
|
58
|
+
.catch(() => {});
|
|
59
|
+
}
|
|
60
|
+
}
|
|
@@ -1,7 +1,13 @@
|
|
|
1
1
|
import { Spinner } from "@inkjs/ui";
|
|
2
2
|
import { Box, Text } from "ink";
|
|
3
3
|
import { useEffect, useRef, useState } from "react";
|
|
4
|
+
import { scrubSecrets } from "../../../utils/secret-scrubber.ts";
|
|
4
5
|
import { generateCompose } from "../compose-generator.ts";
|
|
6
|
+
import {
|
|
7
|
+
buildOnboardDashboardUrl,
|
|
8
|
+
SETUP_URL_PATH,
|
|
9
|
+
writeDashboardSetupUrl,
|
|
10
|
+
} from "../dashboard-url.ts";
|
|
5
11
|
import { generateEnv } from "../env-generator.ts";
|
|
6
12
|
import { generateManifest } from "../manifest.ts";
|
|
7
13
|
import type { StepProps } from "../types.ts";
|
|
@@ -25,11 +31,12 @@ export function GenerateStep({ state, dryRun, addLog, goToNext, goToStep, goToEr
|
|
|
25
31
|
const composeLines = composeContent.split("\n").slice(0, 30).join("\n");
|
|
26
32
|
const envLines = envContent.split("\n").slice(0, 20).join("\n");
|
|
27
33
|
setComposePreview(composeLines);
|
|
28
|
-
setEnvPreview(envLines);
|
|
34
|
+
setEnvPreview(scrubSecrets(envLines));
|
|
29
35
|
|
|
30
36
|
addLog("Write docker-compose.yml", true);
|
|
31
37
|
addLog("Write .env", true);
|
|
32
38
|
addLog("Write .agent-swarm/config.json", true);
|
|
39
|
+
addLog(`Write ${SETUP_URL_PATH} (mode 600)`, true);
|
|
33
40
|
// In dry-run, skip prereq/start/health — go straight to done
|
|
34
41
|
goToStep("done");
|
|
35
42
|
return;
|
|
@@ -51,6 +58,15 @@ export function GenerateStep({ state, dryRun, addLog, goToNext, goToStep, goToEr
|
|
|
51
58
|
await Bun.write(manifestPath, JSON.stringify(manifest, null, 2));
|
|
52
59
|
addLog(`Wrote ${manifestPath}`);
|
|
53
60
|
|
|
61
|
+
await writeDashboardSetupUrl(
|
|
62
|
+
state.outputDir,
|
|
63
|
+
buildOnboardDashboardUrl({
|
|
64
|
+
apiUrl: `http://localhost:${state.apiPort || 3013}`,
|
|
65
|
+
apiKey: state.apiKey,
|
|
66
|
+
}),
|
|
67
|
+
);
|
|
68
|
+
addLog(`Wrote ${SETUP_URL_PATH} (mode 600)`);
|
|
69
|
+
|
|
54
70
|
// Add to .gitignore if in a git repo
|
|
55
71
|
try {
|
|
56
72
|
const result = await Bun.$`git -C ${state.outputDir} rev-parse --show-toplevel`.quiet();
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import { Select } from "@inkjs/ui";
|
|
2
2
|
import { Box, Text } from "ink";
|
|
3
|
-
import {
|
|
3
|
+
import { scrubSecrets } from "../../../utils/secret-scrubber.ts";
|
|
4
|
+
import {
|
|
5
|
+
buildOnboardDashboardUrl,
|
|
6
|
+
maskDashboardUrlApiKey,
|
|
7
|
+
SETUP_URL_PATH,
|
|
8
|
+
} from "../dashboard-url.ts";
|
|
4
9
|
import type { StepProps } from "../types.ts";
|
|
5
10
|
|
|
6
11
|
export function PostDashboardStep({ state, addLog, goToNext }: StepProps) {
|
|
@@ -11,7 +16,8 @@ export function PostDashboardStep({ state, addLog, goToNext }: StepProps) {
|
|
|
11
16
|
return (
|
|
12
17
|
<Box flexDirection="column" padding={1}>
|
|
13
18
|
<Text bold>Open the swarm dashboard?</Text>
|
|
14
|
-
<Text dimColor>{dashboardUrl}</Text>
|
|
19
|
+
<Text dimColor>{scrubSecrets(maskDashboardUrlApiKey(dashboardUrl))}</Text>
|
|
20
|
+
<Text dimColor>Full link (contains API key): cat {SETUP_URL_PATH}</Text>
|
|
15
21
|
<Box marginTop={1}>
|
|
16
22
|
<Select
|
|
17
23
|
options={[
|
|
@@ -24,7 +30,7 @@ export function PostDashboardStep({ state, addLog, goToNext }: StepProps) {
|
|
|
24
30
|
await Bun.$`open ${dashboardUrl}`.quiet();
|
|
25
31
|
addLog("Opened dashboard in browser");
|
|
26
32
|
} catch {
|
|
27
|
-
addLog(`Open manually: ${
|
|
33
|
+
addLog(`Open manually using the full link: cat ${SETUP_URL_PATH}`);
|
|
28
34
|
}
|
|
29
35
|
}
|
|
30
36
|
goToNext();
|
package/src/commands/onboard.tsx
CHANGED
|
@@ -6,6 +6,7 @@ import { useCallback, useEffect, useRef, useState } from "react";
|
|
|
6
6
|
import pkg from "../../package.json";
|
|
7
7
|
import { getSlackConfiguration, isSlackConfigured } from "../slack/config.ts";
|
|
8
8
|
import { getApiKey } from "../utils/api-key.ts";
|
|
9
|
+
import { scrubSecrets } from "../utils/secret-scrubber.ts";
|
|
9
10
|
import {
|
|
10
11
|
CONTAINER_ENGINE_LABELS,
|
|
11
12
|
composeCommandText,
|
|
@@ -13,7 +14,11 @@ import {
|
|
|
13
14
|
isContainerEnginePreference,
|
|
14
15
|
resolveContainerEnginePreference,
|
|
15
16
|
} from "./onboard/container-engine.ts";
|
|
16
|
-
import {
|
|
17
|
+
import {
|
|
18
|
+
buildOnboardDashboardUrl,
|
|
19
|
+
maskDashboardUrlApiKey,
|
|
20
|
+
SETUP_URL_PATH,
|
|
21
|
+
} from "./onboard/dashboard-url.ts";
|
|
17
22
|
import {
|
|
18
23
|
parseMaxConcurrentTasks,
|
|
19
24
|
resolveNonInteractiveProvider,
|
|
@@ -131,7 +136,7 @@ export function Onboard({
|
|
|
131
136
|
(log: string, isDryRunAction = false) => {
|
|
132
137
|
const prefix = isDryRunAction && dryRun ? "[DRY-RUN] Would: " : "";
|
|
133
138
|
const id = nextLogId.current++;
|
|
134
|
-
setState((s) => ({ ...s, logs: [...s.logs, { id, text: `${prefix}${log}` }] }));
|
|
139
|
+
setState((s) => ({ ...s, logs: [...s.logs, { id, text: scrubSecrets(`${prefix}${log}`) }] }));
|
|
135
140
|
},
|
|
136
141
|
[dryRun],
|
|
137
142
|
);
|
|
@@ -288,7 +293,7 @@ export function Onboard({
|
|
|
288
293
|
if (state.step === "error") {
|
|
289
294
|
return (
|
|
290
295
|
<Box flexDirection="column" padding={1}>
|
|
291
|
-
<Text color="red">Onboard failed: {state.error}</Text>
|
|
296
|
+
<Text color="red">Onboard failed: {scrubSecrets(state.error)}</Text>
|
|
292
297
|
</Box>
|
|
293
298
|
);
|
|
294
299
|
}
|
|
@@ -331,9 +336,17 @@ export function Onboard({
|
|
|
331
336
|
<Text>
|
|
332
337
|
API: <Text color="cyan">{apiUrl}</Text>
|
|
333
338
|
</Text>
|
|
334
|
-
|
|
335
|
-
|
|
336
|
-
|
|
339
|
+
{process.env.AGENT_SWARM_INSTALLER !== "1" && (
|
|
340
|
+
<>
|
|
341
|
+
<Text>
|
|
342
|
+
Dashboard:{" "}
|
|
343
|
+
<Text color="cyan">{scrubSecrets(maskDashboardUrlApiKey(dashUrl))}</Text>
|
|
344
|
+
</Text>
|
|
345
|
+
{!dryRun && (
|
|
346
|
+
<Text dimColor>Full link (contains API key): cat {SETUP_URL_PATH}</Text>
|
|
347
|
+
)}
|
|
348
|
+
</>
|
|
349
|
+
)}
|
|
337
350
|
{agentCount > 0 && <Text>Agents: {agentCount} configured</Text>}
|
|
338
351
|
<Text dimColor>Files: docker-compose.yml, .env, .agent-swarm/config.json</Text>
|
|
339
352
|
</Box>
|