@desplega.ai/agent-swarm 2.8.2 → 2.9.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-jqn86aam.js +16 -0
- package/dist/acp-targets-swxq55dr.js +23 -0
- package/dist/{actions-kxek041g.js → actions-pb678g3e.js} +22 -20
- package/dist/agent-fs-provision-dmhnc38q.js +27 -0
- package/dist/{amp-adapter-ce7jjke4.js → amp-adapter-3pa66q27.js} +3 -3
- package/dist/{anthropic-messages-jkva0zps.js → anthropic-messages-x2cp5fvf.js} +41 -41
- package/dist/{app-v6zz8yh0.js → app-17d12ev4.js} +6 -4
- package/dist/approval-notifications-h7vd9pmg.js +20 -0
- package/dist/{assistant-m0sw9xx2.js → assistant-t7k39ree.js} +56 -34
- package/dist/{azure-openai-responses-wgtqkbr3.js → azure-openai-responses-590s1eea.js} +10 -10
- package/dist/{boot-args-schema-66bk37wv.js → boot-args-schema-0gqmkfbe.js} +1 -1
- package/dist/{boot-reembed-edjpwsc1.js → boot-reembed-f064w382.js} +1 -1
- package/dist/{boot-reembed-y27n09tz.js → boot-reembed-n6anc01d.js} +1 -1
- package/dist/{boot-scrub-sweep-1xc35965.js → boot-scrub-sweep-ejd5dnrz.js} +84 -13
- package/dist/{boot-seeds-7hjj91qj.js → boot-seeds-f99fjs5q.js} +4 -4
- package/dist/{boxd-ent8ch04.js → boxd-wn235q80.js} +7 -7
- package/dist/claude-adapter-gvznwxgc.js +28 -0
- package/dist/{claude-managed-adapter-jh6c523j.js → claude-managed-adapter-pbrbvc64.js} +4 -4
- package/dist/{claude-managed-setup-y6z2perp.js → claude-managed-setup-kdxttvc3.js} +11 -11
- package/dist/{claude-sdk-session-vvya8wqk.js → claude-sdk-session-0t2teq6n.js} +9386 -9197
- package/dist/{cli-yjdgea32.js → cli-1jx0srjt.js} +17 -17
- package/dist/{cli-rmzsadkf.js → cli-1tvdx9t5.js} +2 -2
- package/dist/{cli-3vmb0n58.js → cli-25nstr34.js} +1 -1
- package/dist/{cli-959kp5h2.js → cli-2kg31ted.js} +45 -38
- package/dist/{cli-4vzgeta4.js → cli-2tnbc3gw.js} +375 -127
- package/dist/{cli-tekytdq9.js → cli-3zxdz9r7.js} +9 -9
- package/dist/{cli-bsywb58a.js → cli-4ghh072d.js} +16 -16
- package/dist/{cli-9mb2q6pb.js → cli-57pvhnyt.js} +4 -4
- package/dist/{cli-d84byzn8.js → cli-5a6pqy45.js} +441 -53
- package/dist/{cli-jrzkw01m.js → cli-5gpqgs8b.js} +2 -2
- package/dist/{cli-0cq8y6m7.js → cli-5gygrr67.js} +9 -9
- package/dist/{cli-z1w943va.js → cli-5kcmxwxv.js} +3 -3
- package/dist/{cli-3e875j5p.js → cli-5ntc4we6.js} +3189 -328
- package/dist/{cli-bst1vp7e.js → cli-5y2fvw4z.js} +13 -5
- package/dist/{cli-mrt48bx7.js → cli-6237rnyr.js} +1 -1
- package/dist/cli-6dp0jkfj.js +754 -0
- package/dist/{cli-b98a65ed.js → cli-7831nhaw.js} +5 -5
- package/dist/{cli-kjtwrhea.js → cli-7cgf614g.js} +10 -10
- package/dist/{cli-fwy8kfd6.js → cli-7fx9jyfs.js} +942 -63
- package/dist/{cli-28fq781p.js → cli-7zm3b3f5.js} +1 -1
- package/dist/{cli-v1dv1r37.js → cli-812paz57.js} +143 -9
- package/dist/{cli-837vfs2x.js → cli-8axx8vnw.js} +4 -4
- package/dist/cli-8x8y70av.js +103 -0
- package/dist/{cli-vj75tyaw.js → cli-95930z69.js} +15 -7
- package/dist/{cli-j24zbska.js → cli-9a2rtd77.js} +16 -14
- package/dist/cli-9ttx00s3.js +137 -0
- package/dist/{cli-6ek0hff4.js → cli-a9hfzg2r.js} +3 -3
- package/dist/{cli-dzpc6en0.js → cli-aa8s22gn.js} +19 -14
- package/dist/{cli-x1wa213s.js → cli-bk9v1xrv.js} +21 -21
- package/dist/{cli-a0z912j7.js → cli-c07v0qfa.js} +194 -75
- package/dist/{cli-1qkz151v.js → cli-c5cspahx.js} +28 -36
- package/dist/{cli-vdektqgf.js → cli-cw7mc1je.js} +4 -4
- package/dist/{cli-n6vtrcht.js → cli-dd37e0cm.js} +2 -2
- package/dist/cli-dqgnbnxs.js +132 -0
- package/dist/{cli-kc7v1nfv.js → cli-dx439zpg.js} +1 -1
- package/dist/{cli-q6mfk1ej.js → cli-dzzh58sy.js} +2 -2
- package/dist/{cli-f6bahpn5.js → cli-e9973bf0.js} +8 -6
- package/dist/{cli-2znm3dzj.js → cli-eds5xnsz.js} +2 -2
- package/dist/{cli-6rc5frdm.js → cli-eepnpee7.js} +34 -37
- package/dist/{cli-rvhdmjvt.js → cli-eg437b5p.js} +1 -1
- package/dist/cli-faf46gdq.js +714 -0
- package/dist/{cli-f4r3g076.js → cli-fgphc007.js} +2 -2
- package/dist/{cli-5y340nzn.js → cli-fnh4b12r.js} +24 -18
- package/dist/{cli-fsgttth8.js → cli-g0vv9dg4.js} +13 -13
- package/dist/{cli-e1p3n5gq.js → cli-g3zzby8t.js} +13 -13
- package/dist/{cli-3vjhs18n.js → cli-gabsjg8x.js} +3 -1
- package/dist/{cli-1pz0330a.js → cli-gddgcnav.js} +3 -3
- package/dist/{cli-97ae65rz.js → cli-h474mvp5.js} +11 -11
- package/dist/{cli-m88rpzkh.js → cli-hnamkvnc.js} +2 -2
- package/dist/{cli-8bpgbr8k.js → cli-j49yqpvh.js} +6 -6
- package/dist/{cli-w401b9tq.js → cli-jd3kxppb.js} +1 -1
- package/dist/{cli-m9s2qff2.js → cli-jg5txpm6.js} +187 -93
- package/dist/{cli-8aes17e4.js → cli-js8zrfyg.js} +3 -3
- package/dist/{cli-pfs8adn4.js → cli-k09cxm6m.js} +9 -7
- package/dist/{cli-q24n86d2.js → cli-k7pt28ad.js} +10 -3
- package/dist/{cli-zh9rsbqf.js → cli-kaa4bd7x.js} +11 -8
- package/dist/cli-kj0hyr43.js +51 -0
- package/dist/{cli-g70vxtjh.js → cli-kmvcm34h.js} +2 -2
- package/dist/{cli-t2tma8gb.js → cli-kqh27v2y.js} +2 -2
- package/dist/{cli-mxn1qvbn.js → cli-m1fbz2wj.js} +32 -57
- package/dist/{cli-2kvhc7x8.js → cli-mc1fx4xd.js} +51 -90
- package/dist/{cli-pchypa1s.js → cli-me4maa4j.js} +61 -6
- package/dist/{cli-504akrp9.js → cli-meydjstb.js} +3 -3
- package/dist/{cli-n30e0hcp.js → cli-mna6pmfx.js} +2 -2
- package/dist/cli-nhq5js1b.js +142 -0
- package/dist/cli-nmcpzbty.js +296 -0
- package/dist/cli-nr46j5pw.js +78 -0
- package/dist/{cli-5mrq3ake.js → cli-pn1v1pb0.js} +1 -1
- package/dist/{cli-f4e8r23x.js → cli-pwsax0vp.js} +11 -6
- package/dist/{cli-gyt3zydq.js → cli-pz1c00aa.js} +9 -754
- package/dist/{cli-eddnyg3t.js → cli-q2d3e1k1.js} +1 -1
- package/dist/{cli-fpjmegdb.js → cli-q8cfh1t9.js} +2 -2
- package/dist/{cli-vqva1teb.js → cli-qe909n63.js} +2 -2
- package/dist/{cli-2r0jcc3k.js → cli-qj39vrc6.js} +1 -1
- package/dist/{cli-0agcv1v5.js → cli-rqx70rcz.js} +2 -2
- package/dist/{cli-0jzra9ad.js → cli-rts1qvb4.js} +2 -2
- package/dist/{cli-3rkdne1h.js → cli-sn4pc4qx.js} +2 -2
- package/dist/{cli-98rwmcyc.js → cli-snxhtehz.js} +3 -3
- package/dist/{cli-d829z3xc.js → cli-spfz393q.js} +6 -6
- package/dist/{cli-6wj7p986.js → cli-spzkdgtg.js} +3 -3
- package/dist/{cli-m2z8jagn.js → cli-srtkr1h2.js} +18 -18
- package/dist/{cli-2gxeg5gr.js → cli-ssvdrk4y.js} +1 -1
- package/dist/{cli-jdknh18m.js → cli-svc803vq.js} +69 -816
- package/dist/{cli-7349va39.js → cli-t9ga4qmb.js} +935 -445
- package/dist/{cli-m5akxq8q.js → cli-vs9vdpy0.js} +1 -1
- package/dist/{cli-26ctbcdp.js → cli-vvgaz8t6.js} +93 -44
- package/dist/{cli-3sy2xags.js → cli-vw5x18yj.js} +39 -69
- package/dist/{cli-kchjb7qy.js → cli-w16kwbzw.js} +1 -1
- package/dist/cli-w7dxb2fj.js +921 -0
- package/dist/{cli-x6t50dmw.js → cli-wr1h0k28.js} +3 -3
- package/dist/{cli-d6521kb5.js → cli-x40a0w9j.js} +1 -1
- package/dist/{cli-k28wkapa.js → cli-xf1wn5ns.js} +2 -2
- package/dist/{cli-rh15cakt.js → cli-xwsm6xkr.js} +1 -1
- package/dist/{cli-rcecc3yq.js → cli-ymct0ycy.js} +321 -111
- package/dist/{cli-xzm9vcfg.js → cli-zg3z63x3.js} +2 -2
- package/dist/cli.js +29 -26
- package/dist/{codex-adapter-zerf5qsp.js → codex-adapter-44yq2fkn.js} +9 -9
- package/dist/{codex-hook-30gyhzxe.js → codex-hook-h1zb7cfk.js} +6 -6
- package/dist/{codex-login-bcda78ge.js → codex-login-cdyrr5y1.js} +1 -1
- package/dist/{codex-session-runner-89s304py.js → codex-session-runner-zbh26gbw.js} +10 -10
- package/dist/{commands-jeh1b51j.js → commands-54f02v5b.js} +3 -3
- package/dist/{controller-mctfbrse.js → controller-9gpwcdek.js} +6 -6
- package/dist/{controllers-connect-nxa1ddwn.js → controllers-connect-61re6k1n.js} +26 -25
- package/dist/{cursor-adapter-qj8vehv6.js → cursor-adapter-7e4g81vd.js} +2 -2
- package/dist/{db-b36qn6k3.js → db-dg2gc7fd.js} +17 -13
- package/dist/{db-2dvay0es.js → db-wnh0qjy1.js} +3 -3
- package/dist/{devin-adapter-xedz98zv.js → devin-adapter-zp4tqq53.js} +1 -1
- package/dist/{dispatcher-gndbta01.js → dispatcher-jrm24r43.js} +19 -18
- package/dist/{docker-866qpzt9.js → docker-9aq30pp2.js} +5 -5
- package/dist/{dsh-adapter-f75sz821.js → dsh-adapter-1yqk267c.js} +2 -2
- package/dist/{e2b-3gpc2n3w.js → e2b-3v1e745x.js} +6 -6
- package/dist/{e2b-jbm7mj93.js → e2b-sm28k0k3.js} +6 -6
- package/dist/{easter-egg-3d-533knw22.js → easter-egg-3d-r4h9cs9m.js} +1 -1
- package/dist/{embedding-space-4p05vb2x.js → embedding-space-bafjr5f7.js} +6 -6
- package/dist/{embeddings-m6768mgh.js → embeddings-7xmgqe0e.js} +1 -1
- package/dist/{event-bus-e66gh7cc.js → event-bus-xr83x566.js} +1 -1
- package/dist/{execute-b3mrb1mv.js → execute-d6jg5ns0.js} +1 -1
- package/dist/{external-channel-gjv3jne3.js → external-channel-frq1xvq2.js} +2 -2
- package/dist/fx-adapter-0zrkfbkd.js +19 -0
- package/dist/{getMachineId-bsd-nfgrzarv.js → getMachineId-bsd-637a7rbk.js} +3 -3
- package/dist/{getMachineId-darwin-wz886dsk.js → getMachineId-darwin-9vytrcnn.js} +3 -3
- package/dist/{getMachineId-linux-1nng3p1p.js → getMachineId-linux-mkzsvyyz.js} +3 -3
- package/dist/{getMachineId-unsupported-a0428vw9.js → getMachineId-unsupported-4cfs2n11.js} +3 -3
- package/dist/{getMachineId-win-h45922nq.js → getMachineId-win-154s3qma.js} +3 -3
- package/dist/{google-generative-ai-h7s3e9kk.js → google-generative-ai-hh7strj3.js} +1 -1
- package/dist/{google-vertex-fhxaafzw.js → google-vertex-fy5bw2pm.js} +5 -5
- package/dist/grok-adapter-3db1c538.js +19 -0
- package/dist/handlers-k22n8mnn.js +33 -0
- package/dist/{heartbeat-a1tv60gt.js → heartbeat-6bpa611t.js} +22 -21
- package/dist/{hook-8h5dzcgq.js → hook-hvm5nf46.js} +5 -5
- package/dist/{hook-cyaps9ba.js → hook-w12k146y.js} +14 -14
- package/dist/{http-t15mhbd9.js → http-43tthdvs.js} +5838 -2600
- package/dist/{index-d6wkh8ar.js → index-1f0vypbg.js} +2 -2
- package/dist/{index-enn321kd.js → index-42jq9yy3.js} +3 -3
- package/dist/{index-khe3gp0k.js → index-4b1q8kan.js} +20 -20
- package/dist/{index-hjhfk3ra.js → index-585gyczt.js} +1 -1
- package/dist/index-8xcyd3mc.js +33 -0
- package/dist/index-9sy2bh6n.js +38 -0
- package/dist/{index-2skqtd76.js → index-b24j7t2m.js} +30 -28
- package/dist/{index-gjwaqaq8.js → index-cret47a5.js} +6 -6
- package/dist/{index-qwj6ntem.js → index-e3krvkh2.js} +4 -4
- package/dist/{index-w1zqf680.js → index-fn054vsf.js} +1 -1
- package/dist/{index-qav6455f.js → index-ftywhyr0.js} +214 -152
- package/dist/{index-tvfafeyy.js → index-mhq4sh5w.js} +1 -1
- package/dist/index-tx9mc2ap.js +570 -0
- package/dist/index-wjd56k1v.js +34 -0
- package/dist/{keepalive-91s7hzrb.js → keepalive-rk0j0jvh.js} +4 -4
- package/dist/lead-atxf3q6e.js +72 -0
- package/dist/{maintenance-7pjmy5xy.js → maintenance-g6z6kaxw.js} +1 -1
- package/dist/{node-4c5jqxr3.js → node-7qsx5kvm.js} +1 -1
- package/dist/{node-252anz2h.js → node-jftbyawr.js} +4 -4
- package/dist/{node-ray25snp.js → node-zd6shky9.js} +3 -3
- package/dist/{oauth-refresh-sweep-rzqfm94j.js → oauth-refresh-sweep-2k3g2q4w.js} +3 -3
- package/dist/{onboard-74st7pag.js → onboard-6fdbvh3v.js} +8 -8
- package/dist/{openai-codex-responses-k9gapdze.js → openai-codex-responses-bkcd8pjj.js} +9 -9
- package/dist/{openai-responses-4d5dx3c7.js → openai-responses-gbh0wfqe.js} +13 -13
- package/dist/{opencode-adapter-arn7gm8q.js → opencode-adapter-fdbsvts7.js} +7 -7
- package/dist/{otel-impl-rnzey8cb.js → otel-impl-rvwtc09q.js} +110 -110
- package/dist/pending-sqkrb836.js +80 -0
- package/dist/{pi-mono-adapter-6mkwq64n.js → pi-mono-adapter-asqayqcg.js} +13 -13
- package/dist/{pricing-refresh-ha21jhk7.js → pricing-refresh-f5tkgmw2.js} +2 -2
- package/dist/{rbac-roles-wqhma4dr.js → rbac-roles-06s555fa.js} +3 -3
- package/dist/{rbac-roles-59dxachk.js → rbac-roles-szxsg8t1.js} +10 -3
- package/dist/{render-v2-14kpzx12.js → render-v2-103p266q.js} +4 -4
- package/dist/{resume-gsa5fb5f.js → resume-v7kjewt9.js} +8 -7
- package/dist/{runtime-1hv06jsn.js → runtime-f1gmk0b7.js} +1 -1
- package/dist/{session-access-skm7bnp6.js → session-access-6shev8ts.js} +4 -4
- package/dist/{session-source-backfill-pbqzbncv.js → session-source-backfill-bd7spzjd.js} +3 -3
- package/dist/{setup-5yermsem.js → setup-kmxmztdb.js} +1 -1
- package/dist/thread-buffer-4yz236d0.js +36 -0
- package/dist/{virtual-modules-gazyapte.js → virtual-modules-57eje5wy.js} +5 -5
- package/dist/{work-objects-xj0ck0w4.js → work-objects-zr47ygmf.js} +23 -21
- package/dist/{worker-follow-up-911xc0b8.js → worker-follow-up-grrr3fda.js} +19 -18
- package/dist/worker-p4hbtcy3.js +72 -0
- package/dist/{x-2fyrt5pp.js → x-wg164ss9.js} +2 -2
- package/openapi.json +4518 -2356
- package/package.json +11 -8
- package/plugin/commands/create-pr.md +1 -1
- package/plugin/pi-skills/create-pr/SKILL.md +1 -1
- package/src/apps/action-runner.ts +21 -1
- package/src/apps/catalog.generated.json +626 -17
- package/src/apps/page-validator.ts +314 -8
- package/src/assets/key.ts +6 -0
- package/src/be/agent-fs-user-keys.ts +186 -0
- package/src/be/audit-user.ts +27 -13
- package/src/be/automation-preflight.test.ts +14 -14
- package/src/be/automation-preflight.ts +24 -16
- package/src/be/boot-scrub-sweep.ts +143 -14
- package/src/be/caller-session-group.ts +86 -0
- package/src/be/checklist.ts +375 -0
- package/src/be/db/agents.ts +12 -1
- package/src/be/db/approvals.ts +26 -0
- package/src/be/db/session-moves.ts +23 -0
- package/src/be/db/session-tree.ts +78 -19
- package/src/be/db/tasks/eligibility-scan.ts +14 -0
- package/src/be/db/tasks/read.ts +33 -0
- package/src/be/db/tasks/slack-fold.ts +116 -0
- package/src/be/db/tasks/write.ts +34 -0
- package/src/be/db-queries/mcp-servers.ts +13 -0
- package/src/be/db-queries/oauth.ts +6 -0
- package/src/be/db-queries/task-artifacts.ts +10 -8
- package/src/be/db.ts +74 -22
- package/src/be/extensions/assets.ts +17 -13
- package/src/be/import/config.ts +54 -0
- package/src/be/import/dir-source.ts +372 -0
- package/src/be/import/index.ts +149 -0
- package/src/be/import/pending.ts +71 -0
- package/src/be/import/schema.ts +137 -0
- package/src/be/import/seeders.ts +462 -0
- package/src/be/migrations/289_automation_savings_daily.sql +47 -0
- package/src/be/migrations/291_task_slack_participants.sql +4 -0
- package/src/be/migrations/293_savings_component_links.sql +58 -0
- package/src/be/migrations/296_automation_savings_daily_read_index.sql +6 -0
- package/src/be/migrations/297_import_ownership.sql +34 -0
- package/src/be/migrations/301_favorites_key_type.sql +36 -0
- package/src/be/migrations/302_checklist_items.sql +23 -0
- package/src/be/model-profile-check.ts +10 -2
- package/src/be/multi-runtime.ts +8 -1
- package/src/be/rbac-roles.ts +8 -1
- package/src/be/runtime-pools/demand.ts +20 -2
- package/src/be/runtime-pools/reachability.ts +31 -0
- package/src/be/runtime-pools/routing.ts +8 -1
- package/src/be/runtime-pools/supervisor.ts +6 -7
- package/src/be/savings/compute.ts +511 -16
- package/src/be/savings/model.ts +282 -14
- package/src/be/savings/read.ts +1502 -0
- package/src/be/savings/rollup.ts +571 -0
- package/src/be/script-credential-broker.ts +2 -2
- package/src/be/scripts/run-credential.ts +15 -3
- package/src/be/scripts/typecheck.ts +90 -8
- package/src/be/seed/agent-fs-provision.ts +104 -19
- package/src/be/seed/index.ts +1 -1
- package/src/be/seed/registry.ts +27 -8
- package/src/be/seed/runner.ts +1 -1
- package/src/be/seed/schedules-seeder.ts +24 -6
- package/src/be/seed/seed-toggle.ts +32 -0
- package/src/be/seed/types.ts +6 -0
- package/src/be/seed-scripts/catalog/dreaming-gather.ts +2 -2
- package/src/be/seed-scripts/catalog/dreaming-learnings.ts +10 -2
- package/src/be/seed-scripts/catalog/dreaming-memtax-create.ts +70 -4
- package/src/be/steering.ts +27 -4
- package/src/be/swarm-config-guard.ts +38 -0
- package/src/be/task-citations.ts +8 -5
- package/src/be/users.ts +29 -2
- package/src/commands/onboard/agent-fs-version.ts +1 -1
- package/src/commands/runner.ts +219 -42
- package/src/e2b/env.ts +2 -0
- package/src/extensions/catalog.generated.json +17 -0
- package/src/extensions/contract-types.generated.ts +1 -1
- package/src/github/app.ts +10 -1
- package/src/github/handlers.ts +6 -3
- package/src/github/reactions.ts +12 -14
- package/src/heartbeat/heartbeat.ts +14 -4
- package/src/http/agents.ts +19 -10
- package/src/http/all-routes.ts +2 -0
- package/src/http/approval-requests.ts +24 -4
- package/src/http/apps.ts +69 -5
- package/src/http/checklist.ts +176 -0
- package/src/http/db-query-bounded.ts +256 -11
- package/src/http/db-query-shared.ts +9 -0
- package/src/http/favorites.ts +14 -2
- package/src/http/fs.ts +346 -1
- package/src/http/index.ts +37 -2
- package/src/http/kv.ts +13 -0
- package/src/http/mcp-oauth.ts +1 -1
- package/src/http/mcp-servers.ts +15 -2
- package/src/http/onboarding.ts +2 -9
- package/src/http/poll.ts +59 -1
- package/src/http/requested-by.ts +97 -1
- package/src/http/savings.ts +676 -190
- package/src/http/script-connections.ts +1 -0
- package/src/http/scripts.ts +26 -15
- package/src/http/sessions.ts +17 -0
- package/src/http/slack-events.ts +101 -0
- package/src/http/status.ts +25 -7
- package/src/http/task-requester.ts +46 -0
- package/src/http/tasks.ts +107 -42
- package/src/http/users.ts +14 -0
- package/src/http/webhooks.ts +15 -0
- package/src/integrations/cards/index.ts +151 -0
- package/src/integrations/chat-sdk/outbound.ts +39 -13
- package/src/integrations/chat-sdk/runtime.ts +7 -1
- package/src/integrations/chat-sdk/status.ts +17 -0
- package/src/integrations/chat-sdk/telegram-api.ts +6 -1
- package/src/kv-reserved-namespaces.ts +17 -2
- package/src/oauth/presets.ts +29 -2
- package/src/prompts/base-prompt.ts +17 -4
- package/src/prompts/session-templates.ts +163 -9
- package/src/providers/acp-targets.ts +2 -2
- package/src/providers/amp-adapter.ts +1 -1
- package/src/providers/claude-adapter.ts +0 -20
- package/src/providers/claude-flag-settings.ts +12 -10
- package/src/providers/claude-managed-adapter.ts +5 -1
- package/src/providers/codex-adapter.ts +10 -35
- package/src/providers/codex-app-server.ts +2 -11
- package/src/providers/opencode-adapter.ts +41 -31
- package/src/providers/runtime-dependencies.ts +158 -0
- package/src/rbac/legacy-policy.ts +2 -0
- package/src/rbac/permissions.ts +10 -1
- package/src/scheduler/scheduler.ts +20 -14
- package/src/scripts-runtime/credential-broker/default-bindings.ts +19 -11
- package/src/scripts-runtime/credential-broker/index.ts +1 -1
- package/src/scripts-runtime/ctx.ts +1 -1
- package/src/scripts-runtime/egress-secrets.ts +2 -2
- package/src/scripts-runtime/executors/quickjs-bundle.ts +1 -0
- package/src/scripts-runtime/executors/quickjs-prelude.ts +162 -2
- package/src/scripts-runtime/executors/quickjs-runner.ts +4 -1
- package/src/scripts-runtime/stdlib/fetch.ts +113 -15
- package/src/scripts-runtime/stdlib/index.ts +3 -1
- package/src/scripts-runtime/stdlib/retry.ts +174 -0
- package/src/scripts-runtime/swarm-sdk.ts +187 -17
- package/src/scripts-runtime/types/stdlib.d.ts +97 -8
- package/src/scripts-runtime/types/swarm-extension.d.ts +27 -1
- package/src/scripts-runtime/types/swarm-sdk.d.ts +71 -6
- package/src/server.ts +4 -4
- package/src/slack/actions.ts +1 -0
- package/src/slack/app.ts +87 -46
- package/src/slack/assistant.ts +35 -7
- package/src/slack/enrich.ts +144 -50
- package/src/slack/handlers.ts +43 -99
- package/src/slack/http-receiver.ts +284 -0
- package/src/slack/inbound-dispatch.ts +43 -7
- package/src/slack/inbound-files.ts +33 -14
- package/src/slack/message-text.ts +47 -4
- package/src/slack/render-v2.ts +2 -1
- package/src/slack/socket-ack.ts +17 -10
- package/src/slack/steering.ts +5 -0
- package/src/slack/templates.ts +9 -0
- package/src/slack/thread-buffer-store.ts +58 -0
- package/src/slack/thread-buffer.ts +367 -109
- package/src/slack/thread-participants.ts +187 -0
- package/src/tasks/context-key.ts +24 -0
- package/src/tasks/sibling-awareness.ts +13 -1
- package/src/tests/agent-fs-live-url.test.ts +15 -0
- package/src/tests/agent-fs-provision-seeder.test.ts +140 -0
- package/src/tests/agent-fs-user-keys.test.ts +483 -0
- package/src/tests/agentfs-proxy.test.ts +8 -8
- package/src/tests/approval-card-resolution.test.ts +396 -0
- package/src/tests/approval-requests-notifications.test.ts +1 -1
- package/src/tests/approval-respond-auth.test.ts +28 -0
- package/src/tests/apps-action-parent-task.test.ts +140 -0
- package/src/tests/apps-catalog-additions.test.ts +315 -0
- package/src/tests/apps-catalog-files.test.ts +114 -0
- package/src/tests/apps-catalog-hitl.test.ts +117 -0
- package/src/tests/apps-catalog-inputs.test.ts +86 -0
- package/src/tests/apps-catalog-table.test.ts +47 -0
- package/src/tests/apps-chart-shell.test.ts +1 -1
- package/src/tests/apps-element-assembly.test.ts +52 -3
- package/src/tests/apps-session-thread.test.ts +182 -0
- package/src/tests/asset-key-invariants.test.ts +14 -0
- package/src/tests/base-prompt.test.ts +108 -23
- package/src/tests/boot-scrub-sweep.test.ts +172 -0
- package/src/tests/caller-session-group.test.ts +199 -0
- package/src/tests/cards.test.ts +169 -0
- package/src/tests/chat-sdk-status-route.test.ts +16 -3
- package/src/tests/chat-sdk-telegram-token.test.ts +76 -0
- package/src/tests/chat-sdk-tools.test.ts +147 -0
- package/src/tests/checklist-nudge.test.ts +208 -0
- package/src/tests/checklist.test.ts +686 -0
- package/src/tests/claude-adapter-binary.test.ts +7 -1
- package/src/tests/claude-adapter.test.ts +10 -64
- package/src/tests/claude-flag-settings.test.ts +15 -11
- package/src/tests/claude-hook-credentials.test.ts +0 -1
- package/src/tests/claude-sdk-lifecycle.test.ts +5 -1
- package/src/tests/codex-adapter.test.ts +17 -78
- package/src/tests/codex-app-server.test.ts +16 -0
- package/src/tests/comb-config-guard.test.ts +21 -0
- package/src/tests/comb-default.test.ts +59 -97
- package/src/tests/comb-links.test.ts +86 -16
- package/src/tests/comb-status.test.ts +24 -27
- package/src/tests/create-page-tool.test.ts +101 -1
- package/src/tests/create-schedule-key.test.ts +105 -0
- package/src/tests/create-task-vcs-repo.test.ts +136 -0
- package/src/tests/credential-broker.test.ts +2 -2
- package/src/tests/db-query.test.ts +87 -1
- package/src/tests/db-task-read-contract.test.ts +3 -0
- package/src/tests/db-task-write-contract.test.ts +3 -1
- package/src/tests/docs-index-footprint.test.js +3 -3
- package/src/tests/dreaming-learnings.test.ts +104 -0
- package/src/tests/entrypoint-github-enterprise.test.ts +158 -0
- package/src/tests/extensions-assets.test.ts +7 -3
- package/src/tests/extensions-catalog.test.ts +1 -0
- package/src/tests/extensions-example-sql-admin-only.test.ts +198 -0
- package/src/tests/extensions-pre-task.test.ts +7 -5
- package/src/tests/extensions-steering.test.ts +14 -2
- package/src/tests/favorites-agent-fs-path.test.ts +124 -0
- package/src/tests/fetch-resolved-env.test.ts +115 -1
- package/src/tests/fixtures/import-package.ts +32 -0
- package/src/tests/fixtures/runner-missing-dependency.ts +129 -0
- package/src/tests/fs-routes.test.ts +505 -2
- package/src/tests/github-ghes-mock.test.ts +196 -0
- package/src/tests/github-host.test.ts +285 -0
- package/src/tests/heartbeat-supersede-resume.test.ts +73 -0
- package/src/tests/heartbeat.test.ts +56 -0
- package/src/tests/import-config.test.ts +209 -0
- package/src/tests/import.test.ts +464 -0
- package/src/tests/invites-http.test.ts +144 -1
- package/src/tests/kv-http.test.ts +11 -0
- package/src/tests/literal-matcher.test.ts +58 -0
- package/src/tests/mcp-oauth-manual-client.test.ts +1 -1
- package/src/tests/oauth-presets.test.ts +12 -0
- package/src/tests/opencode-adapter.test.ts +53 -6
- package/src/tests/pool-affinity.test.ts +50 -0
- package/src/tests/prompt-template-session.test.ts +69 -6
- package/src/tests/provider-registration.test.ts +2 -55
- package/src/tests/provider-runtime-dependencies.test.ts +212 -0
- package/src/tests/rbac-admission.test.ts +19 -0
- package/src/tests/rbac-charact-misc-tools.test.ts +31 -0
- package/src/tests/rbac-engine.test.ts +2 -0
- package/src/tests/rbac-roles.test.ts +2 -0
- package/src/tests/runner-missing-dependency.test.ts +61 -0
- package/src/tests/runner-requester-profile.test.ts +139 -1
- package/src/tests/runtime-pool-reachability.test.ts +135 -1
- package/src/tests/runtime-pool-routing.test.ts +52 -0
- package/src/tests/runtime-stale-threshold.test.ts +40 -0
- package/src/tests/savings-compound.test.ts +774 -0
- package/src/tests/savings-compute.test.ts +7 -198
- package/src/tests/savings-fleet-latency.test.ts +143 -0
- package/src/tests/savings-fleet-read.test.ts +195 -0
- package/src/tests/savings-fleet-scale.test.ts +222 -0
- package/src/tests/savings-fleet-slices.test.ts +122 -0
- package/src/tests/savings-model.test.ts +212 -0
- package/src/tests/savings-read.test.ts +408 -0
- package/src/tests/savings-rollup.test.ts +766 -0
- package/src/tests/savings-scripts.test.ts +617 -0
- package/src/tests/script-connections.test.ts +4 -0
- package/src/tests/script-executor-conformance.test.ts +481 -0
- package/src/tests/scripts-http.test.ts +55 -0
- package/src/tests/scripts-runtime-fetch.test.ts +2 -2
- package/src/tests/secret-rules.test.ts +124 -1
- package/src/tests/secret-scrub-gate.test.ts +257 -0
- package/src/tests/secret-scrubber.test.ts +1 -1
- package/src/tests/seed-registry.test.ts +142 -9
- package/src/tests/session-source-keys.test.ts +42 -1
- package/src/tests/sessions-move.test.ts +70 -0
- package/src/tests/sessions-tree.test.ts +98 -0
- package/src/tests/sessions.test.ts +69 -0
- package/src/tests/slack-config.test.ts +4 -18
- package/src/tests/slack-dm-implicit-mention.test.ts +20 -1
- package/src/tests/slack-http-receiver.test.ts +472 -0
- package/src/tests/slack-identity-resolution.test.ts +23 -0
- package/src/tests/slack-inbound-files.test.ts +2 -1
- package/src/tests/slack-inbound-logging.test.ts +64 -0
- package/src/tests/slack-leave-thread.test.ts +1 -1
- package/src/tests/slack-message-text.test.ts +104 -0
- package/src/tests/slack-mode-lifecycle.test.ts +6 -4
- package/src/tests/slack-render-v2.test.ts +48 -0
- package/src/tests/slack-skip-reaction.test.ts +2 -2
- package/src/tests/slack-steering.test.ts +22 -10
- package/src/tests/slack-thread-buffer-context.test.ts +1 -1
- package/src/tests/slack-thread-buffer-fold.test.ts +417 -0
- package/src/tests/slack-thread-buffer-restore.test.ts +198 -0
- package/src/tests/slack-thread-buffer-startup-restore.test.ts +86 -0
- package/src/tests/slack-thread-buffer.test.ts +34 -34
- package/src/tests/slack-thread-participants.test.ts +447 -0
- package/src/tests/slack-tool-blocks.test.ts +167 -0
- package/src/tests/status.test.ts +32 -6
- package/src/tests/steering-core.test.ts +13 -0
- package/src/tests/steering-enabled.test.ts +7 -1
- package/src/tests/steering-promotion.test.ts +24 -0
- package/src/tests/swarm-config-reserved-keys.test.ts +17 -0
- package/src/tests/system-one-hosts-ui-mirror.test.ts +67 -0
- package/src/tests/task-artifacts.test.ts +50 -0
- package/src/tests/task-session-prompts.test.ts +95 -1
- package/src/tests/tool-annotations.test.ts +30 -0
- package/src/tests/workflow-system-one-extraction.test.ts +149 -1
- package/src/tools/chat-post.ts +19 -4
- package/src/tools/chat-reply.ts +20 -4
- package/src/tools/create-page.ts +21 -4
- package/src/tools/get-swarm.ts +18 -2
- package/src/tools/join-swarm.ts +2 -1
- package/src/tools/kv/kv-write-auth.ts +17 -1
- package/src/tools/schedules/create-schedule.ts +22 -4
- package/src/tools/slack-post.ts +40 -7
- package/src/tools/slack-reply.ts +50 -14
- package/src/types.ts +74 -2
- package/src/utils/constants.ts +60 -138
- package/src/utils/github-host.ts +217 -0
- package/src/utils/github-pull-request.ts +8 -5
- package/src/utils/literal-matcher.ts +118 -0
- package/src/utils/mcp-server-fetcher.test.ts +89 -0
- package/src/utils/mcp-server-fetcher.ts +13 -5
- package/src/utils/request-auth-context.ts +24 -0
- package/src/utils/secret-rules.generated.ts +1 -1
- package/src/utils/secret-scrubber.ts +485 -54
- package/src/utils/task-attachment-links.ts +9 -12
- package/src/vcs/index.ts +3 -0
- package/src/workflows/approval-notifications.ts +188 -12
- package/src/workflows/executors/swarm-script.ts +23 -19
- package/src/workflows/executors/system-one-extraction.ts +14 -7
- package/src/workflows/executors/system-one-providers.ts +22 -1
- package/templates/community/open-prompt-showreel/PLAYBOOK.md +1 -1
- package/templates/community/open-prompt-showreel/skills/open-prompt-showreel/SKILL.md +1 -1
- package/templates/extensions/README.md +1 -0
- package/templates/extensions/sql-admin-only/README.md +19 -0
- package/templates/extensions/sql-admin-only/hooks.ts +96 -0
- package/templates/extensions/sql-admin-only/manifest.json +8 -0
- package/templates/import/manifest.schema.json +136 -0
- package/templates/import/sources.schema.json +44 -0
- package/templates/skills/agent-browser/SKILL.md +1 -1
- package/templates/skills/agent-browser/content.md +1 -1
- package/templates/skills/apps/SKILL.md +122 -12
- package/templates/skills/apps/content.md +122 -12
- package/templates/skills/asset-namespaces/content.md +2 -1
- package/templates/skills/chat-sdk/content.md +17 -0
- package/templates/skills/db-query-guidance/content.md +2 -1
- package/templates/skills/scheduling/content.md +27 -0
- package/templates/skills/slack-interaction/content.md +12 -2
- package/templates/skills/swarm-docs/content.md +1 -0
- package/templates/skills/swarm-extensions/config.json +1 -1
- package/templates/skills/swarm-extensions/content.md +33 -23
- package/templates/skills/swarm-scripts/SKILL.md +18 -4
- package/templates/skills/swarm-scripts/content.md +18 -4
- package/templates/skills/work-on-task/SKILL.md +1 -1
- package/templates/skills/work-on-task/content.md +1 -1
- package/templates/skills/workflow-iterate/content.md +4 -7
- package/templates/workflows/dreaming/content.md +3 -3
- package/dist/acp-adapter-fqzkxyra.js +0 -15
- package/dist/claude-adapter-stw7jdcf.js +0 -25
- package/dist/cli-4bd1rck6.js +0 -4
- package/dist/cli-dns0y538.js +0 -194
- package/dist/cli-g5mtmf6t.js +0 -432
- package/dist/cli-xf3qw745.js +0 -104
- package/dist/fx-adapter-rpsgb1tw.js +0 -18
- package/dist/grok-adapter-n2m3zjg1.js +0 -18
- package/dist/handlers-nv8edn19.js +0 -32
- package/dist/index-ksmyd6kc.js +0 -37
- package/dist/index-rjnrje98.js +0 -32
- package/dist/index-tv3413wy.js +0 -33
- package/dist/lead-3hmddvrm.js +0 -70
- package/dist/worker-qgg0m2gw.js +0 -70
- package/src/providers/ctx-mode-env.ts +0 -10
- package/src/tests/entrypoint-acp-target-binary.test.ts +0 -439
- package/dist/{cli-4caa1x7d.js → cli-tsa40663.js} +4 -4
- package/dist/{index-0rvk3vd4.js → index-bs7gw5fd.js} +3 -3
- package/dist/{mistral-conversations-a45tx39a.js → mistral-conversations-0c30em7t.js} +4 -4
- package/dist/{openai-completions-xd579js7.js → openai-completions-f3n69rep.js} +18 -18
- package/dist/{pi-messages-hjbv8v10.js → pi-messages-zebyt7gb.js} +5 -5
|
@@ -22,6 +22,7 @@
|
|
|
22
22
|
*/
|
|
23
23
|
|
|
24
24
|
import { openAICompatibleKeyVars } from "@desplega/model-catalog";
|
|
25
|
+
import { LiteralMatcher } from "./literal-matcher";
|
|
25
26
|
import { GITLEAKS_RULES } from "./secret-rules.generated";
|
|
26
27
|
|
|
27
28
|
/**
|
|
@@ -44,8 +45,14 @@ import { GITLEAKS_RULES } from "./secret-rules.generated";
|
|
|
44
45
|
* v10 = the sweep covers the dreaming-v2 KV namespace and decodes its legacy
|
|
45
46
|
* hex copies. A new sweep target needs a bump too: an install that finished
|
|
46
47
|
* the previous version never sweeps it otherwise.
|
|
48
|
+
* v11 = a pass 2 hit inside a longer gitleaks secret redacts that whole
|
|
49
|
+
* secret, so a generic `sk-` match in a Heroku key's tail no longer leaves
|
|
50
|
+
* the key's prefix behind.
|
|
51
|
+
* v12 = the gitleaks global allowlist `^true|false|null$` is anchored as a
|
|
52
|
+
* whole, so a secret containing "false", starting with "true" or ending with
|
|
53
|
+
* "null" is no longer allowed.
|
|
47
54
|
*/
|
|
48
|
-
export const SCRUBBER_RULES_VERSION =
|
|
55
|
+
export const SCRUBBER_RULES_VERSION = 12;
|
|
49
56
|
|
|
50
57
|
/** Env-var names that are always considered secrets, even without suffix hints. */
|
|
51
58
|
const SENSITIVE_KEY_EXACT = new Set<string>([
|
|
@@ -419,6 +426,9 @@ const CURL_PASSWORD_RE = /(?<=^|[\s'"])(--password(?:[ \t]+|=)\\?["']?)([^\s"'\\
|
|
|
419
426
|
const CURL_USER_RE =
|
|
420
427
|
/(?<=^|[\s'"])((?:-u|-U|--user|--proxy-user)(?:[ \t]+|=)\\?["']?([^\s"'\\:@]+):)([^\s"'\\@]+)/g;
|
|
421
428
|
|
|
429
|
+
/** A curl user flag, the only text `CURL_USER_RE` can match in. */
|
|
430
|
+
const CURL_USER_FLAG_RE = /(?:^|\s)-(?:u|U|-user|-proxy-user)\b/;
|
|
431
|
+
|
|
422
432
|
/** `scheme://user:<pw>@host`: only the password goes, the host survives. */
|
|
423
433
|
const URL_USERINFO_RE =
|
|
424
434
|
/(?<![a-z0-9+.-])([a-z][a-z0-9+.-]{0,31}:\/\/[^\s/:@?#"'\\]+:)([^\s/@?#"'\\]+)(?=@)/gi;
|
|
@@ -453,7 +463,7 @@ function scrubKeyContext(text: string): string {
|
|
|
453
463
|
isPlaceholderValue(pw) ? match : `${flag}[REDACTED:curl_password]`,
|
|
454
464
|
);
|
|
455
465
|
}
|
|
456
|
-
if (
|
|
466
|
+
if (CURL_USER_FLAG_RE.test(out)) {
|
|
457
467
|
out = out.replace(CURL_USER_RE, (match, prefix: string, user: string, pw: string) =>
|
|
458
468
|
// `-u 1000:1000` / `-u node:node` is a docker uid:gid, not a credential.
|
|
459
469
|
isPlaceholderValue(pw) || pw === user ? match : `${prefix}[REDACTED:curl_password]`,
|
|
@@ -480,6 +490,11 @@ function scrubKeyContext(text: string): string {
|
|
|
480
490
|
*
|
|
481
491
|
* Order matters when one pattern is a prefix of another (e.g. `sk-ant-` must
|
|
482
492
|
* match before the more general `sk-`).
|
|
493
|
+
*
|
|
494
|
+
* `lits` are literals of which every match of `re` contains one, in any
|
|
495
|
+
* letter case. The boot sweep's `mayRedact` skips a rule whose literals do not
|
|
496
|
+
* occur, so a rule's literals must be a necessary part of its match (the corpus
|
|
497
|
+
* test checks each rule against its own matches).
|
|
483
498
|
*/
|
|
484
499
|
|
|
485
500
|
// Leading word boundary that also matches after JSON escape sequences (\n, \t,
|
|
@@ -489,46 +504,79 @@ const TB = String.raw`(?:(?<=\\[nrtbfu0])|(?<!\w))`;
|
|
|
489
504
|
// ending in `-` has no word boundary after it, so `\b` backtracks and leaves
|
|
490
505
|
// the last character behind.
|
|
491
506
|
|
|
492
|
-
const TOKEN_REGEXES: ReadonlyArray<{ name: string; re: RegExp }> = [
|
|
507
|
+
const TOKEN_REGEXES: ReadonlyArray<{ name: string; lits: string[]; re: RegExp }> = [
|
|
493
508
|
// GitHub fine-grained PATs
|
|
494
|
-
{ name: "github_pat", re: /github_pat_[A-Za-z0-9_]{20,}/g },
|
|
509
|
+
{ name: "github_pat", lits: ["github_pat_"], re: /github_pat_[A-Za-z0-9_]{20,}/g },
|
|
495
510
|
// GitHub classic/OAuth tokens (ghp_, gho_, ghu_, ghs_, ghr_)
|
|
496
|
-
{
|
|
511
|
+
{
|
|
512
|
+
name: "github_token",
|
|
513
|
+
lits: ["ghp_", "gho_", "ghu_", "ghs_", "ghr_"],
|
|
514
|
+
re: new RegExp(String.raw`${TB}gh[pousr]_[A-Za-z0-9]{20,}\b`, "g"),
|
|
515
|
+
},
|
|
497
516
|
// ACP ephemeral session tokens (base62 payload)
|
|
498
|
-
{
|
|
517
|
+
{
|
|
518
|
+
name: "acp_session_token",
|
|
519
|
+
lits: ["aseph_"],
|
|
520
|
+
re: new RegExp(String.raw`${TB}aseph_[A-Za-z0-9]{20,}\b`, "g"),
|
|
521
|
+
},
|
|
499
522
|
// GitLab personal access tokens
|
|
500
|
-
{
|
|
523
|
+
{
|
|
524
|
+
name: "gitlab_pat",
|
|
525
|
+
lits: ["glpat-"],
|
|
526
|
+
re: new RegExp(String.raw`${TB}glpat-[A-Za-z0-9_-]{20,}(?!\w)`, "g"),
|
|
527
|
+
},
|
|
501
528
|
// Azure DevOps personal access tokens (84 chars, "AZDO" signature at offset 76)
|
|
502
529
|
{
|
|
503
530
|
name: "azure_devops_pat",
|
|
531
|
+
lits: ["AZDO"],
|
|
504
532
|
re: new RegExp(String.raw`${TB}[A-Za-z0-9]{76}AZDO[A-Za-z0-9]{4}\b`, "g"),
|
|
505
533
|
},
|
|
506
534
|
// Anthropic API keys (must match before the generic sk- rule below)
|
|
507
|
-
{
|
|
535
|
+
{
|
|
536
|
+
name: "anthropic_key",
|
|
537
|
+
lits: ["sk-ant-"],
|
|
538
|
+
re: new RegExp(String.raw`${TB}sk-ant-[A-Za-z0-9_-]{20,}(?!\w)`, "g"),
|
|
539
|
+
},
|
|
508
540
|
// OpenAI project keys
|
|
509
541
|
{
|
|
510
542
|
name: "openai_proj_key",
|
|
543
|
+
lits: ["sk-proj-"],
|
|
511
544
|
re: new RegExp(String.raw`${TB}sk-proj-[A-Za-z0-9_-]{20,}(?!\w)`, "g"),
|
|
512
545
|
},
|
|
513
546
|
// OpenRouter keys
|
|
514
547
|
{
|
|
515
548
|
name: "openrouter_key",
|
|
549
|
+
lits: ["sk-or-"],
|
|
516
550
|
re: new RegExp(String.raw`${TB}sk-or-(?:v1-)?[A-Za-z0-9_-]{20,}(?!\w)`, "g"),
|
|
517
551
|
},
|
|
518
552
|
// Generic sk- legacy OpenAI keys (must come AFTER the ant/proj/or variants)
|
|
519
|
-
{
|
|
553
|
+
{
|
|
554
|
+
name: "sk_key",
|
|
555
|
+
lits: ["sk-"],
|
|
556
|
+
re: new RegExp(String.raw`${TB}sk-[A-Za-z0-9]{20,}\b`, "g"),
|
|
557
|
+
},
|
|
520
558
|
// Slack tokens
|
|
521
559
|
{
|
|
522
560
|
name: "slack_token",
|
|
561
|
+
lits: ["xoxb-", "xoxa-", "xoxp-", "xoxr-", "xoxs-", "xoxe-", "xoxo-"],
|
|
523
562
|
re: new RegExp(String.raw`${TB}xox[baprseo]-[A-Za-z0-9-]{10,}(?!\w)`, "g"),
|
|
524
563
|
},
|
|
525
564
|
// AWS access key IDs
|
|
526
|
-
{
|
|
565
|
+
{
|
|
566
|
+
name: "aws_access_key",
|
|
567
|
+
lits: ["AKIA"],
|
|
568
|
+
re: new RegExp(String.raw`${TB}AKIA[0-9A-Z]{16}\b`, "g"),
|
|
569
|
+
},
|
|
527
570
|
// Google API keys
|
|
528
|
-
{
|
|
571
|
+
{
|
|
572
|
+
name: "google_api_key",
|
|
573
|
+
lits: ["AIza"],
|
|
574
|
+
re: new RegExp(String.raw`${TB}AIza[A-Za-z0-9_-]{35}(?!\w)`, "g"),
|
|
575
|
+
},
|
|
529
576
|
// JWTs (3 dot-separated base64url segments)
|
|
530
577
|
{
|
|
531
578
|
name: "jwt",
|
|
579
|
+
lits: ["eyJ"],
|
|
532
580
|
re: new RegExp(
|
|
533
581
|
String.raw`${TB}eyJ[A-Za-z0-9_-]{10,}\.eyJ[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{10,}(?!\w)`,
|
|
534
582
|
"g",
|
|
@@ -537,49 +585,79 @@ const TOKEN_REGEXES: ReadonlyArray<{ name: string; re: RegExp }> = [
|
|
|
537
585
|
// SigNoz Cloud OTLP auth header values.
|
|
538
586
|
{
|
|
539
587
|
name: "signoz_ingestion_key",
|
|
588
|
+
lits: ["signoz-ingestion-key="],
|
|
540
589
|
re: new RegExp(String.raw`${TB}signoz-ingestion-key=[A-Za-z0-9._~+/-]{20,}={0,2}\b`, "g"),
|
|
541
590
|
},
|
|
542
591
|
// Linear OAuth tokens and API keys
|
|
543
592
|
{
|
|
544
593
|
name: "linear_oauth",
|
|
594
|
+
lits: ["lin_oauth_"],
|
|
545
595
|
re: new RegExp(String.raw`${TB}lin_oauth_[A-Za-z0-9_-]{10,}(?!\w)`, "g"),
|
|
546
596
|
},
|
|
547
|
-
{
|
|
597
|
+
{
|
|
598
|
+
name: "linear_api",
|
|
599
|
+
lits: ["lin_api_"],
|
|
600
|
+
re: new RegExp(String.raw`${TB}lin_api_[A-Za-z0-9_-]{10,}(?!\w)`, "g"),
|
|
601
|
+
},
|
|
548
602
|
// npm tokens
|
|
549
|
-
{
|
|
603
|
+
{
|
|
604
|
+
name: "npm_token",
|
|
605
|
+
lits: ["npm_"],
|
|
606
|
+
re: new RegExp(String.raw`${TB}npm_[A-Za-z0-9_-]{20,}(?!\w)`, "g"),
|
|
607
|
+
},
|
|
550
608
|
// Jira API tokens (Atlassian cloud)
|
|
551
609
|
{
|
|
552
610
|
name: "atlassian_token",
|
|
611
|
+
lits: ["ATATT"],
|
|
553
612
|
re: new RegExp(String.raw`${TB}ATATT[A-Za-z0-9_=-]{20,}(?![\w=])`, "g"),
|
|
554
613
|
},
|
|
555
614
|
// Agent-swarm MCP user tokens (`aswt_<base62-20+>`). Schema lands in
|
|
556
615
|
// migration 064; mint/revoke endpoints ship with the MCP-token plan.
|
|
557
616
|
// Rule lives here now so plaintexts never leak into logs once endpoints
|
|
558
617
|
// come online.
|
|
559
|
-
{
|
|
618
|
+
{
|
|
619
|
+
name: "mcp_token",
|
|
620
|
+
lits: ["aswt_"],
|
|
621
|
+
re: new RegExp(String.raw`${TB}aswt_[A-Za-z0-9]{20,}\b`, "g"),
|
|
622
|
+
},
|
|
560
623
|
// Vendor shapes the gitleaks rule set (pass 5) has no rule for.
|
|
561
624
|
// Resend API keys: re_<8>_<24>, with a digit and an uppercase letter so
|
|
562
625
|
// snake_case identifiers never match.
|
|
563
626
|
{
|
|
564
627
|
name: "resend_key",
|
|
628
|
+
lits: ["re_"],
|
|
565
629
|
re: new RegExp(
|
|
566
630
|
String.raw`${TB}re_(?=[A-Za-z0-9_]*[0-9])(?=[A-Za-z0-9_]*[A-Z])[A-Za-z0-9]{8}_[A-Za-z0-9]{24}\b`,
|
|
567
631
|
"g",
|
|
568
632
|
),
|
|
569
633
|
},
|
|
570
634
|
// Google OAuth access tokens and refresh tokens
|
|
571
|
-
{
|
|
572
|
-
|
|
635
|
+
{
|
|
636
|
+
name: "google_oauth_token",
|
|
637
|
+
lits: ["ya29."],
|
|
638
|
+
re: new RegExp(String.raw`${TB}ya29\.[A-Za-z0-9_-]{20,}`, "g"),
|
|
639
|
+
},
|
|
640
|
+
{
|
|
641
|
+
name: "google_refresh_token",
|
|
642
|
+
lits: ["1//0"],
|
|
643
|
+
re: /(?<![\w/])1\/\/0[A-Za-z0-9_-]{30,}/g,
|
|
644
|
+
},
|
|
573
645
|
// Discord webhook URLs (the token is the last path segment)
|
|
574
646
|
{
|
|
575
647
|
name: "discord_webhook",
|
|
648
|
+
lits: ["/api/webhooks/"],
|
|
576
649
|
re: /https?:\/\/(?:ptb\.|canary\.)?discord(?:app)?\.com\/api\/webhooks\/\d+\/[A-Za-z0-9_-]{50,}/g,
|
|
577
650
|
},
|
|
578
651
|
// xAI API keys
|
|
579
|
-
{
|
|
652
|
+
{
|
|
653
|
+
name: "xai_key",
|
|
654
|
+
lits: ["xai-"],
|
|
655
|
+
re: new RegExp(String.raw`${TB}xai-[A-Za-z0-9]{40,}\b`, "g"),
|
|
656
|
+
},
|
|
580
657
|
// Telegram bot tokens without a "telegram" keyword nearby: <bot id>:AA<33>
|
|
581
658
|
{
|
|
582
659
|
name: "telegram_bot_token",
|
|
660
|
+
lits: [":AA"],
|
|
583
661
|
re: new RegExp(String.raw`${TB}\d{8,10}:AA[A-Za-z0-9_-]{33}(?![A-Za-z0-9_-])`, "g"),
|
|
584
662
|
},
|
|
585
663
|
];
|
|
@@ -670,12 +748,14 @@ function allowedBy(list: CompiledAllowlist, secret: string, match: string): bool
|
|
|
670
748
|
return list.stopwords.some((word) => lower.includes(word));
|
|
671
749
|
}
|
|
672
750
|
|
|
673
|
-
|
|
751
|
+
/** Secret spans `[start, end)` a rule redacts in `text`, after its entropy and allowlist gates. */
|
|
752
|
+
function* gitleaksSecretSpans(
|
|
753
|
+
text: string,
|
|
754
|
+
rule: CompiledGitleaksRule,
|
|
755
|
+
global: CompiledAllowlist,
|
|
756
|
+
): Generator<[number, number]> {
|
|
674
757
|
const { re } = rule;
|
|
675
758
|
re.lastIndex = 0;
|
|
676
|
-
let out = "";
|
|
677
|
-
let last = 0;
|
|
678
|
-
let changed = false;
|
|
679
759
|
for (let m = re.exec(text); m !== null; m = re.exec(text)) {
|
|
680
760
|
if (m[0].length === 0) {
|
|
681
761
|
re.lastIndex++;
|
|
@@ -700,8 +780,17 @@ function applyGitleaksRule(text: string, rule: CompiledGitleaksRule, global: Com
|
|
|
700
780
|
if (rule.entropy && shannonEntropy(secret) <= rule.entropy) continue;
|
|
701
781
|
if (allowedBy(global, secret, m[0])) continue;
|
|
702
782
|
if (rule.allowlists.some((list) => allowedBy(list, secret, m[0]))) continue;
|
|
703
|
-
|
|
704
|
-
|
|
783
|
+
yield [span[0], span[1]];
|
|
784
|
+
}
|
|
785
|
+
}
|
|
786
|
+
|
|
787
|
+
function applyGitleaksRule(text: string, rule: CompiledGitleaksRule, global: CompiledAllowlist) {
|
|
788
|
+
let out = "";
|
|
789
|
+
let last = 0;
|
|
790
|
+
let changed = false;
|
|
791
|
+
for (const [start, end] of gitleaksSecretSpans(text, rule, global)) {
|
|
792
|
+
out += `${text.slice(last, start)}[REDACTED:gitleaks:${rule.id}]`;
|
|
793
|
+
last = end;
|
|
705
794
|
changed = true;
|
|
706
795
|
}
|
|
707
796
|
return changed ? out + text.slice(last) : text;
|
|
@@ -714,9 +803,10 @@ export function setGitleaksPassEnabledForTesting(enabled: boolean): void {
|
|
|
714
803
|
gitleaksPassEnabled = enabled;
|
|
715
804
|
}
|
|
716
805
|
|
|
717
|
-
|
|
718
|
-
|
|
719
|
-
|
|
806
|
+
/** The gitleaks rules whose keywords appear in `text` (empty when pass 5 is off). */
|
|
807
|
+
function activeGitleaksRules(text: string): CompiledGitleaksRule[] {
|
|
808
|
+
if (!gitleaksPassEnabled) return [];
|
|
809
|
+
const { keywordRe, implied, rules } = getGitleaks();
|
|
720
810
|
// Visit every start position that has a keyword. The alternation is
|
|
721
811
|
// longest-first, so a shorter keyword starting at the same position is a
|
|
722
812
|
// substring of the one found, and `implied` adds it.
|
|
@@ -726,16 +816,134 @@ function scrubGitleaks(text: string): string {
|
|
|
726
816
|
for (const keyword of implied.get(m[0].toLowerCase()) ?? []) present.add(keyword);
|
|
727
817
|
keywordRe.lastIndex = m.index + 1;
|
|
728
818
|
}
|
|
729
|
-
if (present.size === 0) return
|
|
819
|
+
if (present.size === 0) return [];
|
|
820
|
+
return rules.filter((rule) => rule.keywords.some((keyword) => present.has(keyword)));
|
|
821
|
+
}
|
|
822
|
+
|
|
823
|
+
function scrubGitleaks(text: string): string {
|
|
730
824
|
let out = text;
|
|
731
|
-
for (const rule of
|
|
732
|
-
|
|
733
|
-
|
|
825
|
+
for (const rule of activeGitleaksRules(text)) {
|
|
826
|
+
out = applyGitleaksRule(out, rule, getGitleaks().global);
|
|
827
|
+
}
|
|
828
|
+
return out;
|
|
829
|
+
}
|
|
830
|
+
|
|
831
|
+
type VendorSpan = { start: number; end: number; id: string };
|
|
832
|
+
type Edit = { start: number; end: number; len: number };
|
|
833
|
+
|
|
834
|
+
/**
|
|
835
|
+
* Gitleaks spans shared by the pass 2 rules of one scrub call. The sweep runs
|
|
836
|
+
* at most once per call, on the first structural hit; each rule then moves the
|
|
837
|
+
* spans through its own edits instead of sweeping its output again.
|
|
838
|
+
*/
|
|
839
|
+
type VendorSpanCache = { spans: VendorSpan[] | null };
|
|
840
|
+
|
|
841
|
+
let pass2SweepCount = 0;
|
|
842
|
+
|
|
843
|
+
/** Test-only: how many pass 2 gitleaks sweeps ran since the last call. */
|
|
844
|
+
export function takePass2SweepCountForTesting(): number {
|
|
845
|
+
const n = pass2SweepCount;
|
|
846
|
+
pass2SweepCount = 0;
|
|
847
|
+
return n;
|
|
848
|
+
}
|
|
849
|
+
|
|
850
|
+
function vendorSpansOf(text: string, cache: VendorSpanCache): VendorSpan[] {
|
|
851
|
+
if (cache.spans === null) {
|
|
852
|
+
pass2SweepCount++;
|
|
853
|
+
const { global } = getGitleaks();
|
|
854
|
+
cache.spans = activeGitleaksRules(text).flatMap((rule) =>
|
|
855
|
+
[...gitleaksSecretSpans(text, rule, global)].map(([s, e]) => ({
|
|
856
|
+
start: s,
|
|
857
|
+
end: e,
|
|
858
|
+
id: rule.id,
|
|
859
|
+
})),
|
|
860
|
+
);
|
|
861
|
+
}
|
|
862
|
+
return cache.spans;
|
|
863
|
+
}
|
|
864
|
+
|
|
865
|
+
/**
|
|
866
|
+
* Moves spans through sorted, non-overlapping edits. A span an edit touches
|
|
867
|
+
* is dropped: its secret was redacted or cut, and pass 5 still sweeps the
|
|
868
|
+
* final text for anything a fresh sweep would have found.
|
|
869
|
+
*/
|
|
870
|
+
function shiftSpans(spans: VendorSpan[], edits: Edit[]): VendorSpan[] {
|
|
871
|
+
if (edits.length === 0 || spans.length === 0) return spans;
|
|
872
|
+
const out: VendorSpan[] = [];
|
|
873
|
+
let i = 0;
|
|
874
|
+
let delta = 0;
|
|
875
|
+
for (const v of [...spans].sort((x, y) => x.start - y.start)) {
|
|
876
|
+
let e = edits[i];
|
|
877
|
+
while (e && e.end <= v.start) {
|
|
878
|
+
delta += e.len - (e.end - e.start);
|
|
879
|
+
e = edits[++i];
|
|
734
880
|
}
|
|
881
|
+
if (e && e.start < v.end) continue;
|
|
882
|
+
out.push({ start: v.start + delta, end: v.end + delta, id: v.id });
|
|
735
883
|
}
|
|
736
884
|
return out;
|
|
737
885
|
}
|
|
738
886
|
|
|
887
|
+
/** `text.replace(re, marker)` that also returns the edits it made. */
|
|
888
|
+
function replaceAll(text: string, re: RegExp, marker: string): { out: string; edits: Edit[] } {
|
|
889
|
+
const edits: Edit[] = [];
|
|
890
|
+
const out = text.replace(re, (match: string, ...rest: unknown[]) => {
|
|
891
|
+
const start = rest.find((x) => typeof x === "number") as number;
|
|
892
|
+
edits.push({ start, end: start + match.length, len: marker.length });
|
|
893
|
+
return marker;
|
|
894
|
+
});
|
|
895
|
+
return { out, edits };
|
|
896
|
+
}
|
|
897
|
+
|
|
898
|
+
/**
|
|
899
|
+
* Pass 2 for one structural rule. A gitleaks secret that strictly contains a
|
|
900
|
+
* hit wins (longest span): it is redacted whole first, so a generic rule
|
|
901
|
+
* matching inside it (`sk-…` in a Heroku key's tail) cannot leave its prefix
|
|
902
|
+
* behind for pass 5 to miss.
|
|
903
|
+
*/
|
|
904
|
+
function applyTokenRegex(text: string, name: string, re: RegExp, cache: VendorSpanCache): string {
|
|
905
|
+
const marker = `[REDACTED:${name}]`;
|
|
906
|
+
const covering: VendorSpan[] = [];
|
|
907
|
+
const edits: Edit[] = [];
|
|
908
|
+
const out = text.replace(re, (match: string, ...rest: unknown[]) => {
|
|
909
|
+
const start = rest.find((x) => typeof x === "number") as number;
|
|
910
|
+
const end = start + match.length;
|
|
911
|
+
let best: VendorSpan | undefined;
|
|
912
|
+
for (const v of vendorSpansOf(text, cache)) {
|
|
913
|
+
if (v.start <= start && end <= v.end && v.end - v.start > match.length) {
|
|
914
|
+
if (!best || v.end - v.start > best.end - best.start) best = v;
|
|
915
|
+
}
|
|
916
|
+
}
|
|
917
|
+
if (!best) {
|
|
918
|
+
edits.push({ start, end, len: marker.length });
|
|
919
|
+
return marker;
|
|
920
|
+
}
|
|
921
|
+
covering.push(best);
|
|
922
|
+
return match;
|
|
923
|
+
});
|
|
924
|
+
if (covering.length === 0) {
|
|
925
|
+
if (cache.spans) cache.spans = shiftSpans(cache.spans, edits);
|
|
926
|
+
return out;
|
|
927
|
+
}
|
|
928
|
+
// Redact the covering secrets right to left, longest first on a tie; one
|
|
929
|
+
// that overlaps the marker to its right merges into that marker.
|
|
930
|
+
covering.sort((x, y) => y.start - x.start || y.end - x.end);
|
|
931
|
+
let result = text;
|
|
932
|
+
let floor = Number.POSITIVE_INFINITY;
|
|
933
|
+
const vendorEdits: Edit[] = [];
|
|
934
|
+
for (const v of covering) {
|
|
935
|
+
if (v.start >= floor) continue;
|
|
936
|
+
const end = Math.min(v.end, floor);
|
|
937
|
+
const vendorMarker = v.end > floor ? "" : `[REDACTED:gitleaks:${v.id}]`;
|
|
938
|
+
result = result.slice(0, v.start) + vendorMarker + result.slice(end);
|
|
939
|
+
vendorEdits.push({ start: v.start, end, len: vendorMarker.length });
|
|
940
|
+
floor = v.start;
|
|
941
|
+
}
|
|
942
|
+
const structural = replaceAll(result, re, marker);
|
|
943
|
+
cache.spans = shiftSpans(shiftSpans(cache.spans ?? [], vendorEdits.reverse()), structural.edits);
|
|
944
|
+
return structural.out;
|
|
945
|
+
}
|
|
946
|
+
|
|
739
947
|
interface EnvValueEntry {
|
|
740
948
|
value: string;
|
|
741
949
|
name: string;
|
|
@@ -921,13 +1129,16 @@ export type ScrubbedText = string & { readonly __scrubbed: true };
|
|
|
921
1129
|
export function scrubSecrets(text: string | null | undefined): ScrubbedText {
|
|
922
1130
|
if (text == null) return "" as ScrubbedText;
|
|
923
1131
|
if (text.length === 0) return text as ScrubbedText;
|
|
1132
|
+
return scrubWithMatcher(text, getMatcher());
|
|
1133
|
+
}
|
|
924
1134
|
|
|
1135
|
+
function scrubWithMatcher(text: string, matcher: KnownValueMatcher): ScrubbedText {
|
|
925
1136
|
let out = text;
|
|
926
1137
|
|
|
927
1138
|
// Pass 1: exact-match known values, env first then volatile (registered at
|
|
928
1139
|
// runtime, incl. every stored secret the API's secret registry loads). The
|
|
929
1140
|
// marker keeps the env-var / source name for debugging.
|
|
930
|
-
const { re, names, fallback } =
|
|
1141
|
+
const { re, names, fallback } = matcher;
|
|
931
1142
|
if (re) {
|
|
932
1143
|
re.lastIndex = 0;
|
|
933
1144
|
out = out.replace(re, (match) => `[REDACTED:${names.get(match) ?? "secret"}]`);
|
|
@@ -940,24 +1151,252 @@ export function scrubSecrets(text: string | null | undefined): ScrubbedText {
|
|
|
940
1151
|
// Pass 2: structural patterns (catches secrets we never saw in env, e.g.
|
|
941
1152
|
// a token pasted into a tool_result by the operator or fetched from a
|
|
942
1153
|
// third-party API during a task).
|
|
943
|
-
|
|
944
|
-
|
|
945
|
-
}
|
|
946
|
-
|
|
947
|
-
// Pass 3: values of sensitive `KEY=value` assignments (env dumps, .env
|
|
948
|
-
// files, shell traces), including ones too short for pass 1.
|
|
949
|
-
out = out.replace(ASSIGNMENT_RE, redactAssignment);
|
|
950
|
-
if (out.includes("=")) out = out.replace(INI_ASSIGNMENT_RE, redactLineValue);
|
|
1154
|
+
const vendorSpans: VendorSpanCache = { spans: null };
|
|
1155
|
+
for (const { name, re } of TOKEN_REGEXES) out = applyTokenRegex(out, name, re, vendorSpans);
|
|
951
1156
|
|
|
952
|
-
//
|
|
953
|
-
//
|
|
954
|
-
|
|
1157
|
+
// Passes 3 and 4: values of sensitive `KEY=value` assignments (env dumps,
|
|
1158
|
+
// .env files, shell traces), including ones too short for pass 1, and
|
|
1159
|
+
// credentials known by their context (JSON/YAML keys, auth headers, curl
|
|
1160
|
+
// flags, URL userinfo, PEM blocks).
|
|
1161
|
+
out = scrubKeyPasses(out);
|
|
955
1162
|
|
|
956
1163
|
// Pass 5: vendor token shapes from the gitleaks rule set, behind a keyword
|
|
957
1164
|
// prefilter and each rule's entropy floor.
|
|
958
1165
|
return scrubGitleaks(out) as ScrubbedText;
|
|
959
1166
|
}
|
|
960
1167
|
|
|
1168
|
+
/**
|
|
1169
|
+
* Boot-sweep gate. `mayRedact(text)` is false only when `scrubSecrets(text)`
|
|
1170
|
+
* would return `text` unchanged, so the sweep can skip those rows and run the
|
|
1171
|
+
* full scrub on the rest. Each clause is a necessary condition of one pass, and
|
|
1172
|
+
* the last of each is the pass itself, minus the rewrite:
|
|
1173
|
+
* 1. a known value occurs (the pass-1 matcher);
|
|
1174
|
+
* 2. a structural rule's literal occurs and its regex matches;
|
|
1175
|
+
* 3-4. a key-context trigger occurs (PRIVATE KEY, an auth header, a curl
|
|
1176
|
+
* flag, URL userinfo, or a sensitive key name before `=`, `:` or a quote)
|
|
1177
|
+
* and passes 3 and 4 then change the text;
|
|
1178
|
+
* 5. a gitleaks rule yields a span (same keyword gate and span walk).
|
|
1179
|
+
* With every clause false no pass edits `text`, so each pass sees the original.
|
|
1180
|
+
* A new pass or trigger in `scrubSecrets` needs a clause here.
|
|
1181
|
+
*/
|
|
1182
|
+
const DIRECT_KEY_TRIGGERS = ["private key", "authorization", "x-api-key", "--password"];
|
|
1183
|
+
/** Triggers that need a second check: a curl `-u`, and a URL (`://`) with userinfo (`@`). */
|
|
1184
|
+
const KEY_TRIGGER_LITERALS = [...DIRECT_KEY_TRIGGERS, "-u", "://", "@"];
|
|
1185
|
+
|
|
1186
|
+
/** Longest prefix of a known value the gate looks for; `re` then confirms the whole value. */
|
|
1187
|
+
const VALUE_PREFIX_LENGTH = 12;
|
|
1188
|
+
|
|
1189
|
+
interface SweepMatchers {
|
|
1190
|
+
/** Gitleaks keywords, structural rule literals, key triggers and known-value prefixes, in one pass. */
|
|
1191
|
+
literals: LiteralMatcher;
|
|
1192
|
+
/** Scratch for `literals.collect`. */
|
|
1193
|
+
found: Uint8Array;
|
|
1194
|
+
/** False when a known value has no usable ASCII prefix: only the matcher itself can clear it. */
|
|
1195
|
+
valuesGated: boolean;
|
|
1196
|
+
}
|
|
1197
|
+
|
|
1198
|
+
let sweepRules: {
|
|
1199
|
+
keywords: string[];
|
|
1200
|
+
keywordRules: CompiledGitleaksRule[][];
|
|
1201
|
+
ruleLiterals: string[];
|
|
1202
|
+
literalRules: Array<Array<(typeof TOKEN_REGEXES)[number]>>;
|
|
1203
|
+
} | null = null;
|
|
1204
|
+
|
|
1205
|
+
function getSweepRules() {
|
|
1206
|
+
if (sweepRules) return sweepRules;
|
|
1207
|
+
const { rules } = getGitleaks();
|
|
1208
|
+
const keywords = [...new Set(rules.flatMap((rule) => rule.keywords))];
|
|
1209
|
+
const ruleLiterals = [...new Set(TOKEN_REGEXES.flatMap((rule) => rule.lits))];
|
|
1210
|
+
sweepRules = {
|
|
1211
|
+
keywords,
|
|
1212
|
+
keywordRules: keywords.map((keyword) =>
|
|
1213
|
+
rules.filter((rule) => rule.keywords.includes(keyword)),
|
|
1214
|
+
),
|
|
1215
|
+
ruleLiterals,
|
|
1216
|
+
literalRules: ruleLiterals.map((lit) =>
|
|
1217
|
+
TOKEN_REGEXES.filter((rule) => rule.lits.includes(lit)),
|
|
1218
|
+
),
|
|
1219
|
+
};
|
|
1220
|
+
return sweepRules;
|
|
1221
|
+
}
|
|
1222
|
+
|
|
1223
|
+
const sweepMatchers = new WeakMap<KnownValueMatcher, SweepMatchers>();
|
|
1224
|
+
|
|
1225
|
+
/** The one-pass literal matcher for the current known values (rebuilt when they change). */
|
|
1226
|
+
function getSweepMatchers(matcher: KnownValueMatcher): SweepMatchers {
|
|
1227
|
+
const cached = sweepMatchers.get(matcher);
|
|
1228
|
+
if (cached) return cached;
|
|
1229
|
+
const { keywords, ruleLiterals } = getSweepRules();
|
|
1230
|
+
// A value that occurs starts with its prefix, so a prefix is a necessary condition.
|
|
1231
|
+
const prefixes = new Set<string>();
|
|
1232
|
+
let valuesGated = true;
|
|
1233
|
+
for (const value of matcher.names.keys()) {
|
|
1234
|
+
const ascii = /^[^\u0080-\uffff]*/.exec(value)?.[0] ?? "";
|
|
1235
|
+
const prefix = ascii.slice(0, VALUE_PREFIX_LENGTH);
|
|
1236
|
+
if (prefix.length < 4) valuesGated = false;
|
|
1237
|
+
else prefixes.add(prefix);
|
|
1238
|
+
}
|
|
1239
|
+
const patterns = [...keywords, ...ruleLiterals, ...KEY_TRIGGER_LITERALS, ...prefixes];
|
|
1240
|
+
const built = {
|
|
1241
|
+
literals: new LiteralMatcher(patterns),
|
|
1242
|
+
found: new Uint8Array(patterns.length),
|
|
1243
|
+
valuesGated,
|
|
1244
|
+
};
|
|
1245
|
+
sweepMatchers.set(matcher, built);
|
|
1246
|
+
return built;
|
|
1247
|
+
}
|
|
1248
|
+
|
|
1249
|
+
let keyNeedles: LiteralMatcher | null = null;
|
|
1250
|
+
|
|
1251
|
+
/**
|
|
1252
|
+
* Matches a sensitive key name right before `=`, `:`, a space, a tab, a quote
|
|
1253
|
+
* or a backslash, where the key-context regexes end a key. `normalizeKey` only
|
|
1254
|
+
* upper-cases and adds `_`, so `isSensitiveKey` accepts a key only when, with
|
|
1255
|
+
* `_ . -` dropped, it ends with a suffix or is an exact name, a registered name
|
|
1256
|
+
* or `codex_oauth` (each with `_ . -` dropped too). The matcher skips those
|
|
1257
|
+
* characters in the text, so it also reads `to-ken` as `token`: a superset.
|
|
1258
|
+
*/
|
|
1259
|
+
function sensitiveKeyNeedles(): LiteralMatcher {
|
|
1260
|
+
if (keyNeedles) return keyNeedles;
|
|
1261
|
+
const strip = (name: string) => name.toUpperCase().replace(/[_.-]/g, "");
|
|
1262
|
+
const all = [...SENSITIVE_KEY_SUFFIXES, ...SENSITIVE_KEY_EXACT, ...registeredSensitiveKeys].map(
|
|
1263
|
+
strip,
|
|
1264
|
+
);
|
|
1265
|
+
const names = all
|
|
1266
|
+
// A key is ASCII, so a name with other characters can never equal one.
|
|
1267
|
+
.filter((name) => /^[A-Z0-9]+$/.test(name));
|
|
1268
|
+
// An ending that another name ends with already covers the longer name.
|
|
1269
|
+
const needles = [...new Set(names)].filter(
|
|
1270
|
+
(name) => !names.some((other) => other !== name && name.endsWith(other)),
|
|
1271
|
+
);
|
|
1272
|
+
// `codex_oauth_<n>` is sensitive too, so a digit also ends that key. No other
|
|
1273
|
+
// name covers it (a suffix like `OAUTH` ends before the digit), so it skips the dedupe.
|
|
1274
|
+
const codexOauth = "CODEXOAUTH";
|
|
1275
|
+
const ends = [...'=: \t"\\'];
|
|
1276
|
+
// A name of only `_ . -` strips to "": its key is the bare name, so any end can follow.
|
|
1277
|
+
const bare = all.includes("") ? ends : [];
|
|
1278
|
+
keyNeedles = new LiteralMatcher(
|
|
1279
|
+
[
|
|
1280
|
+
...needles.flatMap((needle) => ends.map((end) => needle + end)),
|
|
1281
|
+
...[...ends, ..."0123456789"].map((end) => codexOauth + end),
|
|
1282
|
+
...bare,
|
|
1283
|
+
],
|
|
1284
|
+
{ skip: "_.-" },
|
|
1285
|
+
);
|
|
1286
|
+
return keyNeedles;
|
|
1287
|
+
}
|
|
1288
|
+
|
|
1289
|
+
/** Passes 3 and 4 of `scrubSecrets`: key-context credentials. */
|
|
1290
|
+
function scrubKeyPasses(text: string): string {
|
|
1291
|
+
let out = text.replace(ASSIGNMENT_RE, redactAssignment);
|
|
1292
|
+
if (out.includes("=")) out = out.replace(INI_ASSIGNMENT_RE, redactLineValue);
|
|
1293
|
+
return scrubKeyContext(out);
|
|
1294
|
+
}
|
|
1295
|
+
|
|
1296
|
+
function mayRedactWith(text: string, matcher: KnownValueMatcher): boolean {
|
|
1297
|
+
if (text.length === 0) return false;
|
|
1298
|
+
const { keywordRules, literalRules, keywords, ruleLiterals } = getSweepRules();
|
|
1299
|
+
const sweep = getSweepMatchers(matcher);
|
|
1300
|
+
const found = sweep.found.fill(0);
|
|
1301
|
+
sweep.literals.collect(text, found);
|
|
1302
|
+
const ruleBase = keywords.length;
|
|
1303
|
+
const triggerBase = ruleBase + ruleLiterals.length;
|
|
1304
|
+
const valueBase = triggerBase + KEY_TRIGGER_LITERALS.length;
|
|
1305
|
+
|
|
1306
|
+
// Pass 1: a known value's prefix occurs, and the matcher then finds the value.
|
|
1307
|
+
const { re, fallback } = matcher;
|
|
1308
|
+
if (!sweep.valuesGated || found.indexOf(1, valueBase) !== -1) {
|
|
1309
|
+
if (re) {
|
|
1310
|
+
re.lastIndex = 0;
|
|
1311
|
+
if (re.test(text)) return true;
|
|
1312
|
+
} else if (fallback.some((value) => text.includes(value))) return true;
|
|
1313
|
+
}
|
|
1314
|
+
|
|
1315
|
+
// Pass 2: a literal of a structural rule occurs, and the rule's regex then matches.
|
|
1316
|
+
for (let id = ruleBase; id < triggerBase; id++) {
|
|
1317
|
+
if (!found[id]) continue;
|
|
1318
|
+
for (const rule of literalRules[id - ruleBase] ?? []) {
|
|
1319
|
+
rule.re.lastIndex = 0;
|
|
1320
|
+
if (rule.re.test(text)) return true;
|
|
1321
|
+
}
|
|
1322
|
+
}
|
|
1323
|
+
|
|
1324
|
+
// Passes 3 and 4: a trigger occurs, and the key passes then change the text.
|
|
1325
|
+
const [user, url, at] = [4, 5, 6].map((i) => found[triggerBase + i]);
|
|
1326
|
+
const keyTrigger =
|
|
1327
|
+
DIRECT_KEY_TRIGGERS.some((_, i) => found[triggerBase + i]) ||
|
|
1328
|
+
(user && CURL_USER_FLAG_RE.test(text)) ||
|
|
1329
|
+
(url && at);
|
|
1330
|
+
if ((keyTrigger || sensitiveKeyNeedles().has(text)) && scrubKeyPasses(text) !== text) {
|
|
1331
|
+
return true;
|
|
1332
|
+
}
|
|
1333
|
+
|
|
1334
|
+
// Pass 5: a gitleaks rule whose keyword occurs yields a span.
|
|
1335
|
+
const { global } = getGitleaks();
|
|
1336
|
+
const active = new Set<CompiledGitleaksRule>();
|
|
1337
|
+
for (let id = 0; id < ruleBase; id++) {
|
|
1338
|
+
if (found[id]) for (const rule of keywordRules[id] ?? []) active.add(rule);
|
|
1339
|
+
}
|
|
1340
|
+
for (const rule of active) if (!gitleaksSecretSpans(text, rule, global).next().done) return true;
|
|
1341
|
+
return false;
|
|
1342
|
+
}
|
|
1343
|
+
|
|
1344
|
+
/**
|
|
1345
|
+
* `scrubSecrets` for a sweep: one call per time slice, then call the result per
|
|
1346
|
+
* text. It resolves the known-value matcher once, where `scrubSecrets` re-reads
|
|
1347
|
+
* the environment on every call, and returns a text `mayRedact` clears as is.
|
|
1348
|
+
* Valid until the event loop next turns: a secret registered in between needs a
|
|
1349
|
+
* fresh one.
|
|
1350
|
+
*/
|
|
1351
|
+
export function createSweepScrubber(): (text: string) => string {
|
|
1352
|
+
const matcher = getMatcher();
|
|
1353
|
+
return (text) => (mayRedactWith(text, matcher) ? scrubWithMatcher(text, matcher) : text);
|
|
1354
|
+
}
|
|
1355
|
+
|
|
1356
|
+
let rulesFingerprint: string | null = null;
|
|
1357
|
+
|
|
1358
|
+
/**
|
|
1359
|
+
* A short hash of the rule tables (structural and gitleaks rules, key names and
|
|
1360
|
+
* the key-context regexes). The boot sweep records it with a skipped rules
|
|
1361
|
+
* version, so an operator can tell which rule set a forward-only install never
|
|
1362
|
+
* backfilled. Coverage itself is keyed by `SCRUBBER_RULES_VERSION`.
|
|
1363
|
+
*/
|
|
1364
|
+
export function scrubberRulesFingerprint(): string {
|
|
1365
|
+
if (rulesFingerprint) return rulesFingerprint;
|
|
1366
|
+
const hasher = new Bun.CryptoHasher("sha256");
|
|
1367
|
+
hasher.update(
|
|
1368
|
+
JSON.stringify([
|
|
1369
|
+
TOKEN_REGEXES.map((rule) => [rule.name, rule.re.source, rule.re.flags]),
|
|
1370
|
+
GITLEAKS_RULES,
|
|
1371
|
+
SENSITIVE_KEY_SUFFIXES,
|
|
1372
|
+
[...SENSITIVE_KEY_EXACT],
|
|
1373
|
+
[
|
|
1374
|
+
ASSIGNMENT_RE,
|
|
1375
|
+
INI_ASSIGNMENT_RE,
|
|
1376
|
+
YAML_KEY_RE,
|
|
1377
|
+
JSON_KEY_RE,
|
|
1378
|
+
ESCAPED_JSON_KEY_RE,
|
|
1379
|
+
AUTH_HEADER_RE,
|
|
1380
|
+
API_KEY_HEADER_RE,
|
|
1381
|
+
CURL_PASSWORD_RE,
|
|
1382
|
+
CURL_USER_RE,
|
|
1383
|
+
URL_USERINFO_RE,
|
|
1384
|
+
PEM_RE,
|
|
1385
|
+
].map((re) => re.source),
|
|
1386
|
+
]),
|
|
1387
|
+
);
|
|
1388
|
+
rulesFingerprint = hasher.digest("hex").slice(0, 16);
|
|
1389
|
+
return rulesFingerprint;
|
|
1390
|
+
}
|
|
1391
|
+
|
|
1392
|
+
/** Test-only: the structural rules, to check each rule's `lits` against its own matches. */
|
|
1393
|
+
export const tokenRulesForTesting = TOKEN_REGEXES;
|
|
1394
|
+
|
|
1395
|
+
/** Test-only: the sweep gate on its own. */
|
|
1396
|
+
export function mayRedactForTesting(text: string): boolean {
|
|
1397
|
+
return mayRedactWith(text, getMatcher());
|
|
1398
|
+
}
|
|
1399
|
+
|
|
961
1400
|
/** What `findSecretsIn` found: names and rule ids only, never the values. */
|
|
962
1401
|
export interface SecretFindings {
|
|
963
1402
|
/** Names of known values (env + registered secrets, every encoded form). */
|
|
@@ -990,18 +1429,8 @@ export function findSecretsIn(text: string): SecretFindings {
|
|
|
990
1429
|
}
|
|
991
1430
|
}
|
|
992
1431
|
|
|
993
|
-
|
|
994
|
-
|
|
995
|
-
const present = new Set<string>();
|
|
996
|
-
keywordRe.lastIndex = 0;
|
|
997
|
-
for (let m = keywordRe.exec(text); m !== null; m = keywordRe.exec(text)) {
|
|
998
|
-
for (const keyword of implied.get(m[0].toLowerCase()) ?? []) present.add(keyword);
|
|
999
|
-
keywordRe.lastIndex = m.index + 1;
|
|
1000
|
-
}
|
|
1001
|
-
for (const rule of rules) {
|
|
1002
|
-
if (!rule.keywords.some((keyword) => present.has(keyword))) continue;
|
|
1003
|
-
if (applyGitleaksRule(text, rule, global) !== text) gitleaksRules.add(rule.id);
|
|
1004
|
-
}
|
|
1432
|
+
for (const rule of activeGitleaksRules(text)) {
|
|
1433
|
+
if (applyGitleaksRule(text, rule, getGitleaks().global) !== text) gitleaksRules.add(rule.id);
|
|
1005
1434
|
}
|
|
1006
1435
|
|
|
1007
1436
|
return { knownValues: [...knownValues].sort(), gitleaksRules: [...gitleaksRules].sort() };
|
|
@@ -1133,6 +1562,7 @@ export function registerSensitiveKeyName(key: string): void {
|
|
|
1133
1562
|
if (registeredSensitiveKeys.has(key)) return;
|
|
1134
1563
|
registeredSensitiveKeys.add(key);
|
|
1135
1564
|
sensitiveKeyVerdicts.clear();
|
|
1565
|
+
keyNeedles = null;
|
|
1136
1566
|
cache = null;
|
|
1137
1567
|
}
|
|
1138
1568
|
|
|
@@ -1143,5 +1573,6 @@ export function clearVolatileSecretsForTesting(): void {
|
|
|
1143
1573
|
matcher = null;
|
|
1144
1574
|
registeredSensitiveKeys.clear();
|
|
1145
1575
|
sensitiveKeyVerdicts.clear();
|
|
1576
|
+
keyNeedles = null;
|
|
1146
1577
|
cache = null;
|
|
1147
1578
|
}
|