@desplega.ai/agent-swarm 2.12.0 → 2.13.1
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-xtj40wd8.js +17 -0
- package/dist/{acp-targets-311gcyvw.js → acp-targets-n7vm5atw.js} +10 -9
- package/dist/{actions-c4chgxp6.js → actions-hq6wp9xv.js} +28 -27
- package/dist/{agent-fs-provision-0b9awm5n.js → agent-fs-provision-y0qc1rdd.js} +4 -4
- package/dist/{amp-adapter-r0veq6x5.js → amp-adapter-1qqs6h91.js} +3 -3
- package/dist/{app-hn5fftf5.js → app-7m4z44rv.js} +10 -8
- package/dist/{approval-notifications-3g6yc8nv.js → approval-notifications-8sr41gjx.js} +11 -10
- package/dist/{assistant-cpjgpjvp.js → assistant-hkczwfv6.js} +29 -28
- package/dist/{boot-args-schema-hce1av1h.js → boot-args-schema-8025snev.js} +1 -1
- package/dist/{boot-reembed-bztbxc4z.js → boot-reembed-15m87nr1.js} +5 -2
- package/dist/{boot-reembed-d7xcym0j.js → boot-reembed-4bbpxjh1.js} +1 -1
- package/dist/{boot-scrub-sweep-mkmm16gk.js → boot-scrub-sweep-eajr97e9.js} +2 -2
- package/dist/{boot-seeds-arrkbe8t.js → boot-seeds-9cwy39jx.js} +4 -4
- package/dist/{boxd-68n75y1s.js → boxd-hr8rsxzq.js} +1 -1
- package/dist/{claude-adapter-ykpyr5p8.js → claude-adapter-g61wa4rt.js} +9 -8
- package/dist/{claude-managed-adapter-ssg6z4bt.js → claude-managed-adapter-znkk0prm.js} +4 -4
- package/dist/{claude-managed-setup-trd59v7b.js → claude-managed-setup-f1wndkr2.js} +7 -7
- package/dist/{claude-sdk-session-yjcze0j1.js → claude-sdk-session-687xzf21.js} +20763 -19380
- package/dist/{cli-ya3kf4gs.js → cli-04103ryh.js} +1 -1
- package/dist/{cli-55tc8cj4.js → cli-0a336ze7.js} +5 -5
- package/dist/{cli-q8tc22bj.js → cli-0fx95c06.js} +5 -5
- package/dist/{cli-mq2fbgva.js → cli-0m77n7ej.js} +3 -3
- package/dist/{cli-7yn42w6m.js → cli-0xwb7zpt.js} +2 -2
- package/dist/{cli-mcymtvwn.js → cli-13t0smbk.js} +1000 -28
- package/dist/{cli-c7j31hq9.js → cli-1b5axkt1.js} +4 -4
- package/dist/{cli-yegz2g06.js → cli-1carhg8g.js} +4 -4
- package/dist/{cli-j5gtytvg.js → cli-1dr5at77.js} +15 -12
- package/dist/cli-2v4xxnx2.js +148 -0
- package/dist/{cli-sv2r3bw8.js → cli-32xndx6b.js} +7 -7
- package/dist/{cli-h70a2mxy.js → cli-3m8vqehw.js} +53 -13
- package/dist/{cli-ercwc8xn.js → cli-3mf04tkh.js} +1 -1
- package/dist/{cli-52nfye5j.js → cli-3zyme1wt.js} +24 -16
- package/dist/{cli-s6zk31gr.js → cli-43dsqhcp.js} +4 -4
- package/dist/{cli-b93d81yg.js → cli-4h90xaet.js} +2 -2
- package/dist/{cli-5tg94mdw.js → cli-4mj5g29m.js} +9 -12
- package/dist/{cli-47hz21se.js → cli-4tbvndmm.js} +4 -5
- package/dist/{cli-r0mz92by.js → cli-50whymxq.js} +2 -2
- package/dist/{cli-js10kdk7.js → cli-5basv0e7.js} +19 -5
- package/dist/{cli-krbcr00p.js → cli-5v6b2am8.js} +59 -5
- package/dist/{cli-en6dmkxd.js → cli-6r1dwegd.js} +3 -3
- package/dist/{cli-9qe5y107.js → cli-7ewre3dm.js} +15 -6
- package/dist/{cli-n3qe7tyr.js → cli-84xtgbn6.js} +35 -2
- package/dist/{cli-xm34qj8m.js → cli-8cmjkbvj.js} +2 -2
- package/dist/{cli-2m6yaq6b.js → cli-8fj8yfmk.js} +1 -1
- package/dist/{cli-nja15knq.js → cli-8rbkw18r.js} +3 -3
- package/dist/{cli-x05p2d05.js → cli-9tevdxyf.js} +1 -1
- package/dist/{cli-hhc47ack.js → cli-9xx36trj.js} +4 -4
- package/dist/{cli-39qm0rtm.js → cli-a8ts6x1n.js} +29 -150
- package/dist/{cli-bp6k9acz.js → cli-aebswqmz.js} +18 -18
- package/dist/{cli-ex1y88j3.js → cli-at67kvnp.js} +1 -1
- package/dist/{cli-q2dywc8h.js → cli-bjmq14k9.js} +4 -4
- package/dist/{cli-v9ya390t.js → cli-byxsctca.js} +12 -12
- package/dist/{cli-bz97ff9n.js → cli-c0tyzt73.js} +152 -12
- package/dist/{cli-fyaq4zdv.js → cli-c8kqmzzf.js} +9 -9
- package/dist/{cli-t75xngj1.js → cli-cd9acnvd.js} +12 -12
- package/dist/{cli-eqq0hwvx.js → cli-cmgdptmx.js} +3 -3
- package/dist/{cli-r14ac1y0.js → cli-cn6fpa1p.js} +1 -1
- package/dist/{cli-0k1a0sde.js → cli-cp0m07wb.js} +10 -10
- package/dist/{cli-3p288654.js → cli-cpkxh68d.js} +2 -2
- package/dist/{cli-fxd1mwtr.js → cli-cqxwjb93.js} +2 -2
- package/dist/{cli-8hp56wat.js → cli-d2epqm0y.js} +1 -1
- package/dist/{cli-73q4g5nx.js → cli-dd57p1gd.js} +21 -21
- package/dist/{cli-5z0g0e8v.js → cli-f8rcvf2x.js} +49 -13
- package/dist/{cli-wvjqaqcp.js → cli-fn8aj7gb.js} +1330 -249
- package/dist/{cli-bpje8n65.js → cli-fp65jdp2.js} +31 -6
- package/dist/{cli-0pp1yjg2.js → cli-gedf48yw.js} +11 -11
- package/dist/{cli-m5qtmrbc.js → cli-gq6qhmrr.js} +2 -2
- package/dist/{cli-5x03v6en.js → cli-grcc2h2g.js} +8 -8
- package/dist/{cli-01tvvtad.js → cli-h03j6je3.js} +4 -4
- package/dist/{cli-mbwmqb5w.js → cli-h0ewec3d.js} +1 -1
- package/dist/{cli-12vek61e.js → cli-h9bejmkf.js} +535 -146
- package/dist/{cli-gfy6hbd9.js → cli-hs3mqswp.js} +18 -11
- package/dist/{cli-tdk7jtka.js → cli-hv3820ez.js} +1 -1
- package/dist/{cli-pqfecppn.js → cli-je587f74.js} +1 -1
- package/dist/{cli-cjqyse9q.js → cli-jhtvt7gn.js} +3 -3
- package/dist/{cli-dkvtfgn4.js → cli-mmw2sjaf.js} +76 -17
- package/dist/{cli-2z2c4k6q.js → cli-mwxez0pz.js} +22 -0
- package/dist/{cli-yfpc6qy9.js → cli-nk8swfpx.js} +47 -16
- package/dist/{cli-eq4kew31.js → cli-p7g7wd9n.js} +26 -13
- package/dist/{cli-bhgrhedp.js → cli-q8aq48v1.js} +1 -1
- package/dist/{cli-dd2k2mcd.js → cli-qn79645p.js} +1 -1
- package/dist/{cli-ma9ys8rt.js → cli-qx1dwrr5.js} +7 -4
- package/dist/{cli-tm60vtax.js → cli-rfejbpe1.js} +1 -1
- package/dist/{cli-agjbj5x0.js → cli-s6fhqbz1.js} +38 -20
- package/dist/{cli-kwr5qv5g.js → cli-sfajkbd7.js} +2 -2
- package/dist/{cli-9y4tgrkf.js → cli-skd2c4ej.js} +2 -1
- package/dist/{cli-e8n0hdzd.js → cli-snypfjgj.js} +1 -1
- package/dist/{cli-n8f0fs3c.js → cli-t25rq8mg.js} +11 -11
- package/dist/{cli-72yms3ey.js → cli-t90k0phh.js} +201 -21
- package/dist/{cli-xf4z5bdn.js → cli-tzzas8rb.js} +4 -4
- package/dist/{cli-rtmqzat7.js → cli-vdfngx2g.js} +2 -2
- package/dist/{cli-9w8712tq.js → cli-vr4eyq6p.js} +43 -14
- package/dist/{cli-z4f346g5.js → cli-vx9acp12.js} +1 -1
- package/dist/{cli-2amwhyv2.js → cli-w24f3j49.js} +13 -11
- package/dist/cli-w41bvvms.js +148 -0
- package/dist/{cli-04zc3f7b.js → cli-w6c6dj91.js} +1 -1
- package/dist/{cli-fy4gb74g.js → cli-x5yb8zc8.js} +2 -2
- package/dist/{cli-2tw284hj.js → cli-xhkek467.js} +3 -3
- package/dist/{cli-5r95eqbh.js → cli-y260hgep.js} +1 -1
- package/dist/{cli-hbvgzjq4.js → cli-y6qqbpwc.js} +3 -3
- package/dist/{cli-7wy8gbwb.js → cli-ya1cj689.js} +1 -1
- package/dist/{cli-1htmtqc2.js → cli-yeh3g1q6.js} +620 -95
- package/dist/{cli-0vcqcwfn.js → cli-yfvhvw8m.js} +2 -0
- package/dist/{cli-k5jx8jya.js → cli-z6m6xzxt.js} +2 -2
- package/dist/{cli-pe3yxedk.js → cli-zaate0rd.js} +3 -3
- package/dist/{cli-n85m2wkq.js → cli-zkbz8m2q.js} +3 -2
- package/dist/{cli-e3ahxq5y.js → cli-zvpkrgsc.js} +6 -6
- package/dist/cli.js +30 -28
- package/dist/{codex-adapter-wc6e4wct.js → codex-adapter-ysfg6ty3.js} +8 -8
- package/dist/{codex-hook-aqtj17yr.js → codex-hook-c0nvm30r.js} +73 -2
- package/dist/{codex-login-1ven7yje.js → codex-login-ven5cz5j.js} +1 -1
- package/dist/{codex-session-runner-ppfgjd97.js → codex-session-runner-823scr6g.js} +9 -9
- package/dist/{commands-tsv2vx5b.js → commands-5rbm07fz.js} +3 -3
- package/dist/{controller-ye4sdwsy.js → controller-wn3vd217.js} +4 -4
- package/dist/{controllers-connect-zn4dg69h.js → controllers-connect-34jzhfft.js} +29 -28
- package/dist/core-kdehq26g.js +42 -0
- package/dist/{cursor-adapter-q2g9vwts.js → cursor-adapter-w1681kp1.js} +2 -2
- package/dist/{db-g111qn9j.js → db-6bkgbfwk.js} +3 -3
- package/dist/{db-3r1fyr2n.js → db-hcj16x7z.js} +4 -2
- package/dist/{devin-adapter-t8d86q9x.js → devin-adapter-fs90ab4v.js} +1 -1
- package/dist/{dispatcher-4q8s0mx8.js → dispatcher-jgjqrfzv.js} +28 -25
- package/dist/{docker-1b41eysj.js → docker-1h33jvh9.js} +2 -2
- package/dist/{dsh-adapter-mmcw1z5s.js → dsh-adapter-g9yqv09y.js} +2 -2
- package/dist/{e2b-xm60c8ad.js → e2b-jnk0yeva.js} +2 -2
- package/dist/{e2b-ew8c5j5v.js → e2b-y7e5kmzf.js} +2 -2
- package/dist/{easter-egg-3d-04ke6hcp.js → easter-egg-3d-w17nsny6.js} +1 -1
- package/dist/{embedding-space-kcdn52vz.js → embedding-space-v06fwy7b.js} +6 -6
- package/dist/{embeddings-jnzcd91a.js → embeddings-g50dxea4.js} +1 -1
- package/dist/{event-bus-v4ywhc2p.js → event-bus-08t2b4y2.js} +1 -1
- package/dist/{execute-74amghty.js → execute-1n36haw1.js} +1 -1
- package/dist/{external-channel-v9zgxnxz.js → external-channel-43tv8pg6.js} +2 -2
- package/dist/fx-adapter-bvh05t4a.js +20 -0
- package/dist/grok-adapter-my5j8mdf.js +20 -0
- package/dist/handlers-wyymeeqh.js +41 -0
- package/dist/heartbeat-sf3nk937.js +50 -0
- package/dist/{hook-p5reemds.js → hook-dqph1e05.js} +77 -18
- package/dist/{hook-k1h73zd7.js → hook-m1m9dm6w.js} +6 -5
- package/dist/{http-ms1z5xxy.js → http-w0th1cz9.js} +888 -226
- package/dist/index-22khdtby.js +44 -0
- package/dist/{index-76zzxtzf.js → index-c0e8en64.js} +1 -1
- package/dist/{index-620y7jzq.js → index-e8pz8qdg.js} +3 -3
- package/dist/{index-8p0j4h4j.js → index-ez823q84.js} +94 -89
- package/dist/{index-fbkqhvvj.js → index-ffba0z8q.js} +217 -165
- package/dist/{index-gjn6qfgn.js → index-gkpfgpg7.js} +1 -1
- package/dist/{index-4k7m5dgj.js → index-k8ajc0g0.js} +143 -103
- package/dist/index-np0582ac.js +40 -0
- package/dist/{index-kn63q1gr.js → index-pb03vans.js} +33 -32
- package/dist/index-vgkrj1jt.js +39 -0
- package/dist/{index-pe3d8jfy.js → index-whysn1wf.js} +1 -1
- package/dist/{index-0h6qd4p1.js → index-y4vd4mhn.js} +3 -4
- package/dist/{k8s-fy8hbhkg.js → k8s-8326q0rq.js} +2 -2
- package/dist/{keepalive-031js8jz.js → keepalive-2v06q2e8.js} +5 -4
- package/dist/lead-55z813ng.js +79 -0
- package/dist/{maintenance-sq9v3qx9.js → maintenance-vx7vjhhy.js} +1 -1
- package/dist/{oauth-refresh-sweep-zqmnyvs8.js → oauth-refresh-sweep-g06k4bza.js} +4 -3
- package/dist/{object-webhooks-r24wwb5y.js → object-webhooks-3dzdq4fm.js} +7 -7
- package/dist/{onboard-p25yhh7t.js → onboard-232pazny.js} +4 -4
- package/dist/{opencode-adapter-wcjc4zdk.js → opencode-adapter-t0paqbh8.js} +8 -7
- package/dist/{otel-impl-ff1gf20m.js → otel-impl-kmpkyp4y.js} +2 -2
- package/dist/{pending-hxj5yatb.js → pending-x0z3vx1x.js} +27 -26
- package/dist/{pi-mono-adapter-vkp4zz7p.js → pi-mono-adapter-7pmypn6d.js} +93 -22
- package/dist/{pricing-refresh-9w7gx41w.js → pricing-refresh-ytjmtyd7.js} +2 -2
- package/dist/{rbac-roles-84aw10nz.js → rbac-roles-fgm5mxr2.js} +3 -3
- package/dist/{rbac-roles-hz74vckp.js → rbac-roles-xyaxekh3.js} +7 -4
- package/dist/{registry-eeyx1201.js → registry-zv0zvxsx.js} +1 -1
- package/dist/{render-v2-nrdkg9gf.js → render-v2-ws972g4r.js} +12 -8
- package/dist/{resume-s6ey36rh.js → resume-m6mjzhkp.js} +13 -12
- package/dist/{runtime-x0b4pyam.js → runtime-zzpc0c8a.js} +1 -1
- package/dist/{session-access-xv49tk14.js → session-access-vp35xs91.js} +5 -4
- package/dist/{session-source-backfill-r5j988ah.js → session-source-backfill-p73e8zbe.js} +3 -3
- package/dist/{setup-mj0krk1p.js → setup-r4kd7rxg.js} +1 -1
- package/dist/thread-buffer-cm2nzq6t.js +42 -0
- package/dist/{tree-visibility-cbrsfaar.js → tree-visibility-07h2tbs2.js} +2 -2
- package/dist/{user-merge-jobs-f9d8nwnw.js → user-merge-jobs-96vg9rpe.js} +3 -3
- package/dist/{virtual-modules-ns0ryw05.js → virtual-modules-vgn3f2x4.js} +3 -3
- package/dist/{work-objects-pydhzast.js → work-objects-74hbcx3e.js} +31 -29
- package/dist/worker-5pn2vzx6.js +79 -0
- package/dist/{worker-follow-up-9z2xec5e.js → worker-follow-up-ezavwn5d.js} +26 -25
- package/dist/{x-3dtaf2r9.js → x-asbrnafg.js} +2 -2
- package/dist/xlsx-9acfmxr1.js +31534 -0
- package/openapi.json +2816 -1464
- package/package.json +13 -11
- package/src/agentmail/handlers.ts +26 -19
- package/src/apps/catalog.generated.json +757 -0
- package/src/apps/definition.ts +24 -7
- package/src/apps/page-validator.ts +225 -3
- 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 +152 -33
- package/src/be/extensions/assets.ts +11 -7
- package/src/be/mcp-proxy.ts +5 -4
- 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/migrations/340_api_key_spend_cap.sql +5 -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/schedules/validate.ts +26 -0
- 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 +5 -0
- package/src/be/unmapped-identities.ts +95 -1
- package/src/bitbucket/handlers.ts +2 -0
- package/src/commands/credential-outcome-report.ts +5 -2
- package/src/commands/onboard/agent-fs-version.ts +1 -1
- package/src/commands/provider-credentials.ts +19 -0
- package/src/commands/provider-error-class.ts +4 -1
- package/src/commands/rate-limit-outcome.ts +48 -3
- package/src/commands/runner.ts +113 -55
- package/src/commands/worktree-reaper.ts +600 -0
- 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/agents.ts +4 -0
- package/src/http/all-routes.ts +1 -0
- package/src/http/api-keys.ts +27 -3
- 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-public.ts +40 -4
- package/src/http/pages.ts +3 -3
- package/src/http/poll.ts +43 -12
- package/src/http/pool-keys.ts +21 -2
- package/src/http/repos.ts +7 -6
- package/src/http/schedules.ts +38 -9
- package/src/http/script-connections.ts +14 -6
- package/src/http/script-runs.ts +12 -3
- 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 +18 -12
- 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/mcp-client/http-client.ts +3 -1
- package/src/oauth/identity-capture.ts +6 -1
- package/src/oauth/mcp-wrapper.ts +10 -3
- package/src/oauth/wrapper.ts +15 -3
- package/src/prompts/base-prompt.ts +35 -13
- package/src/prompts/session-templates.ts +26 -0
- package/src/providers/acp-targets.ts +2 -2
- 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 +143 -11
- package/src/providers/pi-mono-extension.ts +69 -0
- package/src/providers/runtime-dependencies.ts +1 -1
- package/src/rbac/legacy-policy.ts +5 -0
- package/src/rbac/permissions.ts +16 -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 +8 -7
- package/src/scripts-runtime/types/swarm-sdk.d.ts +47 -4
- package/src/server.ts +4 -0
- package/src/slack/enrich.ts +94 -31
- 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/agents-list-model-display.test.ts +23 -0
- package/src/tests/apps-spike2.test.ts +35 -0
- package/src/tests/audit-agent-person.test.ts +825 -0
- package/src/tests/audit-updated-by.test.ts +19 -12
- package/src/tests/base-prompt.test.ts +1 -0
- 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/deploy-guard.test.ts +24 -0
- package/src/tests/dsh-adapter.test.ts +1 -1
- package/src/tests/ensure-token.test.ts +2 -2
- package/src/tests/entrypoint-repo-autoclone-args.test.ts +202 -0
- package/src/tests/extensions-catalog.test.ts +33 -25
- package/src/tests/fake-dns.ts +47 -0
- package/src/tests/fixtures/base-prompt-baseline.json +12 -12
- 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/latest-model-report.test.ts +138 -0
- package/src/tests/mcp-oauth-dcr-reuse.test.ts +5 -2
- package/src/tests/mcp-oauth-ensure-token.test.ts +3 -2
- package/src/tests/mcp-oauth-manual-client.test.ts +6 -1
- package/src/tests/mcp-oauth-wrapper.test.ts +20 -4
- package/src/tests/mcp-outbound-fetch-guard.test.ts +169 -0
- package/src/tests/mcp-server-ssrf.test.ts +2 -0
- package/src/tests/memory-search-reader.test.ts +258 -0
- package/src/tests/memory-search-stall.test.ts +202 -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/oauth-connection-fetch-guard.test.ts +162 -0
- package/src/tests/oauth-token-endpoint-fetch-guard.test.ts +121 -0
- package/src/tests/oauth-wrapper.test.ts +1 -2
- package/src/tests/opencode-swarm-plugin.test.ts +6 -1
- package/src/tests/pages-head-v2.test.ts +2 -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-http.test.ts +8 -3
- package/src/tests/script-connections.test.ts +6 -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 +77 -4
- package/src/tests/spend-cap-credentials.test.ts +34 -0
- package/src/tests/spend-cap-outcome.test.ts +67 -0
- package/src/tests/subscription-first.test.ts +119 -0
- package/src/tests/tool-registrar-no-input.test.ts +1 -0
- package/src/tests/worktree-reaper.test.ts +424 -0
- package/src/tools/defer-task.ts +154 -12
- package/src/tools/get-task-details.ts +247 -5
- 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 +38 -4
- package/src/tools/schedules/update-schedule.ts +40 -5
- 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/utils/credentials.ts +36 -1
- package/src/utils/egress-guard.ts +40 -10
- package/src/utils/error-tracker.ts +17 -0
- 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/apps/SKILL.md +191 -2
- package/templates/skills/apps/content.md +191 -2
- package/templates/skills/boards-and-sheets/config.json +14 -0
- package/templates/skills/boards-and-sheets/content.md +174 -0
- package/templates/skills/pages/content.md +11 -0
- package/templates/skills/swarm-docs/content.md +11 -0
- package/templates/skills/swarm-scripts/SKILL.md +1 -0
- package/templates/skills/swarm-scripts/content.md +1 -0
- package/templates/workflows/ralph-loop/content.md +6 -6
- package/dist/acp-adapter-11m13kx4.js +0 -16
- package/dist/cli-pr0eze3x.js +0 -149
- 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/heartbeat-p8pk1msj.js +0 -49
- 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
|
@@ -0,0 +1,245 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Worker shim for harness-native tool calls (bash, read, write, edit, ...).
|
|
3
|
+
*
|
|
4
|
+
* Every harness reports its own built-in tool calls to `POST /api/tool-hooks`, where
|
|
5
|
+
* extensions whose manifest lists `toolSources: ["native"]` can observe, block or rewrite
|
|
6
|
+
* them. One module serves all four harnesses (claude and codex run it per hook process, pi
|
|
7
|
+
* and opencode run it in-process); each harness only maps its own event to a `NativeCall`
|
|
8
|
+
* and applies the `NativeDecision`.
|
|
9
|
+
*
|
|
10
|
+
* Contract, in order of importance:
|
|
11
|
+
* - Fail open. An API that is down, slow (2 s) or answers non-2xx lets the call run.
|
|
12
|
+
* - Skip the round trip when no enabled extension takes native calls: a cached
|
|
13
|
+
* `GET /api/tool-hooks/status` answer (30 s) gates everything else.
|
|
14
|
+
* - Scrub arguments worker-side before they leave the process. The server scrubs again, but
|
|
15
|
+
* only knows its own env; a worker holds per-task credentials the server never sees.
|
|
16
|
+
* - Talk HTTP only. Never import the DB layer.
|
|
17
|
+
*/
|
|
18
|
+
|
|
19
|
+
import { createHash } from "node:crypto";
|
|
20
|
+
import { readFileSync, writeFileSync } from "node:fs";
|
|
21
|
+
import { tmpdir } from "node:os";
|
|
22
|
+
import { join } from "node:path";
|
|
23
|
+
import { scrubObject } from "../utils/secret-scrubber";
|
|
24
|
+
|
|
25
|
+
const REQUEST_TIMEOUT_MS = 2_000;
|
|
26
|
+
const STATUS_TTL_MS = 30_000;
|
|
27
|
+
/** After a failed status read: stay quiet this long so a dead API costs one timeout, not one per call. */
|
|
28
|
+
const STATUS_FAILURE_TTL_MS = 10_000;
|
|
29
|
+
|
|
30
|
+
export interface NativeHookTarget {
|
|
31
|
+
apiUrl: string;
|
|
32
|
+
/** Authorization and X-Agent-ID, as the rest of the worker sends them. */
|
|
33
|
+
headers: Record<string, string>;
|
|
34
|
+
/** The running task, forwarded as `X-Source-Task-ID` so an extension run points at it. */
|
|
35
|
+
taskId?: string;
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
export interface NativeCall {
|
|
39
|
+
harness: "claude" | "codex" | "pi" | "opencode";
|
|
40
|
+
/** Canonical name: `bash`, `read`, `write`, `edit`, otherwise the harness name, lowercased. */
|
|
41
|
+
tool: string;
|
|
42
|
+
/** The harness's own tool name, such as `Bash`. */
|
|
43
|
+
nativeTool: string;
|
|
44
|
+
args: Record<string, unknown>;
|
|
45
|
+
rawArgs: unknown;
|
|
46
|
+
toolCallId?: string;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
export type NativeDecision =
|
|
50
|
+
| { action: "continue" }
|
|
51
|
+
| { action: "modify"; args: Record<string, unknown> }
|
|
52
|
+
| { action: "block"; reason: string };
|
|
53
|
+
|
|
54
|
+
const CONTINUE: NativeDecision = { action: "continue" };
|
|
55
|
+
|
|
56
|
+
const CANONICAL_NAMES: Record<string, string> = {
|
|
57
|
+
bash: "bash",
|
|
58
|
+
shell: "bash",
|
|
59
|
+
read: "read",
|
|
60
|
+
write: "write",
|
|
61
|
+
edit: "edit",
|
|
62
|
+
multiedit: "edit",
|
|
63
|
+
};
|
|
64
|
+
|
|
65
|
+
/** Canonical tool name: the four shared ones are the same on every harness. */
|
|
66
|
+
export function canonicalToolName(nativeTool: string): string {
|
|
67
|
+
const lower = nativeTool.toLowerCase();
|
|
68
|
+
return CANONICAL_NAMES[lower] ?? lower;
|
|
69
|
+
}
|
|
70
|
+
|
|
71
|
+
/**
|
|
72
|
+
* Canonical args are the harness's own keys with Claude's `file_path` renamed `path`, the key
|
|
73
|
+
* pi and opencode already use.
|
|
74
|
+
* shortcut: no per-tool schema (edit shapes still differ per harness), upgrade when an
|
|
75
|
+
* extension needs to treat an edit identically across harnesses.
|
|
76
|
+
*/
|
|
77
|
+
export function canonicalArgs(raw: unknown): Record<string, unknown> {
|
|
78
|
+
if (typeof raw !== "object" || raw === null || Array.isArray(raw)) return {};
|
|
79
|
+
const { file_path, ...rest } = raw as Record<string, unknown>;
|
|
80
|
+
return file_path === undefined ? rest : { ...rest, path: file_path };
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
/** Back to the harness's key names, so a rewritten `path` reaches a tool that reads `file_path`. */
|
|
84
|
+
export function rawArgsFromCanonical(args: Record<string, unknown>, raw: unknown): unknown {
|
|
85
|
+
const usesFilePath = typeof raw === "object" && raw !== null && "file_path" in raw;
|
|
86
|
+
if (!usesFilePath || args.path === undefined) return args;
|
|
87
|
+
const { path, ...rest } = args;
|
|
88
|
+
return { ...rest, file_path: path };
|
|
89
|
+
}
|
|
90
|
+
|
|
91
|
+
function cacheKey(target: NativeHookTarget): string {
|
|
92
|
+
return createHash("sha256")
|
|
93
|
+
.update(`${target.apiUrl}\n${target.headers["X-Agent-ID"] ?? ""}`)
|
|
94
|
+
.digest("hex")
|
|
95
|
+
.slice(0, 16);
|
|
96
|
+
}
|
|
97
|
+
|
|
98
|
+
interface StatusEntry {
|
|
99
|
+
native: boolean;
|
|
100
|
+
/** When this answer stops being trusted. */
|
|
101
|
+
until: number;
|
|
102
|
+
}
|
|
103
|
+
|
|
104
|
+
const memoryStatus = new Map<string, StatusEntry>();
|
|
105
|
+
|
|
106
|
+
function readStatusFile(path: string): StatusEntry | undefined {
|
|
107
|
+
try {
|
|
108
|
+
const parsed = JSON.parse(readFileSync(path, "utf8")) as Partial<StatusEntry>;
|
|
109
|
+
if (typeof parsed.native === "boolean" && typeof parsed.until === "number") {
|
|
110
|
+
return { native: parsed.native, until: parsed.until };
|
|
111
|
+
}
|
|
112
|
+
} catch {
|
|
113
|
+
// No file, or a half-written one: read the API instead.
|
|
114
|
+
}
|
|
115
|
+
return undefined;
|
|
116
|
+
}
|
|
117
|
+
|
|
118
|
+
/**
|
|
119
|
+
* Whether any enabled extension takes native tool calls. The claude and codex hooks are a new
|
|
120
|
+
* process per call, so the answer lives in a small file under the temp dir as well as in memory.
|
|
121
|
+
*/
|
|
122
|
+
export async function nativeHooksActive(
|
|
123
|
+
target: NativeHookTarget,
|
|
124
|
+
fetchImpl: typeof fetch = fetch,
|
|
125
|
+
now: () => number = Date.now,
|
|
126
|
+
): Promise<boolean> {
|
|
127
|
+
const key = cacheKey(target);
|
|
128
|
+
const file = join(tmpdir(), `agent-swarm-native-hooks-${key}.json`);
|
|
129
|
+
const cached = memoryStatus.get(key) ?? readStatusFile(file);
|
|
130
|
+
if (cached && cached.until > now()) return cached.native;
|
|
131
|
+
|
|
132
|
+
let entry: StatusEntry;
|
|
133
|
+
try {
|
|
134
|
+
const response = await fetchImpl(`${target.apiUrl}/api/tool-hooks/status`, {
|
|
135
|
+
headers: target.headers,
|
|
136
|
+
signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
|
|
137
|
+
});
|
|
138
|
+
if (!response.ok) throw new Error(`status ${response.status}`);
|
|
139
|
+
const body = (await response.json()) as { native?: unknown };
|
|
140
|
+
entry = { native: body.native === true, until: now() + STATUS_TTL_MS };
|
|
141
|
+
} catch {
|
|
142
|
+
entry = { native: false, until: now() + STATUS_FAILURE_TTL_MS };
|
|
143
|
+
}
|
|
144
|
+
memoryStatus.set(key, entry);
|
|
145
|
+
try {
|
|
146
|
+
writeFileSync(file, JSON.stringify(entry));
|
|
147
|
+
} catch {
|
|
148
|
+
// An unwritable temp dir only costs the cache.
|
|
149
|
+
}
|
|
150
|
+
return entry.native;
|
|
151
|
+
}
|
|
152
|
+
|
|
153
|
+
/** Drop the cached answers. Tests and e2e runs that flip an extension need a fresh read. */
|
|
154
|
+
export function resetNativeHookCache(): void {
|
|
155
|
+
memoryStatus.clear();
|
|
156
|
+
}
|
|
157
|
+
|
|
158
|
+
function postHeaders(target: NativeHookTarget): Record<string, string> {
|
|
159
|
+
return {
|
|
160
|
+
...target.headers,
|
|
161
|
+
"Content-Type": "application/json",
|
|
162
|
+
...(target.taskId ? { "X-Source-Task-ID": target.taskId } : {}),
|
|
163
|
+
};
|
|
164
|
+
}
|
|
165
|
+
|
|
166
|
+
function wireBody(call: NativeCall) {
|
|
167
|
+
return scrubObject({
|
|
168
|
+
harness: call.harness,
|
|
169
|
+
tool: call.tool,
|
|
170
|
+
nativeTool: call.nativeTool,
|
|
171
|
+
args: call.args,
|
|
172
|
+
rawArgs: call.rawArgs,
|
|
173
|
+
...(call.toolCallId ? { toolCallId: call.toolCallId } : {}),
|
|
174
|
+
});
|
|
175
|
+
}
|
|
176
|
+
|
|
177
|
+
/**
|
|
178
|
+
* Ask the extensions about a native call before it runs. Returns `continue` when no extension
|
|
179
|
+
* takes native calls (no request is made), unless one blocked or rewrote it; any failure is
|
|
180
|
+
* `continue`. A body over the route's 2 MB limit is refused with a 4xx and so is not intercepted.
|
|
181
|
+
*/
|
|
182
|
+
export async function runNativePre(
|
|
183
|
+
target: NativeHookTarget,
|
|
184
|
+
call: NativeCall,
|
|
185
|
+
fetchImpl: typeof fetch = fetch,
|
|
186
|
+
): Promise<NativeDecision> {
|
|
187
|
+
if (!(await nativeHooksActive(target, fetchImpl))) return CONTINUE;
|
|
188
|
+
try {
|
|
189
|
+
const response = await fetchImpl(`${target.apiUrl}/api/tool-hooks`, {
|
|
190
|
+
method: "POST",
|
|
191
|
+
headers: postHeaders(target),
|
|
192
|
+
body: JSON.stringify({ phase: "pre", ...wireBody(call) }),
|
|
193
|
+
signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
|
|
194
|
+
});
|
|
195
|
+
if (!response.ok) return CONTINUE;
|
|
196
|
+
const decision = (await response.json()) as Record<string, unknown>;
|
|
197
|
+
if (decision.action === "block" && typeof decision.reason === "string") {
|
|
198
|
+
return { action: "block", reason: decision.reason };
|
|
199
|
+
}
|
|
200
|
+
if (decision.action === "modify") {
|
|
201
|
+
const args = decision.args;
|
|
202
|
+
if (typeof args === "object" && args !== null && !Array.isArray(args)) {
|
|
203
|
+
return { action: "modify", args: args as Record<string, unknown> };
|
|
204
|
+
}
|
|
205
|
+
}
|
|
206
|
+
} catch {
|
|
207
|
+
// Fail open.
|
|
208
|
+
}
|
|
209
|
+
return CONTINUE;
|
|
210
|
+
}
|
|
211
|
+
|
|
212
|
+
const MAX_RESULT_CHARS = 64_000;
|
|
213
|
+
|
|
214
|
+
/** A tool result can be megabytes; an observer needs the head of it, not all of it. */
|
|
215
|
+
function clipResult(result: unknown): unknown {
|
|
216
|
+
const text = typeof result === "string" ? result : JSON.stringify(result);
|
|
217
|
+
if (text === undefined || text.length <= MAX_RESULT_CHARS) return result;
|
|
218
|
+
return `${text.slice(0, MAX_RESULT_CHARS)}… [clipped, ${text.length} chars]`;
|
|
219
|
+
}
|
|
220
|
+
|
|
221
|
+
/** Report a finished native call. Observe-only: the answer is 202 and nothing can change. */
|
|
222
|
+
export async function runNativePost(
|
|
223
|
+
target: NativeHookTarget,
|
|
224
|
+
call: NativeCall,
|
|
225
|
+
outcome: { result: unknown; isError?: boolean; durationMs: number },
|
|
226
|
+
fetchImpl: typeof fetch = fetch,
|
|
227
|
+
): Promise<void> {
|
|
228
|
+
if (!(await nativeHooksActive(target, fetchImpl))) return;
|
|
229
|
+
try {
|
|
230
|
+
await fetchImpl(`${target.apiUrl}/api/tool-hooks`, {
|
|
231
|
+
method: "POST",
|
|
232
|
+
headers: postHeaders(target),
|
|
233
|
+
body: JSON.stringify({
|
|
234
|
+
phase: "post",
|
|
235
|
+
...wireBody(call),
|
|
236
|
+
...scrubObject({ result: clipResult(outcome.result) }),
|
|
237
|
+
...(outcome.isError === undefined ? {} : { isError: outcome.isError }),
|
|
238
|
+
durationMs: Math.max(0, outcome.durationMs),
|
|
239
|
+
}),
|
|
240
|
+
signal: AbortSignal.timeout(REQUEST_TIMEOUT_MS),
|
|
241
|
+
});
|
|
242
|
+
} catch {
|
|
243
|
+
// Fail open.
|
|
244
|
+
}
|
|
245
|
+
}
|
package/src/http/agents.ts
CHANGED
|
@@ -1384,6 +1384,10 @@ export async function handleAgentsRest(
|
|
|
1384
1384
|
if (model !== undefined || profile === null) {
|
|
1385
1385
|
await deleteSwarmConfigByKey("agent", parsed.params.id, MODEL_PROFILE_CONFIG_KEY);
|
|
1386
1386
|
} else if (profile !== undefined) {
|
|
1387
|
+
// The profile beats MODEL_OVERRIDE at claim: drop the override so the two
|
|
1388
|
+
// keys cannot name different models. Before the upsert, since deleting an
|
|
1389
|
+
// override clears the profile.
|
|
1390
|
+
await deleteSwarmConfigByKey("agent", parsed.params.id, "MODEL_OVERRIDE");
|
|
1387
1391
|
await upsertSwarmConfig({
|
|
1388
1392
|
scope: "agent",
|
|
1389
1393
|
scopeId: parsed.params.id,
|
package/src/http/all-routes.ts
CHANGED
package/src/http/api-keys.ts
CHANGED
|
@@ -20,7 +20,11 @@ import {
|
|
|
20
20
|
KeyWindowUsageLimitError,
|
|
21
21
|
keyWindowUsageSchema,
|
|
22
22
|
} from "../be/key-window-usage";
|
|
23
|
-
import {
|
|
23
|
+
import {
|
|
24
|
+
MAX_RATE_LIMIT_RESET_MS,
|
|
25
|
+
MAX_SPEND_CAP_HOLD_MS,
|
|
26
|
+
type RateLimitWindowTelemetry,
|
|
27
|
+
} from "../utils/error-tracker";
|
|
24
28
|
import {
|
|
25
29
|
activeModelBlocks,
|
|
26
30
|
isModelScopedWindow,
|
|
@@ -85,6 +89,13 @@ const reportUsage = route({
|
|
|
85
89
|
auth: { apiKey: true },
|
|
86
90
|
});
|
|
87
91
|
|
|
92
|
+
/** A provider spend limit behind a key's rate limit (`SpendCap`). */
|
|
93
|
+
export const SpendCapSchema = z.object({
|
|
94
|
+
limitUsd: z.number().nullable(),
|
|
95
|
+
spendUsd: z.number().nullable(),
|
|
96
|
+
resetsAt: z.string().datetime().nullable(),
|
|
97
|
+
});
|
|
98
|
+
|
|
88
99
|
const reportRateLimit = route({
|
|
89
100
|
method: "post",
|
|
90
101
|
path: "/api/keys/report-rate-limit",
|
|
@@ -98,6 +109,8 @@ const reportRateLimit = route({
|
|
|
98
109
|
rateLimitedUntil: z.string().datetime(),
|
|
99
110
|
scope: z.string().optional(),
|
|
100
111
|
scopeId: z.string().optional(),
|
|
112
|
+
/** The provider spend limit behind the rejection (OpenRouter key limit, out of credits). */
|
|
113
|
+
spendCap: SpendCapSchema.optional(),
|
|
101
114
|
}),
|
|
102
115
|
responses: {
|
|
103
116
|
200: { description: "Key marked as rate-limited", schema: successMessageSchema },
|
|
@@ -402,6 +415,8 @@ const getAvailable = route({
|
|
|
402
415
|
earliestModelResetAt: z.string().nullable().optional(),
|
|
403
416
|
/** Indices excluded because the key's subscription plan cannot run the model. Present only when model was passed. */
|
|
404
417
|
seatBlockedIndices: z.array(z.number().int()).optional(),
|
|
418
|
+
/** Rate-limited indices whose limit is a provider spend cap. */
|
|
419
|
+
spendCappedIndices: z.array(z.number().int()),
|
|
405
420
|
/**
|
|
406
421
|
* Server-side order of the newest auth failure on these keys. Pass it back as
|
|
407
422
|
* `authFence` on `clear-rate-limit`: failures recorded after it survive the clear.
|
|
@@ -425,6 +440,8 @@ const ApiKeyStatusSchema = z.object({
|
|
|
425
440
|
scopeId: z.string().nullable(),
|
|
426
441
|
status: z.string(),
|
|
427
442
|
rateLimitedUntil: z.string().nullable(),
|
|
443
|
+
/** The spend cap behind the current rate limit, or null for an ordinary one. */
|
|
444
|
+
spendCap: SpendCapSchema.nullable(),
|
|
428
445
|
lastUsedAt: z.string().nullable(),
|
|
429
446
|
lastRateLimitAt: z.string().nullable(),
|
|
430
447
|
totalUsageCount: z.number().int(),
|
|
@@ -744,7 +761,12 @@ export async function handleApiKeys(
|
|
|
744
761
|
const parsed = await reportRateLimit.parse(req, res, pathSegments, queryParams);
|
|
745
762
|
if (!parsed) return true;
|
|
746
763
|
|
|
747
|
-
const { keyType, keySuffix, keyIndex,
|
|
764
|
+
const { keyType, keySuffix, keyIndex, scope, scopeId, spendCap } = parsed.body;
|
|
765
|
+
// A spend cap fails admission for the whole pool, so the reporter never sets an unbounded hold.
|
|
766
|
+
const holdUntilMs = Date.now() + (spendCap ? MAX_SPEND_CAP_HOLD_MS : MAX_RATE_LIMIT_RESET_MS);
|
|
767
|
+
const rateLimitedUntil = new Date(
|
|
768
|
+
Math.min(Date.parse(parsed.body.rateLimitedUntil), holdUntilMs),
|
|
769
|
+
).toISOString();
|
|
748
770
|
try {
|
|
749
771
|
await markKeyRateLimited(
|
|
750
772
|
keyType,
|
|
@@ -753,10 +775,11 @@ export async function handleApiKeys(
|
|
|
753
775
|
rateLimitedUntil,
|
|
754
776
|
scope,
|
|
755
777
|
scopeId ?? null,
|
|
778
|
+
spendCap ?? null,
|
|
756
779
|
);
|
|
757
780
|
reportRateLimit.respond(res, 200, {
|
|
758
781
|
success: true,
|
|
759
|
-
message: `Key ...${keySuffix} marked as rate-limited until ${rateLimitedUntil}`,
|
|
782
|
+
message: `Key ...${keySuffix} marked as ${spendCap ? "spend-capped" : "rate-limited"} until ${rateLimitedUntil}`,
|
|
760
783
|
});
|
|
761
784
|
} catch (err) {
|
|
762
785
|
jsonError(res, err instanceof Error ? err.message : "Failed to mark rate limit", 500);
|
|
@@ -886,6 +909,7 @@ export async function handleApiKeys(
|
|
|
886
909
|
success: true,
|
|
887
910
|
availableIndices: result.availableIndices,
|
|
888
911
|
rejectedIndices: result.rejectedIndices,
|
|
912
|
+
spendCappedIndices: result.spendCappedIndices,
|
|
889
913
|
totalKeys,
|
|
890
914
|
authFailureFence: result.authFailureFence,
|
|
891
915
|
...(model !== undefined
|
package/src/http/assets.ts
CHANGED
|
@@ -5,7 +5,7 @@ import { normalizeAssetKey } from "../assets/key";
|
|
|
5
5
|
import { sourceMoveError, sourceOfKey } from "../assets/source-key";
|
|
6
6
|
import { auditAssetKeys } from "../be/asset-key-audit";
|
|
7
7
|
import { AssetKeyAuthorizationError, authorizeAssetKeyWrite } from "../be/asset-key-auth";
|
|
8
|
-
import {
|
|
8
|
+
import { resolveHttpRequesterUserId } from "../be/audit-user";
|
|
9
9
|
import {
|
|
10
10
|
AssetKeyMovesBlockedError,
|
|
11
11
|
getDb,
|
|
@@ -281,7 +281,7 @@ export async function handleAssets(
|
|
|
281
281
|
if (!parsed) return true;
|
|
282
282
|
if (!ensureOperator(req, res)) return true;
|
|
283
283
|
try {
|
|
284
|
-
const actor = await
|
|
284
|
+
const actor = await resolveHttpRequesterUserId(req, myAgentId);
|
|
285
285
|
const key = parsed.body.key
|
|
286
286
|
? await authorizeAssetKeyWrite(parsed.body.key, actor)
|
|
287
287
|
: undefined;
|
|
@@ -381,13 +381,14 @@ export async function handleAssets(
|
|
|
381
381
|
}
|
|
382
382
|
|
|
383
383
|
try {
|
|
384
|
-
const actor = await
|
|
384
|
+
const actor = await resolveHttpRequesterUserId(req, myAgentId);
|
|
385
385
|
const key = await authorizeAssetKeyWrite(parsed.body.key, actor);
|
|
386
386
|
const moved = await moveAssetKey({
|
|
387
387
|
entityType: parsed.params.entityType,
|
|
388
388
|
id: parsed.params.id,
|
|
389
389
|
key,
|
|
390
390
|
changedBy: actor ?? undefined,
|
|
391
|
+
changedByAgentId: myAgentId,
|
|
391
392
|
descendantTaskIds,
|
|
392
393
|
});
|
|
393
394
|
if (!moved) {
|
package/src/http/comb.ts
CHANGED
|
@@ -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 { getCombConfig } from "../comb/config";
|
|
5
5
|
import {
|
|
6
6
|
REVIEW_BATCH_MAX,
|
|
@@ -120,7 +120,7 @@ export async function handleComb(
|
|
|
120
120
|
try {
|
|
121
121
|
const result = await sendReviewBatch({
|
|
122
122
|
...parsed.body,
|
|
123
|
-
requestedByUserId: await
|
|
123
|
+
requestedByUserId: await resolveHttpRequesterUserId(req, myAgentId),
|
|
124
124
|
});
|
|
125
125
|
reviewBatchRoute.respond(res, result.taskId === null ? 200 : 201, result);
|
|
126
126
|
} catch (error) {
|
|
@@ -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 { authUserId, getRequestAuth, isOperatorAuth } from "../utils/request-auth-context";
|
|
5
5
|
|
|
@@ -67,6 +67,6 @@ export async function resolveHttpFavoriteOwner(
|
|
|
67
67
|
};
|
|
68
68
|
}
|
|
69
69
|
|
|
70
|
-
const userId = await
|
|
70
|
+
const userId = await resolveHttpRequesterUserId(req, callerAgentId);
|
|
71
71
|
return userId ? { scope: `user:${userId}`, userId, actorId: userId } : null;
|
|
72
72
|
}
|
package/src/http/favorites.ts
CHANGED
|
@@ -51,7 +51,7 @@ const putFavorite = route({
|
|
|
51
51
|
row: UserFavoriteSchema.nullable(),
|
|
52
52
|
}),
|
|
53
53
|
},
|
|
54
|
-
400: { description: "Invalid asset key for a key favorite" },
|
|
54
|
+
400: { description: "Invalid asset key for a key or hidden-key favorite" },
|
|
55
55
|
401: { description: "No authenticated principal context" },
|
|
56
56
|
},
|
|
57
57
|
});
|
|
@@ -96,7 +96,8 @@ export async function handleFavorites(
|
|
|
96
96
|
return true;
|
|
97
97
|
}
|
|
98
98
|
let itemId = parsed.body.itemId;
|
|
99
|
-
|
|
99
|
+
// A group key (a star or a hidden group) is stored normalized.
|
|
100
|
+
if (parsed.body.itemType === "key" || parsed.body.itemType === "hidden-key") {
|
|
100
101
|
try {
|
|
101
102
|
itemId = normalizeAssetKey(itemId);
|
|
102
103
|
} catch (error) {
|
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.
|