@desplega.ai/agent-swarm 2.9.0 → 2.10.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-bht22g3k.js +16 -0
- package/dist/{acp-targets-swxq55dr.js → acp-targets-arrwv4f0.js} +7 -7
- package/dist/{actions-pb678g3e.js → actions-y0d2n1c2.js} +102 -21
- package/dist/{agent-fs-provision-dmhnc38q.js → agent-fs-provision-tpj7sktd.js} +4 -4
- package/dist/{amp-adapter-3pa66q27.js → amp-adapter-vmmnmw8d.js} +2 -2
- package/dist/{anthropic-messages-x2cp5fvf.js → anthropic-messages-zdca3gv1.js} +22 -22
- package/dist/{app-17d12ev4.js → app-wb7w45dq.js} +6 -3
- package/dist/{approval-notifications-h7vd9pmg.js → approval-notifications-7mqr6vbd.js} +8 -5
- package/dist/{assistant-t7k39ree.js → assistant-gf60454p.js} +23 -21
- package/dist/{boot-args-schema-0gqmkfbe.js → boot-args-schema-qxmd59sr.js} +1 -1
- package/dist/{boot-reembed-f064w382.js → boot-reembed-5tmeskj2.js} +1 -1
- package/dist/{boot-reembed-n6anc01d.js → boot-reembed-wb44vc3s.js} +1 -1
- package/dist/boot-scrub-sweep-25bxhnw4.js +9 -0
- package/dist/{boot-seeds-f99fjs5q.js → boot-seeds-nj9za0vk.js} +4 -4
- package/dist/{claude-adapter-gvznwxgc.js → claude-adapter-d3krpdyb.js} +7 -7
- package/dist/{claude-managed-adapter-pbrbvc64.js → claude-managed-adapter-t8nfgcgz.js} +2 -2
- package/dist/{claude-managed-setup-kdxttvc3.js → claude-managed-setup-7y4pwd81.js} +3 -3
- package/dist/{claude-sdk-session-0t2teq6n.js → claude-sdk-session-d138zy0e.js} +7 -7
- package/dist/{cli-6dp0jkfj.js → cli-01k6wpr9.js} +4 -4
- package/dist/{cli-c07v0qfa.js → cli-124ntmf0.js} +83 -74
- package/dist/{cli-1tvdx9t5.js → cli-2rnd5j3t.js} +1 -1
- package/dist/{cli-4ghh072d.js → cli-2spnz7ye.js} +36 -36
- package/dist/{cli-dd37e0cm.js → cli-2v2zdm0a.js} +1 -1
- package/dist/{cli-aa8s22gn.js → cli-3aaeb78m.js} +195 -186
- package/dist/{cli-8x8y70av.js → cli-3caf7pmg.js} +2 -2
- package/dist/{cli-jd3kxppb.js → cli-3et6fmfe.js} +1 -1
- package/dist/{cli-kaa4bd7x.js → cli-3f8zbtqa.js} +9 -8
- package/dist/{cli-57pvhnyt.js → cli-43evxwj4.js} +1 -1
- package/dist/cli-43ms35q9.js +270 -0
- package/dist/cli-47hz21se.js +25584 -0
- package/dist/{cli-n515ex5z.js → cli-4ymxrwg5.js} +16 -16
- package/dist/{cli-2tnbc3gw.js → cli-539h29es.js} +2379 -66
- package/dist/{cli-rts1qvb4.js → cli-5qhfv9rw.js} +2 -2
- package/dist/{cli-faf46gdq.js → cli-6037prsx.js} +10 -10
- package/dist/{cli-bk9v1xrv.js → cli-6cwr32fe.js} +25 -25
- package/dist/{cli-812paz57.js → cli-6ehs4mta.js} +18 -2
- package/dist/{cli-95930z69.js → cli-6ym4jhzp.js} +2 -2
- package/dist/{cli-zg3z63x3.js → cli-7mv4h3sn.js} +1 -1
- package/dist/{cli-9a2rtd77.js → cli-7r162fxe.js} +24 -15
- package/dist/{cli-eg437b5p.js → cli-7sf9sb0w.js} +2 -1
- package/dist/{cli-vw5x18yj.js → cli-8st34zhr.js} +20 -10
- package/dist/{cli-fgphc007.js → cli-91pkxres.js} +1 -1
- package/dist/{cli-2kg31ted.js → cli-9fjr27ez.js} +11 -11
- package/dist/{cli-wr1h0k28.js → cli-9w8712tq.js} +617 -278
- package/dist/cli-aw83sr40.js +98 -0
- package/dist/{cli-ssvdrk4y.js → cli-b6px1k1q.js} +1 -1
- package/dist/{cli-w7dxb2fj.js → cli-cc93xzes.js} +6 -6
- package/dist/{cli-js8zrfyg.js → cli-fcfbct2j.js} +5 -5
- package/dist/{cli-3zxdz9r7.js → cli-fq2rr3jb.js} +6 -6
- package/dist/{boot-scrub-sweep-ejd5dnrz.js → cli-had1p04a.js} +8 -9
- package/dist/{cli-7cgf614g.js → cli-j6te8keb.js} +5 -5
- package/dist/{cli-25nstr34.js → cli-jrbq4djp.js} +1 -1
- package/dist/{cli-pz1c00aa.js → cli-k3q2va86.js} +2 -2
- package/dist/{cli-nhq5js1b.js → cli-k5yewqgd.js} +3 -3
- package/dist/cli-kbtzfrxj.js +404 -0
- package/dist/{cli-dx439zpg.js → cli-kpgcm7xy.js} +13 -1
- package/dist/{cli-mc1fx4xd.js → cli-m9cvf7vs.js} +10 -10
- package/dist/{cli-kmvcm34h.js → cli-md50mj0r.js} +2 -2
- package/dist/{cli-q8cfh1t9.js → cli-mk7c5ac4.js} +1 -1
- package/dist/cli-mys27d03.js +321 -0
- package/dist/{cli-spzkdgtg.js → cli-n3qe7tyr.js} +172 -168
- package/dist/{cli-7akn6ze9.js → cli-nh7x3133.js} +7 -28
- package/dist/{cli-fnh4b12r.js → cli-nstkanmx.js} +6 -6
- package/dist/{cli-g3zzby8t.js → cli-nv4xsvmk.js} +5 -5
- package/dist/{cli-sn4pc4qx.js → cli-p0c3vtch.js} +2 -2
- package/dist/{cli-5ntc4we6.js → cli-p0n7b5rz.js} +859 -2058
- package/dist/{cli-pn1v1pb0.js → cli-psffsanb.js} +3 -2
- package/dist/{cli-svc803vq.js → cli-q5srsxq2.js} +15 -15
- package/dist/{cli-nmcpzbty.js → cli-qrta34nb.js} +4 -4
- package/dist/{cli-k09cxm6m.js → cli-qx4f057j.js} +2 -2
- package/dist/{cli-eepnpee7.js → cli-s1khw52h.js} +12 -12
- package/dist/{cli-h474mvp5.js → cli-s1zqk1aj.js} +21 -11
- package/dist/{cli-8axx8vnw.js → cli-sb4426be.js} +10 -10
- package/dist/{cli-kqh27v2y.js → cli-th1dkc2v.js} +1 -1
- package/dist/{cli-cw7mc1je.js → cli-tr27kwyg.js} +3 -3
- package/dist/{cli-5kcmxwxv.js → cli-tvgqesec.js} +7 -5
- package/dist/{cli-a9hfzg2r.js → cli-ty3gha1p.js} +6 -6
- package/dist/{cli-fjggej24.js → cli-v46zsvqk.js} +1 -1
- package/dist/{cli-5gygrr67.js → cli-v8z0yga9.js} +4 -4
- package/dist/{cli-k7pt28ad.js → cli-vfqvrd82.js} +5 -5
- package/dist/{cli-vvgaz8t6.js → cli-vq2eg24x.js} +2 -2
- package/dist/{cli-pwsax0vp.js → cli-vsw91x06.js} +23 -22
- package/dist/{cli-7fx9jyfs.js → cli-w1q68d8x.js} +67 -11
- package/dist/{cli-c5cspahx.js → cli-wafmk3fn.js} +45 -20
- package/dist/{cli-ymct0ycy.js → cli-wwp1bd3n.js} +5495 -5095
- package/dist/{cli-me4maa4j.js → cli-y4ccxtz5.js} +45 -9
- package/dist/{cli-m1fbz2wj.js → cli-y8p78ekx.js} +178 -19
- package/dist/{cli-nr46j5pw.js → cli-z0m452jr.js} +1 -1
- package/dist/{cli-gddgcnav.js → cli-zeh2mhkg.js} +1 -1
- package/dist/{cli-e9973bf0.js → cli-zk7v5s89.js} +2 -2
- package/dist/cli.js +24 -23
- package/dist/{cloudflare-workers-ai-system-one-9y1zx3pt.js → cloudflare-workers-ai-system-one-4aysy6rh.js} +2 -2
- package/dist/{codex-adapter-44yq2fkn.js → codex-adapter-exfdbj73.js} +6 -6
- package/dist/{codex-hook-h1zb7cfk.js → codex-hook-59atdwd8.js} +1 -1
- package/dist/{codex-login-cdyrr5y1.js → codex-login-a239g1ah.js} +1 -1
- package/dist/{codex-session-runner-zbh26gbw.js → codex-session-runner-xhznc4g3.js} +6 -6
- package/dist/{commands-54f02v5b.js → commands-d8g349v4.js} +3 -3
- package/dist/{controller-9gpwcdek.js → controller-mwgdmb8y.js} +6 -3
- package/dist/{controllers-connect-61re6k1n.js → controllers-connect-5v7qx04j.js} +22 -20
- package/dist/core-sxy4epp2.js +38 -0
- package/dist/{cursor-adapter-7e4g81vd.js → cursor-adapter-p2q5h35d.js} +1 -1
- package/dist/{db-wnh0qjy1.js → db-qpganbeb.js} +3 -3
- package/dist/{db-dg2gc7fd.js → db-wcw0b2j8.js} +8 -2
- package/dist/{dispatcher-jrm24r43.js → dispatcher-8d8s49yz.js} +20 -18
- package/dist/{docker-9aq30pp2.js → docker-09tkkg0n.js} +42 -3
- package/dist/{dsh-adapter-1yqk267c.js → dsh-adapter-me0twn13.js} +1 -1
- package/dist/{easter-egg-3d-r4h9cs9m.js → easter-egg-3d-wv7w5ty6.js} +1 -1
- package/dist/{embedding-space-bafjr5f7.js → embedding-space-e48xchqa.js} +6 -6
- package/dist/{embeddings-7xmgqe0e.js → embeddings-tgq2afbq.js} +1 -1
- package/dist/{execute-d6jg5ns0.js → execute-8rhwrk7f.js} +1 -1
- package/dist/{external-channel-frq1xvq2.js → external-channel-8bt3j2pm.js} +2 -2
- package/dist/fx-adapter-adtdb3jb.js +19 -0
- package/dist/{google-generative-ai-hh7strj3.js → google-generative-ai-bh0djqjp.js} +5 -5
- package/dist/{google-vertex-fy5bw2pm.js → google-vertex-prjbw8dj.js} +9 -9
- package/dist/grok-adapter-accnn9km.js +19 -0
- package/dist/handlers-1x77561e.js +35 -0
- package/dist/{heartbeat-6bpa611t.js → heartbeat-x0056ra5.js} +23 -21
- package/dist/{hook-hvm5nf46.js → hook-a7vmn2st.js} +5 -5
- package/dist/{hook-w12k146y.js → hook-mrd2ayxv.js} +6 -6
- package/dist/{http-43tthdvs.js → http-ym9c5svp.js} +1335 -363
- package/dist/{index-fn054vsf.js → index-01ns1pkw.js} +1 -1
- package/dist/{index-1f0vypbg.js → index-0h6qd4p1.js} +34 -24
- package/dist/index-48qzcqzj.js +35 -0
- package/dist/{index-4b1q8kan.js → index-4k7m5dgj.js} +629 -354
- package/dist/index-620y7jzq.js +15 -0
- package/dist/{index-cret47a5.js → index-8p0j4h4j.js} +506 -43
- package/dist/{index-m5gx1xd6.js → index-9myfj74s.js} +40 -40
- package/dist/{index-bs7gw5fd.js → index-b5wgnm78.js} +44 -44
- package/dist/{index-ftywhyr0.js → index-ny60jcat.js} +394 -66
- package/dist/{index-tx9mc2ap.js → index-p46tvwtx.js} +24 -22
- package/dist/{index-585gyczt.js → index-pe3d8jfy.js} +3 -3
- package/dist/index-rkvaambe.js +36 -0
- package/dist/{index-mhq4sh5w.js → index-x6azjwm8.js} +1 -1
- package/dist/index-xj1mq27m.js +40 -0
- package/dist/k8s-m56sw868.js +217 -0
- package/dist/{keepalive-rk0j0jvh.js → keepalive-7yxg8z4c.js} +3 -3
- package/dist/lead-enzn86bz.js +74 -0
- package/dist/{maintenance-g6z6kaxw.js → maintenance-6tefxmk1.js} +1 -1
- package/dist/{node-jftbyawr.js → node-2wfcey7d.js} +1 -1
- package/dist/{oauth-refresh-sweep-2k3g2q4w.js → oauth-refresh-sweep-70cavc3a.js} +2 -2
- package/dist/{onboard-6fdbvh3v.js → onboard-fja65z08.js} +5 -5
- package/dist/{openai-decisions-q3hh60wr.js → openai-decisions-ytp6w6xh.js} +1 -1
- package/dist/{opencode-adapter-fdbsvts7.js → opencode-adapter-hakkm7yh.js} +6 -6
- package/dist/{otel-impl-rvwtc09q.js → otel-impl-7zhnt6gj.js} +1 -1
- package/dist/{pending-sqkrb836.js → pending-h01yzpx4.js} +21 -19
- package/dist/{pi-mono-adapter-asqayqcg.js → pi-mono-adapter-f52hz743.js} +40 -13
- package/dist/{pricing-refresh-f5tkgmw2.js → pricing-refresh-fzxvk2zf.js} +2 -2
- package/dist/{rbac-roles-06s555fa.js → rbac-roles-9v6vhgbs.js} +3 -3
- package/dist/{rbac-roles-szxsg8t1.js → rbac-roles-hfgh8sba.js} +2 -2
- package/dist/{render-v2-103p266q.js → render-v2-1rgspxzf.js} +6 -3
- package/dist/{resume-v7kjewt9.js → resume-tqy61x24.js} +10 -7
- package/dist/{runtime-f1gmk0b7.js → runtime-exkxyx5f.js} +1 -1
- package/dist/{session-access-6shev8ts.js → session-access-3act7vt4.js} +4 -4
- package/dist/{session-source-backfill-bd7spzjd.js → session-source-backfill-82qe7fqq.js} +3 -3
- package/dist/{setup-kmxmztdb.js → setup-ry1vfdef.js} +1 -1
- package/dist/thread-buffer-3x93yexa.js +38 -0
- package/dist/{typesafe-system-one-f2en2knd.js → typesafe-system-one-vcfj2ak8.js} +2 -2
- package/dist/user-merge-jobs-bx6bf7db.js +22 -0
- package/dist/{virtual-modules-57eje5wy.js → virtual-modules-s0rjzcqq.js} +3 -3
- package/dist/{work-objects-zr47ygmf.js → work-objects-z2e5tv03.js} +29 -23
- package/dist/{worker-follow-up-grrr3fda.js → worker-follow-up-y3xeg89w.js} +20 -18
- package/dist/worker-zfcv2wbf.js +74 -0
- package/openapi.json +2763 -147
- package/package.json +9 -8
- package/src/apps/catalog.generated.json +43 -3
- package/src/apps/page-validator.ts +27 -0
- package/src/be/boot-seeds.ts +7 -1
- package/src/be/db/model-groups.ts +238 -0
- package/src/be/db/model-profiles.ts +28 -7
- package/src/be/db/session-costs.ts +225 -0
- package/src/be/db/session-log-reasoning.ts +36 -0
- package/src/be/db/tasks/read.ts +8 -3
- package/src/be/db/tasks/write.ts +34 -1
- package/src/be/db/user-references.ts +75 -0
- package/src/be/db/users/references.ts +185 -0
- package/src/be/db-client.ts +70 -19
- package/src/be/db.ts +232 -361
- package/src/be/key-window-usage.ts +386 -0
- package/src/be/memory/demotion-evidence.ts +34 -0
- package/src/be/memory/reranker.ts +34 -12
- package/src/be/memory/review-recall-filter.ts +83 -0
- package/src/be/memory/search-candidates.ts +19 -6
- package/src/be/memory/types.ts +11 -0
- package/src/be/migrations/303_task_ui_specs.sql +28 -0
- package/src/be/migrations/306_provider_account_telemetry.sql +1 -0
- package/src/be/migrations/307_session_cost_credential_attribution.sql +23 -0
- package/src/be/migrations/310_session_logs_reasoning.sql +12 -0
- package/src/be/migrations/312_task_ui_action_runs_repeatable.sql +6 -0
- package/src/be/migrations/314_model_groups.sql +85 -0
- package/src/be/migrations/318_superseded_workflow_cut_backfill.sql +22 -0
- package/src/be/migrations/319_user_fk_indexes.sql +153 -0
- package/src/be/migrations/320_session_costs_kind.sql +4 -0
- package/src/be/migrations/321_user_merge_jobs.sql +52 -0
- package/src/be/pricing-normalize.ts +2 -0
- package/src/be/rbac-roles.ts +6 -4
- package/src/be/runtime-pools/db.ts +23 -5
- package/src/be/runtime-pools/supervisor.ts +15 -1
- package/src/be/scripts/db.ts +11 -0
- package/src/be/scripts/typecheck.ts +2 -0
- package/src/be/seed-model-groups.ts +86 -0
- package/src/be/seed-model-profiles.ts +20 -13
- package/src/be/seed-scripts/catalog/boot-triage.inline.ts +1 -0
- package/src/be/seed-scripts/catalog/boot-triage.ts +1 -0
- package/src/be/seed-scripts/catalog/dreaming-gather.ts +165 -1
- package/src/be/seed-scripts/catalog/wait-for-task.ts +5 -1
- package/src/be/seed-skills/index.ts +3 -0
- package/src/be/swarm-config-guard.ts +58 -1
- package/src/be/task-ui-spec.ts +259 -0
- package/src/be/user-merge-jobs.ts +564 -0
- package/src/be/users.ts +41 -23
- package/src/commands/controller.ts +3 -0
- package/src/commands/credential-outcome-report.ts +13 -3
- package/src/commands/onboard/agent-fs-version.ts +1 -1
- package/src/commands/onboard/compose-generator.ts +1 -1
- package/src/commands/onboard/env-generator.ts +1 -1
- package/src/commands/provider-credentials.ts +1 -1
- package/src/commands/rate-limit-outcome.ts +6 -0
- package/src/commands/runner.ts +34 -53
- package/src/extensions/catalog.generated.json +3 -3
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/extensions/contract.ts +15 -0
- package/src/extensions/dispatcher.ts +14 -4
- package/src/github/handlers.ts +57 -0
- package/src/github/types.ts +4 -0
- package/src/http/all-routes.ts +2 -0
- package/src/http/api-keys.ts +258 -30
- package/src/http/approval-requests.ts +5 -1
- package/src/http/auth.ts +3 -1
- package/src/http/config.ts +34 -1
- package/src/http/index.ts +13 -0
- package/src/http/memory.ts +19 -6
- package/src/http/model-groups.ts +277 -0
- package/src/http/model-profiles.ts +30 -13
- package/src/http/session-data.ts +74 -23
- package/src/http/sessions.ts +6 -2
- package/src/http/tasks.ts +140 -5
- package/src/http/tool-hooks.ts +140 -0
- package/src/http/users.ts +142 -19
- package/src/http/workflows.ts +19 -1
- package/src/integrations/chat-sdk/inbound.ts +8 -2
- package/src/integrations/chat-sdk/limits.ts +8 -3
- package/src/integrations/chat-sdk/relay.ts +87 -0
- package/src/jira/outbound.ts +5 -3
- package/src/linear/outbound.ts +5 -1
- package/src/prompts/base-prompt.ts +8 -0
- package/src/prompts/session-templates.ts +19 -2
- package/src/providers/acp-targets.ts +2 -2
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/claude-adapter.ts +27 -4
- package/src/providers/claude-flag-settings.ts +39 -1
- package/src/providers/codex-adapter.ts +85 -3
- package/src/providers/codex-app-server.ts +9 -5
- package/src/providers/codex-oauth/auth-json.ts +1 -0
- package/src/providers/pi-mono-adapter.ts +35 -2
- package/src/providers/pricing-sources.md +41 -0
- package/src/providers/types.ts +11 -0
- package/src/rbac/legacy-policy.ts +1 -0
- package/src/rbac/permissions.ts +5 -0
- package/src/runtime-providers/docker.ts +65 -1
- package/src/runtime-providers/index.ts +7 -5
- package/src/runtime-providers/k8s.ts +250 -0
- package/src/scheduler/deferred-task-waits.ts +18 -5
- package/src/scripts-runtime/types/stdlib.d.ts +2 -0
- package/src/scripts-runtime/types/swarm-extension.d.ts +24 -9
- package/src/scripts-runtime/types/swarm-sdk.d.ts +2 -0
- package/src/slack/actions.ts +79 -0
- package/src/slack/app.ts +22 -15
- package/src/slack/blocks.ts +23 -2
- package/src/slack/inbound-files.ts +2 -0
- package/src/slack/render-v2.ts +154 -23
- package/src/slack/responses.ts +3 -2
- package/src/slack/work-objects.ts +4 -1
- package/src/tasks/errors.ts +5 -0
- package/src/tests/acp-adapter.test.ts +30 -6
- package/src/tests/api-key-tracking.test.ts +0 -72
- package/src/tests/api-keys-status-model-limits.test.ts +93 -1
- package/src/tests/api-keys-validation.test.ts +42 -0
- package/src/tests/approval-card-resolution.test.ts +7 -1
- package/src/tests/approval-requests-notifications.test.ts +11 -1
- package/src/tests/apps-catalog-page-frame.test.ts +49 -0
- package/src/tests/apps-session-thread.test.ts +79 -0
- package/src/tests/base-prompt.test.ts +111 -5
- package/src/tests/chat-sdk-relay.test.ts +170 -2
- package/src/tests/check-pr-body.test.ts +43 -0
- package/src/tests/claude-adapter-binary.test.ts +67 -6
- package/src/tests/claude-flag-settings.test.ts +29 -0
- package/src/tests/claude-sdk-lifecycle.test.ts +5 -0
- package/src/tests/codex-adapter.test.ts +340 -2
- package/src/tests/codex-app-server.test.ts +16 -0
- package/src/tests/codex-oauth.test.ts +3 -1
- package/src/tests/codex-rate-limits.test.ts +384 -0
- package/src/tests/credential-check.test.ts +14 -6
- package/src/tests/credential-outcome-report.test.ts +20 -0
- package/src/tests/db-client.test.ts +146 -0
- package/src/tests/db-task-read-contract.test.ts +3 -0
- package/src/tests/db-task-write-contract.test.ts +4 -0
- package/src/tests/deferred-task-wake.test.ts +63 -1
- package/src/tests/deploy-guard.test.ts +7 -7
- package/src/tests/deploy-select.test.ts +83 -0
- package/src/tests/docker-isolation-config-guard.test.ts +29 -0
- package/src/tests/docs-index-footprint.test.js +11 -3
- package/src/tests/dreaming-gather-corrections.test.ts +467 -0
- package/src/tests/e2e-visuals-comment.test.ts +82 -0
- package/src/tests/e2e-visuals-verify-pr.test.ts +138 -0
- package/src/tests/event-loop-lag.test.ts +9 -7
- package/src/tests/extensions-example-sql-admin-only.test.ts +7 -4
- package/src/tests/fixtures/extensions/native-tool-recorder/hooks.ts +26 -0
- package/src/tests/fixtures/extensions/native-tool-recorder/manifest.json +10 -0
- package/src/tests/fixtures/onboard/content.compose.yml.txt +1 -1
- package/src/tests/fixtures/onboard/content.env.txt +1 -1
- package/src/tests/fixtures/onboard/dev.compose.yml.txt +1 -1
- package/src/tests/fixtures/onboard/dev.env.txt +1 -1
- package/src/tests/fixtures/onboard/full-all.compose.yml.txt +1 -1
- package/src/tests/fixtures/onboard/full-all.env.txt +1 -1
- package/src/tests/fixtures/onboard/full.compose.yml.txt +1 -1
- package/src/tests/fixtures/onboard/full.env.txt +1 -1
- package/src/tests/fixtures/onboard/research.compose.yml.txt +1 -1
- package/src/tests/fixtures/onboard/research.env.txt +1 -1
- package/src/tests/fixtures/onboard/solo.compose.yml.txt +1 -1
- package/src/tests/fixtures/onboard/solo.env.txt +1 -1
- package/src/tests/fixtures/ui-spec-slack/deploys.json +121 -0
- package/src/tests/fixtures/ui-spec-slack/incident.json +183 -0
- package/src/tests/fixtures/ui-spec-slack/three-charts-stale.json +196 -0
- package/src/tests/fixtures/ui-spec-slack/video-rejected-by-slack.json +183 -0
- package/src/tests/fixtures/ui-spec-slack/video.json +446 -0
- package/src/tests/github-event-filter.test.ts +8 -0
- package/src/tests/github-handlers-inline-comments.test.ts +2 -0
- package/src/tests/github-handlers-reactions.test.ts +4 -0
- package/src/tests/github-handlers.test.ts +3 -0
- package/src/tests/github-sender-trust.test.ts +223 -0
- package/src/tests/gitleaks-download-retry.test.ts +85 -0
- package/src/tests/http-users.test.ts +142 -41
- package/src/tests/human-thread-routing.test.ts +187 -0
- package/src/tests/jira-outbound-sync.test.ts +33 -1
- package/src/tests/k8s-pool-smoke.test.ts +190 -0
- package/src/tests/key-window-usage.test.ts +846 -0
- package/src/tests/linear-outbound-sync.test.ts +30 -1
- package/src/tests/memory-rater-store.test.ts +35 -1
- package/src/tests/memory-reranker.test.ts +39 -4
- package/src/tests/memory-review-recall-filter.test.ts +205 -0
- package/src/tests/migration-318-superseded-workflow-cut-backfill.test.ts +74 -0
- package/src/tests/model-groups-api.test.ts +415 -0
- package/src/tests/model-profiles-api.test.ts +1 -0
- package/src/tests/operator-granted-credentials.test.ts +7 -2
- package/src/tests/operator-granted-role-wire.test.ts +2 -1
- package/src/tests/pi-mono-adapter.test.ts +79 -0
- package/src/tests/preload-env.test.ts +2 -0
- package/src/tests/preload.ts +3 -1
- package/src/tests/prompt-template-session.test.ts +4 -3
- package/src/tests/provider-quota-persistence.test.ts +362 -0
- package/src/tests/rate-limit-event.test.ts +22 -0
- package/src/tests/rbac-engine.test.ts +1 -0
- package/src/tests/reasoning-events.test.ts +164 -0
- package/src/tests/routing-affinity-inventory.test.ts +22 -0
- package/src/tests/runtime-k8s-pools.test.ts +142 -0
- package/src/tests/runtime-pools-db.test.ts +42 -2
- package/src/tests/runtime-pools-http.test.ts +47 -2
- package/src/tests/runtime-provider-registration.test.ts +5 -14
- package/src/tests/runtime-providers-docker.test.ts +91 -0
- package/src/tests/runtime-providers-k8s.test.ts +303 -0
- package/src/tests/script-connections.test.ts +18 -1
- package/src/tests/secret-canary-sweep.test.ts +41 -5
- package/src/tests/seed-scripts.test.ts +23 -0
- package/src/tests/session-cost-attribution.test.ts +748 -0
- package/src/tests/session-costs.test.ts +14 -15
- package/src/tests/session-logs.test.ts +83 -0
- package/src/tests/sessions-detail-batch.test.ts +7 -0
- package/src/tests/short-id.test.ts +23 -0
- package/src/tests/slack-blocks.test.ts +69 -0
- package/src/tests/slack-render-v2.test.ts +411 -0
- package/src/tests/slack-start-reload-race.test.ts +67 -0
- package/src/tests/spec-base-url.test.ts +13 -1
- package/src/tests/subscription-plans.test.ts +20 -1
- package/src/tests/system-one-decide-session-cost.test.ts +196 -0
- package/src/tests/task-ui-action-route.test.ts +249 -0
- package/src/tests/task-ui-actions.test.ts +195 -0
- package/src/tests/task-ui-script-actions.test.ts +517 -0
- package/src/tests/task-ui-spec-fallback.test.ts +65 -0
- package/src/tests/task-ui-spec.test.ts +368 -0
- package/src/tests/tool-hooks-http.test.ts +187 -0
- package/src/tests/ui-spec-script-actions-config.test.ts +196 -0
- package/src/tests/user-delete-perf.test.ts +321 -0
- package/src/tests/user-merge-jobs.test.ts +680 -0
- package/src/tests/vcs-provider.test.ts +25 -5
- package/src/tests/vendored-openapi.test.ts +13 -1
- package/src/tests/workflow-agent-task-retry.test.ts +96 -1
- package/src/tests/workflow-foreach-supersede-retry.test.ts +10 -0
- package/src/tests/workflow-http-v2.test.ts +27 -0
- package/src/tests/workflow-replay.test.ts +10 -1
- package/src/tests/workflow-triggers-v2.test.ts +128 -0
- package/src/tests/workflow-wait-event.test.ts +109 -1
- package/src/tools/defer-task.ts +1 -1
- package/src/tools/memory-search.ts +14 -3
- package/src/tools/store-progress.ts +69 -3
- package/src/tools/swarm-config/delete-config.ts +12 -1
- package/src/tools/swarm-config/set-config.ts +8 -0
- package/src/tools/system-one-decide.ts +113 -3
- package/src/tools/utils.ts +4 -1
- package/src/tools/workflows/create-workflow.ts +2 -0
- package/src/tools/workflows/update-workflow.ts +3 -1
- package/src/types.ts +93 -4
- package/src/ui-spec/actions.ts +112 -0
- package/src/ui-spec/fallback.ts +19 -0
- package/src/ui-spec/schema.ts +38 -0
- package/src/ui-spec/script-actions.ts +340 -0
- package/src/ui-spec/script-allowlist.ts +48 -0
- package/src/ui-spec/slack.ts +17 -0
- package/src/ui-spec/validate.ts +169 -0
- package/src/utils/codex-rate-limits.ts +159 -0
- package/src/utils/credentials.ts +2 -0
- package/src/utils/error-tracker.ts +19 -0
- package/src/utils/provider-account-telemetry.ts +331 -0
- package/src/utils/reasoning-events.ts +107 -0
- package/src/utils/short-id.ts +20 -14
- package/src/utils/subscription-plans.ts +11 -59
- package/src/utils/task-ui-spec.ts +79 -0
- package/src/vcs/index.ts +12 -2
- package/src/workflows/executors/system-one-decision.ts +2 -2
- package/src/workflows/resume.ts +3 -2
- package/src/workflows/task-step-routing.ts +38 -13
- package/src/workflows/triggers.ts +35 -3
- package/templates/extensions/manifest.schema.json +13 -0
- package/templates/extensions/sql-admin-only/README.md +2 -1
- package/templates/extensions/sql-admin-only/hooks.ts +7 -3
- package/templates/extensions/sql-admin-only/manifest.json +1 -1
- package/templates/skills/apps/SKILL.md +32 -5
- package/templates/skills/apps/content.md +32 -5
- package/templates/skills/swarm-docs/content.md +2 -0
- package/templates/skills/ui-spec/config.json +14 -0
- package/templates/skills/ui-spec/content.md +133 -0
- package/templates/workflows/dreaming/content.md +1 -1
- package/dist/acp-adapter-jqn86aam.js +0 -16
- package/dist/cli-7831nhaw.js +0 -93
- package/dist/cli-srtkr1h2.js +0 -12078
- package/dist/fx-adapter-0zrkfbkd.js +0 -19
- package/dist/grok-adapter-3db1c538.js +0 -19
- package/dist/handlers-k22n8mnn.js +0 -33
- package/dist/index-8xcyd3mc.js +0 -33
- package/dist/index-9sy2bh6n.js +0 -38
- package/dist/index-b24j7t2m.js +0 -12797
- package/dist/index-wjd56k1v.js +0 -34
- package/dist/lead-atxf3q6e.js +0 -72
- package/dist/thread-buffer-4yz236d0.js +0 -36
- package/dist/worker-p4hbtcy3.js +0 -72
- package/dist/{azure-openai-responses-590s1eea.js → azure-openai-responses-b3y7fz36.js} +8 -8
- package/dist/{cli-j49yqpvh.js → cli-7evph51z.js} +3 -3
- package/dist/{cli-g0vv9dg4.js → cli-8y43jx2r.js} +8 -8
- package/dist/{cli-m0cy2vyf.js → cli-k6nejceb.js} +4 -4
- package/dist/{mistral-conversations-0c30em7t.js → mistral-conversations-tm2vd4gc.js} +8 -8
- package/dist/{openai-codex-responses-bkcd8pjj.js → openai-codex-responses-sxjv60xx.js} +4 -4
- package/dist/{openai-completions-f3n69rep.js → openai-completions-0c7qnhsx.js} +20 -20
- package/dist/{openai-responses-gbh0wfqe.js → openai-responses-a7h29chp.js} +15 -15
- package/dist/{pi-messages-zebyt7gb.js → pi-messages-2j0fpqwq.js} +5 -5
|
@@ -3,7 +3,7 @@ import { setAssetsEnabled } from "../be/extensions/assets";
|
|
|
3
3
|
import { insertExtensionRun, recordExtensionFailure, setExtensionState } from "../be/extensions/db";
|
|
4
4
|
import { grantLeadEquivalence, revokeLeadEquivalence } from "../rbac/elevated-agents";
|
|
5
5
|
import { scrubSecrets } from "../utils/secret-scrubber";
|
|
6
|
-
import type { SwarmEventMap } from "./contract";
|
|
6
|
+
import type { SwarmEventMap, ToolSource } from "./contract";
|
|
7
7
|
import { buildCtx } from "./ctx";
|
|
8
8
|
import type { ExtensionHandler, LoadedExtension } from "./loader";
|
|
9
9
|
|
|
@@ -91,9 +91,19 @@ function positiveEnv(name: string, fallback: number): number {
|
|
|
91
91
|
return Number.isFinite(value) && value > 0 ? Math.floor(value) : fallback;
|
|
92
92
|
}
|
|
93
93
|
|
|
94
|
-
|
|
94
|
+
/** The tool source of a tool event, or undefined for every other event. */
|
|
95
|
+
function toolSourceOf(event: keyof SwarmEventMap, payload: unknown): ToolSource | undefined {
|
|
96
|
+
if (event !== "pre.tool.call" && event !== "post.tool.call") return undefined;
|
|
97
|
+
return stringField(payload, "requestInfo", "callOrigin") === "native" ? "native" : "mcp";
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
function handlersFor(event: keyof SwarmEventMap, payload: unknown, opts?: DispatchOptions) {
|
|
101
|
+
const toolSource = toolSourceOf(event, payload);
|
|
95
102
|
return [...registry.values()]
|
|
96
103
|
.filter((loaded) => loaded.record.id !== opts?.skipExtensionId)
|
|
104
|
+
.filter(
|
|
105
|
+
(loaded) => !toolSource || (loaded.manifest.toolSources ?? ["mcp"]).includes(toolSource),
|
|
106
|
+
)
|
|
97
107
|
.flatMap((loaded) =>
|
|
98
108
|
loaded.handlers
|
|
99
109
|
.filter((handler) => handler.event === event)
|
|
@@ -392,7 +402,7 @@ export async function dispatchPre<E extends PreEventName>(
|
|
|
392
402
|
let currentPayload: Record<string, unknown> = { ...payload };
|
|
393
403
|
const mergedData: Record<string, unknown> = {};
|
|
394
404
|
let modified = false;
|
|
395
|
-
for (const { loaded, handler } of handlersFor(event, opts)) {
|
|
405
|
+
for (const { loaded, handler } of handlersFor(event, payload, opts)) {
|
|
396
406
|
if (!isRegistered(loaded.record.id)) continue;
|
|
397
407
|
const run = await runHandler(loaded, handler, event, currentPayload);
|
|
398
408
|
if (!run.ok) continue;
|
|
@@ -498,7 +508,7 @@ export async function dispatchPost<E extends PostEventName>(
|
|
|
498
508
|
payload: SwarmEventMap[E]["event"],
|
|
499
509
|
opts?: DispatchOptions,
|
|
500
510
|
): Promise<void> {
|
|
501
|
-
for (const { loaded, handler } of handlersFor(event, opts)) {
|
|
511
|
+
for (const { loaded, handler } of handlersFor(event, payload, opts)) {
|
|
502
512
|
if (!isRegistered(loaded.record.id)) continue;
|
|
503
513
|
const run = await runHandler(loaded, handler, event, payload);
|
|
504
514
|
if (run.ok) {
|
package/src/github/handlers.ts
CHANGED
|
@@ -198,6 +198,44 @@ async function resolveGitHubSender(
|
|
|
198
198
|
return undefined;
|
|
199
199
|
}
|
|
200
200
|
|
|
201
|
+
const TRUSTED_AUTHOR_ASSOCIATIONS = new Set(["OWNER", "MEMBER", "COLLABORATOR"]);
|
|
202
|
+
|
|
203
|
+
/**
|
|
204
|
+
* Whether a sender may open a lead task through content that any account able
|
|
205
|
+
* to read the repo can post (mentions, comments, reviews). Accepted: a linked
|
|
206
|
+
* swarm user, this bot, a login listed in GITHUB_ALLOWED_SENDERS
|
|
207
|
+
* (comma-separated), or the content's author when GitHub reports them as an
|
|
208
|
+
* owner, org member or collaborator. Assignment, label and review-request
|
|
209
|
+
* events already need write or triage access on GitHub, so they skip this.
|
|
210
|
+
*/
|
|
211
|
+
function isTrustedGitHubSender(
|
|
212
|
+
login: string,
|
|
213
|
+
requestedByUserId: string | undefined,
|
|
214
|
+
content: { user: { login: string }; author_association?: string },
|
|
215
|
+
): boolean {
|
|
216
|
+
if (requestedByUserId || isBotAssignee(login)) return true;
|
|
217
|
+
const normalized = login.toLowerCase();
|
|
218
|
+
const allowed = (process.env.GITHUB_ALLOWED_SENDERS ?? "")
|
|
219
|
+
.split(",")
|
|
220
|
+
.map((name) => name.trim().toLowerCase())
|
|
221
|
+
.filter(Boolean);
|
|
222
|
+
if (allowed.includes(normalized)) return true;
|
|
223
|
+
// author_association describes the content's author, so it vouches only when the sender wrote it.
|
|
224
|
+
return (
|
|
225
|
+
content.user.login.toLowerCase() === normalized &&
|
|
226
|
+
TRUSTED_AUTHOR_ASSOCIATIONS.has(content.author_association ?? "")
|
|
227
|
+
);
|
|
228
|
+
}
|
|
229
|
+
|
|
230
|
+
const UNTRUSTED_SENDER_REASON =
|
|
231
|
+
"sender is not a linked user, an allowed sender, or a repo owner, member or collaborator";
|
|
232
|
+
|
|
233
|
+
function logUntrustedSender(eventType: string, login: string, repo: string, number: number) {
|
|
234
|
+
console.log(
|
|
235
|
+
`[GitHub] Skipped ${eventType} by ${login} on ${repo}#${number}: ${UNTRUSTED_SENDER_REASON}`,
|
|
236
|
+
);
|
|
237
|
+
}
|
|
238
|
+
|
|
201
239
|
/**
|
|
202
240
|
* Handle pull_request events (opened, edited)
|
|
203
241
|
*/
|
|
@@ -538,6 +576,11 @@ export async function handlePullRequest(
|
|
|
538
576
|
return { created: false };
|
|
539
577
|
}
|
|
540
578
|
|
|
579
|
+
if (!isTrustedGitHubSender(sender.login, requestedByUserId, pr)) {
|
|
580
|
+
logUntrustedSender(`pull_request.${action}`, sender.login, repository.full_name, pr.number);
|
|
581
|
+
return { created: false };
|
|
582
|
+
}
|
|
583
|
+
|
|
541
584
|
// Deduplicate
|
|
542
585
|
const eventKey = `pr:${repository.full_name}:${pr.number}:${action}`;
|
|
543
586
|
if (isDuplicate(eventKey)) {
|
|
@@ -799,6 +842,11 @@ export async function handleIssue(
|
|
|
799
842
|
return { created: false };
|
|
800
843
|
}
|
|
801
844
|
|
|
845
|
+
if (!isTrustedGitHubSender(sender.login, requestedByUserId, issue)) {
|
|
846
|
+
logUntrustedSender(`issues.${action}`, sender.login, repository.full_name, issue.number);
|
|
847
|
+
return { created: false };
|
|
848
|
+
}
|
|
849
|
+
|
|
802
850
|
// Deduplicate
|
|
803
851
|
const eventKey = `issue:${repository.full_name}:${issue.number}:${action}`;
|
|
804
852
|
if (isDuplicate(eventKey)) {
|
|
@@ -896,6 +944,10 @@ export async function handleComment(
|
|
|
896
944
|
return skip("no bot mention");
|
|
897
945
|
}
|
|
898
946
|
|
|
947
|
+
if (!isTrustedGitHubSender(sender.login, requestedByUserId, comment)) {
|
|
948
|
+
return skip(UNTRUSTED_SENDER_REASON);
|
|
949
|
+
}
|
|
950
|
+
|
|
899
951
|
// Deduplicate
|
|
900
952
|
const eventKey = `comment:${repository.full_name}:${comment.id}`;
|
|
901
953
|
if (isDuplicate(eventKey)) {
|
|
@@ -1317,6 +1369,11 @@ export async function handlePullRequestReview(
|
|
|
1317
1369
|
return { created: false };
|
|
1318
1370
|
}
|
|
1319
1371
|
|
|
1372
|
+
if (!isTrustedGitHubSender(sender.login, requestedByUserId, review)) {
|
|
1373
|
+
logUntrustedSender("pull_request_review", sender.login, repository.full_name, pr.number);
|
|
1374
|
+
return { created: false };
|
|
1375
|
+
}
|
|
1376
|
+
|
|
1320
1377
|
// Deduplicate before making any API calls
|
|
1321
1378
|
const eventKey = `pr-review:${repository.full_name}:${pr.number}:${review.id}`;
|
|
1322
1379
|
if (isDuplicate(eventKey)) {
|
package/src/github/types.ts
CHANGED
|
@@ -13,6 +13,7 @@ export interface PullRequestEvent extends GitHubWebhookEvent {
|
|
|
13
13
|
body: string | null;
|
|
14
14
|
html_url: string;
|
|
15
15
|
user: { login: string };
|
|
16
|
+
author_association?: string;
|
|
16
17
|
head: { ref: string; sha: string };
|
|
17
18
|
base: { ref: string };
|
|
18
19
|
merged: boolean;
|
|
@@ -30,6 +31,7 @@ export interface IssueEvent extends GitHubWebhookEvent {
|
|
|
30
31
|
body: string | null;
|
|
31
32
|
html_url: string;
|
|
32
33
|
user: { login: string };
|
|
34
|
+
author_association?: string;
|
|
33
35
|
};
|
|
34
36
|
label?: { id: number; name: string; color: string }; // Added for labeled/unlabeled events
|
|
35
37
|
}
|
|
@@ -41,6 +43,7 @@ export interface CommentEvent extends GitHubWebhookEvent {
|
|
|
41
43
|
body: string;
|
|
42
44
|
html_url: string;
|
|
43
45
|
user: { login: string };
|
|
46
|
+
author_association?: string;
|
|
44
47
|
};
|
|
45
48
|
issue?: { number: number; title: string; html_url: string };
|
|
46
49
|
pull_request?: { number: number; title: string; html_url: string };
|
|
@@ -55,6 +58,7 @@ export interface PullRequestReviewEvent extends GitHubWebhookEvent {
|
|
|
55
58
|
state: "approved" | "changes_requested" | "commented" | "dismissed";
|
|
56
59
|
html_url: string;
|
|
57
60
|
user: { login: string };
|
|
61
|
+
author_association?: string;
|
|
58
62
|
submitted_at: string;
|
|
59
63
|
commit_id?: string;
|
|
60
64
|
};
|
package/src/http/all-routes.ts
CHANGED
|
@@ -36,6 +36,7 @@ import "./integrations";
|
|
|
36
36
|
import "./kv";
|
|
37
37
|
import "./memory";
|
|
38
38
|
import "./metrics";
|
|
39
|
+
import "./model-groups";
|
|
39
40
|
import "./model-profiles";
|
|
40
41
|
import "./models-catalog";
|
|
41
42
|
import "./oauth-locks";
|
|
@@ -72,6 +73,7 @@ import "./status";
|
|
|
72
73
|
import "./tasks";
|
|
73
74
|
import "./task-templates";
|
|
74
75
|
import "./telemetry-ui";
|
|
76
|
+
import "./tool-hooks";
|
|
75
77
|
import "./trackers/jira";
|
|
76
78
|
import "./trackers/linear";
|
|
77
79
|
import "./ranking";
|
package/src/http/api-keys.ts
CHANGED
|
@@ -14,17 +14,43 @@ import {
|
|
|
14
14
|
setApiKeyName,
|
|
15
15
|
setApiKeyPlan,
|
|
16
16
|
} from "../be/db";
|
|
17
|
+
import {
|
|
18
|
+
aggregateKeyWindowUsage,
|
|
19
|
+
currentKeyWindows,
|
|
20
|
+
KeyWindowUsageLimitError,
|
|
21
|
+
keyWindowUsageSchema,
|
|
22
|
+
} from "../be/key-window-usage";
|
|
17
23
|
import { MAX_RATE_LIMIT_RESET_MS, type RateLimitWindowTelemetry } from "../utils/error-tracker";
|
|
18
|
-
import {
|
|
24
|
+
import {
|
|
25
|
+
activeModelBlocks,
|
|
26
|
+
isModelScopedWindow,
|
|
27
|
+
MODEL_SCOPED_WINDOWS,
|
|
28
|
+
} from "../utils/model-rate-limit-windows";
|
|
29
|
+
import {
|
|
30
|
+
MAX_PROVIDER_QUOTA_ENTRIES,
|
|
31
|
+
ProviderQuotaCapacityError,
|
|
32
|
+
type ProviderQuotaReport,
|
|
33
|
+
providerAccountTelemetrySchema,
|
|
34
|
+
rateLimitReplacementSchema,
|
|
35
|
+
windowFieldObservedAtSchema,
|
|
36
|
+
} from "../utils/provider-account-telemetry";
|
|
19
37
|
import {
|
|
20
38
|
isSubscriptionPlanId,
|
|
21
39
|
SUBSCRIPTION_PLANS,
|
|
22
40
|
SUBSCRIPTION_PLANS_CHECKED_AT,
|
|
23
41
|
} from "../utils/subscription-plans";
|
|
42
|
+
import { createIpRateLimiter } from "./ip-rate-limit";
|
|
24
43
|
import { bodyTask, route } from "./route-def";
|
|
25
|
-
import { clearUsageCache } from "./usage-cache";
|
|
44
|
+
import { cachedUsageReport, clearUsageCache } from "./usage-cache";
|
|
26
45
|
import { jsonError } from "./utils";
|
|
27
46
|
|
|
47
|
+
// One process-wide budget for cache misses. Filters, callers, and reports cannot reset it.
|
|
48
|
+
const windowUsageQueryRateLimit = createIpRateLimiter({ capacity: 8, refillPerMs: 1 / 1000 });
|
|
49
|
+
|
|
50
|
+
export function _resetKeyWindowUsageRateLimitForTests(): void {
|
|
51
|
+
windowUsageQueryRateLimit.reset();
|
|
52
|
+
}
|
|
53
|
+
|
|
28
54
|
// ─── Route Definitions ───────────────────────────────────────────────────────
|
|
29
55
|
|
|
30
56
|
/** Wire shape sent by every `report-*` acknowledgement route. */
|
|
@@ -49,6 +75,7 @@ const reportUsage = route({
|
|
|
49
75
|
scopeId: z.string().optional(),
|
|
50
76
|
/** Plan id the worker detected on the credential (`SUBSCRIPTION_PLANS`). Unknown ids are ignored. */
|
|
51
77
|
plan: z.string().max(40).optional(),
|
|
78
|
+
planRaw: z.string().min(1).max(80).optional(),
|
|
52
79
|
}),
|
|
53
80
|
responses: {
|
|
54
81
|
200: { description: "Usage recorded", schema: successMessageSchema },
|
|
@@ -148,58 +175,150 @@ const reportAuthFailure = route({
|
|
|
148
175
|
});
|
|
149
176
|
|
|
150
177
|
export const rateLimitWindowSchema = z.object({
|
|
151
|
-
status: z.string(),
|
|
178
|
+
status: z.string().max(256),
|
|
152
179
|
utilization: z.number().optional(),
|
|
153
180
|
// .finite() rejects NaN/Infinity at the report boundary; sanitizeReportedWindowResets
|
|
154
181
|
// below still has to guard a finite-but-out-of-range or implausibly far-future value.
|
|
155
182
|
resetsAt: z.number().finite().optional(),
|
|
183
|
+
fieldObservedAt: windowFieldObservedAtSchema.optional(),
|
|
184
|
+
durationMins: z.number().int().positive().max(576000).optional(),
|
|
185
|
+
source: z.enum(["claude", "codex"]).optional(),
|
|
186
|
+
limitId: z.string().min(1).max(128).optional(),
|
|
187
|
+
label: z.string().max(256).optional(),
|
|
188
|
+
normalModelSlug: z.string().max(256).optional(),
|
|
189
|
+
overageStatus: z.string().max(256).optional(),
|
|
190
|
+
overageDisabledReason: z.string().max(256).optional(),
|
|
156
191
|
isUsingOverage: z.boolean().optional(),
|
|
157
192
|
surpassedThreshold: z.number().optional(),
|
|
158
193
|
lastSeenAt: z.string().datetime(),
|
|
159
194
|
});
|
|
160
195
|
|
|
161
196
|
/**
|
|
162
|
-
*
|
|
163
|
-
*
|
|
164
|
-
*
|
|
165
|
-
*
|
|
166
|
-
*
|
|
167
|
-
* downstream in `computeModelLimits`, and a representable but implausible
|
|
168
|
-
* value (far-future, or negative/past — a freshly reported window can't
|
|
169
|
-
* reset in the past) that would otherwise read as bogus. NaN/Infinity are
|
|
170
|
-
* already rejected upstream by the route's `.finite()` schema. Applied
|
|
171
|
-
* before storage, so `computeModelLimits` never sees an out-of-range value
|
|
172
|
-
* from data reported through this endpoint.
|
|
197
|
+
* A finite reset can still exceed Date's range and crash status rendering.
|
|
198
|
+
* Model blocks retain the fixed routing ceiling regardless of reported duration.
|
|
199
|
+
* Display-only windows can be monthly and allow one day of provider clock skew.
|
|
200
|
+
* Never extend an expired reset into a new quota period.
|
|
201
|
+
* Sparse updates do not establish a new period.
|
|
173
202
|
*/
|
|
203
|
+
export const MAX_DISPLAY_RESET_MS = 400 * 86400000;
|
|
174
204
|
export function sanitizeReportedWindowResets(
|
|
175
205
|
windows: RateLimitWindowTelemetry,
|
|
176
206
|
): RateLimitWindowTelemetry {
|
|
177
|
-
const
|
|
178
|
-
const
|
|
207
|
+
const nowMs = Date.now();
|
|
208
|
+
const nowSec = Math.floor(nowMs / 1000);
|
|
209
|
+
|
|
179
210
|
const sanitized: RateLimitWindowTelemetry = {};
|
|
180
211
|
for (const [key, window] of Object.entries(windows)) {
|
|
212
|
+
const duration =
|
|
213
|
+
window.durationMins ??
|
|
214
|
+
(key === "five_hour" ? 300 : key.startsWith("seven_day") ? 10080 : undefined);
|
|
215
|
+
const horizonMs = isModelScopedWindow(key)
|
|
216
|
+
? MAX_RATE_LIMIT_RESET_MS
|
|
217
|
+
: duration === undefined
|
|
218
|
+
? MAX_DISPLAY_RESET_MS
|
|
219
|
+
: Math.min(
|
|
220
|
+
MAX_DISPLAY_RESET_MS,
|
|
221
|
+
Math.max(MAX_RATE_LIMIT_RESET_MS, duration * 60000 + 86400000),
|
|
222
|
+
);
|
|
223
|
+
const maxResetsAtSec = Math.floor((nowMs + horizonMs) / 1000);
|
|
181
224
|
sanitized[key] =
|
|
182
225
|
window.resetsAt === undefined
|
|
183
226
|
? window
|
|
184
|
-
: {
|
|
227
|
+
: {
|
|
228
|
+
...window,
|
|
229
|
+
resetsAt: Math.min(
|
|
230
|
+
window.resetsAt < nowSec - MAX_DISPLAY_RESET_MS / 1000 ? nowSec : window.resetsAt,
|
|
231
|
+
maxResetsAtSec,
|
|
232
|
+
),
|
|
233
|
+
};
|
|
185
234
|
}
|
|
186
235
|
return sanitized;
|
|
187
236
|
}
|
|
188
237
|
|
|
238
|
+
/** Future clocks can otherwise prevent every subsequent report from taking effect. */
|
|
239
|
+
export function sanitizeReportedQuotaObservations(
|
|
240
|
+
report: ProviderQuotaReport,
|
|
241
|
+
nowMs = Date.now(),
|
|
242
|
+
): ProviderQuotaReport {
|
|
243
|
+
const bound = (at: string) =>
|
|
244
|
+
Date.parse(at) > nowMs + 60000 ? new Date(nowMs).toISOString() : at;
|
|
245
|
+
const times = <K extends string>(
|
|
246
|
+
values: Partial<Record<K, string>> | undefined,
|
|
247
|
+
): Partial<Record<K, string>> | undefined =>
|
|
248
|
+
values &&
|
|
249
|
+
(Object.fromEntries(Object.entries(values).map(([key, at]) => [key, bound(at as string)])) as
|
|
250
|
+
| Partial<Record<K, string>>
|
|
251
|
+
| undefined);
|
|
252
|
+
return {
|
|
253
|
+
windows: Object.fromEntries(
|
|
254
|
+
Object.entries(report.windows).map(([key, window]) => [
|
|
255
|
+
key,
|
|
256
|
+
{
|
|
257
|
+
...window,
|
|
258
|
+
lastSeenAt: bound(window.lastSeenAt),
|
|
259
|
+
...(window.fieldObservedAt ? { fieldObservedAt: times(window.fieldObservedAt) } : {}),
|
|
260
|
+
},
|
|
261
|
+
]),
|
|
262
|
+
),
|
|
263
|
+
account: report.account && {
|
|
264
|
+
...report.account,
|
|
265
|
+
observedAt: bound(report.account.observedAt),
|
|
266
|
+
...(report.account.fieldObservedAt
|
|
267
|
+
? { fieldObservedAt: times(report.account.fieldObservedAt) }
|
|
268
|
+
: {}),
|
|
269
|
+
...(report.account.limits
|
|
270
|
+
? {
|
|
271
|
+
limits: Object.fromEntries(
|
|
272
|
+
Object.entries(report.account.limits).map(([id, limit]) => [
|
|
273
|
+
id,
|
|
274
|
+
{
|
|
275
|
+
...limit,
|
|
276
|
+
observedAt: bound(limit.observedAt),
|
|
277
|
+
...(limit.fieldObservedAt
|
|
278
|
+
? { fieldObservedAt: times(limit.fieldObservedAt) }
|
|
279
|
+
: {}),
|
|
280
|
+
...(limit.windowRemovedAt
|
|
281
|
+
? { windowRemovedAt: times(limit.windowRemovedAt) }
|
|
282
|
+
: {}),
|
|
283
|
+
},
|
|
284
|
+
]),
|
|
285
|
+
),
|
|
286
|
+
}
|
|
287
|
+
: {}),
|
|
288
|
+
},
|
|
289
|
+
replace: report.replace?.map((replacement) => ({
|
|
290
|
+
...replacement,
|
|
291
|
+
observedAt: bound(replacement.observedAt),
|
|
292
|
+
})),
|
|
293
|
+
};
|
|
294
|
+
}
|
|
295
|
+
|
|
189
296
|
const reportRateLimitWindows = route({
|
|
190
297
|
method: "post",
|
|
191
298
|
path: "/api/keys/report-rate-limit-windows",
|
|
192
299
|
pattern: ["api", "keys", "report-rate-limit-windows"],
|
|
193
300
|
summary: "Record provider-emitted rate-limit window telemetry for an API key",
|
|
301
|
+
description:
|
|
302
|
+
"Reports accept up to 64 windows and 64 account limits within 256 KiB. Stored records have the same count limits.",
|
|
194
303
|
tags: ["API Keys"],
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
198
|
-
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
|
|
202
|
-
|
|
304
|
+
maxBodyBytes: 256 * 1024,
|
|
305
|
+
body: z
|
|
306
|
+
.object({
|
|
307
|
+
keyType: z.string(),
|
|
308
|
+
keySuffix: z.string().min(1).max(10),
|
|
309
|
+
keyIndex: z.number().int().min(0),
|
|
310
|
+
windows: z.record(z.string().max(256), rateLimitWindowSchema),
|
|
311
|
+
account: providerAccountTelemetrySchema.optional(),
|
|
312
|
+
replace: z.array(rateLimitReplacementSchema).max(128).optional(),
|
|
313
|
+
scope: z.string().optional(),
|
|
314
|
+
scopeId: z.string().optional(),
|
|
315
|
+
})
|
|
316
|
+
.refine(
|
|
317
|
+
(report) =>
|
|
318
|
+
Object.keys(report.windows).length <= MAX_PROVIDER_QUOTA_ENTRIES &&
|
|
319
|
+
Object.keys(report.account?.limits ?? {}).length <= MAX_PROVIDER_QUOTA_ENTRIES,
|
|
320
|
+
"Reports support at most 64 windows and 64 account limits.",
|
|
321
|
+
),
|
|
203
322
|
responses: {
|
|
204
323
|
200: {
|
|
205
324
|
description: "Rate-limit window telemetry recorded",
|
|
@@ -207,8 +326,12 @@ const reportRateLimitWindows = route({
|
|
|
207
326
|
},
|
|
208
327
|
400: { description: "Validation error" },
|
|
209
328
|
401: { description: "Unauthorized" },
|
|
329
|
+
413: { description: "Telemetry report exceeds 256 KiB" },
|
|
210
330
|
},
|
|
211
331
|
auth: { apiKey: true },
|
|
332
|
+
rbac: {
|
|
333
|
+
ungated: "worker credential telemetry, same posture as POST /api/keys/report-rate-limit",
|
|
334
|
+
},
|
|
212
335
|
});
|
|
213
336
|
|
|
214
337
|
const reportSeatMismatch = route({
|
|
@@ -312,9 +435,11 @@ const ApiKeyStatusSchema = z.object({
|
|
|
312
435
|
provider: z.string(),
|
|
313
436
|
/** Latest provider-emitted rate-limit window snapshots, keyed by window type. */
|
|
314
437
|
rateLimitWindows: z.record(z.string(), rateLimitWindowSchema),
|
|
438
|
+
providerAccount: providerAccountTelemetrySchema.nullable(),
|
|
315
439
|
/** Subscription plan id (see `GET /api/keys/plans`), when known. */
|
|
316
440
|
plan: z.string().nullable(),
|
|
317
441
|
planSource: z.enum(["manual", "detected", "estimated"]).nullable(),
|
|
442
|
+
detectedPlanRaw: z.string().nullable(),
|
|
318
443
|
/** When the CLI last rejected a model with `credits_required` on this key. */
|
|
319
444
|
lastSeatMismatchAt: z.string().nullable(),
|
|
320
445
|
/** Model family of that rejection (`fable`, `opus`, ...). */
|
|
@@ -398,6 +523,38 @@ const listStatuses = route({
|
|
|
398
523
|
auth: { apiKey: true },
|
|
399
524
|
});
|
|
400
525
|
|
|
526
|
+
const getWindowUsage = route({
|
|
527
|
+
method: "get",
|
|
528
|
+
path: "/api/keys/window-usage",
|
|
529
|
+
pattern: ["api", "keys", "window-usage"],
|
|
530
|
+
summary: "Get Swarm-observed usage within current provider windows",
|
|
531
|
+
description:
|
|
532
|
+
"Usage calculations support 256 windows, 16 distinct windows per credential, 90 days, and 100,000 session rows. Oversized requests fail without partial totals.",
|
|
533
|
+
tags: ["API Keys"],
|
|
534
|
+
query: z.object({
|
|
535
|
+
keyType: z.string().max(128).optional(),
|
|
536
|
+
keySuffix: z.string().min(1).max(10).optional(),
|
|
537
|
+
scope: z.string().max(64).optional(),
|
|
538
|
+
scopeId: z.string().max(128).optional(),
|
|
539
|
+
}),
|
|
540
|
+
responses: {
|
|
541
|
+
200: {
|
|
542
|
+
description: "Independent windows with receipt-time tokens and explicit measurement coverage",
|
|
543
|
+
schema: z.object({
|
|
544
|
+
success: z.literal(true),
|
|
545
|
+
asOf: z.string(),
|
|
546
|
+
accounting: z.literal("session_cost_receipt_time"),
|
|
547
|
+
windows: z.array(keyWindowUsageSchema),
|
|
548
|
+
}),
|
|
549
|
+
},
|
|
550
|
+
400: { description: "Invalid filters" },
|
|
551
|
+
401: { description: "Unauthorized" },
|
|
552
|
+
422: { description: "Requested usage exceeds the aggregation bounds" },
|
|
553
|
+
429: { description: "Usage query budget exhausted. Retry after one second" },
|
|
554
|
+
},
|
|
555
|
+
auth: { apiKey: true },
|
|
556
|
+
});
|
|
557
|
+
|
|
401
558
|
/** Mirrors `KeyCostSummary` in `src/be/db.ts`. */
|
|
402
559
|
const KeyCostSummarySchema = z.object({
|
|
403
560
|
keyType: z.string(),
|
|
@@ -562,7 +719,7 @@ export async function handleApiKeys(
|
|
|
562
719
|
const parsed = await reportUsage.parse(req, res, pathSegments, queryParams);
|
|
563
720
|
if (!parsed) return true;
|
|
564
721
|
|
|
565
|
-
const { keyType, keySuffix, keyIndex, taskId, scope, scopeId, plan } = parsed.body;
|
|
722
|
+
const { keyType, keySuffix, keyIndex, taskId, scope, scopeId, plan, planRaw } = parsed.body;
|
|
566
723
|
try {
|
|
567
724
|
const { planChanged } = await recordKeyUsage(
|
|
568
725
|
keyType,
|
|
@@ -572,6 +729,7 @@ export async function handleApiKeys(
|
|
|
572
729
|
scope,
|
|
573
730
|
scopeId ?? null,
|
|
574
731
|
plan && isSubscriptionPlanId(plan) ? plan : null,
|
|
732
|
+
planRaw,
|
|
575
733
|
);
|
|
576
734
|
if (planChanged) clearUsageCache();
|
|
577
735
|
reportUsage.respond(res, 200, { success: true, message: "Key usage recorded" });
|
|
@@ -648,17 +806,27 @@ export async function handleApiKeys(
|
|
|
648
806
|
const parsed = await reportRateLimitWindows.parse(req, res, pathSegments, queryParams);
|
|
649
807
|
if (!parsed) return true;
|
|
650
808
|
|
|
651
|
-
const { keyType, keySuffix, keyIndex,
|
|
809
|
+
const { keyType, keySuffix, keyIndex, scope, scopeId } = parsed.body;
|
|
810
|
+
const { windows, account, replace } = sanitizeReportedQuotaObservations(parsed.body);
|
|
652
811
|
try {
|
|
653
|
-
|
|
812
|
+
// Spend strings retain provider units. Validate their reset independently of routing.
|
|
813
|
+
for (const limit of Object.values(account?.limits ?? {})) {
|
|
814
|
+
if (limit.spend)
|
|
815
|
+
limit.spend.resetsAt = Math.min(
|
|
816
|
+
limit.spend.resetsAt,
|
|
817
|
+
Math.floor(Date.now() / 1000) + 400 * 86400,
|
|
818
|
+
);
|
|
819
|
+
}
|
|
820
|
+
await recordKeyRateLimitWindows(
|
|
654
821
|
keyType,
|
|
655
822
|
keySuffix,
|
|
656
823
|
keyIndex,
|
|
657
824
|
sanitizeReportedWindowResets(windows),
|
|
658
825
|
scope,
|
|
659
826
|
scopeId ?? null,
|
|
827
|
+
account ?? undefined,
|
|
828
|
+
replace,
|
|
660
829
|
);
|
|
661
|
-
if (planChanged) clearUsageCache();
|
|
662
830
|
reportRateLimitWindows.respond(res, 200, {
|
|
663
831
|
success: true,
|
|
664
832
|
message: `Rate-limit windows recorded for ...${keySuffix}`,
|
|
@@ -667,7 +835,7 @@ export async function handleApiKeys(
|
|
|
667
835
|
jsonError(
|
|
668
836
|
res,
|
|
669
837
|
err instanceof Error ? err.message : "Failed to record rate-limit windows",
|
|
670
|
-
500,
|
|
838
|
+
err instanceof ProviderQuotaCapacityError ? 400 : 500,
|
|
671
839
|
);
|
|
672
840
|
}
|
|
673
841
|
return true;
|
|
@@ -734,6 +902,66 @@ export async function handleApiKeys(
|
|
|
734
902
|
return true;
|
|
735
903
|
}
|
|
736
904
|
|
|
905
|
+
// GET /api/keys/window-usage
|
|
906
|
+
if (getWindowUsage.match(req.method, pathSegments)) {
|
|
907
|
+
const parsed = await getWindowUsage.parse(req, res, pathSegments, queryParams);
|
|
908
|
+
if (!parsed) return true;
|
|
909
|
+
const { keyType, keySuffix, scope, scopeId } = parsed.query;
|
|
910
|
+
try {
|
|
911
|
+
const statuses = await getKeyStatuses(keyType, scope, scope ? (scopeId ?? null) : undefined);
|
|
912
|
+
const sampledAt = Date.now();
|
|
913
|
+
const windows = currentKeyWindows(
|
|
914
|
+
statuses.filter((key) => keySuffix === undefined || key.keySuffix === keySuffix),
|
|
915
|
+
sampledAt,
|
|
916
|
+
);
|
|
917
|
+
// Visibility matches /keys/status for every authenticated caller.
|
|
918
|
+
const bounds = windows.map((w) => [
|
|
919
|
+
w.statusId,
|
|
920
|
+
w.windowKey,
|
|
921
|
+
w.startsAt,
|
|
922
|
+
w.endsAt,
|
|
923
|
+
w.modelScope,
|
|
924
|
+
w.unavailableReason,
|
|
925
|
+
]);
|
|
926
|
+
const cached = await cachedUsageReport(
|
|
927
|
+
`key-windows:${JSON.stringify([parsed.query, bounds])}`,
|
|
928
|
+
() => {
|
|
929
|
+
if (!windowUsageQueryRateLimit.take("window-usage")) {
|
|
930
|
+
throw new KeyWindowUsageLimitError(
|
|
931
|
+
"Window usage is busy. Retry after one second.",
|
|
932
|
+
429,
|
|
933
|
+
);
|
|
934
|
+
}
|
|
935
|
+
return aggregateKeyWindowUsage(windows, new Date(sampledAt).toISOString());
|
|
936
|
+
},
|
|
937
|
+
);
|
|
938
|
+
const nowMs = Date.now();
|
|
939
|
+
const byWindow = new Map(
|
|
940
|
+
cached.map((item) => [JSON.stringify([item.statusId, item.windowKey]), item]),
|
|
941
|
+
);
|
|
942
|
+
getWindowUsage.respond(res, 200, {
|
|
943
|
+
success: true,
|
|
944
|
+
asOf: new Date(nowMs).toISOString(),
|
|
945
|
+
accounting: "session_cost_receipt_time",
|
|
946
|
+
windows: windows
|
|
947
|
+
.filter((w) => w.endsAt === null || Date.parse(w.endsAt) > nowMs)
|
|
948
|
+
.map((window) => {
|
|
949
|
+
const aggregate = byWindow.get(JSON.stringify([window.statusId, window.windowKey]));
|
|
950
|
+
return {
|
|
951
|
+
...window,
|
|
952
|
+
observationAgeMs: Math.max(0, nowMs - Date.parse(window.observedAt)),
|
|
953
|
+
...(aggregate ? { dataThrough: aggregate.dataThrough, usage: aggregate.usage } : {}),
|
|
954
|
+
};
|
|
955
|
+
}),
|
|
956
|
+
});
|
|
957
|
+
} catch (err) {
|
|
958
|
+
const status = err instanceof KeyWindowUsageLimitError ? err.status : 500;
|
|
959
|
+
if (status === 429) res.setHeader("Retry-After", "1");
|
|
960
|
+
jsonError(res, err instanceof Error ? err.message : "Failed to get window usage", status);
|
|
961
|
+
}
|
|
962
|
+
return true;
|
|
963
|
+
}
|
|
964
|
+
|
|
737
965
|
// GET /api/keys/costs
|
|
738
966
|
if (getCosts.match(req.method, pathSegments)) {
|
|
739
967
|
const parsed = await getCosts.parse(req, res, pathSegments, queryParams);
|
|
@@ -42,7 +42,7 @@ import {
|
|
|
42
42
|
dispatchApprovalNotifications,
|
|
43
43
|
} from "../workflows/approval-notifications";
|
|
44
44
|
import { workflowEventBus } from "../workflows/event-bus";
|
|
45
|
-
import { ensureConfigAdmin, runConfigWriteSideEffects } from "./config";
|
|
45
|
+
import { ensureConfigAdmin, ensureHumanOnlyConfigWrite, runConfigWriteSideEffects } from "./config";
|
|
46
46
|
import { type ApprovalResponder, approvalResponder, responderKey } from "./person-responder";
|
|
47
47
|
import { agentFirstPrincipal, authUserId } from "./request-principal";
|
|
48
48
|
import { bodyTask, route } from "./route-def";
|
|
@@ -623,6 +623,10 @@ export async function handleApprovalRequests(
|
|
|
623
623
|
}
|
|
624
624
|
if ([...configAnswers.values()].some(({ answer }) => answer.action === "set")) {
|
|
625
625
|
if (!(await ensureConfigAdmin(req, res, "config.write.any"))) return true;
|
|
626
|
+
for (const { question, answer } of configAnswers.values()) {
|
|
627
|
+
if (answer.action !== "set") continue;
|
|
628
|
+
if (!(await ensureHumanOnlyConfigWrite(req, res, question.config.key))) return true;
|
|
629
|
+
}
|
|
626
630
|
// Admission only checked `approval.respond`; `ensureConfigAdmin` passes
|
|
627
631
|
// every user, so check the config write grant here as PUT /api/config would.
|
|
628
632
|
const userId = authUserId(getRequestAuth(req));
|
package/src/http/auth.ts
CHANGED
|
@@ -69,5 +69,7 @@ export async function resolveHttpRequestAuth(
|
|
|
69
69
|
}
|
|
70
70
|
|
|
71
71
|
function isActiveUser(user: User | null): user is User {
|
|
72
|
-
|
|
72
|
+
// A merge source (mergedIntoUserId set) is on its way out: the merge route
|
|
73
|
+
// revoked its tokens, and any credential that still names it is refused.
|
|
74
|
+
return !!user && user.status === "active" && !user.mergedIntoUserId;
|
|
73
75
|
}
|