@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
package/src/http/user-roles.ts
CHANGED
|
@@ -15,6 +15,7 @@ import {
|
|
|
15
15
|
LastAdminError,
|
|
16
16
|
listRbacRoles,
|
|
17
17
|
listUserRoles,
|
|
18
|
+
OperatorGrantedRoleError,
|
|
18
19
|
PRIMARY_ROLE_NAMES,
|
|
19
20
|
setUserRoles,
|
|
20
21
|
} from "../be/rbac-roles";
|
|
@@ -58,14 +59,16 @@ const setUserRolesRoute = route({
|
|
|
58
59
|
pattern: ["api", "users", null, "roles"],
|
|
59
60
|
operationId: "users_setRbacRoles",
|
|
60
61
|
summary: "Set a user's RBAC roles",
|
|
61
|
-
description: `Replaces the user's roles. The set holds exactly one of ${PRIMARY_ROLE_NAMES.join(", ")} plus any extra roles. Demoting a user below admin removes the ability to answer approval requests, even when the user is listed as an approver. Fails with 409 when it would leave no active admin.`,
|
|
62
|
+
description: `Replaces the user's roles. The set holds exactly one of ${PRIMARY_ROLE_NAMES.join(", ")} plus any extra roles. Demoting a user below admin removes the ability to answer approval requests, even when the user is listed as an approver. Fails with 409 when it would leave no active admin. Adding a role that grants session.read.all (the built-in auditor role) requires the operator key: every new user is a grant-all admin, so a user token could grant it to itself. Adding such a role revokes the user's MCP tokens and spends its unused connector and invite codes.`,
|
|
62
63
|
tags: ["Users"],
|
|
63
64
|
params: z.object({ id: z.string().min(1) }),
|
|
64
65
|
body: z.object({ roles: z.array(z.string().min(1)).min(1) }).strict(),
|
|
65
66
|
responses: {
|
|
66
67
|
200: { description: "The user's roles after the change", schema: UserRbacRolesSchema },
|
|
67
68
|
400: { description: "Invalid role set" },
|
|
68
|
-
403: {
|
|
69
|
+
403: {
|
|
70
|
+
description: "Not allowed to change roles, or adding an operator-only role with a user token",
|
|
71
|
+
},
|
|
69
72
|
404: { description: "User not found" },
|
|
70
73
|
409: { description: "Would leave no active admin" },
|
|
71
74
|
},
|
|
@@ -147,6 +150,8 @@ export async function handleUserRoles(
|
|
|
147
150
|
return true;
|
|
148
151
|
}
|
|
149
152
|
try {
|
|
153
|
+
// A user actor may keep or drop an operator-granted role but not add it;
|
|
154
|
+
// setUserRoles checks that inside its write transaction.
|
|
150
155
|
const { before, after } = await setUserRoles(
|
|
151
156
|
userId,
|
|
152
157
|
parsed.body.roles,
|
|
@@ -168,6 +173,10 @@ export async function handleUserRoles(
|
|
|
168
173
|
jsonError(res, err.message, 400);
|
|
169
174
|
return true;
|
|
170
175
|
}
|
|
176
|
+
if (err instanceof OperatorGrantedRoleError) {
|
|
177
|
+
jsonError(res, err.message, 403);
|
|
178
|
+
return true;
|
|
179
|
+
}
|
|
171
180
|
throw err;
|
|
172
181
|
}
|
|
173
182
|
setUserRolesRoute.respond(res, 200, await composeRoles(userId));
|
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,
|
|
@@ -304,6 +307,10 @@ const resolveUnmapped = route({
|
|
|
304
307
|
},
|
|
305
308
|
400: { description: "Validation error" },
|
|
306
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
|
+
},
|
|
307
314
|
404: { description: "Target user not found" },
|
|
308
315
|
},
|
|
309
316
|
auth: { apiKey: true },
|
|
@@ -370,6 +377,10 @@ const updateUserRoute = route({
|
|
|
370
377
|
},
|
|
371
378
|
400: { description: "Validation error or empty body" },
|
|
372
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
|
+
},
|
|
373
384
|
404: { description: "User not found" },
|
|
374
385
|
},
|
|
375
386
|
auth: { apiKey: true },
|
|
@@ -397,6 +408,10 @@ const mintUserMcpTokenRoute = route({
|
|
|
397
408
|
}),
|
|
398
409
|
},
|
|
399
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
|
+
},
|
|
400
415
|
404: { description: "User not found" },
|
|
401
416
|
},
|
|
402
417
|
auth: { apiKey: true },
|
|
@@ -443,6 +458,10 @@ const createConnectorCodeRoute = route({
|
|
|
443
458
|
},
|
|
444
459
|
400: { description: "The public API origin or CONNECTOR_CONNECT_URL is not HTTPS" },
|
|
445
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
|
+
},
|
|
446
465
|
404: { description: "User not found" },
|
|
447
466
|
},
|
|
448
467
|
auth: { apiKey: true },
|
|
@@ -590,6 +609,10 @@ const mergeUsersRoute = route({
|
|
|
590
609
|
},
|
|
591
610
|
400: { description: "Validation error (e.g. target == source)" },
|
|
592
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
|
+
},
|
|
593
616
|
404: { description: "Target or source user not found" },
|
|
594
617
|
409: { description: "Source is the last active admin (last_admin)" },
|
|
595
618
|
},
|
|
@@ -633,6 +656,10 @@ const addIdentityRoute = route({
|
|
|
633
656
|
},
|
|
634
657
|
400: { description: "Validation error" },
|
|
635
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
|
+
},
|
|
636
663
|
404: { description: "User not found" },
|
|
637
664
|
409: { description: "The (kind, externalId) identity is already linked (identity_taken)" },
|
|
638
665
|
},
|
|
@@ -659,6 +686,32 @@ const deleteIdentityRoute = route({
|
|
|
659
686
|
|
|
660
687
|
// ─── Helpers ─────────────────────────────────────────────────────────────────
|
|
661
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
|
+
|
|
662
715
|
/** True when `err` is a SQLite UNIQUE violation whose message names `target` (e.g. `users.email`). */
|
|
663
716
|
function isUniqueViolation(err: unknown, target: string): boolean {
|
|
664
717
|
return (
|
|
@@ -885,16 +938,22 @@ export async function handleUsers(
|
|
|
885
938
|
|
|
886
939
|
try {
|
|
887
940
|
const { identities, ...userFields } = parsed.body;
|
|
888
|
-
|
|
889
|
-
|
|
890
|
-
|
|
891
|
-
|
|
892
|
-
|
|
893
|
-
|
|
894
|
-
|
|
895
|
-
|
|
896
|
-
}
|
|
897
|
-
|
|
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
|
+
});
|
|
898
957
|
const composed = await composeUser(user.id);
|
|
899
958
|
createUserRoute.respond(res, 200, { user: composed });
|
|
900
959
|
} catch (err) {
|
|
@@ -947,15 +1006,23 @@ export async function handleUsers(
|
|
|
947
1006
|
return true;
|
|
948
1007
|
}
|
|
949
1008
|
targetUserId = existing.id;
|
|
1009
|
+
await writeGuarded(actor, targetUserId, () =>
|
|
1010
|
+
linkIdentity(targetUserId, kind, externalId, actor),
|
|
1011
|
+
);
|
|
950
1012
|
} else {
|
|
951
|
-
|
|
952
|
-
|
|
953
|
-
|
|
954
|
-
|
|
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;
|
|
955
1024
|
});
|
|
956
|
-
targetUserId = created.id;
|
|
957
1025
|
}
|
|
958
|
-
await linkIdentity(targetUserId, kind, externalId, actor);
|
|
959
1026
|
// Clear both kv rows (best-effort — DELETE is idempotent).
|
|
960
1027
|
const ns = `integration:unmapped:${kind}`;
|
|
961
1028
|
await deleteKv(ns, `${externalId}:meta`);
|
|
@@ -963,6 +1030,7 @@ export async function handleUsers(
|
|
|
963
1030
|
const user = await composeUser(targetUserId);
|
|
964
1031
|
resolveUnmapped.respond(res, 200, { user });
|
|
965
1032
|
} catch (err) {
|
|
1033
|
+
if (respondOperatorGrantedRefusal(res, err)) return true;
|
|
966
1034
|
jsonError(res, err instanceof Error ? err.message : "Failed to resolve unmapped", 500);
|
|
967
1035
|
}
|
|
968
1036
|
return true;
|
|
@@ -994,12 +1062,9 @@ export async function handleUsers(
|
|
|
994
1062
|
jsonError(res, "User not found", 404);
|
|
995
1063
|
return true;
|
|
996
1064
|
}
|
|
997
|
-
|
|
998
1065
|
try {
|
|
999
|
-
const { tokenId, plaintext } = await
|
|
1000
|
-
parsed.params.id,
|
|
1001
|
-
parsed.body.label ?? null,
|
|
1002
|
-
actor,
|
|
1066
|
+
const { tokenId, plaintext } = await writeGuarded(actor, parsed.params.id, () =>
|
|
1067
|
+
mintToken(parsed.params.id, parsed.body.label ?? null, actor),
|
|
1003
1068
|
);
|
|
1004
1069
|
const token = (await listUserTokens(parsed.params.id)).find((t) => t.id === tokenId);
|
|
1005
1070
|
mintUserMcpTokenRoute.respond(res, 200, {
|
|
@@ -1008,6 +1073,7 @@ export async function handleUsers(
|
|
|
1008
1073
|
user: await composeUser(parsed.params.id),
|
|
1009
1074
|
});
|
|
1010
1075
|
} catch (err) {
|
|
1076
|
+
if (respondOperatorGrantedRefusal(res, err)) return true;
|
|
1011
1077
|
jsonError(res, err instanceof Error ? err.message : "Failed to mint token", 500);
|
|
1012
1078
|
}
|
|
1013
1079
|
return true;
|
|
@@ -1051,6 +1117,8 @@ export async function handleUsers(
|
|
|
1051
1117
|
const connectUrl = connect.toString();
|
|
1052
1118
|
createConnectorCodeRoute.respond(res, 201, { code, expiresAt, connectUrl });
|
|
1053
1119
|
} catch (err) {
|
|
1120
|
+
// createConnectorCode runs the operator-granted check with its insert.
|
|
1121
|
+
if (respondOperatorGrantedRefusal(res, err)) return true;
|
|
1054
1122
|
jsonError(res, err instanceof Error ? err.message : "Failed to create connector code", 500);
|
|
1055
1123
|
}
|
|
1056
1124
|
return true;
|
|
@@ -1269,11 +1337,14 @@ export async function handleUsers(
|
|
|
1269
1337
|
return true;
|
|
1270
1338
|
}
|
|
1271
1339
|
try {
|
|
1272
|
-
await
|
|
1340
|
+
await writeGuarded(actor, parsed.params.id, () =>
|
|
1341
|
+
linkIdentity(parsed.params.id, parsed.body.kind, parsed.body.externalId, actor),
|
|
1342
|
+
);
|
|
1273
1343
|
addIdentityRoute.respond(res, 200, {
|
|
1274
1344
|
identities: await getUserIdentities(parsed.params.id),
|
|
1275
1345
|
});
|
|
1276
1346
|
} catch (err) {
|
|
1347
|
+
if (respondOperatorGrantedRefusal(res, err)) return true;
|
|
1277
1348
|
if (isUniqueViolation(err, "user_external_ids")) {
|
|
1278
1349
|
jsonError(res, "identity_taken", 409);
|
|
1279
1350
|
return true;
|
|
@@ -1332,9 +1403,10 @@ export async function handleUsers(
|
|
|
1332
1403
|
jsonError(res, "Source user not found", 404);
|
|
1333
1404
|
return true;
|
|
1334
1405
|
}
|
|
1335
|
-
|
|
1336
1406
|
try {
|
|
1337
1407
|
const mergedUser = await getDbClient().transaction(async () => {
|
|
1408
|
+
// The source's identities and email aliases move to the target.
|
|
1409
|
+
await assertMayActOnOperatorGrantedTarget(actor, targetId);
|
|
1338
1410
|
// Move every identity from source → target.
|
|
1339
1411
|
for (const ident of sourceBefore.identities) {
|
|
1340
1412
|
await unlinkIdentity(sourceId, ident.kind, ident.externalId, actor);
|
|
@@ -1395,6 +1467,7 @@ export async function handleUsers(
|
|
|
1395
1467
|
});
|
|
1396
1468
|
mergeUsersRoute.respond(res, 200, { user: mergedUser });
|
|
1397
1469
|
} catch (err) {
|
|
1470
|
+
if (respondOperatorGrantedRefusal(res, err)) return true;
|
|
1398
1471
|
if (err instanceof LastAdminError) {
|
|
1399
1472
|
jsonError(res, "last_admin", 409);
|
|
1400
1473
|
return true;
|
|
@@ -1429,6 +1502,9 @@ export async function handleUsers(
|
|
|
1429
1502
|
jsonError(res, "User not found", 404);
|
|
1430
1503
|
return true;
|
|
1431
1504
|
}
|
|
1505
|
+
const { identities: newIdentities, email: newEmail, emailAliases: newAliases } = parsed.body;
|
|
1506
|
+
const bindsIdentity =
|
|
1507
|
+
newIdentities !== undefined || newEmail !== undefined || newAliases !== undefined;
|
|
1432
1508
|
|
|
1433
1509
|
try {
|
|
1434
1510
|
const { identities, metadata, comms, ...rest } = parsed.body;
|
|
@@ -1450,102 +1526,116 @@ export async function handleUsers(
|
|
|
1450
1526
|
} else if (metadata !== undefined) {
|
|
1451
1527
|
update.metadata = metadata as Record<string, unknown> | null;
|
|
1452
1528
|
}
|
|
1453
|
-
|
|
1454
|
-
|
|
1455
|
-
|
|
1456
|
-
|
|
1457
|
-
|
|
1458
|
-
|
|
1459
|
-
|
|
1460
|
-
|
|
1461
|
-
|
|
1462
|
-
|
|
1463
|
-
|
|
1464
|
-
|
|
1465
|
-
|
|
1466
|
-
|
|
1467
|
-
|
|
1468
|
-
|
|
1469
|
-
|
|
1470
|
-
|
|
1471
|
-
|
|
1472
|
-
|
|
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
|
+
}
|
|
1473
1550
|
|
|
1474
|
-
|
|
1475
|
-
|
|
1476
|
-
|
|
1477
|
-
|
|
1478
|
-
|
|
1479
|
-
|
|
1480
|
-
|
|
1481
|
-
|
|
1482
|
-
|
|
1483
|
-
|
|
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
|
+
}
|
|
1484
1561
|
|
|
1485
|
-
|
|
1486
|
-
|
|
1487
|
-
|
|
1488
|
-
|
|
1489
|
-
|
|
1490
|
-
|
|
1491
|
-
|
|
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
|
+
}
|
|
1492
1570
|
}
|
|
1493
|
-
|
|
1494
|
-
|
|
1495
|
-
|
|
1496
|
-
|
|
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
|
+
}
|
|
1497
1581
|
}
|
|
1498
1582
|
}
|
|
1499
|
-
}
|
|
1500
1583
|
|
|
1501
|
-
|
|
1502
|
-
|
|
1503
|
-
|
|
1504
|
-
|
|
1505
|
-
|
|
1506
|
-
|
|
1507
|
-
|
|
1508
|
-
|
|
1509
|
-
|
|
1510
|
-
|
|
1511
|
-
|
|
1512
|
-
|
|
1513
|
-
|
|
1514
|
-
|
|
1515
|
-
|
|
1516
|
-
|
|
1517
|
-
|
|
1518
|
-
|
|
1519
|
-
|
|
1520
|
-
|
|
1521
|
-
|
|
1522
|
-
|
|
1523
|
-
|
|
1524
|
-
|
|
1525
|
-
|
|
1526
|
-
|
|
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
|
+
}
|
|
1527
1610
|
|
|
1528
|
-
|
|
1529
|
-
|
|
1530
|
-
|
|
1531
|
-
|
|
1532
|
-
|
|
1533
|
-
|
|
1534
|
-
|
|
1535
|
-
|
|
1536
|
-
|
|
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
|
+
}
|
|
1537
1621
|
}
|
|
1538
|
-
|
|
1539
|
-
|
|
1540
|
-
|
|
1541
|
-
|
|
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
|
+
}
|
|
1542
1626
|
}
|
|
1543
1627
|
}
|
|
1628
|
+
return true;
|
|
1629
|
+
});
|
|
1630
|
+
if (!found) {
|
|
1631
|
+
jsonError(res, "User not found", 404);
|
|
1632
|
+
return true;
|
|
1544
1633
|
}
|
|
1545
1634
|
|
|
1546
1635
|
const composed = await composeUser(parsed.params.id);
|
|
1547
1636
|
updateUserRoute.respond(res, 200, { user: composed });
|
|
1548
1637
|
} catch (err) {
|
|
1638
|
+
if (respondOperatorGrantedRefusal(res, err)) return true;
|
|
1549
1639
|
jsonError(res, err instanceof Error ? err.message : "Failed to update user", 500);
|
|
1550
1640
|
}
|
|
1551
1641
|
return true;
|
|
@@ -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",
|
|
@@ -24,9 +24,10 @@ export function listCodexModels(): string[] {
|
|
|
24
24
|
}
|
|
25
25
|
|
|
26
26
|
/**
|
|
27
|
-
* The
|
|
28
|
-
*
|
|
29
|
-
*
|
|
27
|
+
* The compile-time no-tier fallback when no worker override, task model,
|
|
28
|
+
* task modelTier, or task/agent model profile selects a model. This fallback
|
|
29
|
+
* is not changed by MODEL_TIER_CODEX_REGULAR; that setting applies only when
|
|
30
|
+
* a task explicitly resolves the regular tier.
|
|
30
31
|
*/
|
|
31
32
|
export const CODEX_DEFAULT_MODEL: string = DEFAULT_MODEL_TIER_MAP.codex.regular;
|
|
32
33
|
|
|
@@ -28,25 +28,21 @@ import { decodeJwt, extractChatgptPlanType, extractChatgptUserId } from "./flow.
|
|
|
28
28
|
import type { CodexAuthJson, CodexOAuthCredentials } from "./types.js";
|
|
29
29
|
|
|
30
30
|
/**
|
|
31
|
-
* Derive the slot-unique `keySuffix`
|
|
32
|
-
*
|
|
33
|
-
*
|
|
34
|
-
*
|
|
35
|
-
*
|
|
36
|
-
*
|
|
37
|
-
*
|
|
38
|
-
*
|
|
31
|
+
* Derive the slot-unique `keySuffix` that identifies a Codex OAuth pool slot
|
|
32
|
+
* in `api_key_status`, the `codex-auth-watch` KV bench namespace, task
|
|
33
|
+
* history, logs and failure messages: `<last 5 of chatgpt_user_id>-<slot>`.
|
|
34
|
+
*
|
|
35
|
+
* The slot is part of the identity because two slots signed in by the same
|
|
36
|
+
* ChatGPT user carry the same `chatgpt_user_id`, and a shared suffix made
|
|
37
|
+
* them share one status row and one bench marker: an auth failure on one slot
|
|
38
|
+
* benched the other. Slot keys (`codex_oauth_<n>`) are stable; deleting an
|
|
39
|
+
* account never renumbers the others. The user tail keeps the suffix
|
|
40
|
+
* readable and gives a re-login by a different user a fresh status row.
|
|
41
|
+
* `accountId` stands in for the tail when the token has no user claim.
|
|
39
42
|
*/
|
|
40
|
-
export function deriveCodexKeySuffix(accessToken: string, accountId: string): string {
|
|
43
|
+
export function deriveCodexKeySuffix(accessToken: string, accountId: string, slot: number): string {
|
|
41
44
|
const userId = extractChatgptUserId(accessToken);
|
|
42
|
-
|
|
43
|
-
if (!userId) {
|
|
44
|
-
console.warn(
|
|
45
|
-
"[codex-oauth] No chatgpt_user_id in JWT — falling back to account_id for keySuffix derivation. " +
|
|
46
|
-
"If two slots share an account, their suffixes will collide.",
|
|
47
|
-
);
|
|
48
|
-
}
|
|
49
|
-
return suffixSource.slice(-5);
|
|
45
|
+
return `${(userId ?? accountId).slice(-5)}-${slot}`;
|
|
50
46
|
}
|
|
51
47
|
|
|
52
48
|
export function authJsonToCredentialSelection(auth: CodexAuthJson, slot = 0, total = 1) {
|
|
@@ -57,7 +53,7 @@ export function authJsonToCredentialSelection(auth: CodexAuthJson, slot = 0, tot
|
|
|
57
53
|
selected: auth.tokens.account_id,
|
|
58
54
|
index: slot,
|
|
59
55
|
total,
|
|
60
|
-
keySuffix: deriveCodexKeySuffix(auth.tokens.access_token, auth.tokens.account_id),
|
|
56
|
+
keySuffix: deriveCodexKeySuffix(auth.tokens.access_token, auth.tokens.account_id, slot),
|
|
61
57
|
keyType: "CODEX_OAUTH",
|
|
62
58
|
isRateLimitFallback: false,
|
|
63
59
|
// The ChatGPT plan rides in the token itself (`chatgpt_plan_type`).
|
|
@@ -451,7 +451,7 @@ export async function getValidCodexOAuth(
|
|
|
451
451
|
throw new CodexOAuthRefreshError(
|
|
452
452
|
slot,
|
|
453
453
|
"lock_timeout",
|
|
454
|
-
deriveCodexKeySuffix(creds.access, creds.accountId),
|
|
454
|
+
deriveCodexKeySuffix(creds.access, creds.accountId, slot),
|
|
455
455
|
);
|
|
456
456
|
}
|
|
457
457
|
await sleep(REFRESH_LOCK_POLL_MS);
|
|
@@ -472,7 +472,7 @@ export async function getValidCodexOAuth(
|
|
|
472
472
|
throw new CodexOAuthRefreshError(
|
|
473
473
|
slot,
|
|
474
474
|
"refresh_rejected",
|
|
475
|
-
deriveCodexKeySuffix(lockedCreds.access, lockedCreds.accountId),
|
|
475
|
+
deriveCodexKeySuffix(lockedCreds.access, lockedCreds.accountId, slot),
|
|
476
476
|
result.status,
|
|
477
477
|
result.error,
|
|
478
478
|
);
|
|
@@ -276,6 +276,8 @@ export const LEGACY_POLICY = {
|
|
|
276
276
|
"task.cancel.any": leadOrTaskCreator,
|
|
277
277
|
"approval.cancel.any": humanOrLeadOrResourceOwner,
|
|
278
278
|
"approval.respond": operatorOrUser,
|
|
279
|
+
"improvement.submit": anyAuthenticated,
|
|
280
|
+
"improvement.approve": operatorOrUser,
|
|
279
281
|
"task.steer.any": leadOrTaskCreator,
|
|
280
282
|
"task.create.own": anyAuthenticated,
|
|
281
283
|
"task.requester.assign": leadOrOperatorOrUser,
|
package/src/rbac/permissions.ts
CHANGED
|
@@ -54,6 +54,16 @@ export const PERMISSIONS = {
|
|
|
54
54
|
"Approve or reject a pending approval request as a person. Agents never hold it; the request's approvers list still applies.",
|
|
55
55
|
namespace: "approval",
|
|
56
56
|
},
|
|
57
|
+
"improvement.submit": {
|
|
58
|
+
description:
|
|
59
|
+
"Draft a product improvement for desplega. An agent's draft stays pending until a person approves it.",
|
|
60
|
+
namespace: "improvement",
|
|
61
|
+
},
|
|
62
|
+
"improvement.approve": {
|
|
63
|
+
description:
|
|
64
|
+
"Approve and send a drafted product improvement to desplega as a person. Agents never hold it.",
|
|
65
|
+
namespace: "improvement",
|
|
66
|
+
},
|
|
57
67
|
"task.steer.any": {
|
|
58
68
|
description: "Steer any task (beyond tasks the caller created).",
|
|
59
69
|
namespace: "task",
|