@desplega.ai/agent-swarm 2.12.0 → 2.13.0
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-cn53011z.js +17 -0
- package/dist/{acp-targets-311gcyvw.js → acp-targets-86f0sh6g.js} +9 -8
- package/dist/{actions-c4chgxp6.js → actions-zv8vcxvr.js} +24 -23
- package/dist/{agent-fs-provision-0b9awm5n.js → agent-fs-provision-jqshb33y.js} +4 -4
- package/dist/{amp-adapter-r0veq6x5.js → amp-adapter-gt503ywc.js} +2 -2
- package/dist/{app-hn5fftf5.js → app-6t4k5rh1.js} +6 -4
- package/dist/{approval-notifications-3g6yc8nv.js → approval-notifications-fcfw063h.js} +7 -6
- package/dist/{assistant-cpjgpjvp.js → assistant-9dzybh12.js} +25 -24
- package/dist/{boot-args-schema-hce1av1h.js → boot-args-schema-xzfp2feg.js} +1 -1
- package/dist/{boot-reembed-d7xcym0j.js → boot-reembed-3jz0p2jk.js} +1 -1
- package/dist/{boot-reembed-bztbxc4z.js → boot-reembed-r88wngfg.js} +5 -2
- package/dist/{boot-scrub-sweep-mkmm16gk.js → boot-scrub-sweep-scrqhw48.js} +2 -2
- package/dist/{boot-seeds-arrkbe8t.js → boot-seeds-vb2dcrrb.js} +4 -4
- package/dist/{claude-adapter-ykpyr5p8.js → claude-adapter-h3mp9hgs.js} +7 -6
- package/dist/{claude-managed-adapter-ssg6z4bt.js → claude-managed-adapter-kpbyj2vb.js} +3 -3
- package/dist/{claude-managed-setup-trd59v7b.js → claude-managed-setup-0efr3wkg.js} +5 -5
- package/dist/{claude-sdk-session-yjcze0j1.js → claude-sdk-session-03dw669q.js} +7 -6
- package/dist/{cli-e3ahxq5y.js → cli-0b655smz.js} +4 -4
- package/dist/{cli-mcymtvwn.js → cli-0dg7ytxm.js} +89 -11
- package/dist/cli-0jkenasr.js +148 -0
- package/dist/{cli-c7j31hq9.js → cli-0pazkmd4.js} +3 -3
- package/dist/{cli-5tg94mdw.js → cli-117g15t4.js} +8 -11
- package/dist/{cli-r14ac1y0.js → cli-1dbv9mj9.js} +1 -1
- package/dist/{cli-q8tc22bj.js → cli-1v82d2w6.js} +3 -3
- package/dist/{cli-pe3yxedk.js → cli-2jk4s7z1.js} +2 -2
- package/dist/{cli-0pp1yjg2.js → cli-2skf1mdf.js} +8 -8
- package/dist/{cli-2tw284hj.js → cli-48nvk6sb.js} +1 -1
- package/dist/{cli-en6dmkxd.js → cli-49f5jyhh.js} +2 -2
- package/dist/{cli-2z2c4k6q.js → cli-50w82h6m.js} +21 -0
- package/dist/{cli-dd2k2mcd.js → cli-6a40p4kv.js} +1 -1
- package/dist/{cli-yegz2g06.js → cli-6h88mn9q.js} +3 -3
- package/dist/{cli-52nfye5j.js → cli-7dbhnsj9.js} +23 -15
- package/dist/{cli-04zc3f7b.js → cli-9fsagra4.js} +1 -1
- package/dist/{cli-nja15knq.js → cli-9m9kyw77.js} +3 -3
- package/dist/{cli-k5jx8jya.js → cli-ajjvqhf3.js} +1 -1
- package/dist/{cli-hbvgzjq4.js → cli-avqkr20b.js} +2 -2
- package/dist/{cli-yfpc6qy9.js → cli-avxh26pd.js} +46 -15
- package/dist/{cli-q2dywc8h.js → cli-b2jh3dyb.js} +4 -4
- package/dist/{cli-m5qtmrbc.js → cli-c8v2yvej.js} +2 -2
- package/dist/{cli-gfy6hbd9.js → cli-ct8sz3np.js} +17 -10
- package/dist/{cli-bz97ff9n.js → cli-dka73bak.js} +1 -1
- package/dist/{cli-dkvtfgn4.js → cli-dkejt425.js} +75 -16
- package/dist/{cli-sv2r3bw8.js → cli-dnh64e8e.js} +2 -2
- package/dist/{cli-kwr5qv5g.js → cli-eb279wn3.js} +2 -2
- package/dist/{cli-hhc47ack.js → cli-f1952kjy.js} +2 -2
- package/dist/{cli-5z0g0e8v.js → cli-f8rcvf2x.js} +49 -13
- package/dist/{cli-eq4kew31.js → cli-fhvk2nvp.js} +24 -11
- package/dist/{cli-xf4z5bdn.js → cli-fz9pcjsw.js} +2 -2
- package/dist/{cli-fxd1mwtr.js → cli-g6j6ac3h.js} +1 -1
- package/dist/{cli-ya3kf4gs.js → cli-gfcv679k.js} +1 -1
- package/dist/{cli-55tc8cj4.js → cli-hbq0kwxz.js} +4 -4
- package/dist/{cli-39qm0rtm.js → cli-hc6e4tac.js} +28 -149
- package/dist/{cli-j5gtytvg.js → cli-hgsxnjyg.js} +13 -10
- package/dist/{cli-h70a2mxy.js → cli-hpb9x72z.js} +48 -8
- package/dist/{cli-7yn42w6m.js → cli-j53hpbsm.js} +1 -1
- package/dist/{cli-12vek61e.js → cli-jj3c5nyb.js} +471 -119
- package/dist/{cli-fy4gb74g.js → cli-kde4ky90.js} +1 -1
- package/dist/{cli-9qe5y107.js → cli-kspxjftk.js} +1 -1
- package/dist/{cli-bp6k9acz.js → cli-mh7pdxe0.js} +16 -16
- package/dist/{cli-v9ya390t.js → cli-mz34pxbk.js} +8 -8
- package/dist/{cli-ma9ys8rt.js → cli-nc6a8b5b.js} +7 -4
- package/dist/{cli-1htmtqc2.js → cli-prf7kz78.js} +49 -49
- package/dist/{cli-01tvvtad.js → cli-qec9bynj.js} +3 -3
- package/dist/{cli-t75xngj1.js → cli-qhhb30e8.js} +7 -7
- package/dist/{cli-73q4g5nx.js → cli-qm3ntjqs.js} +12 -12
- package/dist/{cli-tm60vtax.js → cli-rfejbpe1.js} +1 -1
- package/dist/{cli-agjbj5x0.js → cli-sdh61g52.js} +37 -19
- package/dist/{cli-9y4tgrkf.js → cli-skd2c4ej.js} +2 -1
- package/dist/{cli-5x03v6en.js → cli-sq913bh1.js} +8 -8
- package/dist/{cli-b93d81yg.js → cli-t35hx078.js} +1 -1
- package/dist/{cli-r0mz92by.js → cli-tn91wc6e.js} +1 -1
- package/dist/{cli-wvjqaqcp.js → cli-tstj6e8e.js} +1113 -227
- package/dist/{cli-xm34qj8m.js → cli-w14j2z4k.js} +2 -2
- package/dist/{cli-eqq0hwvx.js → cli-wndegmns.js} +1 -1
- package/dist/{cli-0k1a0sde.js → cli-wrhbym01.js} +6 -6
- package/dist/{cli-fyaq4zdv.js → cli-wv20kbr3.js} +6 -6
- package/dist/{cli-mq2fbgva.js → cli-wxwv3t11.js} +2 -2
- package/dist/{cli-krbcr00p.js → cli-xfjn2kyq.js} +58 -4
- package/dist/{cli-5r95eqbh.js → cli-y260hgep.js} +1 -1
- package/dist/{cli-cjqyse9q.js → cli-y4a4458j.js} +3 -3
- package/dist/{cli-2amwhyv2.js → cli-y518qkjg.js} +5 -3
- package/dist/{cli-0vcqcwfn.js → cli-yfvhvw8m.js} +2 -0
- package/dist/cli-yn4kt85g.js +148 -0
- package/dist/{cli-n8f0fs3c.js → cli-ytc7fpza.js} +8 -8
- package/dist/{cli-e8n0hdzd.js → cli-z64t9pe6.js} +1 -1
- package/dist/{cli-72yms3ey.js → cli-zqmmy073.js} +198 -18
- package/dist/cli.js +18 -16
- package/dist/{codex-adapter-wc6e4wct.js → codex-adapter-f3yp0kaj.js} +5 -5
- package/dist/{codex-hook-aqtj17yr.js → codex-hook-262cekfp.js} +73 -2
- package/dist/{codex-session-runner-ppfgjd97.js → codex-session-runner-ns4mv70p.js} +5 -5
- package/dist/{commands-tsv2vx5b.js → commands-5bzf2tfw.js} +3 -3
- package/dist/{controller-ye4sdwsy.js → controller-5xt7kvfm.js} +2 -2
- package/dist/{controllers-connect-zn4dg69h.js → controllers-connect-0gg13mzp.js} +24 -23
- package/dist/core-0fqtbrxa.js +42 -0
- package/dist/{cursor-adapter-q2g9vwts.js → cursor-adapter-p0c5zv6r.js} +1 -1
- package/dist/{db-g111qn9j.js → db-2s68ycq7.js} +3 -3
- package/dist/{db-3r1fyr2n.js → db-q7q639k5.js} +4 -2
- package/dist/{dispatcher-4q8s0mx8.js → dispatcher-j2y1q7ae.js} +24 -21
- package/dist/{dsh-adapter-mmcw1z5s.js → dsh-adapter-pgnkf4st.js} +1 -1
- package/dist/{easter-egg-3d-04ke6hcp.js → easter-egg-3d-0kea97jf.js} +1 -1
- package/dist/{embedding-space-kcdn52vz.js → embedding-space-3n6mhhmy.js} +6 -6
- package/dist/{embeddings-jnzcd91a.js → embeddings-jfmj6yme.js} +1 -1
- package/dist/{execute-74amghty.js → execute-tjrej979.js} +1 -1
- package/dist/{external-channel-v9zgxnxz.js → external-channel-jy8w2gg3.js} +2 -2
- package/dist/fx-adapter-k6w3jvz9.js +20 -0
- package/dist/grok-adapter-4q5tssw0.js +20 -0
- package/dist/handlers-qxgfvvsf.js +41 -0
- package/dist/{heartbeat-p8pk1msj.js → heartbeat-6tr2w2da.js} +25 -24
- package/dist/{hook-p5reemds.js → hook-bpnncsec.js} +76 -17
- package/dist/{hook-k1h73zd7.js → hook-fv1jwrv7.js} +6 -5
- package/dist/{http-ms1z5xxy.js → http-bpa26czn.js} +785 -181
- package/dist/index-0mcxjdsa.js +44 -0
- package/dist/{index-kn63q1gr.js → index-52tgbhrw.js} +29 -28
- package/dist/index-dz4q23ag.js +40 -0
- package/dist/{index-76zzxtzf.js → index-mpj0z9e0.js} +1 -1
- package/dist/index-s175jckx.js +39 -0
- package/dist/{index-gjn6qfgn.js → index-s8re7mvq.js} +1 -1
- package/dist/{index-fbkqhvvj.js → index-w216g9y9.js} +198 -160
- package/dist/{keepalive-031js8jz.js → keepalive-d6z12s04.js} +3 -3
- package/dist/lead-p3hx7h35.js +79 -0
- package/dist/{maintenance-sq9v3qx9.js → maintenance-7kac6g2g.js} +1 -1
- package/dist/{oauth-refresh-sweep-zqmnyvs8.js → oauth-refresh-sweep-t1xjetbh.js} +2 -2
- package/dist/{object-webhooks-r24wwb5y.js → object-webhooks-6rdagg0r.js} +7 -7
- package/dist/{onboard-p25yhh7t.js → onboard-32y1cfxy.js} +3 -3
- package/dist/{opencode-adapter-wcjc4zdk.js → opencode-adapter-enp3v31n.js} +7 -6
- package/dist/{otel-impl-ff1gf20m.js → otel-impl-k0tm5ptj.js} +1 -1
- package/dist/{pending-hxj5yatb.js → pending-24zebgvs.js} +23 -22
- package/dist/{pi-mono-adapter-vkp4zz7p.js → pi-mono-adapter-yj72xxxe.js} +85 -16
- package/dist/{pricing-refresh-9w7gx41w.js → pricing-refresh-cf25x38j.js} +2 -2
- package/dist/{rbac-roles-84aw10nz.js → rbac-roles-0wydd22m.js} +3 -3
- package/dist/{rbac-roles-hz74vckp.js → rbac-roles-at6crb3r.js} +7 -4
- package/dist/{registry-eeyx1201.js → registry-zv0zvxsx.js} +1 -1
- package/dist/{render-v2-nrdkg9gf.js → render-v2-nvcw0jd7.js} +8 -4
- package/dist/{resume-s6ey36rh.js → resume-y4w0k5v3.js} +9 -8
- package/dist/{runtime-x0b4pyam.js → runtime-vpe43hx0.js} +1 -1
- package/dist/{session-access-xv49tk14.js → session-access-gkyvnfye.js} +5 -4
- package/dist/{session-source-backfill-r5j988ah.js → session-source-backfill-3w2st4m2.js} +2 -2
- package/dist/{setup-mj0krk1p.js → setup-axxvqtys.js} +1 -1
- package/dist/thread-buffer-rwa7d4dx.js +42 -0
- package/dist/{tree-visibility-cbrsfaar.js → tree-visibility-y4fqvab5.js} +2 -2
- package/dist/{user-merge-jobs-f9d8nwnw.js → user-merge-jobs-kcmwvrc6.js} +3 -3
- package/dist/{virtual-modules-ns0ryw05.js → virtual-modules-7d92dct1.js} +3 -3
- package/dist/{work-objects-pydhzast.js → work-objects-f708e069.js} +27 -25
- package/dist/worker-8rg9gz74.js +79 -0
- package/dist/{worker-follow-up-9z2xec5e.js → worker-follow-up-0by8wztc.js} +22 -21
- package/dist/xlsx-9acfmxr1.js +31534 -0
- package/openapi.json +1385 -204
- package/package.json +5 -3
- package/src/agentmail/handlers.ts +26 -19
- package/src/apps/catalog.generated.json +31 -0
- package/src/apps/row-store.ts +37 -14
- package/src/azure-devops/handlers.ts +2 -0
- package/src/be/audit-user.ts +46 -6
- package/src/be/db/kv-windows.ts +22 -0
- package/src/be/db/session-moves.ts +3 -3
- package/src/be/db/session-tree.ts +52 -5
- package/src/be/db/skill-audit.ts +17 -0
- package/src/be/db/tasks/write.ts +18 -3
- package/src/be/db.ts +114 -23
- package/src/be/extensions/assets.ts +11 -7
- package/src/be/memory/demotion-evidence.ts +2 -2
- package/src/be/memory/providers/sqlite-store.ts +151 -18
- package/src/be/memory/search-read-worker.ts +60 -0
- package/src/be/memory/search-reader.ts +223 -0
- package/src/be/migrations/337_favorites_session_hidden_key.sql +39 -0
- package/src/be/migrations/338_audit_agent_columns.sql +30 -0
- package/src/be/migrations/339_deferred_event_waits.sql +26 -0
- package/src/be/model-tier-resolution.ts +18 -1
- package/src/be/multi-runtime.ts +17 -0
- package/src/be/primitives/object-embed.ts +250 -0
- package/src/be/primitives/objects.ts +29 -9
- package/src/be/primitives/sheets/service.ts +138 -6
- package/src/be/primitives/sheets/xlsx.ts +367 -0
- package/src/be/rbac-roles.ts +3 -0
- package/src/be/repo-checked-update.ts +4 -4
- package/src/be/repo-merge-policy.ts +26 -9
- package/src/be/scripts/boot-reembed.ts +6 -0
- package/src/be/scripts/db.ts +17 -5
- package/src/be/scripts/embeddings.ts +6 -0
- package/src/be/scripts/typecheck.ts +43 -2
- package/src/be/seed/schedules-seeder.ts +9 -1
- package/src/be/seed/workflows-seeder.ts +9 -1
- package/src/be/seed-scripts/index.ts +2 -0
- package/src/be/seed-skills/index.ts +12 -0
- package/src/be/swarm-config-guard.ts +1 -0
- package/src/be/unmapped-identities.ts +95 -1
- package/src/bitbucket/handlers.ts +2 -0
- package/src/commands/onboard/agent-fs-version.ts +1 -1
- package/src/event-waits/github.ts +43 -0
- package/src/event-waits/index.ts +29 -0
- package/src/event-waits/types.ts +51 -0
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/extensions/dispatcher.ts +9 -0
- package/src/fs/agent-fs-provider.ts +4 -1
- package/src/github/handlers.ts +3 -1
- package/src/github/pull-request-state.ts +34 -0
- package/src/gitlab/handlers.ts +12 -7
- package/src/hooks/codex-hook.ts +99 -1
- package/src/hooks/hook.ts +85 -11
- package/src/hooks/native-tool-hooks.ts +245 -0
- package/src/http/all-routes.ts +1 -0
- package/src/http/assets.ts +4 -3
- package/src/http/comb.ts +2 -2
- package/src/http/favorite-owner.ts +2 -2
- package/src/http/favorites.ts +3 -2
- package/src/http/fs.ts +13 -4
- package/src/http/index.ts +2 -0
- package/src/http/mcp-bridge.ts +4 -0
- package/src/http/objects.ts +265 -0
- package/src/http/pages.ts +3 -3
- package/src/http/poll.ts +43 -12
- package/src/http/repos.ts +7 -6
- package/src/http/schedules.ts +10 -6
- package/src/http/script-connections.ts +2 -2
- package/src/http/scripts.ts +9 -0
- package/src/http/sessions.ts +30 -12
- package/src/http/skills.ts +17 -0
- package/src/http/task-requester.ts +2 -2
- package/src/http/tasks.ts +13 -3
- package/src/http/tool-hooks.ts +24 -2
- package/src/http/trackers/authorize-gate.ts +2 -2
- package/src/http/users.ts +136 -1
- package/src/http/workflow-events.ts +13 -0
- package/src/http/workflows.ts +21 -11
- package/src/linear/sync.ts +3 -1
- package/src/prompts/base-prompt.ts +35 -13
- package/src/prompts/session-templates.ts +25 -0
- package/src/providers/acp-targets.ts +1 -1
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/dsh-adapter.ts +1 -1
- package/src/providers/opencode-adapter.ts +1 -0
- package/src/providers/opencode-swarm-plugin.ts +50 -1
- package/src/providers/pi-mono-adapter.ts +139 -9
- package/src/providers/pi-mono-extension.ts +69 -0
- package/src/providers/runtime-dependencies.ts +1 -1
- package/src/rbac/legacy-policy.ts +3 -0
- package/src/rbac/permissions.ts +11 -1
- package/src/scheduler/deferred-task-waits.ts +170 -13
- package/src/scripts-runtime/executors/types.ts +5 -0
- package/src/scripts-runtime/loader.ts +8 -0
- package/src/scripts-runtime/mcp-client.ts +4 -0
- package/src/scripts-runtime/sdk-allowlist.ts +14 -1
- package/src/scripts-runtime/swarm-config.ts +8 -0
- package/src/scripts-runtime/swarm-sdk.ts +4 -0
- package/src/scripts-runtime/types/stdlib.d.ts +47 -4
- package/src/scripts-runtime/types/swarm-extension.d.ts +1 -0
- package/src/scripts-runtime/types/swarm-sdk.d.ts +47 -4
- package/src/server.ts +4 -0
- package/src/slack/enrich.ts +81 -21
- package/src/slack/handlers.test.ts +55 -2
- package/src/slack/handlers.ts +38 -3
- package/src/slack/render-v2.ts +19 -0
- package/src/slack/session-mirror.ts +208 -0
- package/src/slack/thread-participants.ts +0 -5
- package/src/slack/watcher.ts +3 -0
- package/src/slack/work-objects.test.ts +2 -1
- package/src/slack/work-objects.ts +7 -2
- package/src/tests/agentmail-filters.test.ts +4 -3
- package/src/tests/audit-agent-person.test.ts +825 -0
- package/src/tests/audit-updated-by.test.ts +19 -12
- package/src/tests/claude-hook-output.test.ts +107 -2
- package/src/tests/claude-managed-setup.test.ts +1 -1
- package/src/tests/codex-adapter.test.ts +6 -6
- package/src/tests/codex-gpt6-release.test.ts +4 -4
- package/src/tests/db-task-read-contract.test.ts +1 -0
- package/src/tests/db-task-write-contract.test.ts +1 -0
- package/src/tests/dsh-adapter.test.ts +1 -1
- package/src/tests/extensions-catalog.test.ts +33 -25
- package/src/tests/fixtures/sheets/eocd-count-mismatch.xlsx +0 -0
- package/src/tests/fixtures/sheets/rich-budget.xlsx +0 -0
- package/src/tests/fixtures/sheets/tracker-export.xlsx +0 -0
- package/src/tests/kv-storage.test.ts +3 -0
- package/src/tests/memory-search-reader.test.ts +258 -0
- package/src/tests/memory-search-stall.test.ts +197 -20
- package/src/tests/model-control.test.ts +4 -4
- package/src/tests/model-tier-resolution.test.ts +2 -2
- package/src/tests/multi-runtime-registration.test.ts +8 -2
- package/src/tests/native-tool-hooks.test.ts +188 -0
- package/src/tests/opencode-swarm-plugin.test.ts +6 -1
- package/src/tests/pi-provider-runtime-keys.test.ts +163 -0
- package/src/tests/poll-probe-readonly.test.ts +108 -0
- package/src/tests/primitives-sheets-xlsx.test.ts +549 -0
- package/src/tests/prompt-template-session.test.ts +3 -2
- package/src/tests/rbac-roles.test.ts +3 -0
- package/src/tests/script-connections.test.ts +4 -0
- package/src/tests/seed-model-profiles.test.ts +1 -1
- package/src/tests/sessions-tree.test.ts +10 -2
- package/src/tests/slack-thread-participants.test.ts +66 -4
- package/src/tests/tool-registrar-no-input.test.ts +1 -0
- package/src/tools/defer-task.ts +154 -12
- package/src/tools/objects.ts +10 -5
- package/src/tools/repos/update-repo.ts +6 -6
- package/src/tools/schedules/create-schedule.ts +1 -0
- package/src/tools/schedules/list-schedules.ts +3 -0
- package/src/tools/schedules/patch-schedule.ts +12 -3
- package/src/tools/schedules/update-schedule.ts +12 -3
- package/src/tools/sheets.ts +66 -0
- package/src/tools/skills/skill-create.ts +6 -0
- package/src/tools/skills/skill-install-remote.ts +6 -0
- package/src/tools/skills/skill-sync-remote.ts +9 -0
- package/src/tools/skills/skill-update.ts +9 -1
- package/src/tools/tool-config.ts +3 -1
- package/src/tools/utils.ts +15 -0
- package/src/tools/workflows/create-workflow.ts +9 -4
- package/src/tools/workflows/patch-workflow-node.ts +1 -1
- package/src/tools/workflows/patch-workflow.ts +5 -2
- package/src/tools/workflows/update-workflow.ts +13 -7
- package/src/types.ts +96 -12
- package/src/workflows/input.ts +12 -5
- package/src/workflows/patch-definition.ts +13 -5
- package/src/workflows/triggers.ts +11 -6
- package/src/workflows/version.ts +7 -1
- package/templates/skills/boards-and-sheets/config.json +14 -0
- package/templates/skills/boards-and-sheets/content.md +163 -0
- package/templates/skills/swarm-docs/content.md +9 -0
- package/dist/acp-adapter-11m13kx4.js +0 -16
- package/dist/core-dxcy02sc.js +0 -41
- package/dist/fx-adapter-0ar6pqm3.js +0 -19
- package/dist/grok-adapter-t6m74fb1.js +0 -19
- package/dist/handlers-9kwcrc4k.js +0 -38
- package/dist/index-23cdfzr6.js +0 -39
- package/dist/index-g7kkjs5b.js +0 -38
- package/dist/index-stk36pa5.js +0 -43
- package/dist/lead-mfggjtfk.js +0 -77
- package/dist/thread-buffer-temgaqsy.js +0 -41
- package/dist/worker-efcemc22.js +0 -77
- /package/dist/{cli-cah298e5.js → cli-m4ejz4nj.js} +0 -0
package/src/http/sessions.ts
CHANGED
|
@@ -10,7 +10,7 @@ import {
|
|
|
10
10
|
} from "../assets/key";
|
|
11
11
|
import { SOURCE_GROUPS_READ_ONLY, sourceMoveError, sourceOfKey } from "../assets/source-key";
|
|
12
12
|
import { AssetKeyAuthorizationError, authorizeAssetKeyWrite } from "../be/asset-key-auth";
|
|
13
|
-
import {
|
|
13
|
+
import { resolveHttpRequesterUserId } from "../be/audit-user";
|
|
14
14
|
import {
|
|
15
15
|
AgentDeletedError,
|
|
16
16
|
AssetKeyMovesBlockedError,
|
|
@@ -180,6 +180,9 @@ const SessionTreeResponseSchema = z.object({
|
|
|
180
180
|
labels: z.record(z.string(), z.string()).optional(),
|
|
181
181
|
groups: z.array(SessionTreeGroupSchema),
|
|
182
182
|
inbox: SessionSectionCountsSchema,
|
|
183
|
+
working: SessionSectionCountsSchema.describe(
|
|
184
|
+
"Inbox sessions with a task running and nothing for the person to answer. They list under Working, not Inbox.",
|
|
185
|
+
),
|
|
183
186
|
later: SessionSectionCountsSchema,
|
|
184
187
|
done: SessionSectionCountsSchema,
|
|
185
188
|
noGroup: SessionSectionCountsSchema,
|
|
@@ -589,13 +592,15 @@ const listSessions = route({
|
|
|
589
592
|
keyPrefix: SessionKeyFilterSchema.optional(),
|
|
590
593
|
/** Exact asset group, including direct resource leaves. */
|
|
591
594
|
groupKey: SessionKeyFilterSchema.optional(),
|
|
595
|
+
/** Comma-separated root task ids (the first 200 count): only these sessions, in any read state. */
|
|
596
|
+
ids: z.string().optional(),
|
|
592
597
|
/** Shared and viewer-personal namespace roots and direct resource leaves. */
|
|
593
598
|
noGroup: z
|
|
594
599
|
.enum(["true", "false"])
|
|
595
600
|
.transform((v) => v === "true")
|
|
596
601
|
.optional(),
|
|
597
|
-
/** Chain-wide read state or Inbox section. */
|
|
598
|
-
triage: z.enum(["inbox", "later", "done", "unread"]).optional(),
|
|
602
|
+
/** Chain-wide read state, or the Inbox or Working section. */
|
|
603
|
+
triage: z.enum(["inbox", "working", "later", "done", "unread"]).optional(),
|
|
599
604
|
/** Latest chain status or pending human attention. */
|
|
600
605
|
status: z.enum(["running", "failed", "needs"]).optional(),
|
|
601
606
|
/** Requester anywhere in the chain or active share recipient. */
|
|
@@ -668,23 +673,31 @@ const triageSessionListRoute = route({
|
|
|
668
673
|
pattern: ["api", "session-triage"],
|
|
669
674
|
summary: "Triage every session of one sidebar list",
|
|
670
675
|
description:
|
|
671
|
-
"The bulk bar's 'Select all N': Done, back to the Inbox, read, or unread for every session that one sessions v2 list shows the caller (the `GET /api/sessions?scope=tree` filters)
|
|
676
|
+
"The bulk bar's 'Select all N': Done, back to the Inbox, read, or unread for every session that one sessions v2 list shows the caller (the `GET /api/sessions?scope=tree` filters), minus `exceptIds`. Needs a picked user.",
|
|
672
677
|
tags: ["Sessions"],
|
|
673
678
|
body: z
|
|
674
679
|
.object({
|
|
675
680
|
action: z.enum(["done", "inbox", "read", "unread"]),
|
|
676
|
-
/** The list: one of Inbox, Later, Done, No group, or a group. */
|
|
677
|
-
triage: z.enum(["inbox", "later", "done"]).optional(),
|
|
681
|
+
/** The list: one of Inbox, Later, Done, No group, a group, or a source group with its threads. */
|
|
682
|
+
triage: z.enum(["inbox", "working", "later", "done"]).optional(),
|
|
678
683
|
noGroup: z.boolean().optional(),
|
|
679
684
|
groupKey: SessionKeyFilterSchema.optional(),
|
|
685
|
+
/** A source group (`shared/slack/<channel>/`) with its nested threads, as the sidebar lists it. */
|
|
686
|
+
keyPrefix: SessionKeyFilterSchema.refine((key) => sourceOfKey(key) !== null, {
|
|
687
|
+
message: "keyPrefix must be a source group",
|
|
688
|
+
}).optional(),
|
|
680
689
|
show: SessionShowSchema,
|
|
681
690
|
hideSource: z.array(z.string().min(1)).max(32).optional(),
|
|
682
691
|
/** Root sources to keep; an empty array keeps none. */
|
|
683
692
|
showSource: z.array(z.string().min(1)).max(32).optional(),
|
|
693
|
+
/** Root task ids to leave out: rows unchecked after 'Select all N'. */
|
|
694
|
+
exceptIds: z.array(z.string().min(1)).max(500).optional(),
|
|
684
695
|
})
|
|
685
|
-
.refine(
|
|
686
|
-
|
|
687
|
-
|
|
696
|
+
.refine(
|
|
697
|
+
(body) =>
|
|
698
|
+
[body.triage, body.noGroup, body.groupKey, body.keyPrefix].filter(Boolean).length === 1,
|
|
699
|
+
{ message: "Name exactly one list: triage, noGroup, groupKey, or keyPrefix" },
|
|
700
|
+
),
|
|
688
701
|
responses: {
|
|
689
702
|
200: {
|
|
690
703
|
description: "The number of sessions written",
|
|
@@ -757,7 +770,7 @@ async function withSessionMove(
|
|
|
757
770
|
run: (context: { actor: SessionActor; changedBy?: string; key: string | null }) => Promise<void>,
|
|
758
771
|
): Promise<void> {
|
|
759
772
|
try {
|
|
760
|
-
const changedBy = await
|
|
773
|
+
const changedBy = await resolveHttpRequesterUserId(req, myAgentId);
|
|
761
774
|
const actor = await resolveSessionActor(req, myAgentId);
|
|
762
775
|
const key = destination === null ? null : await authorizeAssetKeyWrite(destination, changedBy);
|
|
763
776
|
await assertAssetKeyMovesAllowed();
|
|
@@ -1055,6 +1068,11 @@ export async function handleSessions(
|
|
|
1055
1068
|
contextKeyPrefix: parsed.query.contextKeyPrefix,
|
|
1056
1069
|
keyPrefix: parsed.query.keyPrefix,
|
|
1057
1070
|
groupKey: parsed.query.groupKey,
|
|
1071
|
+
rootIds: parsed.query.ids
|
|
1072
|
+
?.split(",")
|
|
1073
|
+
.map((id) => id.trim())
|
|
1074
|
+
.filter(Boolean)
|
|
1075
|
+
.slice(0, 200),
|
|
1058
1076
|
noGroup: parsed.query.noGroup,
|
|
1059
1077
|
triage: parsed.query.triage,
|
|
1060
1078
|
status: parsed.query.status,
|
|
@@ -1132,10 +1150,10 @@ export async function handleSessions(
|
|
|
1132
1150
|
jsonError(res, "Pick a user to triage sessions", 400);
|
|
1133
1151
|
return true;
|
|
1134
1152
|
}
|
|
1135
|
-
const { action, show, ...list } = parsed.body;
|
|
1153
|
+
const { action, show, exceptIds, ...list } = parsed.body;
|
|
1136
1154
|
const updated = await triageSessionList(
|
|
1137
1155
|
actor.userId,
|
|
1138
|
-
{ ...list, mine: show !== "all" },
|
|
1156
|
+
{ ...list, exceptRootIds: exceptIds, mine: show !== "all" },
|
|
1139
1157
|
action,
|
|
1140
1158
|
actor.readAll,
|
|
1141
1159
|
);
|
package/src/http/skills.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
2
|
import { z } from "zod";
|
|
3
|
+
import { resolveHttpAuditActor, resolveHttpAuditUserId } from "../be/audit-user";
|
|
3
4
|
import {
|
|
4
5
|
createSkill,
|
|
5
6
|
deleteSkill,
|
|
@@ -12,6 +13,7 @@ import {
|
|
|
12
13
|
listSkillFileManifest,
|
|
13
14
|
listSkills,
|
|
14
15
|
searchSkills,
|
|
16
|
+
setSkillUpdatedBy,
|
|
15
17
|
uninstallSkill,
|
|
16
18
|
updateSkill,
|
|
17
19
|
upsertSkillFile,
|
|
@@ -664,6 +666,8 @@ export async function handleSkills(
|
|
|
664
666
|
sourcePath: parsed.body.sourcePath,
|
|
665
667
|
sourceBranch: branch,
|
|
666
668
|
isComplex: parsed.body.isComplex ?? false,
|
|
669
|
+
createdByAgentId: myAgentId ?? null,
|
|
670
|
+
createdBy: await resolveHttpAuditUserId(req, myAgentId),
|
|
667
671
|
});
|
|
668
672
|
|
|
669
673
|
installRemoteRoute.respond(res, 201, { skill });
|
|
@@ -687,6 +691,9 @@ export async function handleSkills(
|
|
|
687
691
|
|
|
688
692
|
let updated = 0;
|
|
689
693
|
const errors: string[] = [];
|
|
694
|
+
// A content change is attributed to the caller; a lastFetchedAt-only
|
|
695
|
+
// touch is a fetch, not an edit, and leaves the audit pair alone.
|
|
696
|
+
const actor = await resolveHttpAuditActor(req, myAgentId);
|
|
690
697
|
|
|
691
698
|
for (const skill of remoteSkills) {
|
|
692
699
|
if (skill.isComplex || !skill.sourceRepo) continue;
|
|
@@ -717,6 +724,8 @@ export async function handleSkills(
|
|
|
717
724
|
userInvocable: pm.userInvocable,
|
|
718
725
|
sourceHash: newHash,
|
|
719
726
|
lastFetchedAt: now,
|
|
727
|
+
updatedBy: actor.userId,
|
|
728
|
+
updatedByAgentId: actor.agentId,
|
|
720
729
|
});
|
|
721
730
|
updated++;
|
|
722
731
|
} else {
|
|
@@ -866,6 +875,7 @@ export async function handleSkills(
|
|
|
866
875
|
|
|
867
876
|
try {
|
|
868
877
|
const files = await upsertSkillFiles(parsed.params.id, parsed.body.files);
|
|
878
|
+
await setSkillUpdatedBy(parsed.params.id, await resolveHttpAuditActor(req, myAgentId));
|
|
869
879
|
const updatedSkill = await getSkillById(parsed.params.id);
|
|
870
880
|
bulkUpsertSkillFilesRoute.respond(res, 200, {
|
|
871
881
|
files,
|
|
@@ -922,6 +932,7 @@ export async function handleSkills(
|
|
|
922
932
|
path: decodeSkillFilePath(pathSegments),
|
|
923
933
|
...parsed.body,
|
|
924
934
|
});
|
|
935
|
+
await setSkillUpdatedBy(parsed.params.id, await resolveHttpAuditActor(req, myAgentId));
|
|
925
936
|
const updatedSkill = await getSkillById(parsed.params.id);
|
|
926
937
|
upsertSkillFileRoute.respond(res, 200, { file, skill: updatedSkill });
|
|
927
938
|
} catch (err) {
|
|
@@ -951,6 +962,7 @@ export async function handleSkills(
|
|
|
951
962
|
jsonError(res, "Skill file not found", 404);
|
|
952
963
|
return true;
|
|
953
964
|
}
|
|
965
|
+
await setSkillUpdatedBy(parsed.params.id, await resolveHttpAuditActor(req, myAgentId));
|
|
954
966
|
const updatedSkill = await getSkillById(parsed.params.id);
|
|
955
967
|
deleteSkillFileRoute.respond(res, 200, { success: true, skill: updatedSkill });
|
|
956
968
|
} catch (err) {
|
|
@@ -995,6 +1007,8 @@ export async function handleSkills(
|
|
|
995
1007
|
disableModelInvocation: pm.disableModelInvocation,
|
|
996
1008
|
userInvocable: pm.userInvocable,
|
|
997
1009
|
systemDefault: parsed.body.systemDefault,
|
|
1010
|
+
createdByAgentId: myAgentId ?? null,
|
|
1011
|
+
createdBy: await resolveHttpAuditUserId(req, myAgentId),
|
|
998
1012
|
});
|
|
999
1013
|
createSkillRoute.respond(res, 201, { skill });
|
|
1000
1014
|
} catch (err) {
|
|
@@ -1062,6 +1076,9 @@ export async function handleSkills(
|
|
|
1062
1076
|
updates.disableModelInvocation = pm.disableModelInvocation;
|
|
1063
1077
|
updates.userInvocable = pm.userInvocable;
|
|
1064
1078
|
}
|
|
1079
|
+
const actor = await resolveHttpAuditActor(req, myAgentId);
|
|
1080
|
+
updates.updatedBy = actor.userId;
|
|
1081
|
+
updates.updatedByAgentId = actor.agentId;
|
|
1065
1082
|
|
|
1066
1083
|
const skill = await updateSkill(parsed.params.id, updates as Parameters<typeof updateSkill>[1]);
|
|
1067
1084
|
if (!skill) {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { IncomingMessage } from "node:http";
|
|
2
|
-
import {
|
|
2
|
+
import { resolveHttpRequesterUserId } from "../be/audit-user";
|
|
3
3
|
import { findUserById } from "../be/users";
|
|
4
4
|
import { can } from "../rbac";
|
|
5
5
|
import { agentFirstPrincipal } from "./request-principal";
|
|
@@ -31,7 +31,7 @@ export async function resolveTaskRequester(
|
|
|
31
31
|
trustedUserId?: string | null,
|
|
32
32
|
): Promise<string | undefined> {
|
|
33
33
|
const trusted =
|
|
34
|
-
trustedUserId === undefined ? await
|
|
34
|
+
trustedUserId === undefined ? await resolveHttpRequesterUserId(req, myAgentId) : trustedUserId;
|
|
35
35
|
if (trusted) return trusted;
|
|
36
36
|
if (process.env.TRUST_BODY_REQUESTED_BY_USER_ID === "false" || !bodyUserId) return undefined;
|
|
37
37
|
// A worker on the shared key is not the operator: its X-Agent-ID names it, so the body
|
package/src/http/tasks.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { AssetKeyAuthorizationError, authorizeAssetKeyWrite } from "../be/asset-key-auth";
|
|
4
|
-
import {
|
|
4
|
+
import { resolveHttpRequesterUserId } from "../be/audit-user";
|
|
5
5
|
import {
|
|
6
6
|
backfillSupersedeTaskResumeTaskId,
|
|
7
7
|
cancelTask,
|
|
@@ -61,6 +61,7 @@ import { getTaskCitations, TaskCitationSchema } from "../be/task-citations";
|
|
|
61
61
|
import { getTaskUiSpec, TaskUiSpecSchema } from "../be/task-ui-spec";
|
|
62
62
|
import { findUserById } from "../be/users";
|
|
63
63
|
import { can, isRbacEnabled, type RbacPrincipal, type RbacResource } from "../rbac";
|
|
64
|
+
import { mirrorSessionPrompt } from "../slack/session-mirror";
|
|
64
65
|
import { chatThreadOfContextKey } from "../tasks/context-key";
|
|
65
66
|
import { TaskCreationBlockedError, TaskRoutingAuthorizationError } from "../tasks/errors";
|
|
66
67
|
import { createTaskWithSiblingAwareness } from "../tasks/sibling-awareness";
|
|
@@ -1140,7 +1141,7 @@ export async function handleTasks(
|
|
|
1140
1141
|
if (!parsed) return true;
|
|
1141
1142
|
|
|
1142
1143
|
// Trusted identity first, then the body hint; see resolveTaskRequester.
|
|
1143
|
-
const trustedUserId = await
|
|
1144
|
+
const trustedUserId = await resolveHttpRequesterUserId(req, myAgentId);
|
|
1144
1145
|
const requestedByUserId = await resolveTaskRequester(
|
|
1145
1146
|
req,
|
|
1146
1147
|
myAgentId,
|
|
@@ -1317,6 +1318,11 @@ export async function handleTasks(
|
|
|
1317
1318
|
},
|
|
1318
1319
|
});
|
|
1319
1320
|
|
|
1321
|
+
// A person's Sessions follow-up shows up in the session's Slack thread too.
|
|
1322
|
+
if (principal.kind === "user" || principal.kind === "operator") {
|
|
1323
|
+
getDbClient().afterCommit(() => mirrorSessionPrompt(task));
|
|
1324
|
+
}
|
|
1325
|
+
|
|
1320
1326
|
createTask.respond(res, 201, task);
|
|
1321
1327
|
} catch (error) {
|
|
1322
1328
|
if (error instanceof TaskRoutingAuthorizationError) {
|
|
@@ -1378,6 +1384,10 @@ export async function handleTasks(
|
|
|
1378
1384
|
jsonError(res, "Task not found", 404);
|
|
1379
1385
|
return true;
|
|
1380
1386
|
}
|
|
1387
|
+
// A draft holds back its mirror until its uploads settle, like its claim.
|
|
1388
|
+
if (existingTask.status === "draft") {
|
|
1389
|
+
getDbClient().afterCommit(() => mirrorSessionPrompt(promoted));
|
|
1390
|
+
}
|
|
1381
1391
|
|
|
1382
1392
|
promoteDraftTaskRoute.respond(res, 200, promoted);
|
|
1383
1393
|
return true;
|
|
@@ -1533,7 +1543,7 @@ export async function handleTasks(
|
|
|
1533
1543
|
return true;
|
|
1534
1544
|
}
|
|
1535
1545
|
|
|
1536
|
-
const trustedUserId = await await
|
|
1546
|
+
const trustedUserId = await await resolveHttpRequesterUserId(req, myAgentId);
|
|
1537
1547
|
let requestedByUserId = trustedUserId ?? undefined;
|
|
1538
1548
|
if (
|
|
1539
1549
|
process.env.TRUST_BODY_REQUESTED_BY_USER_ID !== "false" &&
|
package/src/http/tool-hooks.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import type { ToolCallEvent } from "../extensions/contract";
|
|
4
|
-
import { dispatchPost, dispatchPre } from "../extensions/dispatcher";
|
|
4
|
+
import { dispatchPost, dispatchPre, hasNativeToolHandlers } from "../extensions/dispatcher";
|
|
5
5
|
import type { RequestInfo } from "../tools/utils";
|
|
6
6
|
import { scrubObject } from "../utils/secret-scrubber";
|
|
7
7
|
import { route } from "./route-def";
|
|
@@ -64,6 +64,22 @@ const toolHookRoute = route({
|
|
|
64
64
|
},
|
|
65
65
|
});
|
|
66
66
|
|
|
67
|
+
const toolHookStatusRoute = route({
|
|
68
|
+
method: "get",
|
|
69
|
+
path: "/api/tool-hooks/status",
|
|
70
|
+
pattern: ["api", "tool-hooks", "status"],
|
|
71
|
+
summary: "Whether any enabled extension takes harness-native tool calls",
|
|
72
|
+
description:
|
|
73
|
+
"Worker shims read this before each native tool call and skip `POST /api/tool-hooks` while " +
|
|
74
|
+
"`native` is false, so a swarm with no native-tool extension pays no per-call round trip. " +
|
|
75
|
+
"Shims cache the answer for a short time.",
|
|
76
|
+
tags: ["Extensions"],
|
|
77
|
+
auth: { apiKey: true },
|
|
78
|
+
responses: {
|
|
79
|
+
200: { description: "Native tool hook status", schema: z.object({ native: z.boolean() }) },
|
|
80
|
+
},
|
|
81
|
+
});
|
|
82
|
+
|
|
67
83
|
function header(req: IncomingMessage, name: string): string | undefined {
|
|
68
84
|
const raw = req.headers[name];
|
|
69
85
|
return Array.isArray(raw) ? raw[0] : raw;
|
|
@@ -76,6 +92,10 @@ export async function handleToolHooks(
|
|
|
76
92
|
queryParams: URLSearchParams,
|
|
77
93
|
myAgentId: string | undefined,
|
|
78
94
|
): Promise<boolean> {
|
|
95
|
+
if (toolHookStatusRoute.match(req.method, pathSegments)) {
|
|
96
|
+
toolHookStatusRoute.respond(res, 200, { native: hasNativeToolHandlers() });
|
|
97
|
+
return true;
|
|
98
|
+
}
|
|
79
99
|
if (!toolHookRoute.match(req.method, pathSegments)) return false;
|
|
80
100
|
if (!myAgentId) {
|
|
81
101
|
jsonError(res, "Missing X-Agent-ID header", 400);
|
|
@@ -86,11 +106,13 @@ export async function handleToolHooks(
|
|
|
86
106
|
|
|
87
107
|
// Scrub at entry: handlers, extension_runs rows and logs only ever see the scrubbed body.
|
|
88
108
|
const body = scrubObject(parsed.body);
|
|
109
|
+
const sourceTaskId = header(req, "x-source-task-id");
|
|
89
110
|
const requestInfo: RequestInfo = {
|
|
90
111
|
sessionId: undefined,
|
|
91
112
|
agentId: myAgentId,
|
|
92
113
|
runtimeInstanceId: header(req, "x-runtime-instance-id"),
|
|
93
|
-
sourceTaskId
|
|
114
|
+
sourceTaskId,
|
|
115
|
+
auditSourceTaskId: sourceTaskId ?? header(req, "x-audit-source-task-id"),
|
|
94
116
|
contextKey: header(req, "x-context-key"),
|
|
95
117
|
callOrigin: "native",
|
|
96
118
|
harness: body.harness,
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
2
|
import { z } from "zod";
|
|
3
|
-
import {
|
|
3
|
+
import { resolveHttpRequesterUserId } from "../../be/audit-user";
|
|
4
4
|
import { ensureHttpPermission } from "../config";
|
|
5
5
|
|
|
6
6
|
/**
|
|
@@ -37,5 +37,5 @@ export async function ensureTrackerAuthorizeAdmin(
|
|
|
37
37
|
agentId,
|
|
38
38
|
);
|
|
39
39
|
if (!allowed) return null;
|
|
40
|
-
return { userId: await
|
|
40
|
+
return { userId: await resolveHttpRequesterUserId(req, agentId) };
|
|
41
41
|
}
|
package/src/http/users.ts
CHANGED
|
@@ -14,6 +14,8 @@
|
|
|
14
14
|
* POST /api/users
|
|
15
15
|
* GET /api/users/unmapped (must precede /:id)
|
|
16
16
|
* POST /api/users/unmapped/:kind/:externalId/resolve
|
|
17
|
+
* POST /api/users/unmapped/dismiss
|
|
18
|
+
* POST /api/users/unmapped/restore
|
|
17
19
|
* GET /api/users/:id
|
|
18
20
|
* PATCH /api/users/:id
|
|
19
21
|
* POST /api/users/:id/mcp-tokens
|
|
@@ -61,6 +63,12 @@ import {
|
|
|
61
63
|
OperatorGrantedTargetError,
|
|
62
64
|
setUserRoles,
|
|
63
65
|
} from "../be/rbac-roles";
|
|
66
|
+
import {
|
|
67
|
+
type DismissedUnmapped,
|
|
68
|
+
dismissedNamespace,
|
|
69
|
+
dismissUnmappedIdentity,
|
|
70
|
+
restoreUnmappedIdentity,
|
|
71
|
+
} from "../be/unmapped-identities";
|
|
64
72
|
import {
|
|
65
73
|
createUserMergeJob,
|
|
66
74
|
findActiveUserMergeJob,
|
|
@@ -183,6 +191,16 @@ const UnmappedIdentitySchema = z.object({
|
|
|
183
191
|
count: z.number(),
|
|
184
192
|
sampleEventType: z.string().nullable(),
|
|
185
193
|
sampleContext: z.unknown().nullable(),
|
|
194
|
+
/** Set only on rows from `?dismissed=true`. */
|
|
195
|
+
dismissedAt: z.string().optional(),
|
|
196
|
+
dismissedBy: z.string().optional(),
|
|
197
|
+
});
|
|
198
|
+
|
|
199
|
+
const UnmappedIdentityRefsSchema = z.object({
|
|
200
|
+
identities: z
|
|
201
|
+
.array(z.object({ kind: z.string().min(1), externalId: z.string().min(1) }))
|
|
202
|
+
.min(1)
|
|
203
|
+
.max(500),
|
|
186
204
|
});
|
|
187
205
|
|
|
188
206
|
// ─── Route Definitions ───────────────────────────────────────────────────────
|
|
@@ -292,6 +310,10 @@ const listUnmapped = route({
|
|
|
292
310
|
query: z.object({
|
|
293
311
|
kind: z.string().optional(),
|
|
294
312
|
limit: z.coerce.number().int().min(1).max(1000).optional(),
|
|
313
|
+
/** `true` lists the dismissed identities instead of the triage queue. */
|
|
314
|
+
dismissed: z.enum(["true", "false"]).optional(),
|
|
315
|
+
/** Logins ending in `[bot]` are hidden unless this is `true`. */
|
|
316
|
+
includeBots: z.enum(["true", "false"]).optional(),
|
|
295
317
|
}),
|
|
296
318
|
responses: {
|
|
297
319
|
200: {
|
|
@@ -334,6 +356,50 @@ const resolveUnmapped = route({
|
|
|
334
356
|
auth: { apiKey: true },
|
|
335
357
|
});
|
|
336
358
|
|
|
359
|
+
const DISMISS_RBAC = {
|
|
360
|
+
ungated:
|
|
361
|
+
"same posture as POST /api/users/unmapped/{kind}/{externalId}/resolve: bearer auth, guests rejected; it links and trusts nothing",
|
|
362
|
+
};
|
|
363
|
+
|
|
364
|
+
const dismissUnmapped = route({
|
|
365
|
+
method: "post",
|
|
366
|
+
path: "/api/users/unmapped/dismiss",
|
|
367
|
+
pattern: ["api", "users", "unmapped", "dismiss"],
|
|
368
|
+
summary:
|
|
369
|
+
"Dismiss unmapped identities: hide them from triage and stop recording them. Links nothing.",
|
|
370
|
+
tags: ["Users"],
|
|
371
|
+
body: UnmappedIdentityRefsSchema,
|
|
372
|
+
responses: {
|
|
373
|
+
200: {
|
|
374
|
+
description: "Identities moved to the ignore list",
|
|
375
|
+
schema: z.object({ dismissed: z.number() }),
|
|
376
|
+
},
|
|
377
|
+
400: { description: "Validation error" },
|
|
378
|
+
401: { description: "Unauthorized" },
|
|
379
|
+
},
|
|
380
|
+
auth: { apiKey: true },
|
|
381
|
+
rbac: DISMISS_RBAC,
|
|
382
|
+
});
|
|
383
|
+
|
|
384
|
+
const restoreUnmapped = route({
|
|
385
|
+
method: "post",
|
|
386
|
+
path: "/api/users/unmapped/restore",
|
|
387
|
+
pattern: ["api", "users", "unmapped", "restore"],
|
|
388
|
+
summary: "Undo a dismissal: return identities to the triage queue",
|
|
389
|
+
tags: ["Users"],
|
|
390
|
+
body: UnmappedIdentityRefsSchema,
|
|
391
|
+
responses: {
|
|
392
|
+
200: {
|
|
393
|
+
description: "Count of identities taken off the ignore list",
|
|
394
|
+
schema: z.object({ restored: z.number() }),
|
|
395
|
+
},
|
|
396
|
+
400: { description: "Validation error" },
|
|
397
|
+
401: { description: "Unauthorized" },
|
|
398
|
+
},
|
|
399
|
+
auth: { apiKey: true },
|
|
400
|
+
rbac: DISMISS_RBAC,
|
|
401
|
+
});
|
|
402
|
+
|
|
337
403
|
const getUserRoute = route({
|
|
338
404
|
method: "get",
|
|
339
405
|
path: "/api/users/{id}",
|
|
@@ -863,6 +929,34 @@ async function collectUnmappedForKind(kind: string, limit: number) {
|
|
|
863
929
|
return Array.from(byId.values());
|
|
864
930
|
}
|
|
865
931
|
|
|
932
|
+
/** The ignore list for one kind, in the triage-row shape plus who dismissed it and when. */
|
|
933
|
+
async function collectDismissedForKind(kind: string, limit: number) {
|
|
934
|
+
const rows = await listKv(dismissedNamespace(kind), { limit, offset: 0 });
|
|
935
|
+
return rows.map((row) => {
|
|
936
|
+
const saved = (row.value ?? {}) as Partial<DismissedUnmapped>;
|
|
937
|
+
const meta = (saved.meta ?? {}) as Record<string, unknown>;
|
|
938
|
+
return {
|
|
939
|
+
kind,
|
|
940
|
+
externalId: row.key,
|
|
941
|
+
lastSeenAt: typeof meta.lastSeenAt === "string" ? meta.lastSeenAt : null,
|
|
942
|
+
count: Number(saved.count ?? 0),
|
|
943
|
+
sampleEventType: typeof meta.sampleEventType === "string" ? meta.sampleEventType : null,
|
|
944
|
+
sampleContext: meta.sampleContext ?? null,
|
|
945
|
+
dismissedAt: saved.dismissedAt,
|
|
946
|
+
dismissedBy: saved.dismissedBy,
|
|
947
|
+
};
|
|
948
|
+
});
|
|
949
|
+
}
|
|
950
|
+
|
|
951
|
+
/** A bulk body can name one identity twice; act on it once. */
|
|
952
|
+
function uniqueIdentities<T extends { kind: string; externalId: string }>(identities: T[]): T[] {
|
|
953
|
+
const seen = new Map<string, T>();
|
|
954
|
+
for (const identity of identities) {
|
|
955
|
+
seen.set(`${identity.kind}\u0000${identity.externalId}`, identity);
|
|
956
|
+
}
|
|
957
|
+
return [...seen.values()];
|
|
958
|
+
}
|
|
959
|
+
|
|
866
960
|
const DEFAULT_CONNECTOR_CONNECT_URL = "https://mcp.agent-swarm.dev/connections";
|
|
867
961
|
|
|
868
962
|
/**
|
|
@@ -1034,7 +1128,22 @@ export async function handleUsers(
|
|
|
1034
1128
|
if (!parsed) return true;
|
|
1035
1129
|
const limit = parsed.query.limit ?? 100;
|
|
1036
1130
|
const kinds = parsed.query.kind ? [parsed.query.kind] : UNMAPPED_KINDS;
|
|
1037
|
-
const
|
|
1131
|
+
const collect =
|
|
1132
|
+
parsed.query.dismissed === "true" ? collectDismissedForKind : collectUnmappedForKind;
|
|
1133
|
+
const includeBots = parsed.query.includeBots === "true";
|
|
1134
|
+
// A sighting that raced a dismiss can re-create a tracker row; the ignore list still wins.
|
|
1135
|
+
const dismissedKeys =
|
|
1136
|
+
parsed.query.dismissed === "true"
|
|
1137
|
+
? new Set<string>()
|
|
1138
|
+
: new Set(
|
|
1139
|
+
(await Promise.all(kinds.map((k) => collectDismissedForKind(k, 1000))))
|
|
1140
|
+
.flat()
|
|
1141
|
+
.map((row) => `${row.kind}\u0000${row.externalId}`),
|
|
1142
|
+
);
|
|
1143
|
+
const rows = (await Promise.all(kinds.map((k) => collect(k, limit))))
|
|
1144
|
+
.flat()
|
|
1145
|
+
.filter((row) => includeBots || !row.externalId.endsWith("[bot]"))
|
|
1146
|
+
.filter((row) => !dismissedKeys.has(`${row.kind}\u0000${row.externalId}`));
|
|
1038
1147
|
rows.sort((a, b) => {
|
|
1039
1148
|
if (b.count !== a.count) return b.count - a.count;
|
|
1040
1149
|
const al = a.lastSeenAt ?? "";
|
|
@@ -1045,6 +1154,32 @@ export async function handleUsers(
|
|
|
1045
1154
|
return true;
|
|
1046
1155
|
}
|
|
1047
1156
|
|
|
1157
|
+
// ─── POST /api/users/unmapped/dismiss | restore ─────────────────────────────
|
|
1158
|
+
if (dismissUnmapped.match(req.method, pathSegments)) {
|
|
1159
|
+
const parsed = await dismissUnmapped.parse(req, res, pathSegments, queryParams);
|
|
1160
|
+
if (!parsed) return true;
|
|
1161
|
+
const actor = getOperatorActor(req, res);
|
|
1162
|
+
if (!actor) return true;
|
|
1163
|
+
const identities = uniqueIdentities(parsed.body.identities);
|
|
1164
|
+
for (const { kind, externalId } of identities) {
|
|
1165
|
+
await dismissUnmappedIdentity(kind, externalId, `${actor.kind}:${actor.id}`);
|
|
1166
|
+
}
|
|
1167
|
+
dismissUnmapped.respond(res, 200, { dismissed: identities.length });
|
|
1168
|
+
return true;
|
|
1169
|
+
}
|
|
1170
|
+
|
|
1171
|
+
if (restoreUnmapped.match(req.method, pathSegments)) {
|
|
1172
|
+
const parsed = await restoreUnmapped.parse(req, res, pathSegments, queryParams);
|
|
1173
|
+
if (!parsed) return true;
|
|
1174
|
+
if (!getOperatorActor(req, res)) return true;
|
|
1175
|
+
let restored = 0;
|
|
1176
|
+
for (const { kind, externalId } of uniqueIdentities(parsed.body.identities)) {
|
|
1177
|
+
if (await restoreUnmappedIdentity(kind, externalId)) restored++;
|
|
1178
|
+
}
|
|
1179
|
+
restoreUnmapped.respond(res, 200, { restored });
|
|
1180
|
+
return true;
|
|
1181
|
+
}
|
|
1182
|
+
|
|
1048
1183
|
// ─── POST /api/users/unmapped/:kind/:externalId/resolve ───────────────────
|
|
1049
1184
|
if (resolveUnmapped.match(req.method, pathSegments)) {
|
|
1050
1185
|
const parsed = await resolveUnmapped.parse(req, res, pathSegments, queryParams);
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { getWorkflowRun } from "../be/db";
|
|
4
|
+
import { isReservedProviderEvent } from "../event-waits";
|
|
4
5
|
import { workflowEventBus } from "../workflows/event-bus";
|
|
5
6
|
import { route } from "./route-def";
|
|
6
7
|
import { jsonError } from "./utils";
|
|
@@ -39,6 +40,7 @@ const runScopedSignalRoute = route({
|
|
|
39
40
|
}),
|
|
40
41
|
},
|
|
41
42
|
404: { description: "Workflow run not found" },
|
|
43
|
+
403: { description: "Event name is reserved for provider webhooks" },
|
|
42
44
|
400: { description: "Validation error" },
|
|
43
45
|
},
|
|
44
46
|
auth: { apiKey: true },
|
|
@@ -70,11 +72,14 @@ const globalSignalRoute = route({
|
|
|
70
72
|
name: z.string(),
|
|
71
73
|
}),
|
|
72
74
|
},
|
|
75
|
+
403: { description: "Event name is reserved for provider webhooks" },
|
|
73
76
|
400: { description: "Validation error" },
|
|
74
77
|
},
|
|
75
78
|
auth: { apiKey: true },
|
|
76
79
|
});
|
|
77
80
|
|
|
81
|
+
const RESERVED_EVENT_MESSAGE = "Event name is reserved for provider webhooks";
|
|
82
|
+
|
|
78
83
|
// ─── Handler ─────────────────────────────────────────────────────────────────
|
|
79
84
|
|
|
80
85
|
export async function handleWorkflowEvents(
|
|
@@ -88,6 +93,10 @@ export async function handleWorkflowEvents(
|
|
|
88
93
|
const parsed = await runScopedSignalRoute.parse(req, res, pathSegments, queryParams);
|
|
89
94
|
if (!parsed) return true;
|
|
90
95
|
|
|
96
|
+
if (isReservedProviderEvent(parsed.body.name)) {
|
|
97
|
+
jsonError(res, RESERVED_EVENT_MESSAGE, 403);
|
|
98
|
+
return true;
|
|
99
|
+
}
|
|
91
100
|
const run = await getWorkflowRun(parsed.params.runId);
|
|
92
101
|
if (!run) {
|
|
93
102
|
jsonError(res, "Workflow run not found", 404);
|
|
@@ -110,6 +119,10 @@ export async function handleWorkflowEvents(
|
|
|
110
119
|
const parsed = await globalSignalRoute.parse(req, res, pathSegments, queryParams);
|
|
111
120
|
if (!parsed) return true;
|
|
112
121
|
|
|
122
|
+
if (isReservedProviderEvent(parsed.body.name)) {
|
|
123
|
+
jsonError(res, RESERVED_EVENT_MESSAGE, 403);
|
|
124
|
+
return true;
|
|
125
|
+
}
|
|
113
126
|
workflowEventBus.emit(parsed.body.name, parsed.body.payload ?? {});
|
|
114
127
|
|
|
115
128
|
globalSignalRoute.respond(res, 200, { ok: true, name: parsed.body.name });
|
package/src/http/workflows.ts
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { AssetKeyAuthorizationError, authorizeAssetKeyWrite } from "../be/asset-key-auth";
|
|
4
|
-
import { resolveHttpAuditUserId } from "../be/audit-user";
|
|
4
|
+
import { resolveHttpAuditUserId, resolveHttpRequesterUserId } from "../be/audit-user";
|
|
5
5
|
import {
|
|
6
6
|
createWorkflow,
|
|
7
7
|
deleteWorkflow,
|
|
@@ -727,13 +727,13 @@ export async function handleWorkflows(
|
|
|
727
727
|
return true;
|
|
728
728
|
}
|
|
729
729
|
|
|
730
|
-
const refKeys = serverRefInputKeys(parsed.body.input);
|
|
730
|
+
const refKeys = serverRefInputKeys(parsed.body.input, parsed.body.params);
|
|
731
731
|
if (refKeys.length > 0 && (await requestSecretReadScope(req)) !== "all") {
|
|
732
732
|
jsonError(res, serverRefInputDeniedMessage(refKeys), 403);
|
|
733
733
|
return true;
|
|
734
734
|
}
|
|
735
735
|
|
|
736
|
-
const trustedUserId = await
|
|
736
|
+
const trustedUserId = await resolveHttpRequesterUserId(req, myAgentId);
|
|
737
737
|
let key: string | undefined;
|
|
738
738
|
try {
|
|
739
739
|
key = parsed.body.key
|
|
@@ -867,7 +867,10 @@ export async function handleWorkflows(
|
|
|
867
867
|
const updateArgs: Omit<Parameters<typeof updateWorkflow>[1], "definition"> = {};
|
|
868
868
|
if (parsed.body.key !== undefined) {
|
|
869
869
|
try {
|
|
870
|
-
updateArgs.key = await authorizeAssetKeyWrite(
|
|
870
|
+
updateArgs.key = await authorizeAssetKeyWrite(
|
|
871
|
+
parsed.body.key,
|
|
872
|
+
await resolveHttpRequesterUserId(req, myAgentId),
|
|
873
|
+
);
|
|
871
874
|
} catch (error) {
|
|
872
875
|
if (error instanceof AssetKeyAuthorizationError) {
|
|
873
876
|
jsonError(res, error.message, error.statusCode);
|
|
@@ -959,11 +962,15 @@ export async function handleWorkflows(
|
|
|
959
962
|
}
|
|
960
963
|
}
|
|
961
964
|
|
|
962
|
-
// New ref input, or a new definition over stored ref input,
|
|
963
|
-
// server-resolved values go:
|
|
964
|
-
const refKeys =
|
|
965
|
-
body.input !== undefined
|
|
966
|
-
|
|
965
|
+
// New ref input or params, or a new definition over stored ref input,
|
|
966
|
+
// decides where server-resolved values go: all need config.read.secrets.
|
|
967
|
+
const refKeys =
|
|
968
|
+
body.input !== undefined || body.params !== undefined || body.definition
|
|
969
|
+
? serverRefInputKeys(
|
|
970
|
+
body.input !== undefined ? body.input : existing.input,
|
|
971
|
+
body.params !== undefined ? body.params : existing.params,
|
|
972
|
+
)
|
|
973
|
+
: [];
|
|
967
974
|
if (refKeys.length > 0 && (await requestSecretReadScope(req)) !== "all") {
|
|
968
975
|
jsonError(res, serverRefInputDeniedMessage(refKeys), 403);
|
|
969
976
|
return true;
|
|
@@ -973,7 +980,10 @@ export async function handleWorkflows(
|
|
|
973
980
|
let key: string | undefined;
|
|
974
981
|
if (body.key !== undefined) {
|
|
975
982
|
try {
|
|
976
|
-
key = await authorizeAssetKeyWrite(
|
|
983
|
+
key = await authorizeAssetKeyWrite(
|
|
984
|
+
body.key,
|
|
985
|
+
await resolveHttpRequesterUserId(req, myAgentId),
|
|
986
|
+
);
|
|
977
987
|
} catch (error) {
|
|
978
988
|
if (error instanceof AssetKeyAuthorizationError) {
|
|
979
989
|
jsonError(res, error.message, error.statusCode);
|
|
@@ -1097,7 +1107,7 @@ export async function handleWorkflows(
|
|
|
1097
1107
|
runId = await startWorkflowExecution(workflow, body, getExecutorRegistry(), {
|
|
1098
1108
|
triggerType: "api",
|
|
1099
1109
|
triggeredByAgentId: myAgentId,
|
|
1100
|
-
requestedByUserId: (await
|
|
1110
|
+
requestedByUserId: (await resolveHttpRequesterUserId(req, myAgentId)) ?? undefined,
|
|
1101
1111
|
detach: parsed.query.wait === "false",
|
|
1102
1112
|
// Recorded in the run's own transaction, before the walk starts.
|
|
1103
1113
|
accept: claim
|