@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/fs.ts
CHANGED
|
@@ -315,13 +315,16 @@ const inviteMemberRoute = route({
|
|
|
315
315
|
schema: agentFsInviteStateSchema,
|
|
316
316
|
},
|
|
317
317
|
400: { description: "Invalid body" },
|
|
318
|
-
403: {
|
|
318
|
+
403: {
|
|
319
|
+
description:
|
|
320
|
+
"The caller is not the operator key or a user, or a non-admin user token named an email other than its own",
|
|
321
|
+
},
|
|
319
322
|
500: { description: "Provisioning or invite failed" },
|
|
320
323
|
},
|
|
321
324
|
auth: { apiKey: true },
|
|
322
325
|
// The operator key and grant-all users invite any email at any role. Other
|
|
323
326
|
// users may only join with their own account email, at a role the handler
|
|
324
|
-
// derives from their grant.
|
|
327
|
+
// derives from their grant. Agent session tokens are refused.
|
|
325
328
|
rbac: { permission: "fs.join.own" },
|
|
326
329
|
});
|
|
327
330
|
|
|
@@ -436,13 +439,19 @@ type InviteRole = "viewer" | "editor" | "admin";
|
|
|
436
439
|
* keep the body as sent. Any other user joins only as itself: the body email
|
|
437
440
|
* must match the account email (ignoring case), the stored spelling is used,
|
|
438
441
|
* and the role is `editor` when the user may change task files, else `viewer`.
|
|
442
|
+
* Every other principal (agent session tokens, guests) is refused.
|
|
439
443
|
*/
|
|
440
444
|
async function resolveInvite(
|
|
441
445
|
req: IncomingMessage,
|
|
442
446
|
body: { email: string; role: InviteRole },
|
|
443
447
|
): Promise<{ email: string; role: InviteRole } | { denied: string }> {
|
|
444
|
-
const
|
|
445
|
-
if (
|
|
448
|
+
const auth = getRequestAuth(req);
|
|
449
|
+
if (auth?.kind === "operator") return body;
|
|
450
|
+
const user = authUser(auth);
|
|
451
|
+
// Agent session tokens and guests provision through /api/fs/agent-credentials, not here.
|
|
452
|
+
if (!user)
|
|
453
|
+
return { denied: "Only the operator key or a user token can invite to the shared drive" };
|
|
454
|
+
if (!isRbacEnabled()) return body;
|
|
446
455
|
const grant = await getUserGrant(user.id);
|
|
447
456
|
if (grant.grantsAll) return body;
|
|
448
457
|
const decision = can({
|
package/src/http/index.ts
CHANGED
|
@@ -125,6 +125,7 @@ import { handleOAuthCallback, startOAuthPendingGc, stopOAuthPendingGc } from "./
|
|
|
125
125
|
import { handleGenericOAuth } from "./oauth-generic";
|
|
126
126
|
import { handleOAuthLocks } from "./oauth-locks";
|
|
127
127
|
import { handleObjectWebhooks } from "./object-webhooks";
|
|
128
|
+
import { handleObjects } from "./objects";
|
|
128
129
|
import { handleOnboarding } from "./onboarding";
|
|
129
130
|
import { handlePageProxy } from "./page-proxy";
|
|
130
131
|
import { handlePages } from "./pages";
|
|
@@ -376,6 +377,7 @@ const httpServer = createHttpServer(async (req, res) => {
|
|
|
376
377
|
() => handleTrackers(req, res, pathSegments),
|
|
377
378
|
() => handleWebhooks(req, res, pathSegments),
|
|
378
379
|
() => handleObjectWebhooks(req, res, pathSegments),
|
|
380
|
+
() => handleObjects(req, res, pathSegments, queryParams, myAgentId),
|
|
379
381
|
() => handleAgentLifecycle(req, res, pathSegments, queryParams, myAgentId),
|
|
380
382
|
() => handleAgentsRest(req, res, pathSegments, queryParams, myAgentId),
|
|
381
383
|
() => handleBudgets(req, res, pathSegments, queryParams, myAgentId),
|
package/src/http/mcp-bridge.ts
CHANGED
|
@@ -59,6 +59,8 @@ export async function invokeToolInProcess(args: {
|
|
|
59
59
|
args?: unknown;
|
|
60
60
|
agentId?: string;
|
|
61
61
|
sourceTaskId?: string;
|
|
62
|
+
/** Audit-only task; see `RequestInfo.auditSourceTaskId`. */
|
|
63
|
+
auditSourceTaskId?: string;
|
|
62
64
|
runtimeInstanceId?: string;
|
|
63
65
|
callOrigin: Extract<RequestInfo["callOrigin"], "script-sdk" | "extension">;
|
|
64
66
|
}): Promise<unknown> {
|
|
@@ -89,6 +91,7 @@ export async function invokeToolInProcess(args: {
|
|
|
89
91
|
headers: {
|
|
90
92
|
"x-agent-id": args.agentId ?? "",
|
|
91
93
|
...(args.sourceTaskId ? { "x-source-task-id": args.sourceTaskId } : {}),
|
|
94
|
+
...(args.auditSourceTaskId ? { "x-audit-source-task-id": args.auditSourceTaskId } : {}),
|
|
92
95
|
...(args.runtimeInstanceId ? { "x-runtime-instance-id": args.runtimeInstanceId } : {}),
|
|
93
96
|
},
|
|
94
97
|
},
|
|
@@ -170,6 +173,7 @@ export async function handleMcpBridge(
|
|
|
170
173
|
args,
|
|
171
174
|
agentId: myAgentId,
|
|
172
175
|
sourceTaskId,
|
|
176
|
+
auditSourceTaskId: headerValue(req, "x-audit-source-task-id"),
|
|
173
177
|
runtimeInstanceId,
|
|
174
178
|
// The agent header is caller-controlled; the extension origin also needs the
|
|
175
179
|
// per-process token that only the in-process extension SDK holds.
|
|
@@ -0,0 +1,265 @@
|
|
|
1
|
+
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
|
+
import { z } from "zod";
|
|
3
|
+
import {
|
|
4
|
+
applySheetOp,
|
|
5
|
+
type EmbedActor,
|
|
6
|
+
ObjectEmbedError,
|
|
7
|
+
readObject,
|
|
8
|
+
saveBoardContent,
|
|
9
|
+
} from "../be/primitives/object-embed";
|
|
10
|
+
import type { PrimitiveObject } from "../be/primitives/objects";
|
|
11
|
+
import { MAX_OBJECT_BYTES } from "../be/primitives/write-object";
|
|
12
|
+
import { findUserById } from "../be/users";
|
|
13
|
+
import { can } from "../rbac";
|
|
14
|
+
import { getRequestAuth } from "../utils/request-auth-context";
|
|
15
|
+
import { dashboardUserIdHeader } from "./favorite-owner";
|
|
16
|
+
import { authUser, isOperatorAuth, resolveRequestPrincipal } from "./request-principal";
|
|
17
|
+
import { route } from "./route-def";
|
|
18
|
+
import { json, jsonError } from "./utils";
|
|
19
|
+
|
|
20
|
+
/**
|
|
21
|
+
* Boards and sheets for people (an app's ObjectEmbed, a page's
|
|
22
|
+
* `<swarm-object>`). Agents use the board-* and sheet-* tools instead.
|
|
23
|
+
* The service (src/be/primitives/object-embed.ts) acts as the object's owner
|
|
24
|
+
* agent on agent-fs; swarm RBAC (`objects.read`, `objects.write`) is the gate.
|
|
25
|
+
*/
|
|
26
|
+
|
|
27
|
+
const ObjectSchema = z.object({
|
|
28
|
+
id: z.string(),
|
|
29
|
+
kind: z.string(),
|
|
30
|
+
orgId: z.string(),
|
|
31
|
+
driveId: z.string(),
|
|
32
|
+
path: z.string(),
|
|
33
|
+
title: z.string().nullable(),
|
|
34
|
+
fileVersion: z.number().nullable(),
|
|
35
|
+
ownerAgentId: z.string().nullable(),
|
|
36
|
+
createdAt: z.string(),
|
|
37
|
+
updatedAt: z.string(),
|
|
38
|
+
link: z.string().nullable(),
|
|
39
|
+
});
|
|
40
|
+
|
|
41
|
+
const params = z.object({ id: z.string().uuid().describe("Object id (`swarm.id` in the file)") });
|
|
42
|
+
|
|
43
|
+
const CellSchema = z.union([z.number(), z.string(), z.boolean(), z.null()]);
|
|
44
|
+
const CellRowsSchema = z.array(z.array(CellSchema));
|
|
45
|
+
|
|
46
|
+
const objectErrors = {
|
|
47
|
+
400: { description: "Invalid input, or the object is not the kind this route edits" },
|
|
48
|
+
403: {
|
|
49
|
+
description:
|
|
50
|
+
"Permission denied, a page guest, a read-only page session, or an object off the shared drive",
|
|
51
|
+
},
|
|
52
|
+
404: { description: "No such object, or its file is gone" },
|
|
53
|
+
503: { description: "The owner agent has no agent-fs key on the object's drive" },
|
|
54
|
+
} as const;
|
|
55
|
+
|
|
56
|
+
const getObjectRoute = route({
|
|
57
|
+
method: "get",
|
|
58
|
+
path: "/api/objects/{id}",
|
|
59
|
+
pattern: ["api", "objects", null],
|
|
60
|
+
summary: "Read a board or sheet on the shared drive, or confirm it is unchanged",
|
|
61
|
+
tags: ["Objects"],
|
|
62
|
+
params,
|
|
63
|
+
query: z.object({
|
|
64
|
+
knownVersion: z.coerce
|
|
65
|
+
.number()
|
|
66
|
+
.int()
|
|
67
|
+
.min(0)
|
|
68
|
+
.optional()
|
|
69
|
+
.describe("The version the caller holds. A match answers `unchanged: true` with no content"),
|
|
70
|
+
}),
|
|
71
|
+
rbac: { permission: "objects.read" },
|
|
72
|
+
responses: {
|
|
73
|
+
200: {
|
|
74
|
+
description: "The object with its content, or `unchanged: true` with no content",
|
|
75
|
+
schema: z.object({
|
|
76
|
+
object: ObjectSchema,
|
|
77
|
+
version: z.number().nullable(),
|
|
78
|
+
unchanged: z.boolean(),
|
|
79
|
+
content: z.unknown().optional(),
|
|
80
|
+
}),
|
|
81
|
+
},
|
|
82
|
+
...objectErrors,
|
|
83
|
+
},
|
|
84
|
+
});
|
|
85
|
+
|
|
86
|
+
const putContentRoute = route({
|
|
87
|
+
method: "put",
|
|
88
|
+
path: "/api/objects/{id}/content",
|
|
89
|
+
pattern: ["api", "objects", null, "content"],
|
|
90
|
+
summary: "Save a board's full Excalidraw scene, guarded by its agent-fs version",
|
|
91
|
+
tags: ["Objects"],
|
|
92
|
+
params,
|
|
93
|
+
body: z.object({
|
|
94
|
+
content: z.record(z.string(), z.unknown()).describe("The Excalidraw scene"),
|
|
95
|
+
ifMatch: z.number().int().min(0).describe("The version the scene was edited from"),
|
|
96
|
+
}),
|
|
97
|
+
// The scene is capped at 5 MiB as stored; the request may carry some slack.
|
|
98
|
+
maxBodyBytes: MAX_OBJECT_BYTES + 256 * 1024,
|
|
99
|
+
rbac: { permission: "objects.write" },
|
|
100
|
+
responses: {
|
|
101
|
+
200: {
|
|
102
|
+
description: "Saved",
|
|
103
|
+
schema: z.object({ object: ObjectSchema, version: z.number().nullable() }),
|
|
104
|
+
},
|
|
105
|
+
...objectErrors,
|
|
106
|
+
409: { description: "The board changed since `ifMatch`; the body carries its `version`" },
|
|
107
|
+
413: { description: "The scene exceeds 5 MiB" },
|
|
108
|
+
},
|
|
109
|
+
});
|
|
110
|
+
|
|
111
|
+
const sheetOpsRoute = route({
|
|
112
|
+
method: "post",
|
|
113
|
+
path: "/api/objects/{id}/sheet-ops",
|
|
114
|
+
pattern: ["api", "objects", null, "sheet-ops"],
|
|
115
|
+
summary: "Patch sheet cells; the server recalculates and merges concurrent edits",
|
|
116
|
+
tags: ["Objects"],
|
|
117
|
+
params,
|
|
118
|
+
body: z.discriminatedUnion("op", [
|
|
119
|
+
z.object({ op: z.literal("setRange"), range: z.string().min(1), values: CellRowsSchema }),
|
|
120
|
+
z.object({ op: z.literal("clearRange"), range: z.string().min(1) }),
|
|
121
|
+
z.object({ op: z.literal("appendRows"), tab: z.string().min(1), rows: CellRowsSchema }),
|
|
122
|
+
]),
|
|
123
|
+
maxBodyBytes: 2 * 1024 * 1024,
|
|
124
|
+
rbac: { permission: "objects.write" },
|
|
125
|
+
responses: {
|
|
126
|
+
200: {
|
|
127
|
+
description: "Applied: the range written and the new version",
|
|
128
|
+
schema: z.object({
|
|
129
|
+
op: z.enum(["setRange", "clearRange", "appendRows"]),
|
|
130
|
+
range: z.string(),
|
|
131
|
+
version: z.number(),
|
|
132
|
+
changed: z.number().optional(),
|
|
133
|
+
recalculated: z.number().optional(),
|
|
134
|
+
cleared: z.number().optional(),
|
|
135
|
+
}),
|
|
136
|
+
},
|
|
137
|
+
...objectErrors,
|
|
138
|
+
409: { description: "Other writers changed the sheet on every retry; try again" },
|
|
139
|
+
},
|
|
140
|
+
});
|
|
141
|
+
|
|
142
|
+
const publicObject = (o: PrimitiveObject): z.infer<typeof ObjectSchema> => ({
|
|
143
|
+
id: o.id,
|
|
144
|
+
kind: o.kind,
|
|
145
|
+
orgId: o.orgId,
|
|
146
|
+
driveId: o.driveId,
|
|
147
|
+
path: o.path,
|
|
148
|
+
title: o.title,
|
|
149
|
+
fileVersion: o.fileVersion,
|
|
150
|
+
ownerAgentId: o.ownerAgentId,
|
|
151
|
+
createdAt: o.createdAt,
|
|
152
|
+
updatedAt: o.updatedAt,
|
|
153
|
+
link: o.link,
|
|
154
|
+
});
|
|
155
|
+
|
|
156
|
+
/**
|
|
157
|
+
* Check the verb and resolve who is acting. A password-page guest is refused
|
|
158
|
+
* (the page proxy already refuses it; this covers a direct call), and a page
|
|
159
|
+
* launched with the operator key may read but not write. Returns null after
|
|
160
|
+
* the refusal is written.
|
|
161
|
+
*/
|
|
162
|
+
async function authorize(
|
|
163
|
+
req: IncomingMessage,
|
|
164
|
+
res: ServerResponse,
|
|
165
|
+
myAgentId: string | undefined,
|
|
166
|
+
verb: "objects.read" | "objects.write",
|
|
167
|
+
): Promise<EmbedActor | null> {
|
|
168
|
+
const auth = getRequestAuth(req);
|
|
169
|
+
if (auth?.kind === "guest" || auth?.kind === "controller") {
|
|
170
|
+
jsonError(res, "sign in to the swarm to view this object", 403);
|
|
171
|
+
return null;
|
|
172
|
+
}
|
|
173
|
+
const principal = await resolveRequestPrincipal(req, myAgentId, {
|
|
174
|
+
unauthenticatedFallback: "operator",
|
|
175
|
+
});
|
|
176
|
+
const decision = principal
|
|
177
|
+
? can({ principal, verb, resource: { kind: "none" }, source: "http" })
|
|
178
|
+
: { allow: false as const, reason: "no authenticated principal" };
|
|
179
|
+
if (!decision.allow) {
|
|
180
|
+
jsonError(res, decision.reason, 403);
|
|
181
|
+
return null;
|
|
182
|
+
}
|
|
183
|
+
const via = auth?.page ? "page" : "app";
|
|
184
|
+
if (verb === "objects.write" && auth?.page && principal?.kind !== "user") {
|
|
185
|
+
jsonError(res, "this page session is read-only; sign in to the swarm to edit", 403);
|
|
186
|
+
return null;
|
|
187
|
+
}
|
|
188
|
+
let user = principal?.kind === "user" ? authUser(auth) : undefined;
|
|
189
|
+
// The dashboard sends the operator key plus the user it picked (as fs.ts does).
|
|
190
|
+
if (!user && isOperatorAuth(auth) && !auth.page && !myAgentId) {
|
|
191
|
+
const pickedId = dashboardUserIdHeader(req);
|
|
192
|
+
const picked = pickedId ? await findUserById(pickedId) : null;
|
|
193
|
+
if (picked?.status === "active" && !picked.mergedIntoUserId) user = picked;
|
|
194
|
+
}
|
|
195
|
+
return { via, userId: user?.id ?? null, name: user?.name ?? null };
|
|
196
|
+
}
|
|
197
|
+
|
|
198
|
+
function respondError(res: ServerResponse, error: unknown): boolean {
|
|
199
|
+
if (!(error instanceof ObjectEmbedError)) return false;
|
|
200
|
+
if (error.status === 409 && error.version !== undefined) {
|
|
201
|
+
json(res, { error: error.message, version: error.version }, 409);
|
|
202
|
+
} else {
|
|
203
|
+
jsonError(res, error.message, error.status);
|
|
204
|
+
}
|
|
205
|
+
return true;
|
|
206
|
+
}
|
|
207
|
+
|
|
208
|
+
export async function handleObjects(
|
|
209
|
+
req: IncomingMessage,
|
|
210
|
+
res: ServerResponse,
|
|
211
|
+
pathSegments: string[],
|
|
212
|
+
queryParams: URLSearchParams,
|
|
213
|
+
myAgentId: string | undefined,
|
|
214
|
+
): Promise<boolean> {
|
|
215
|
+
if (getObjectRoute.match(req.method, pathSegments)) {
|
|
216
|
+
const parsed = await getObjectRoute.parse(req, res, pathSegments, queryParams);
|
|
217
|
+
if (!parsed) return true;
|
|
218
|
+
if (!(await authorize(req, res, myAgentId, "objects.read"))) return true;
|
|
219
|
+
try {
|
|
220
|
+
const read = await readObject(parsed.params.id, parsed.query.knownVersion);
|
|
221
|
+
getObjectRoute.respond(res, 200, { ...read, object: publicObject(read.object) });
|
|
222
|
+
} catch (error) {
|
|
223
|
+
if (!respondError(res, error)) throw error;
|
|
224
|
+
}
|
|
225
|
+
return true;
|
|
226
|
+
}
|
|
227
|
+
|
|
228
|
+
if (putContentRoute.match(req.method, pathSegments)) {
|
|
229
|
+
const parsed = await putContentRoute.parse(req, res, pathSegments, queryParams);
|
|
230
|
+
if (!parsed) return true;
|
|
231
|
+
const actor = await authorize(req, res, myAgentId, "objects.write");
|
|
232
|
+
if (!actor) return true;
|
|
233
|
+
try {
|
|
234
|
+
const saved = await saveBoardContent({
|
|
235
|
+
id: parsed.params.id,
|
|
236
|
+
content: parsed.body.content,
|
|
237
|
+
ifMatch: parsed.body.ifMatch,
|
|
238
|
+
actor,
|
|
239
|
+
});
|
|
240
|
+
putContentRoute.respond(res, 200, { ...saved, object: publicObject(saved.object) });
|
|
241
|
+
} catch (error) {
|
|
242
|
+
if (!respondError(res, error)) throw error;
|
|
243
|
+
}
|
|
244
|
+
return true;
|
|
245
|
+
}
|
|
246
|
+
|
|
247
|
+
if (sheetOpsRoute.match(req.method, pathSegments)) {
|
|
248
|
+
const parsed = await sheetOpsRoute.parse(req, res, pathSegments, queryParams);
|
|
249
|
+
if (!parsed) return true;
|
|
250
|
+
const actor = await authorize(req, res, myAgentId, "objects.write");
|
|
251
|
+
if (!actor) return true;
|
|
252
|
+
try {
|
|
253
|
+
sheetOpsRoute.respond(
|
|
254
|
+
res,
|
|
255
|
+
200,
|
|
256
|
+
await applySheetOp({ id: parsed.params.id, op: parsed.body, actor }),
|
|
257
|
+
);
|
|
258
|
+
} catch (error) {
|
|
259
|
+
if (!respondError(res, error)) throw error;
|
|
260
|
+
}
|
|
261
|
+
return true;
|
|
262
|
+
}
|
|
263
|
+
|
|
264
|
+
return false;
|
|
265
|
+
}
|
package/src/http/pages.ts
CHANGED
|
@@ -2,7 +2,7 @@ import { randomUUID } from "node:crypto";
|
|
|
2
2
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
3
3
|
import { z } from "zod";
|
|
4
4
|
import { AssetKeyAuthorizationError, authorizeAssetKeyWrite } from "../be/asset-key-auth";
|
|
5
|
-
import {
|
|
5
|
+
import { resolveHttpRequesterUserId } from "../be/audit-user";
|
|
6
6
|
import {
|
|
7
7
|
countAllPages,
|
|
8
8
|
countPagesByAgent,
|
|
@@ -631,7 +631,7 @@ export async function handlePages(
|
|
|
631
631
|
const key = parsed.body.key
|
|
632
632
|
? await authorizeAssetKeyWrite(
|
|
633
633
|
parsed.body.key,
|
|
634
|
-
await
|
|
634
|
+
await resolveHttpRequesterUserId(req, myAgentId),
|
|
635
635
|
)
|
|
636
636
|
: undefined;
|
|
637
637
|
const page = await createPage({
|
|
@@ -878,7 +878,7 @@ export async function handlePages(
|
|
|
878
878
|
try {
|
|
879
879
|
key = await authorizeAssetKeyWrite(
|
|
880
880
|
parsed.body.key,
|
|
881
|
-
await
|
|
881
|
+
await resolveHttpRequesterUserId(req, myAgentId),
|
|
882
882
|
);
|
|
883
883
|
} catch (error) {
|
|
884
884
|
if (error instanceof AssetKeyAuthorizationError) {
|
package/src/http/poll.ts
CHANGED
|
@@ -28,12 +28,17 @@ import {
|
|
|
28
28
|
} from "../be/db";
|
|
29
29
|
import { checkProfileForAgent } from "../be/model-profile-check";
|
|
30
30
|
import {
|
|
31
|
+
modelTierOverridesDiffer,
|
|
31
32
|
parseModelTierOverridesHeader,
|
|
32
33
|
recordClaimModelResolution,
|
|
33
34
|
setAgentModelTierOverrides,
|
|
34
35
|
} from "../be/model-tier-resolution";
|
|
35
36
|
import { poolTaskRunsOnHarness } from "../be/model-validation";
|
|
36
|
-
import {
|
|
37
|
+
import {
|
|
38
|
+
getRuntimeInstanceById,
|
|
39
|
+
isRuntimeInstanceFresh,
|
|
40
|
+
touchRuntimeInstance,
|
|
41
|
+
} from "../be/multi-runtime";
|
|
37
42
|
import { hasCapability } from "../server";
|
|
38
43
|
import { fetchChannelActivity } from "../slack/channel-activity";
|
|
39
44
|
import { type TaskModelPinFields, taskModelPin } from "../tasks/model-pin";
|
|
@@ -208,6 +213,9 @@ const pollTriggers = route({
|
|
|
208
213
|
|
|
209
214
|
// ─── Channel Activity Throttle ──────────────────────────────────────────────
|
|
210
215
|
|
|
216
|
+
/** The idle-poll probe hit a write: rerun the poll under the write lock. */
|
|
217
|
+
const NEEDS_WRITE = Symbol("poll-needs-write");
|
|
218
|
+
|
|
211
219
|
const CHANNEL_ACTIVITY_INTERVAL_MS = 60_000; // Check at most once per 60s
|
|
212
220
|
let lastChannelActivityCheckAt = 0;
|
|
213
221
|
|
|
@@ -390,7 +398,12 @@ export async function handlePoll(
|
|
|
390
398
|
let runtimeDraining = false;
|
|
391
399
|
let result: PollTxnResult;
|
|
392
400
|
try {
|
|
393
|
-
|
|
401
|
+
// Runs twice at most. The probe pass (`probe: true`) runs in a read-only
|
|
402
|
+
// transaction, so an idle poll never takes the SQLite write lock; at its
|
|
403
|
+
// first would-be write it returns NEEDS_WRITE instead. Only then does the
|
|
404
|
+
// same body run again under BEGIN IMMEDIATE, where every claim and its
|
|
405
|
+
// capacity/budget check stay atomic exactly as before.
|
|
406
|
+
const pollBody = async (probe: boolean): Promise<PollTxnResult | typeof NEEDS_WRITE> => {
|
|
394
407
|
const agent = await getAgentById(myAgentId);
|
|
395
408
|
if (!agent) {
|
|
396
409
|
return { error: "Agent not found", status: 404 };
|
|
@@ -399,7 +412,8 @@ export async function handlePoll(
|
|
|
399
412
|
// The worker's parsed MODEL_TIER_* env overrides ride on every poll so
|
|
400
413
|
// claim-time resolution can honor them (no write when unchanged).
|
|
401
414
|
if (modelTierOverrides) {
|
|
402
|
-
await setAgentModelTierOverrides(agent.id, modelTierOverrides);
|
|
415
|
+
if (!probe) await setAgentModelTierOverrides(agent.id, modelTierOverrides);
|
|
416
|
+
else if (await modelTierOverridesDiffer(agent.id, modelTierOverrides)) return NEEDS_WRITE;
|
|
403
417
|
}
|
|
404
418
|
|
|
405
419
|
// Extension identities authenticate to the API but never execute
|
|
@@ -413,12 +427,15 @@ export async function handlePoll(
|
|
|
413
427
|
// live runtime identity rather than on X-Agent-ID alone, which only
|
|
414
428
|
// names the logical agent. Polling is worker activity, so this also
|
|
415
429
|
// refreshes liveness — it cannot revive a retired runtime, since the
|
|
416
|
-
// update only matches one that is still live.
|
|
417
|
-
|
|
418
|
-
|
|
419
|
-
!
|
|
420
|
-
|
|
421
|
-
|
|
430
|
+
// update only matches one that is still live. The probe skips the
|
|
431
|
+
// touch while the last one is fresh (well inside the stale window).
|
|
432
|
+
if (isMultiRuntimeEnabled()) {
|
|
433
|
+
if (!runtimeInstanceId) return { trigger: null };
|
|
434
|
+
if (probe) {
|
|
435
|
+
if (!(await isRuntimeInstanceFresh(runtimeInstanceId, agent.id))) return NEEDS_WRITE;
|
|
436
|
+
} else if (!(await touchRuntimeInstance(runtimeInstanceId, agent.id))) {
|
|
437
|
+
return { trigger: null };
|
|
438
|
+
}
|
|
422
439
|
}
|
|
423
440
|
|
|
424
441
|
if (
|
|
@@ -448,6 +465,7 @@ export async function handlePoll(
|
|
|
448
465
|
: [];
|
|
449
466
|
const firstOfferedTask = offeredTasks[0];
|
|
450
467
|
if (firstOfferedTask) {
|
|
468
|
+
if (probe) return NEEDS_WRITE;
|
|
451
469
|
const claimedTask = await claimOfferedTask(firstOfferedTask.id, myAgentId);
|
|
452
470
|
if (claimedTask) {
|
|
453
471
|
await recordRuntimeTask(claimedTask.id);
|
|
@@ -468,7 +486,10 @@ export async function handlePoll(
|
|
|
468
486
|
// Check for pending tasks (assigned directly to this agent)
|
|
469
487
|
// Only return a task if agent has capacity (server-side enforcement)
|
|
470
488
|
if (await hasCapacity(myAgentId)) {
|
|
471
|
-
|
|
489
|
+
// The probe also escalates when only an affinity-skip log row is due.
|
|
490
|
+
const pendingProbe = probe ? { skipLogDue: false } : undefined;
|
|
491
|
+
const pendingTask = await getPendingTaskForAgent(myAgentId, pendingProbe);
|
|
492
|
+
if (pendingProbe && (pendingTask || pendingProbe.skipLogDue)) return NEEDS_WRITE;
|
|
472
493
|
if (pendingTask) {
|
|
473
494
|
// Budget admission gate (Phase 3). Runs in the same transaction as
|
|
474
495
|
// the capacity check so capacity AND budget gates share atomicity.
|
|
@@ -586,8 +607,11 @@ export async function handlePoll(
|
|
|
586
607
|
// Gated on the messaging capability: without it the read-messages /
|
|
587
608
|
// post-message tools aren't registered, so an unread_mentions trigger
|
|
588
609
|
// would instruct a missing tool and strand the claimed mentions.
|
|
589
|
-
const claimedChannels = hasCapability("messaging")
|
|
610
|
+
const claimedChannels = hasCapability("messaging")
|
|
611
|
+
? await claimMentions(myAgentId, { dryRun: probe })
|
|
612
|
+
: [];
|
|
590
613
|
if (claimedChannels.length > 0) {
|
|
614
|
+
if (probe) return NEEDS_WRITE;
|
|
591
615
|
// Count what this claim took: the inbox summary no longer sees mentions already
|
|
592
616
|
// moved to "processing".
|
|
593
617
|
return {
|
|
@@ -662,6 +686,7 @@ export async function handlePoll(
|
|
|
662
686
|
// refusal, and the dedup is per-(task,date) so subsequent same-day
|
|
663
687
|
// refusals on the same lead-candidate are suppressed.
|
|
664
688
|
if (unassignedIds.length > 0) {
|
|
689
|
+
if (probe) return NEEDS_WRITE;
|
|
665
690
|
const candidateId = unassignedIds[0]!;
|
|
666
691
|
const candidateTask = await getTaskById(candidateId);
|
|
667
692
|
const admission = await canClaim(
|
|
@@ -755,7 +780,13 @@ export async function handlePoll(
|
|
|
755
780
|
|
|
756
781
|
// No trigger found
|
|
757
782
|
return { trigger: null };
|
|
758
|
-
}
|
|
783
|
+
};
|
|
784
|
+
const probed = await getDbClient().transaction(() => pollBody(true), { readOnly: true });
|
|
785
|
+
// The write pass never returns NEEDS_WRITE: every guard above is `if (probe)`.
|
|
786
|
+
result =
|
|
787
|
+
probed === NEEDS_WRITE
|
|
788
|
+
? ((await getDbClient().transaction(() => pollBody(false))) as PollTxnResult)
|
|
789
|
+
: probed;
|
|
759
790
|
} catch (error) {
|
|
760
791
|
console.error("[/api/poll] Database error:", error);
|
|
761
792
|
jsonError(
|
package/src/http/repos.ts
CHANGED
|
@@ -2,7 +2,7 @@ import type { IncomingMessage, ServerResponse } from "node:http";
|
|
|
2
2
|
import { z } from "zod";
|
|
3
3
|
import { createSwarmRepo, deleteSwarmRepo, getSwarmRepoById, getSwarmRepos } from "../be/db";
|
|
4
4
|
import { updateSwarmRepoChecked } from "../be/repo-checked-update";
|
|
5
|
-
import {
|
|
5
|
+
import { changesMergePolicy } from "../be/repo-merge-policy";
|
|
6
6
|
import { can } from "../rbac";
|
|
7
7
|
import { emitIntegrationConnected } from "../telemetry";
|
|
8
8
|
import { RepoGuidelinesInputSchema, RepoHooksSchema, SwarmRepoSchema } from "../types";
|
|
@@ -62,7 +62,8 @@ const createRepo = route({
|
|
|
62
62
|
201: { description: "Repo created", schema: SwarmRepoSchema },
|
|
63
63
|
400: { description: "Validation error", schema: z.object({ error: z.string() }) },
|
|
64
64
|
403: {
|
|
65
|
-
description:
|
|
65
|
+
description:
|
|
66
|
+
"Only the lead, the operator or a user can turn allowMerge on or set a mergePolicy",
|
|
66
67
|
schema: z.object({ error: z.string() }),
|
|
67
68
|
},
|
|
68
69
|
409: { description: "Duplicate repo", schema: z.object({ error: z.string() }) },
|
|
@@ -89,7 +90,7 @@ const updateRepo = route({
|
|
|
89
90
|
responses: {
|
|
90
91
|
200: { description: "Repo updated", schema: SwarmRepoSchema },
|
|
91
92
|
403: {
|
|
92
|
-
description: "Only the lead, the operator or a user can change allowMerge",
|
|
93
|
+
description: "Only the lead, the operator or a user can change allowMerge or mergePolicy",
|
|
93
94
|
schema: z.object({ error: z.string() }),
|
|
94
95
|
},
|
|
95
96
|
404: { description: "Repo not found", schema: z.object({ error: z.string() }) },
|
|
@@ -113,7 +114,7 @@ const deleteRepo = route({
|
|
|
113
114
|
|
|
114
115
|
// ─── Handler ─────────────────────────────────────────────────────────────────
|
|
115
116
|
|
|
116
|
-
/** The refusal text when the caller may not change
|
|
117
|
+
/** The refusal text when the caller may not change the merge policy, or null when they may. */
|
|
117
118
|
async function allowMergeRefusal(
|
|
118
119
|
req: IncomingMessage,
|
|
119
120
|
myAgentId: string | undefined,
|
|
@@ -160,7 +161,7 @@ export async function handleRepos(
|
|
|
160
161
|
if (createRepo.match(req.method, pathSegments)) {
|
|
161
162
|
const parsed = await createRepo.parse(req, res, pathSegments, queryParams);
|
|
162
163
|
if (!parsed) return true;
|
|
163
|
-
if (
|
|
164
|
+
if (changesMergePolicy(null, parsed.body.guidelines)) {
|
|
164
165
|
const refusal = await allowMergeRefusal(req, myAgentId);
|
|
165
166
|
if (refusal) {
|
|
166
167
|
jsonError(res, refusal, 403);
|
|
@@ -198,7 +199,7 @@ export async function handleRepos(
|
|
|
198
199
|
const parsed = await updateRepo.parse(req, res, pathSegments, queryParams);
|
|
199
200
|
if (!parsed) return true;
|
|
200
201
|
try {
|
|
201
|
-
// The comparison with the stored
|
|
202
|
+
// The comparison with the stored merge policy, the decision and the write share one
|
|
202
203
|
// transaction, so a stale edit cannot overwrite a merge-policy change committed after it.
|
|
203
204
|
const result = await updateSwarmRepoChecked(
|
|
204
205
|
parsed.params.id,
|
package/src/http/schedules.ts
CHANGED
|
@@ -2,7 +2,7 @@ import type { IncomingMessage, ServerResponse } from "node:http";
|
|
|
2
2
|
import { CronExpressionParser } from "cron-parser";
|
|
3
3
|
import { z } from "zod";
|
|
4
4
|
import { AssetKeyAuthorizationError, authorizeAssetKeyWrite } from "../be/asset-key-auth";
|
|
5
|
-
import { resolveHttpAuditUserId } from "../be/audit-user";
|
|
5
|
+
import { resolveHttpAuditUserId, resolveHttpRequesterUserId } from "../be/audit-user";
|
|
6
6
|
import {
|
|
7
7
|
createScheduledTask,
|
|
8
8
|
deleteScheduledTask,
|
|
@@ -432,7 +432,7 @@ export async function handleSchedules(
|
|
|
432
432
|
}
|
|
433
433
|
|
|
434
434
|
try {
|
|
435
|
-
const trustedUserId = await
|
|
435
|
+
const trustedUserId = await resolveHttpRequesterUserId(req, myAgentId);
|
|
436
436
|
let key: string | undefined;
|
|
437
437
|
try {
|
|
438
438
|
key = body.key ? await authorizeAssetKeyWrite(body.key, trustedUserId) : undefined;
|
|
@@ -484,7 +484,9 @@ export async function handleSchedules(
|
|
|
484
484
|
params: body.params,
|
|
485
485
|
requiredParams: body.requiredParams,
|
|
486
486
|
requires: body.requires,
|
|
487
|
-
|
|
487
|
+
createdByAgentId: myAgentId,
|
|
488
|
+
// Not the audit header: a schedule fires its tasks as requested by created_by.
|
|
489
|
+
createdBy: trustedUserId ?? undefined,
|
|
488
490
|
});
|
|
489
491
|
|
|
490
492
|
createSchedule.respond(res, 201, schedule);
|
|
@@ -573,7 +575,7 @@ export async function handleSchedules(
|
|
|
573
575
|
try {
|
|
574
576
|
body.key = await authorizeAssetKeyWrite(
|
|
575
577
|
parsed.body.key,
|
|
576
|
-
await
|
|
578
|
+
await resolveHttpRequesterUserId(req, myAgentId),
|
|
577
579
|
);
|
|
578
580
|
} catch (error) {
|
|
579
581
|
if (error instanceof AssetKeyAuthorizationError) {
|
|
@@ -779,8 +781,10 @@ export async function handleSchedules(
|
|
|
779
781
|
}
|
|
780
782
|
}
|
|
781
783
|
|
|
782
|
-
|
|
783
|
-
|
|
784
|
+
// The audit pair describes this write: the person is null when unknown,
|
|
785
|
+
// never left over from an earlier writer.
|
|
786
|
+
body.updatedBy = await resolveHttpAuditUserId(req, myAgentId);
|
|
787
|
+
body.updatedByAgentId = myAgentId ?? null;
|
|
784
788
|
let schedule: Awaited<ReturnType<typeof updateScheduledTask>>;
|
|
785
789
|
try {
|
|
786
790
|
schedule = await updateScheduledTask(parsed.params.id, body);
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import type { IncomingMessage, ServerResponse } from "node:http";
|
|
2
2
|
import { z } from "zod";
|
|
3
|
-
import { resolveHttpAuditUserId } from "@/be/audit-user";
|
|
3
|
+
import { resolveHttpAuditUserId, resolveHttpRequesterUserId } from "@/be/audit-user";
|
|
4
4
|
import { normalizeDate } from "@/be/date-utils";
|
|
5
5
|
import { getDbClient } from "@/be/db";
|
|
6
6
|
import {
|
|
@@ -2384,7 +2384,7 @@ export async function handleScriptConnections(
|
|
|
2384
2384
|
label,
|
|
2385
2385
|
flow: "generic",
|
|
2386
2386
|
...(parsed.body?.finalRedirect ? { finalRedirect: parsed.body.finalRedirect } : {}),
|
|
2387
|
-
userId: await
|
|
2387
|
+
userId: await resolveHttpRequesterUserId(req, agentId),
|
|
2388
2388
|
});
|
|
2389
2389
|
authorizeUrlRoute.respond(res, 200, {
|
|
2390
2390
|
authorizeUrl: result.url,
|
package/src/http/scripts.ts
CHANGED
|
@@ -762,6 +762,10 @@ export async function handleScripts(
|
|
|
762
762
|
const runtimeInstanceId = ((h) => (Array.isArray(h) ? h[0] : h))(
|
|
763
763
|
req.headers["x-runtime-instance-id"],
|
|
764
764
|
);
|
|
765
|
+
// Forwarded to the run's `ctx.swarm` calls so their writes resolve the same
|
|
766
|
+
// audit person. Not trusted as-is: every resolver re-checks that the task
|
|
767
|
+
// belongs to the calling agent.
|
|
768
|
+
const sourceTaskId = ((h) => (Array.isArray(h) ? h[0] : h))(req.headers["x-source-task-id"]);
|
|
765
769
|
|
|
766
770
|
// Inline source is saved as a scratch script and recorded on the run row:
|
|
767
771
|
// refuse an embedded secret before it executes or persists.
|
|
@@ -820,6 +824,7 @@ export async function handleScripts(
|
|
|
820
824
|
executor,
|
|
821
825
|
agentId: agent.id,
|
|
822
826
|
runtimeInstanceId,
|
|
827
|
+
sourceTaskId,
|
|
823
828
|
egressSecrets: credentials.egressSecrets,
|
|
824
829
|
failedBindings: credentials.failedBindings,
|
|
825
830
|
userConfig: credentials.userConfig,
|
|
@@ -884,6 +889,7 @@ export async function handleScripts(
|
|
|
884
889
|
isScratch: true,
|
|
885
890
|
typeChecked: false,
|
|
886
891
|
changeReason: "Auto-saved successful inline run",
|
|
892
|
+
createdBy: await resolveHttpAuditUserId(req, agent.id),
|
|
887
893
|
});
|
|
888
894
|
autoSaved = { slug, reason: "successful_inline_run" };
|
|
889
895
|
}
|
|
@@ -993,6 +999,9 @@ export async function handleScripts(
|
|
|
993
999
|
fsMode: script.fsMode,
|
|
994
1000
|
executor: script.executor,
|
|
995
1001
|
createdByAgentId: script.createdByAgentId,
|
|
1002
|
+
updatedByAgentId: script.updatedByAgentId,
|
|
1003
|
+
createdBy: script.createdBy,
|
|
1004
|
+
updatedBy: script.updatedBy,
|
|
996
1005
|
createdAt: script.createdAt,
|
|
997
1006
|
updatedAt: script.updatedAt,
|
|
998
1007
|
}));
|