@desplega.ai/agent-swarm 2.7.7 → 2.7.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/acp-adapter-dn4gdsgr.js +16 -0
- package/dist/{actions-3tt153af.js → actions-g563mbn2.js} +19 -19
- package/dist/{amp-adapter-njpts0yr.js → amp-adapter-q61w05eb.js} +3 -3
- package/dist/{anthropic-messages-xey2skwx.js → anthropic-messages-jkva0zps.js} +68 -78
- package/dist/{app-nky4378f.js → app-a66ssc4k.js} +3 -3
- package/dist/{assistant-jnb669pa.js → assistant-p477rjwj.js} +22 -22
- package/dist/{azure-openai-responses-26t7j9ra.js → azure-openai-responses-wgtqkbr3.js} +5 -10
- package/dist/boot-args-schema-h4qj462e.js +89 -0
- package/dist/{boot-reembed-9mgvaztt.js → boot-reembed-n1ehfbsw.js} +1 -1
- package/dist/{boot-reembed-qs2djdej.js → boot-reembed-qw4mc0pt.js} +1 -1
- package/dist/{boot-scrub-sweep-yjpdj7s1.js → boot-scrub-sweep-9w9jp4sm.js} +4 -4
- package/dist/{boot-seeds-5cm6ambd.js → boot-seeds-qdaf3sdy.js} +5 -4
- package/dist/{boxd-nv507va8.js → boxd-qbkxy6ap.js} +1 -1
- package/dist/{claude-adapter-fn287zmm.js → claude-adapter-348p5hx9.js} +8 -8
- package/dist/{claude-managed-adapter-dvs2xw5n.js → claude-managed-adapter-h74d06yz.js} +4 -4
- package/dist/{claude-managed-setup-wtdz2mj2.js → claude-managed-setup-7787fxtp.js} +5 -5
- package/dist/{claude-sdk-session-x91kqyhm.js → claude-sdk-session-hbszbt8a.js} +7901 -7718
- package/dist/{cli-cb2a8pna.js → cli-09kmfkmq.js} +4 -6
- package/dist/{cli-m0da8j35.js → cli-0whpms1z.js} +15 -10
- package/dist/{cli-5zx699j9.js → cli-12xyjhws.js} +29 -12
- package/dist/{cli-snpj5zbj.js → cli-1z4qggfe.js} +9 -36
- package/dist/{cli-e0kmphd6.js → cli-21159vea.js} +35 -12
- package/dist/{cli-s0qnd4wv.js → cli-28fq781p.js} +1 -1
- package/dist/{cli-qh4d4tvk.js → cli-2a8py3sx.js} +6 -6
- package/dist/{cli-adeegh7d.js → cli-2ccpqyyf.js} +412 -116
- package/dist/{cli-1p89xny0.js → cli-2r0jcc3k.js} +1 -1
- package/dist/{cli-rvtm68yy.js → cli-2xv18ywz.js} +2 -2
- package/dist/{cli-5xaqj21p.js → cli-3kd08rej.js} +1 -1
- package/dist/{cli-1c6tzt8g.js → cli-3tqcamp6.js} +13 -13
- package/dist/{cli-ae7mrdf9.js → cli-3vjhs18n.js} +4 -6
- package/dist/{cli-vfym7wmz.js → cli-3xcwp3z8.js} +10 -12
- package/dist/{cli-az48n0nr.js → cli-4caa1x7d.js} +67 -64
- package/dist/{cli-5jnhv72d.js → cli-4t0fmf3z.js} +30 -7
- package/dist/{cli-5b456bpf.js → cli-530hkwdy.js} +7 -9
- package/dist/{cli-pz4rk021.js → cli-54vrpgm0.js} +1 -1
- package/dist/{cli-ddaanqkd.js → cli-587857ys.js} +7 -7
- package/dist/{cli-r9jqcehk.js → cli-5mpy301f.js} +38 -2
- package/dist/{cli-cppkf404.js → cli-605nn699.js} +80 -43
- package/dist/{cli-6pfd54vx.js → cli-650zv9q9.js} +10 -10
- package/dist/cli-6pzk82fd.js +778 -0
- package/dist/{cli-gz6q4eve.js → cli-715t1gx6.js} +9 -9
- package/dist/{cli-08bmz9z9.js → cli-9aezs55w.js} +10 -12
- package/dist/{cli-tgrv9cjx.js → cli-9r5gtwjr.js} +3 -3
- package/dist/{cli-pc6n7fre.js → cli-a0657jmf.js} +2 -2
- package/dist/{cli-pjctyea3.js → cli-agyaeef4.js} +3 -3
- package/dist/cli-b932gexn.js +5266 -0
- package/dist/{cli-e46hg0xw.js → cli-bc779n4v.js} +3 -3
- package/dist/{cli-jtjtabxe.js → cli-btc9cb4c.js} +78 -5
- package/dist/{cli-caj33vcq.js → cli-btf6fw39.js} +5 -5
- package/dist/{cli-q3tkegby.js → cli-cseh6f8w.js} +5 -5
- package/dist/{cli-n6bv12jn.js → cli-cvs2r2vq.js} +23 -14
- package/dist/{cli-tfyyvzx6.js → cli-cyn9v8zr.js} +17 -2
- package/dist/{cli-a22h291q.js → cli-d6521kb5.js} +1 -1
- package/dist/{cli-1b7btd38.js → cli-d84byzn8.js} +869 -5
- package/dist/{cli-wx3rhnm0.js → cli-eddnyg3t.js} +1 -1
- package/dist/{cli-nmzhp1b5.js → cli-ejkvvqbe.js} +55 -46
- package/dist/{cli-ftyxyspd.js → cli-eqtfgfr6.js} +1 -1
- package/dist/{cli-mthwvjre.js → cli-f2zenhja.js} +1 -1
- package/dist/{cli-ws19768n.js → cli-fayav105.js} +624 -227
- package/dist/{cli-ferkkrg9.js → cli-fjggej24.js} +2 -2
- package/dist/{cli-g7s47cc5.js → cli-fsgttth8.js} +123 -102
- package/dist/{cli-8305gbq0.js → cli-gce09r66.js} +5 -5
- package/dist/{cli-mkk9rnzz.js → cli-gxy8y1dt.js} +51 -4
- package/dist/{cli-fyt2g4wd.js → cli-hae9j8sv.js} +288 -76
- package/dist/{cli-agfm16v9.js → cli-hg42n3hx.js} +12 -12
- package/dist/{cli-qghe0h66.js → cli-hwprv9e4.js} +8 -10
- package/dist/{cli-yndmfxb3.js → cli-hxpyc9sn.js} +3 -3
- package/dist/{cli-72v799xn.js → cli-jfx48xrj.js} +10 -12
- package/dist/{cli-dhar9qay.js → cli-jrp1dt73.js} +2 -2
- package/dist/{cli-98rw5dt5.js → cli-jrzkw01m.js} +2 -2
- package/dist/{cli-ayayvfg4.js → cli-k70e3x9e.js} +24 -20
- package/dist/{cli-583frbyr.js → cli-kchjb7qy.js} +1 -1
- package/dist/{cli-cm5yqn35.js → cli-kf3pxxdg.js} +1 -0
- package/dist/{cli-fmjd0t1y.js → cli-m0cy2vyf.js} +2 -2
- package/dist/{cli-4zsenjhy.js → cli-m5akxq8q.js} +16 -3
- package/dist/{cli-73jzwksr.js → cli-m88rpzkh.js} +6 -3
- package/dist/{cli-95jzxcp3.js → cli-mnrkgg60.js} +4 -4
- package/dist/{cli-p82cnnjq.js → cli-ms5m5r1y.js} +1 -1
- package/dist/{cli-fy6x31ps.js → cli-n5yexkdg.js} +1 -0
- package/dist/{cli-wk5yrfwd.js → cli-neyag5p6.js} +191 -85
- package/dist/cli-p0m0p34z.js +9321 -0
- package/dist/{cli-yyj3j5m4.js → cli-p17970qv.js} +8 -10
- package/dist/{cli-6vcp76qk.js → cli-p74md7t8.js} +42 -23
- package/dist/{cli-rjcbm574.js → cli-pr0eze3x.js} +2 -2
- package/dist/{cli-35rsp8ye.js → cli-qkdmz8c8.js} +1 -1
- package/dist/{cli-rtt8g4v9.js → cli-qmd3mse0.js} +2 -2
- package/dist/{cli-je518txm.js → cli-qzt90yze.js} +20 -20
- package/dist/cli-rkc97c6a.js +39 -0
- package/dist/{cli-75gkpjvw.js → cli-rvhdmjvt.js} +8 -12
- package/dist/{cli-6g0hb4cp.js → cli-rwymrnaz.js} +18608 -9089
- package/dist/{cli-3fg0bdcv.js → cli-serm8zrx.js} +6 -6
- package/dist/{cli-g08zdaec.js → cli-sgs5k6yd.js} +1 -1
- package/dist/{cli-afkqkrtw.js → cli-sya22y84.js} +21 -9
- package/dist/{cli-318r69gq.js → cli-t73cas91.js} +440 -9
- package/dist/{cli-e5bzrn01.js → cli-tqq0hspb.js} +2 -2
- package/dist/{cli-pq73h5mz.js → cli-v3cf1ts9.js} +3 -3
- package/dist/{cli-bfv7vdg6.js → cli-varqt4d1.js} +28 -16
- package/dist/{cli-k899ehvh.js → cli-vxh6acp7.js} +6 -6
- package/dist/{cli-g83s9ewh.js → cli-xfjrc279.js} +1 -1
- package/dist/{cli-k1nje3v3.js → cli-xk879m3k.js} +129 -115
- package/dist/{cli-7cx2m6t2.js → cli-y5rbvxhc.js} +2 -2
- package/dist/{cli-8sckt74b.js → cli-y8nbefpb.js} +41 -19
- package/dist/{cli-81p9jd57.js → cli-yab6sh8p.js} +9 -3
- package/dist/{cli-srye3vdt.js → cli-ybjdc978.js} +1 -1
- package/dist/{cli-k5671be5.js → cli-zcfpsfzf.js} +5 -5
- package/dist/{cli-vf078p3e.js → cli-zfqg6fzn.js} +1 -1
- package/dist/{cli-k8196sh2.js → cli-zgv8gxgs.js} +9 -8
- package/dist/cli.js +34 -52
- package/dist/{cloudflare-workers-ai-system-one-ef2a980q.js → cloudflare-workers-ai-system-one-9y1zx3pt.js} +2 -2
- package/dist/{codex-adapter-cf2yxe9m.js → codex-adapter-ysq6bzha.js} +7 -7
- package/dist/{codex-hook-a0c6g6t6.js → codex-hook-fac6175r.js} +1 -1
- package/dist/{codex-login-y0pmff1c.js → codex-login-bcda78ge.js} +2 -2
- package/dist/{codex-session-runner-6vfzdgbd.js → codex-session-runner-qakzfx93.js} +8 -8
- package/dist/{commands-t3mfy7vn.js → commands-rs7hkv9r.js} +3 -3
- package/dist/{controller-q7xrbaz0.js → controller-r5x9bg6e.js} +4 -4
- package/dist/{controllers-connect-c6nm70kg.js → controllers-connect-498hrxvk.js} +24 -24
- package/dist/{cursor-adapter-ftd81ga8.js → cursor-adapter-d46qszer.js} +2 -2
- package/dist/{db-vemtpmcc.js → db-pm96nhdb.js} +6 -2
- package/dist/{db-dk572x25.js → db-s13dqhr6.js} +3 -3
- package/dist/{devin-adapter-r9phbnc9.js → devin-adapter-z46ep5ph.js} +1 -1
- package/dist/{dispatcher-kh7ecxh9.js → dispatcher-j3h81t7m.js} +18 -18
- package/dist/{docker-c1a3gqmf.js → docker-866qpzt9.js} +2 -2
- package/dist/{dsh-adapter-v8628r89.js → dsh-adapter-rw0d5rc4.js} +2 -2
- package/dist/{e2b-fr12yccx.js → e2b-jkwfhbcv.js} +2 -2
- package/dist/{e2b-x6ywzak3.js → e2b-s16txnpx.js} +2 -3
- package/dist/{easter-egg-3d-nenw4x63.js → easter-egg-3d-qtgfxgze.js} +1 -1
- package/dist/{embedding-space-0jepb239.js → embedding-space-xh8p4q4x.js} +6 -6
- package/dist/{embeddings-xxt49yxg.js → embeddings-wp745m91.js} +1 -1
- package/dist/{event-bus-g0ka3pbw.js → event-bus-e66gh7cc.js} +1 -1
- package/dist/{execute-1mhw6e4x.js → execute-2fzb9z74.js} +1 -1
- package/dist/{external-channel-55v12e60.js → external-channel-ys21h3sy.js} +2 -2
- package/dist/fx-adapter-vz0b9z3g.js +19 -0
- package/dist/{google-generative-ai-v94hr7h0.js → google-generative-ai-ytpgncx9.js} +7 -12
- package/dist/{google-vertex-g7vr6cf8.js → google-vertex-tqhze5j7.js} +7 -12
- package/dist/grok-adapter-spea7zkj.js +19 -0
- package/dist/handlers-crckt5dq.js +32 -0
- package/dist/{heartbeat-k42svnr0.js → heartbeat-8phn1kdq.js} +21 -21
- package/dist/{hook-6nphweh0.js → hook-amcj4s10.js} +16 -11
- package/dist/{hook-114m7hap.js → hook-bc6n49qn.js} +5 -5
- package/dist/{http-r8cc4wz7.js → http-7374brv5.js} +854 -332
- package/dist/index-4x08sjtk.js +30 -0
- package/dist/{index-6cxzwfen.js → index-5a9jtqde.js} +26 -26
- package/dist/index-8ybffts4.js +37 -0
- package/dist/{index-nh3wyqdt.js → index-c9y31ytf.js} +16 -16
- package/dist/{index-h39zbx67.js → index-hsad2t3r.js} +31 -31
- package/dist/index-nfy4kkg5.js +33 -0
- package/dist/{index-e3s8wmxy.js → index-p4hjwbvw.js} +1 -1
- package/dist/{index-k7fj52d3.js → index-q5cmtbz5.js} +6 -6
- package/dist/{index-fpk4bcd9.js → index-w4m9z29z.js} +1 -1
- package/dist/{keepalive-x060nt9p.js → keepalive-wy29kbrg.js} +4 -4
- package/dist/lead-zdqxsvjn.js +71 -0
- package/dist/{llama-cpp-classify-s5c47rwh.js → llama-cpp-classify-nfgswa1m.js} +2 -2
- package/dist/{maintenance-2xxfexhf.js → maintenance-h2ds9w6c.js} +1 -1
- package/dist/{mistral-conversations-3gjpdb4b.js → mistral-conversations-a45tx39a.js} +29 -51
- package/dist/{oauth-refresh-sweep-fckc4ar5.js → oauth-refresh-sweep-q7mtbyp3.js} +3 -3
- package/dist/{onboard-zc48j237.js → onboard-vw8r2fdw.js} +68 -16
- package/dist/{openai-codex-responses-8pbxq9h5.js → openai-codex-responses-k9gapdze.js} +7 -11
- package/dist/{openai-completions-rm00s912.js → openai-completions-xd579js7.js} +50 -58
- package/dist/{openai-decisions-8v957r2r.js → openai-decisions-q3hh60wr.js} +2 -2
- package/dist/{openai-responses-agxpf96k.js → openai-responses-4d5dx3c7.js} +5 -10
- package/dist/{opencode-adapter-r690h1cr.js → opencode-adapter-mtb0953j.js} +6 -6
- package/dist/{openrouter-images-3ecegv0d.js → openrouter-images-xr9gme9x.js} +4 -3
- package/dist/{otel-impl-r5xbh81q.js → otel-impl-j42czw3r.js} +2 -2
- package/dist/{pi-messages-pchtw4he.js → pi-messages-hjbv8v10.js} +28 -12
- package/dist/{pi-mono-adapter-c7v8sdec.js → pi-mono-adapter-zk8pg9jr.js} +30 -27
- package/dist/{pricing-refresh-3pmre11v.js → pricing-refresh-x7nhv23d.js} +3 -3
- package/dist/{rbac-roles-3vbshwsb.js → rbac-roles-9044425x.js} +16 -2
- package/dist/rbac-roles-bzvee6cf.js +37 -0
- package/dist/{render-v2-pxykkbab.js → render-v2-t7bn4skz.js} +3 -3
- package/dist/{resume-adda0bwy.js → resume-x94gemep.js} +7 -7
- package/dist/{runtime-fnbm7stk.js → runtime-breq6fmv.js} +1 -1
- package/dist/{session-access-2fvamrdc.js → session-access-q7dmqjvt.js} +7 -5
- package/dist/{session-source-backfill-08xvv0sm.js → session-source-backfill-440ysamr.js} +3 -3
- package/dist/{setup-1aqmvmh1.js → setup-07n4727s.js} +1 -1
- package/dist/{typesafe-system-one-0bmqcxfg.js → typesafe-system-one-f2en2knd.js} +2 -2
- package/dist/virtual-modules-z5h6mcyf.js +362 -0
- package/dist/{work-objects-9s0yrm5j.js → work-objects-pnq5y534.js} +21 -21
- package/dist/{worker-follow-up-3q78fqmr.js → worker-follow-up-7z1gfkr8.js} +18 -18
- package/dist/worker-y62rvvq3.js +71 -0
- package/dist/{x-vmmye1kb.js → x-2fyrt5pp.js} +2 -2
- package/openapi.json +1268 -276
- package/package.json +10 -10
- package/src/apps/catalog.generated.json +299 -82
- package/src/apps/page-validator.ts +115 -2
- package/src/be/connector-codes.ts +21 -6
- package/src/be/db/model-profiles.ts +1 -1
- package/src/be/db/session-tree.ts +9 -5
- package/src/be/db/session-visibility.ts +25 -9
- package/src/be/db/tasks/read.ts +33 -6
- package/src/be/db/tasks/write.ts +77 -7
- package/src/be/db-queries/tracker.ts +4 -2
- package/src/be/db.ts +53 -19
- package/src/be/improvements.ts +416 -0
- package/src/be/migrations/271_subscription_usage_model.sql +30 -0
- package/src/be/migrations/274_improvements.sql +27 -0
- package/src/be/migrations/275_task_dispatched_by.sql +8 -0
- package/src/be/model-validation.ts +19 -1
- package/src/be/rbac-roles.ts +144 -1
- package/src/be/runtime-pools/routing.ts +1 -1
- package/src/be/scripts/boot-args-schema.ts +95 -0
- package/src/be/scripts/extract-schema.ts +15 -10
- package/src/be/seed-scripts/catalog/boot-triage.inline.ts +1 -1
- package/src/be/seed-scripts/catalog/boot-triage.ts +1 -1
- package/src/be/seed-scripts/catalog/get-child-outputs.ts +1 -1
- package/src/be/seed-scripts/catalog/wait-for-task.ts +1 -1
- package/src/be/swarm-config-guard.ts +8 -0
- package/src/be/users.ts +64 -5
- package/src/cli.tsx +5 -25
- package/src/commands/claude-managed-setup.ts +1 -1
- package/src/commands/codex-login.ts +1 -1
- package/src/commands/e2b.ts +0 -1
- package/src/commands/onboard/agent-fs-version.ts +1 -1
- package/src/commands/onboard/compose-generator.ts +0 -1
- package/src/commands/onboard/dashboard-url.ts +31 -0
- package/src/commands/onboard/steps/generate.tsx +17 -1
- package/src/commands/onboard/steps/post-dashboard.tsx +9 -3
- package/src/commands/onboard.tsx +19 -6
- package/src/commands/runner.ts +143 -105
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/hooks/hook.ts +13 -5
- package/src/http/agents.ts +7 -1
- package/src/http/all-routes.ts +1 -0
- package/src/http/approval-requests.ts +32 -50
- package/src/http/auth.ts +5 -4
- package/src/http/codex-oauth-accounts.ts +31 -23
- package/src/http/codex-oauth-device.ts +3 -3
- package/src/http/codex-oauth-keep-warm.ts +1 -1
- package/src/http/improvements.ts +317 -0
- package/src/http/index.ts +10 -0
- package/src/http/mcp-oauth.ts +6 -0
- package/src/http/mcp-servers.ts +8 -0
- package/src/http/models-catalog.ts +1 -1
- package/src/http/operator-actor.ts +2 -1
- package/src/http/pages-public.ts +38 -1
- package/src/http/person-responder.ts +66 -0
- package/src/http/poll.ts +3 -4
- package/src/http/prompt-templates.ts +1 -1
- package/src/http/schedules.ts +4 -0
- package/src/http/script-runs.ts +6 -1
- package/src/http/session-access.ts +61 -6
- package/src/http/sessions.ts +67 -9
- package/src/http/tasks.ts +53 -9
- package/src/http/user-roles.ts +11 -2
- package/src/http/users.ts +224 -105
- package/src/http/utils.ts +2 -1
- package/src/http/workflows.ts +11 -7
- package/src/prompts/session-templates.ts +1 -0
- package/src/providers/acp-targets.ts +1 -1
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/codex-adapter.ts +17 -3
- package/src/providers/codex-models.ts +4 -3
- package/src/providers/codex-oauth/auth-json.ts +14 -18
- package/src/providers/codex-oauth/device.ts +49 -15
- package/src/providers/codex-oauth/flow.ts +2 -1
- package/src/providers/codex-oauth/storage.ts +2 -2
- package/src/providers/pi-mono-adapter.ts +8 -0
- package/src/providers/pricing-sources.md +16 -1
- package/src/providers/swarm-events-shared.ts +15 -2
- package/src/rbac/legacy-policy.ts +3 -0
- package/src/rbac/permissions.ts +15 -0
- package/src/scheduler/deferred-task-waits.ts +9 -4
- package/src/scripts-runtime/extract-args-schema.ts +3 -1
- package/src/scripts-runtime/swarm-sdk.ts +1 -1
- package/src/scripts-runtime/types/swarm-extension.d.ts +31 -28
- package/src/server-user.ts +1 -1
- package/src/server.ts +2 -0
- package/src/slack/ack.ts +68 -26
- package/src/slack/blocks.ts +1 -0
- package/src/slack/reaction-shortcode.ts +8 -2
- package/src/slack/render-v2.ts +72 -20
- package/src/slack/task-output.ts +4 -1
- package/src/slack/thread-buffer.ts +2 -2
- package/src/tasks/task-skip.ts +28 -0
- package/src/tasks/terminal-result-guard.ts +3 -2
- package/src/telemetry.ts +28 -1
- package/src/tests/agentmail-inbox-mapping.test.ts +73 -0
- package/src/tests/api-drain-worker-e2e.test.ts +69 -2
- package/src/tests/approval-requests.test.ts +58 -0
- package/src/tests/apps-catalog-drift.test.ts +35 -0
- package/src/tests/apps-catalog-table.test.ts +203 -0
- package/src/tests/apps-element-assembly.test.ts +28 -0
- package/src/tests/apps-smart-links.test.ts +151 -0
- package/src/tests/apps-table-filters-migration.test.ts +96 -0
- package/src/tests/apps-table-selection-migration.test.ts +95 -0
- package/src/tests/chatgpt-subscription-session-bench.test.ts +2 -2
- package/src/tests/claude-managed-setup.test.ts +36 -0
- package/src/tests/claude-worker-parity.test.ts +2 -2
- package/src/tests/codex-adapter.test.ts +32 -2
- package/src/tests/codex-login.test.ts +2 -2
- package/src/tests/codex-oauth-accounts.test.ts +48 -12
- package/src/tests/codex-oauth-credential-info.test.ts +77 -1
- package/src/tests/codex-oauth-device.test.ts +61 -1
- package/src/tests/codex-oauth-keep-warm.test.ts +2 -2
- package/src/tests/codex-oauth.test.ts +25 -4
- package/src/tests/codex-pool.test.ts +2 -2
- package/src/tests/codex-swarm-events.test.ts +43 -1
- package/src/tests/context-window.test.ts +14 -0
- package/src/tests/db-queries-tracker.test.ts +2 -1
- package/src/tests/db-task-read-contract.test.ts +3 -0
- package/src/tests/db-task-write-contract.test.ts +3 -0
- package/src/tests/deferred-task-wake.test.ts +7 -2
- package/src/tests/deploy-one-box.test.ts +39 -1
- package/src/tests/docs-index-footprint.test.js +3 -3
- package/src/tests/e2e-coverage-contract.test.ts +235 -0
- package/src/tests/empty-output-schema.test.ts +160 -0
- package/src/tests/env-flag.test.ts +1 -0
- package/src/tests/explicit-model-validation.test.ts +14 -0
- package/src/tests/fixtures/onboard/content.compose.yml.txt +0 -4
- package/src/tests/fixtures/onboard/dev.compose.yml.txt +0 -3
- package/src/tests/fixtures/onboard/full-all.compose.yml.txt +0 -11
- package/src/tests/fixtures/onboard/full.compose.yml.txt +0 -11
- package/src/tests/fixtures/onboard/research.compose.yml.txt +0 -3
- package/src/tests/fixtures/onboard/solo.compose.yml.txt +0 -1
- package/src/tests/fixtures/prs-app-definition.json.txt +784 -0
- package/src/tests/fixtures/prs-filters-migration.patch.json.txt +318 -0
- package/src/tests/fixtures/prs-selection-migration.patch.json.txt +373 -0
- package/src/tests/fixtures/runner-identity-refresh.ts +3 -0
- package/src/tests/fixtures/runner-legacy-resume-prompt.ts +3 -0
- package/src/tests/fixtures/runner-task-start-reads.ts +140 -0
- package/src/tests/hook-ping-me-order.test.ts +85 -0
- package/src/tests/http-api-integration.test.ts +2 -2
- package/src/tests/http-users.test.ts +63 -0
- package/src/tests/improvements-payload.test.ts +200 -0
- package/src/tests/improvements-route.test.ts +419 -0
- package/src/tests/install-sh-setup-url.test.ts +190 -0
- package/src/tests/mcp-input-caps.test.ts +4 -3
- package/src/tests/merge-gate-detect-changes.test.ts +22 -0
- package/src/tests/onboard-dashboard-output.test.ts +109 -0
- package/src/tests/onboard-dashboard-url.test.ts +83 -0
- package/src/tests/operator-granted-credentials.test.ts +561 -0
- package/src/tests/operator-granted-role-wire.test.ts +222 -0
- package/src/tests/pages-authed-mode.test.ts +13 -2
- package/src/tests/pi-mono-adapter.test.ts +39 -4
- package/src/tests/rbac-engine.test.ts +3 -0
- package/src/tests/runner-context-usage.test.ts +118 -0
- package/src/tests/runner-legacy-options.test.ts +55 -0
- package/src/tests/runner-slot-reconcile.test.ts +38 -0
- package/src/tests/runner-task-start-reads.test.ts +58 -0
- package/src/tests/script-connections.test.ts +2 -0
- package/src/tests/script-executor-quickjs.test.ts +2 -0
- package/src/tests/script-runs-http.test.ts +57 -0
- package/src/tests/scripts-boot-args-schema.test.ts +181 -0
- package/src/tests/scripts-runtime.test.ts +24 -0
- package/src/tests/sdk-store-progress-skipped.test.ts +155 -0
- package/src/tests/send-task-dispatched-by.test.ts +129 -0
- package/src/tests/session-costs-model-key-normalize.test.ts +59 -0
- package/src/tests/session-dispatched-tasks.test.ts +115 -0
- package/src/tests/session-sharing.test.ts +402 -3
- package/src/tests/slack-file-tools-attachments.test.ts +95 -3
- package/src/tests/slack-reaction-config.test.ts +40 -0
- package/src/tests/slack-render-v2.test.ts +120 -0
- package/src/tests/slack-skip-reaction.test.ts +203 -0
- package/src/tests/store-progress-skipped.test.ts +159 -0
- package/src/tests/submit-improvement-tool.test.ts +82 -0
- package/src/tests/subscription-usage-migration.test.ts +57 -0
- package/src/tests/swarm-config-reserved-keys.test.ts +3 -0
- package/src/tests/telemetry-endpoint-override.test.ts +27 -0
- package/src/tests/tool-annotations.test.ts +1 -1
- package/src/tests/trigger-claiming.test.ts +2 -0
- package/src/tests/workflow-system-one-extraction.test.ts +29 -0
- package/src/tools/create-channel.ts +1 -1
- package/src/tools/defer-task.ts +1 -1
- package/src/tools/manage-user.ts +88 -58
- package/src/tools/register-agentmail-inbox.ts +5 -0
- package/src/tools/repos/update-repo.ts +1 -1
- package/src/tools/request-human-input.ts +1 -1
- package/src/tools/send-task.ts +4 -1
- package/src/tools/slack-read.ts +61 -33
- package/src/tools/store-progress.ts +39 -8
- package/src/tools/submit-improvement.ts +68 -0
- package/src/tools/tool-config.ts +3 -0
- package/src/tools/tracker/tracker-unlink.ts +2 -1
- package/src/tools/workflows/retry-workflow-run.ts +3 -0
- package/src/types.ts +16 -2
- package/src/utils/context-window.ts +6 -1
- package/src/utils/output-schema.ts +23 -0
- package/src/utils/request-auth-context.ts +6 -1
- package/src/workflows/executors/system-one-providers.ts +25 -6
- package/src/workflows/recovery.ts +8 -4
- package/src/workflows/resume.ts +19 -0
- package/templates/skills/apps/SKILL.md +22 -11
- package/templates/skills/apps/content.md +22 -11
- package/templates/skills/swarm-scripts/SKILL.md +1 -1
- package/templates/skills/swarm-scripts/content.md +1 -1
- package/templates/skills/work-on-task/SKILL.md +1 -1
- package/templates/skills/work-on-task/content.md +1 -1
- package/dist/acp-adapter-7b4vk3h5.js +0 -16
- package/dist/cli-5c4hjzne.js +0 -873
- package/dist/cli-excnnjg2.js +0 -20222
- package/dist/cli-pc5znp64.js +0 -364
- package/dist/cli-vz22fyqv.js +0 -428
- package/dist/fx-adapter-bs8wqrk5.js +0 -19
- package/dist/grok-adapter-gpjqmkcq.js +0 -19
- package/dist/handlers-zxmp1ta4.js +0 -32
- package/dist/index-a8phxqnk.js +0 -37
- package/dist/index-k6h00t4c.js +0 -30
- package/dist/index-xrz7te8h.js +0 -33
- package/dist/lead-956sd2yc.js +0 -71
- package/dist/rbac-roles-910mmkgz.js +0 -26
- package/dist/virtual-modules-d2pjk9j1.js +0 -59
- package/dist/worker-y15hy08h.js +0 -71
|
@@ -0,0 +1,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);
|
|
@@ -26,6 +26,7 @@ import {
|
|
|
26
26
|
buildClaudeShortnameMap,
|
|
27
27
|
chatgptSubscriptionModelId,
|
|
28
28
|
type HarnessCatalogSections,
|
|
29
|
+
harnessCatalogSection,
|
|
29
30
|
harnessModelMismatch,
|
|
30
31
|
isAlias,
|
|
31
32
|
type ModelsDevCatalog,
|
|
@@ -75,6 +76,18 @@ export function isKnownCatalogModel(model: string, catalog: CatalogSections): bo
|
|
|
75
76
|
return Object.hasOwn(buildClaudeShortnameMap(anthropic), id);
|
|
76
77
|
}
|
|
77
78
|
|
|
79
|
+
/**
|
|
80
|
+
* The catalog id a Claude CLI shortname stands for (`opus` -> `claude-opus-5-5`), else `model`
|
|
81
|
+
* unchanged. `harnessModelMismatch` lets a bare name no section lists pass, so on a harness that
|
|
82
|
+
* does not run the shortname it must be spelled as its id to be judged like the id.
|
|
83
|
+
*/
|
|
84
|
+
function claudeShortnameToCatalogId(model: string, catalog: CatalogSections): string {
|
|
85
|
+
const anthropic = catalog.anthropic?.models as ModelsDevCatalog[string]["models"] | undefined;
|
|
86
|
+
const shortnames = buildClaudeShortnameMap(anthropic);
|
|
87
|
+
const bare = model.replace(CONTEXT_SUFFIX_RE, "");
|
|
88
|
+
return Object.hasOwn(shortnames, bare) ? (shortnames[bare] as string) : model;
|
|
89
|
+
}
|
|
90
|
+
|
|
78
91
|
export interface ExplicitModelCheck {
|
|
79
92
|
/** The model the caller named. Empty or absent values pass: there is nothing to check. */
|
|
80
93
|
model: string | null | undefined;
|
|
@@ -142,8 +155,13 @@ export async function explicitModelError(check: ExplicitModelCheck): Promise<str
|
|
|
142
155
|
const { providers } = await loadModelsCatalog();
|
|
143
156
|
const catalog = providers as CatalogSections;
|
|
144
157
|
if (check.harnessProvider) {
|
|
158
|
+
// The Claude harnesses run a shortname themselves; every other harness judges the id behind it.
|
|
159
|
+
const harnessModel =
|
|
160
|
+
harnessCatalogSection(check.harnessProvider) === "anthropic"
|
|
161
|
+
? model
|
|
162
|
+
: claudeShortnameToCatalogId(model, catalog);
|
|
145
163
|
const mismatch = harnessModelMismatch(
|
|
146
|
-
|
|
164
|
+
harnessModel,
|
|
147
165
|
check.harnessProvider,
|
|
148
166
|
catalog as HarnessCatalogSections,
|
|
149
167
|
{ agentId: check.agentId, agentName: check.agentName },
|
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
|
|
|
@@ -185,6 +205,94 @@ function parseDatabaseGrantVerb(roleId: string, verb: string): PermissionVerb |
|
|
|
185
205
|
return null;
|
|
186
206
|
}
|
|
187
207
|
|
|
208
|
+
/**
|
|
209
|
+
* Whether one of the user's roles lists `verb` in `role_permissions`. Unlike
|
|
210
|
+
* `getUserGrant`, a grant-all role does not count: it holds no rows, and
|
|
211
|
+
* every new user gets one (`trg_users_default_role`). Use it for a verb that
|
|
212
|
+
* must be granted on purpose.
|
|
213
|
+
*/
|
|
214
|
+
export async function userHoldsExplicitVerb(
|
|
215
|
+
userId: string,
|
|
216
|
+
verb: PermissionVerb,
|
|
217
|
+
): Promise<boolean> {
|
|
218
|
+
const row = await getDbClient().get<{ found: number }>(
|
|
219
|
+
`SELECT 1 AS found
|
|
220
|
+
FROM principal_roles pr
|
|
221
|
+
JOIN role_permissions rp ON rp.roleId = pr.roleId
|
|
222
|
+
WHERE pr.principalType = 'user' AND pr.principalId = ? AND rp.verb = ?
|
|
223
|
+
LIMIT 1`,
|
|
224
|
+
[userId, verb],
|
|
225
|
+
);
|
|
226
|
+
return row != null;
|
|
227
|
+
}
|
|
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
|
+
|
|
188
296
|
export async function getUserGrant(userId: string): Promise<EffectiveGrant> {
|
|
189
297
|
const rows = await getDbClient().query<GrantRow>(
|
|
190
298
|
`SELECT r.id AS roleId, r.grantsAll, rp.verb
|
|
@@ -270,6 +378,13 @@ export async function listRbacRoles(): Promise<RbacRoleCatalogEntry[]> {
|
|
|
270
378
|
|
|
271
379
|
export class InvalidRoleSetError extends Error {}
|
|
272
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
|
+
|
|
273
388
|
export class LastAdminError extends Error {
|
|
274
389
|
constructor() {
|
|
275
390
|
super("last_admin");
|
|
@@ -305,7 +420,9 @@ export async function assertNotLastAdmin(userId: string): Promise<void> {
|
|
|
305
420
|
/**
|
|
306
421
|
* Replace a user's RBAC roles. The set holds exactly one primary role
|
|
307
422
|
* (admin, requester or viewer) plus any extra roles. Refuses to leave the
|
|
308
|
-
* 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.
|
|
309
426
|
*/
|
|
310
427
|
export async function setUserRoles(
|
|
311
428
|
userId: string,
|
|
@@ -335,6 +452,25 @@ export async function setUserRoles(
|
|
|
335
452
|
ORDER BY r.name`,
|
|
336
453
|
[userId],
|
|
337
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
|
+
}
|
|
338
474
|
const wantsAll = wanted.some((r) => r.grantsAll === 1);
|
|
339
475
|
if (current.some((r) => r.grantsAll === 1) && !wantsAll) {
|
|
340
476
|
const user = await tx.get<{ status: string }>("SELECT status FROM users WHERE id = ?", [
|
|
@@ -369,6 +505,13 @@ export async function setUserRoles(
|
|
|
369
505
|
[userId, row.id, actorUserId],
|
|
370
506
|
);
|
|
371
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
|
+
}
|
|
372
515
|
getDbClient().afterCommit(() => invalidateTelemetryUserRole(userId));
|
|
373
516
|
return { before: current.map((r) => r.name), after: wanted.map((r) => r.name).sort() };
|
|
374
517
|
});
|
|
@@ -42,7 +42,7 @@ async function eligibleRuntimeSlots(agentId?: string): Promise<Map<string, numbe
|
|
|
42
42
|
AND r.last_seen_at >= ?
|
|
43
43
|
AND (a.runtime_pool_id IS NULL OR p.enabled = 1)
|
|
44
44
|
AND (COALESCE(p.lifecycle, 'idle') != 'per-task' OR t.id IS NULL
|
|
45
|
-
OR t.status NOT IN ('completed', 'failed', 'cancelled', 'superseded'))
|
|
45
|
+
OR t.status NOT IN ('completed', 'failed', 'cancelled', 'superseded', 'skipped'))
|
|
46
46
|
${agentId ? "AND r.agent_id = ?" : ""}
|
|
47
47
|
GROUP BY r.agent_id`,
|
|
48
48
|
[
|
|
@@ -0,0 +1,95 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Post-listen backfill: normalize stored `argsJsonSchema` JSON, so rows
|
|
3
|
+
* saved before the extractor marked `.default()` fields optional get the
|
|
4
|
+
* corrected schema without a re-upsert. Runs once per boot, async/non-blocking,
|
|
5
|
+
* idempotent: a second run finds every schema equal and rewrites nothing.
|
|
6
|
+
*
|
|
7
|
+
* This removes defaulted properties from `required` without executing script source.
|
|
8
|
+
* The write creates no version and preserves `updatedAt`. Scratch scripts and
|
|
9
|
+
* scripts without a stored schema are skipped.
|
|
10
|
+
*
|
|
11
|
+
* Mirrors the script embedding backfill (src/be/scripts/boot-reembed.ts).
|
|
12
|
+
*/
|
|
13
|
+
|
|
14
|
+
import { getDbClient } from "../db";
|
|
15
|
+
import { listScripts } from "./db";
|
|
16
|
+
|
|
17
|
+
function isObject(value: unknown): value is Record<string, unknown> {
|
|
18
|
+
return typeof value === "object" && value !== null && !Array.isArray(value);
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
/** Normalize schema nodes without changing literal values in default, const, or enum. */
|
|
22
|
+
function optionalDefaults(schema: unknown): boolean {
|
|
23
|
+
if (!isObject(schema)) return false;
|
|
24
|
+
let changed = false;
|
|
25
|
+
if (Array.isArray(schema.required) && isObject(schema.properties)) {
|
|
26
|
+
const properties = schema.properties;
|
|
27
|
+
const required = schema.required.filter((name) => {
|
|
28
|
+
const property = typeof name === "string" ? properties[name] : undefined;
|
|
29
|
+
return !isObject(property) || !Object.hasOwn(property, "default");
|
|
30
|
+
});
|
|
31
|
+
if (required.length !== schema.required.length) {
|
|
32
|
+
if (required.length) schema.required = required;
|
|
33
|
+
else delete schema.required;
|
|
34
|
+
changed = true;
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
for (const key of [
|
|
38
|
+
"properties",
|
|
39
|
+
"$defs",
|
|
40
|
+
"definitions",
|
|
41
|
+
"patternProperties",
|
|
42
|
+
"dependentSchemas",
|
|
43
|
+
]) {
|
|
44
|
+
const children = schema[key];
|
|
45
|
+
if (isObject(children)) {
|
|
46
|
+
for (const child of Object.values(children)) changed = optionalDefaults(child) || changed;
|
|
47
|
+
}
|
|
48
|
+
}
|
|
49
|
+
for (const key of [
|
|
50
|
+
"items",
|
|
51
|
+
"additionalProperties",
|
|
52
|
+
"contains",
|
|
53
|
+
"not",
|
|
54
|
+
"if",
|
|
55
|
+
"then",
|
|
56
|
+
"else",
|
|
57
|
+
"allOf",
|
|
58
|
+
"anyOf",
|
|
59
|
+
"oneOf",
|
|
60
|
+
"prefixItems",
|
|
61
|
+
]) {
|
|
62
|
+
const children = schema[key];
|
|
63
|
+
if (Array.isArray(children)) {
|
|
64
|
+
for (const child of children) changed = optionalDefaults(child) || changed;
|
|
65
|
+
} else {
|
|
66
|
+
changed = optionalDefaults(children) || changed;
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
return changed;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
export async function runBootArgsSchemaBackfill(): Promise<void> {
|
|
73
|
+
const scripts = (await listScripts()).filter((script) => script.argsJsonSchema);
|
|
74
|
+
if (scripts.length === 0) return;
|
|
75
|
+
|
|
76
|
+
let rewrote = 0;
|
|
77
|
+
for (const script of scripts) {
|
|
78
|
+
let schema: unknown;
|
|
79
|
+
try {
|
|
80
|
+
schema = JSON.parse(script.argsJsonSchema as string);
|
|
81
|
+
} catch {
|
|
82
|
+
// Preserve malformed legacy values for explicit repair through script_upsert.
|
|
83
|
+
continue;
|
|
84
|
+
}
|
|
85
|
+
if (!optionalDefaults(schema)) continue;
|
|
86
|
+
// A concurrent upsert must retain its own source and schema.
|
|
87
|
+
const { changes } = await getDbClient().run(
|
|
88
|
+
"UPDATE scripts SET argsJsonSchema = ? WHERE id = ? AND contentHash = ? AND argsJsonSchema = ?",
|
|
89
|
+
[JSON.stringify(schema), script.id, script.contentHash, script.argsJsonSchema],
|
|
90
|
+
);
|
|
91
|
+
rewrote += changes;
|
|
92
|
+
}
|
|
93
|
+
|
|
94
|
+
console.log(`[boot-args-schema] rewrote ${rewrote} of ${scripts.length} script schemas`);
|
|
95
|
+
}
|
|
@@ -8,6 +8,7 @@
|
|
|
8
8
|
*/
|
|
9
9
|
|
|
10
10
|
import { fileURLToPath } from "node:url";
|
|
11
|
+
import { buildSandboxedCommand } from "../../utils/sandboxed-process";
|
|
11
12
|
|
|
12
13
|
const TIMEOUT_MS = 5_000;
|
|
13
14
|
|
|
@@ -28,16 +29,20 @@ export async function extractArgsJsonSchema(source: string): Promise<string | nu
|
|
|
28
29
|
const resultFile = `${tmpdir}/result.json`;
|
|
29
30
|
await Bun.write(sourceFile, source);
|
|
30
31
|
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
32
|
+
// The extractor imports user-supplied source. Run it under the same ulimit
|
|
33
|
+
// sandbox and --no-orphans wrapper as a script run, so a hostile argsSchema
|
|
34
|
+
// module gets the memory, CPU, process and file caps of the runtime.
|
|
35
|
+
const env: Record<string, string> = {
|
|
36
|
+
PATH: process.env.PATH ?? "/usr/bin:/bin",
|
|
37
|
+
HOME: process.env.HOME ?? "/tmp",
|
|
38
|
+
TMPDIR: tmpdir,
|
|
39
|
+
SWARM_SCHEMA_SOURCE_FILE: sourceFile,
|
|
40
|
+
SWARM_SCHEMA_RESULT_FILE: resultFile,
|
|
41
|
+
SWARM_SCHEMA_TMPDIR: tmpdir,
|
|
42
|
+
};
|
|
43
|
+
if (process.env.SCRIPT_RUNTIME_DIR) env.SCRIPT_RUNTIME_DIR = process.env.SCRIPT_RUNTIME_DIR;
|
|
44
|
+
const proc = Bun.spawn(buildSandboxedCommand(["bun", "run", extractorPath()], env), {
|
|
45
|
+
env,
|
|
41
46
|
cwd: tmpdir,
|
|
42
47
|
stdout: "ignore",
|
|
43
48
|
stderr: "ignore",
|
|
@@ -195,7 +195,7 @@ export default async function bootTriage(args: any, ctx: any) {
|
|
|
195
195
|
FROM agent_tasks c
|
|
196
196
|
WHERE c.parentTaskId = p.id
|
|
197
197
|
AND c.taskType = 'resume'
|
|
198
|
-
AND c.status NOT IN ('completed', 'failed', 'cancelled', 'superseded')
|
|
198
|
+
AND c.status NOT IN ('completed', 'failed', 'cancelled', 'superseded', 'skipped')
|
|
199
199
|
)
|
|
200
200
|
ORDER BY datetime(p.lastUpdatedAt) DESC
|
|
201
201
|
LIMIT 50`,
|
|
@@ -195,7 +195,7 @@ export default async function bootTriage(args: any, ctx: any) {
|
|
|
195
195
|
FROM agent_tasks c
|
|
196
196
|
WHERE c.parentTaskId = p.id
|
|
197
197
|
AND c.taskType = 'resume'
|
|
198
|
-
AND c.status NOT IN ('completed', 'failed', 'cancelled', 'superseded')
|
|
198
|
+
AND c.status NOT IN ('completed', 'failed', 'cancelled', 'superseded', 'skipped')
|
|
199
199
|
)
|
|
200
200
|
ORDER BY datetime(p.lastUpdatedAt) DESC
|
|
201
201
|
LIMIT 50`,
|
|
@@ -46,6 +46,6 @@ export default async function getChildOutputs(args: any, ctx: any) {
|
|
|
46
46
|
children,
|
|
47
47
|
allDone:
|
|
48
48
|
children.length > 0 &&
|
|
49
|
-
children.every((t: any) => ["completed", "failed", "cancelled"].includes(t.status)),
|
|
49
|
+
children.every((t: any) => ["completed", "failed", "cancelled", "skipped"].includes(t.status)),
|
|
50
50
|
};
|
|
51
51
|
}
|
|
@@ -23,7 +23,7 @@ export default async function waitForTask(args: any, ctx: any) {
|
|
|
23
23
|
const t: any = await ctx.swarm.task_get({ taskId });
|
|
24
24
|
const d = t?.data ?? t ?? {};
|
|
25
25
|
last = { status: d.status ?? null, output: d.output ?? null };
|
|
26
|
-
if (["completed", "failed", "cancelled"].includes(String(last.status))) {
|
|
26
|
+
if (["completed", "failed", "cancelled", "skipped"].includes(String(last.status))) {
|
|
27
27
|
return { done: true, ...last };
|
|
28
28
|
}
|
|
29
29
|
await new Promise((r) => setTimeout(r, 2000));
|
|
@@ -66,6 +66,12 @@ const RESERVED_KEYS = new Set([
|
|
|
66
66
|
"CORS_ALLOW_ANY_ORIGIN",
|
|
67
67
|
"EXTENSION_ALLOW_LEAD_ACTIVATION",
|
|
68
68
|
"CHAT_SDK_API_URL_OVERRIDES",
|
|
69
|
+
// Test knobs that redirect credential or telemetry traffic. Deployment env only: a
|
|
70
|
+
// config writer must not be able to point the Codex device login or the telemetry
|
|
71
|
+
// relay at a host of their choosing.
|
|
72
|
+
"CODEX_OAUTH_DEVICE_BASE_URL",
|
|
73
|
+
"DESPLEGA_TELEMETRY_ENDPOINT",
|
|
74
|
+
"CLOUDFLARE_API_BASE_URL",
|
|
69
75
|
]);
|
|
70
76
|
|
|
71
77
|
// Config keys the API server owns for its own use and must NEVER hand out over
|
|
@@ -548,6 +554,7 @@ const VALIDATED_KEYS: Record<string, ConfigValidator> = {
|
|
|
548
554
|
"OTEL_TRACE_POLL",
|
|
549
555
|
"OTEL_EXPORT_API_LOGS",
|
|
550
556
|
"ANONYMIZED_TELEMETRY",
|
|
557
|
+
"IMPROVEMENTS_ENABLED",
|
|
551
558
|
"SWARM_HIDE_CLOUD_PROMO",
|
|
552
559
|
"DB_QUERY_BOUNDED_ENABLED",
|
|
553
560
|
"CLAUDE_TRUST_PRESEED",
|
|
@@ -568,6 +575,7 @@ const VALIDATED_KEYS: Record<string, ConfigValidator> = {
|
|
|
568
575
|
"SLACK_REACTION_STEERED",
|
|
569
576
|
"SLACK_REACTION_COMPLETED",
|
|
570
577
|
"SLACK_REACTION_FAILED",
|
|
578
|
+
"SLACK_REACTION_SKIPPED",
|
|
571
579
|
"SLACK_STATUS_ICON_COMPLETED",
|
|
572
580
|
]),
|
|
573
581
|
// Counts, minutes, and intervals: positive integers. Deliberately permissive
|
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 {
|
|
@@ -213,15 +218,17 @@ function rowToEvent(row: IdentityEventRow): IdentityEvent {
|
|
|
213
218
|
}
|
|
214
219
|
|
|
215
220
|
/**
|
|
216
|
-
* Paginated event timeline for a user. `limit` is hard-capped at 200
|
|
217
|
-
*
|
|
218
|
-
*
|
|
221
|
+
* Paginated event timeline for a user. `limit` is hard-capped at 200 and a
|
|
222
|
+
* limit of 0 returns no events (negatives clamp to 0); `before` is a cursor on
|
|
223
|
+
* `createdAt` (ISO string) so the caller can keep paging by passing back the
|
|
224
|
+
* last event's `createdAt`.
|
|
219
225
|
*/
|
|
220
226
|
export async function listUserEvents(
|
|
221
227
|
userId: string,
|
|
222
228
|
opts: { limit?: number; before?: string } = {},
|
|
223
229
|
): Promise<IdentityEvent[]> {
|
|
224
|
-
const limit = Math.max(
|
|
230
|
+
const limit = Math.max(0, Math.min(opts.limit ?? 50, 200));
|
|
231
|
+
if (limit === 0) return [];
|
|
225
232
|
const before = opts.before;
|
|
226
233
|
const client = getDbClient();
|
|
227
234
|
if (before) {
|
|
@@ -513,12 +520,51 @@ export async function revokeToken(tokenId: string, actor: IdentityActor): Promis
|
|
|
513
520
|
});
|
|
514
521
|
}
|
|
515
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
|
+
|
|
516
555
|
/**
|
|
517
556
|
* Resolve a plaintext token to its owning user. Returns null if the token
|
|
518
557
|
* is unknown or revoked. On a successful hit, updates `lastUsedAt` so the
|
|
519
558
|
* People page can surface "last seen".
|
|
520
559
|
*/
|
|
521
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> {
|
|
522
568
|
const hash = sha256Hex(plaintext);
|
|
523
569
|
const client = getDbClient();
|
|
524
570
|
|
|
@@ -539,7 +585,20 @@ export async function resolveUserByToken(plaintext: string): Promise<User | null
|
|
|
539
585
|
// Never let a `lastUsedAt` update failure leak to the caller.
|
|
540
586
|
}
|
|
541
587
|
|
|
542
|
-
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;
|
|
543
602
|
}
|
|
544
603
|
|
|
545
604
|
// ---------------------------------------------------------------------------
|