@desplega.ai/agent-swarm 2.8.3 → 2.9.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/acp-adapter-g909b5hw.js +16 -0
- package/dist/acp-targets-ny75x1qy.js +23 -0
- package/dist/{actions-ewz7bp4g.js → actions-b9qgrmeq.js} +82 -21
- package/dist/agent-fs-provision-b5dhdsbd.js +27 -0
- package/dist/{amp-adapter-f25tqhnf.js → amp-adapter-vtax2c9s.js} +3 -3
- package/dist/{anthropic-messages-jkva0zps.js → anthropic-messages-r5xf5hqw.js} +37 -37
- package/dist/{app-mkptw0k7.js → app-g2z15hax.js} +9 -4
- package/dist/approval-notifications-yt13wp8r.js +23 -0
- package/dist/{assistant-c47rfe77.js → assistant-2cgfxsgk.js} +56 -33
- package/dist/{azure-openai-responses-wgtqkbr3.js → azure-openai-responses-590s1eea.js} +10 -10
- package/dist/{boot-args-schema-4vb0xsat.js → boot-args-schema-3gwy0f60.js} +1 -1
- package/dist/{boot-reembed-htr73hbs.js → boot-reembed-92g7s5zp.js} +1 -1
- package/dist/{boot-reembed-1ghy2sab.js → boot-reembed-mywmyp4s.js} +1 -1
- package/dist/{boot-scrub-sweep-yrytg42z.js → boot-scrub-sweep-7dkdzqxx.js} +84 -13
- package/dist/{boot-seeds-n2b3dx4e.js → boot-seeds-ce7rvgq1.js} +4 -4
- package/dist/{boxd-jmfqgkqa.js → boxd-wn235q80.js} +7 -7
- package/dist/claude-adapter-3m4q7735.js +28 -0
- package/dist/{claude-managed-adapter-hddmxjyj.js → claude-managed-adapter-t8nfgcgz.js} +4 -4
- package/dist/{claude-managed-setup-hfvry1bd.js → claude-managed-setup-c217draw.js} +10 -10
- package/dist/{claude-sdk-session-0hamqzc7.js → claude-sdk-session-7fbqm51z.js} +9386 -9196
- package/dist/{cli-yjdgea32.js → cli-1jx0srjt.js} +17 -17
- package/dist/{cli-sdvcrq5x.js → cli-1jykg0py.js} +18 -14
- package/dist/{cli-k96cecs7.js → cli-2czxfnvj.js} +1221 -357
- package/dist/{cli-qmqt520k.js → cli-2dq9yv8p.js} +2 -2
- package/dist/{cli-e2w34h6z.js → cli-2xs8tsf7.js} +132 -85
- package/dist/{cli-z8cvws4c.js → cli-2yjj3e31.js} +907 -56
- package/dist/{cli-mdpbjnzq.js → cli-32djehja.js} +42 -42
- package/dist/{cli-gpz1d0t2.js → cli-3j873zxq.js} +4 -4
- 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-f1kwb5fc.js → cli-5a6pqy45.js} +333 -21
- package/dist/{cli-93t5s4zq.js → cli-5gpqgs8b.js} +2 -2
- package/dist/{cli-15204js0.js → cli-6237rnyr.js} +1 -1
- package/dist/{cli-4ax9mvvg.js → cli-67mwzr35.js} +9 -9
- package/dist/{cli-t5ys4ebm.js → cli-6945ywhr.js} +3 -3
- package/dist/{cli-0bcgyj5b.js → cli-6ehs4mta.js} +87 -8
- package/dist/{cli-6yygkr0w.js → cli-6ym4jhzp.js} +15 -7
- package/dist/{cli-8bpgbr8k.js → cli-7evph51z.js} +5 -5
- package/dist/{cli-dtdht77h.js → cli-7mv4h3sn.js} +2 -2
- package/dist/{cli-nx2n3z6p.js → cli-7sf9sb0w.js} +3 -2
- package/dist/{cli-pe4d96rb.js → cli-7zm3b3f5.js} +1 -1
- package/dist/cli-8zh9nrew.js +78 -0
- package/dist/cli-9ttx00s3.js +137 -0
- package/dist/{cli-x6t50dmw.js → cli-9w8712tq.js} +620 -281
- package/dist/{cli-8476gtwf.js → cli-b6px1k1q.js} +1 -1
- package/dist/{cli-k2rw11py.js → cli-b91nz213.js} +5 -5
- package/dist/{cli-7c5tgqhf.js → cli-bg63qmsx.js} +10 -10
- package/dist/{cli-qps8je6j.js → cli-bkjdknnp.js} +54 -10
- package/dist/{cli-gn9y6fn7.js → cli-bnqncekd.js} +2 -2
- package/dist/{cli-s7zz734a.js → cli-br0924pw.js} +1 -1
- package/dist/{cli-h9yy18gy.js → cli-ctx0b85j.js} +5484 -5078
- package/dist/{cli-0vksaxvr.js → cli-dgs10ttj.js} +2 -2
- package/dist/cli-dqgnbnxs.js +132 -0
- package/dist/{cli-q6mfk1ej.js → cli-dzzh58sy.js} +2 -2
- package/dist/{cli-2znm3dzj.js → cli-eds5xnsz.js} +2 -2
- package/dist/{cli-c0xjnr8z.js → cli-f3jyzq4g.js} +2 -2
- package/dist/cli-f8x9drqr.js +84 -0
- package/dist/{cli-ztq5z4e1.js → cli-f9gz2vyj.js} +6 -6
- package/dist/{cli-bhsfbmk8.js → cli-fh97xn30.js} +93 -44
- package/dist/cli-fkef327x.js +103 -0
- package/dist/{cli-fsgttth8.js → cli-g0vv9dg4.js} +13 -13
- package/dist/{cli-kd56bmk4.js → cli-gabsjg8x.js} +3 -1
- package/dist/{cli-1m96dc36.js → cli-gfy38pvt.js} +3 -3
- package/dist/{cli-922z7gwm.js → cli-h9yqfzx9.js} +15 -11
- package/dist/{cli-5a7szzfh.js → cli-hnamkvnc.js} +2 -2
- package/dist/{cli-c3ng0mb4.js → cli-j7svy295.js} +71 -818
- package/dist/{cli-yss07azk.js → cli-jaw5v1sy.js} +3 -3
- package/dist/cli-jkw6ptfw.js +921 -0
- package/dist/{cli-s8p8hhty.js → cli-jm0hvmz2.js} +2 -2
- package/dist/{cli-knva3nmx.js → cli-jwampxxq.js} +8 -6
- package/dist/cli-kj0hyr43.js +51 -0
- package/dist/{cli-tnzebztn.js → cli-kpgcm7xy.js} +13 -1
- package/dist/{cli-9zmb7ptc.js → cli-kxx4k2jw.js} +8 -753
- package/dist/{cli-am1ptset.js → cli-m7c2380k.js} +208 -194
- package/dist/{cli-kw44j53p.js → cli-m7zvgt57.js} +45 -38
- package/dist/{cli-504akrp9.js → cli-meydjstb.js} +3 -3
- package/dist/{cli-54qr8mcd.js → cli-mhapr559.js} +4 -4
- package/dist/{cli-tf79ryyy.js → cli-mjw0yf82.js} +3 -3
- package/dist/{cli-rjvsf9qa.js → cli-mkwkwq81.js} +14 -11
- package/dist/{cli-n30e0hcp.js → cli-mna6pmfx.js} +2 -2
- package/dist/{cli-awwptga4.js → cli-mw620q3n.js} +1 -1
- package/dist/{cli-6wj7p986.js → cli-n3qe7tyr.js} +172 -168
- package/dist/{cli-4dpkjc2e.js → cli-nafvvsp8.js} +9 -9
- package/dist/{cli-sg27rk2t.js → cli-nbt14he0.js} +25 -19
- package/dist/{cli-7akn6ze9.js → cli-nh7x3133.js} +7 -28
- package/dist/{cli-zdaypkq9.js → cli-p4kckx1z.js} +285 -97
- package/dist/{cli-n5t077me.js → cli-pb2ay3sh.js} +10 -3
- package/dist/{cli-t4dv07kr.js → cli-psffsanb.js} +4 -3
- package/dist/{cli-mwwmka77.js → cli-pyjn0qhk.js} +2712 -268
- package/dist/{cli-emekyyhr.js → cli-q2d3e1k1.js} +1 -1
- package/dist/{cli-vqva1teb.js → cli-qe909n63.js} +2 -2
- package/dist/{cli-2d0cghfn.js → cli-qj39vrc6.js} +1 -1
- package/dist/{cli-tas6ckky.js → cli-rq5rpv6k.js} +2 -2
- package/dist/{cli-0agcv1v5.js → cli-rqx70rcz.js} +2 -2
- package/dist/{cli-kmemts3w.js → cli-sn650d7x.js} +39 -69
- package/dist/{cli-98rwmcyc.js → cli-snxhtehz.js} +3 -3
- package/dist/{cli-d829z3xc.js → cli-spfz393q.js} +6 -6
- package/dist/{cli-500c09j9.js → cli-t9ga4qmb.js} +14 -14
- package/dist/{cli-me0r8gzr.js → cli-td9tb872.js} +27 -25
- package/dist/cli-tvc4jag9.js +754 -0
- package/dist/{cli-6ek0hff4.js → cli-ty3gha1p.js} +4 -4
- package/dist/{cli-c71n3bxq.js → cli-v57d7fmm.js} +2 -2
- package/dist/{cli-j8cjdzan.js → cli-vs9vdpy0.js} +1 -1
- package/dist/cli-vt89089n.js +296 -0
- package/dist/{cli-pxwtcgcp.js → cli-vyff45ve.js} +2 -2
- package/dist/{cli-x3ex5bqf.js → cli-w16kwbzw.js} +1 -1
- package/dist/{cli-bj6qhgte.js → cli-w4n323t3.js} +197 -45
- package/dist/{cli-rqfvkx5t.js → cli-wn13hhdt.js} +13 -13
- package/dist/{cli-skmhsnqh.js → cli-x40a0w9j.js} +1 -1
- package/dist/{cli-zeaehgyd.js → cli-xag7btpe.js} +2 -2
- package/dist/{cli-k28wkapa.js → cli-xf1wn5ns.js} +2 -2
- package/dist/{cli-rh15cakt.js → cli-xwsm6xkr.js} +1 -1
- package/dist/{cli-dpsfwh7n.js → cli-y2ewxhth.js} +56 -31
- package/dist/{cli-vx421edw.js → cli-ysvspf5e.js} +9 -7
- package/dist/{cli-crpf163n.js → cli-zh0e5x7p.js} +16 -26
- package/dist/{cli-4e1hfbpq.js → cli-zr6qy15y.js} +24 -24
- package/dist/cli.js +33 -29
- package/dist/{codex-adapter-2brxx5ta.js → codex-adapter-n656pvb8.js} +9 -8
- package/dist/{codex-hook-c930c3ea.js → codex-hook-59atdwd8.js} +6 -6
- package/dist/{codex-login-cbrs1h5w.js → codex-login-a239g1ah.js} +1 -1
- package/dist/{codex-session-runner-y9anfj0r.js → codex-session-runner-p0fbv5y9.js} +10 -9
- package/dist/{commands-wn9q06qr.js → commands-gwea8z5p.js} +3 -3
- package/dist/{controller-fw608czd.js → controller-t67c3grh.js} +9 -6
- package/dist/{controllers-connect-63j5rdcm.js → controllers-connect-ks155r0h.js} +28 -25
- package/dist/{cursor-adapter-6mb9jme8.js → cursor-adapter-ygwrtmkv.js} +2 -2
- package/dist/{db-y4wfrzbm.js → db-kpmx06s9.js} +21 -13
- package/dist/{db-0m6v5tq4.js → db-rb2xqdb1.js} +3 -3
- package/dist/{devin-adapter-r0yx3gv8.js → devin-adapter-zp4tqq53.js} +1 -1
- package/dist/{dispatcher-9tq2zzdj.js → dispatcher-31sm0ej2.js} +21 -18
- package/dist/{docker-j75atvpt.js → docker-09tkkg0n.js} +47 -8
- package/dist/{dsh-adapter-t09sv4tq.js → dsh-adapter-qyxh0w31.js} +2 -2
- package/dist/{e2b-a7vzs2vj.js → e2b-3v1e745x.js} +6 -6
- package/dist/{e2b-7s9dscap.js → e2b-sm28k0k3.js} +6 -6
- package/dist/{easter-egg-3d-fbwvmwhe.js → easter-egg-3d-00wjscn6.js} +1 -1
- package/dist/{embedding-space-wh8de1t9.js → embedding-space-qhw4g68n.js} +6 -6
- package/dist/{embeddings-3hpbdtjr.js → embeddings-zdv9ke6x.js} +1 -1
- package/dist/{event-bus-tr6h3gv8.js → event-bus-xr83x566.js} +1 -1
- package/dist/{execute-4bdf8sdy.js → execute-zna8wwr7.js} +1 -1
- package/dist/{external-channel-ts2fwqh0.js → external-channel-1ac6t56s.js} +2 -2
- package/dist/fx-adapter-sk7n0fzc.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-maq6c9bf.js} +1 -1
- package/dist/{google-vertex-fhxaafzw.js → google-vertex-2jgsw2nb.js} +5 -5
- package/dist/grok-adapter-sjbcm5ew.js +19 -0
- package/dist/handlers-yzy0c87x.js +35 -0
- package/dist/{heartbeat-2ze5fzpc.js → heartbeat-2f6z4kdx.js} +24 -21
- package/dist/{hook-gaehe2w5.js → hook-8y0gvtp1.js} +14 -14
- package/dist/{hook-ca54yd4s.js → hook-w1skzaqc.js} +5 -5
- package/dist/{http-jfg8t2yk.js → http-wghxvpef.js} +2333 -589
- package/dist/{index-d6wkh8ar.js → index-0h6qd4p1.js} +34 -24
- package/dist/index-25pvya7q.js +40 -0
- package/dist/index-2t4859r5.js +35 -0
- package/dist/{index-enn321kd.js → index-42jq9yy3.js} +3 -3
- package/dist/{index-khe3gp0k.js → index-4k7m5dgj.js} +645 -370
- package/dist/index-620y7jzq.js +15 -0
- package/dist/{index-gjwaqaq8.js → index-8p0j4h4j.js} +506 -43
- package/dist/{index-3gv6sc4z.js → index-8zn8nxn5.js} +1 -1
- package/dist/{index-m5gx1xd6.js → index-9myfj74s.js} +40 -40
- package/dist/{index-3yvzbhxd.js → index-9zkchs9t.js} +336 -193
- package/dist/{index-0rvk3vd4.js → index-b5wgnm78.js} +47 -47
- package/dist/index-cxca2t8y.js +36 -0
- package/dist/{index-qwj6ntem.js → index-e3krvkh2.js} +4 -4
- package/dist/{index-hjhfk3ra.js → index-pe3d8jfy.js} +3 -3
- package/dist/index-rv89fvzf.js +572 -0
- package/dist/{index-csgrxedz.js → index-s71ez27v.js} +1 -1
- package/dist/{keepalive-k2a3qe73.js → keepalive-sh02349h.js} +4 -4
- package/dist/lead-gk4h5eg7.js +74 -0
- package/dist/{maintenance-gb5sd5nc.js → maintenance-yj0dcjja.js} +1 -1
- package/dist/{node-252anz2h.js → node-dqm4xgxw.js} +4 -4
- package/dist/{node-ray25snp.js → node-zd6shky9.js} +3 -3
- package/dist/{oauth-refresh-sweep-y7rm6bkb.js → oauth-refresh-sweep-d9xedk66.js} +3 -3
- package/dist/{onboard-jmc5qerv.js → onboard-dpgjn03r.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-7eade9ev.js → opencode-adapter-2d31cpjc.js} +7 -6
- package/dist/{otel-impl-8j1xhxqd.js → otel-impl-1skarpfq.js} +110 -110
- package/dist/pending-bfmxtx0g.js +82 -0
- package/dist/{pi-mono-adapter-yqmaf32x.js → pi-mono-adapter-gvppnasy.js} +43 -16
- package/dist/{pricing-refresh-1nj722h6.js → pricing-refresh-c6b325mk.js} +2 -2
- package/dist/{rbac-roles-b1mtr6dr.js → rbac-roles-h80qbdbs.js} +3 -3
- package/dist/{rbac-roles-n1f3frk1.js → rbac-roles-zfcx68tx.js} +10 -3
- package/dist/{render-v2-1gfpd8rj.js → render-v2-nx20t3rb.js} +7 -4
- package/dist/{resume-w1s1eh5v.js → resume-5ep8agan.js} +11 -7
- package/dist/{runtime-84g5egsc.js → runtime-r3pj4mce.js} +1 -1
- package/dist/{session-access-y6z1txk4.js → session-access-n7p3m15b.js} +4 -4
- package/dist/{session-source-backfill-gxxwfh12.js → session-source-backfill-v8mt0zwn.js} +4 -4
- package/dist/{setup-r91gstyk.js → setup-z1psaqhe.js} +1 -1
- package/dist/thread-buffer-a1re2r9r.js +38 -0
- package/dist/{virtual-modules-cgnj6kme.js → virtual-modules-rrbjdpxn.js} +5 -5
- package/dist/{work-objects-qcxzg61c.js → work-objects-4aghh73z.js} +31 -23
- package/dist/worker-3dyyb8ev.js +74 -0
- package/dist/{worker-follow-up-y2d2h7km.js → worker-follow-up-166zmex1.js} +21 -18
- package/dist/{x-qhxq2ama.js → x-wg164ss9.js} +2 -2
- package/openapi.json +2561 -131
- package/package.json +15 -11
- 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 +667 -18
- package/src/apps/page-validator.ts +341 -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/model-profiles.ts +4 -1
- package/src/be/db/session-costs.ts +219 -0
- package/src/be/db/session-log-reasoning.ts +36 -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 +7 -3
- package/src/be/db/tasks/slack-fold.ts +116 -0
- package/src/be/db/tasks/write.ts +67 -1
- 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 +242 -319
- 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/key-window-usage.ts +385 -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/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/multi-runtime.ts +8 -1
- package/src/be/rbac-roles.ts +8 -1
- package/src/be/runtime-pools/db.ts +3 -0
- 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/read.ts +8 -6
- package/src/be/script-credential-broker.ts +2 -2
- package/src/be/scripts/typecheck.ts +4 -4
- 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/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 +2 -2
- package/src/be/seed-scripts/catalog/wait-for-task.ts +5 -1
- package/src/be/seed-skills/index.ts +3 -0
- package/src/be/steering.ts +27 -4
- package/src/be/swarm-config-guard.ts +54 -1
- package/src/be/task-citations.ts +8 -5
- package/src/be/task-ui-spec.ts +158 -0
- 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/rate-limit-outcome.ts +6 -0
- package/src/commands/runner.ts +95 -55
- 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/api-keys.ts +258 -30
- 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 +29 -1
- 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 +45 -0
- package/src/http/script-connections.ts +1 -0
- package/src/http/session-data.ts +74 -23
- package/src/http/sessions.ts +23 -2
- 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 +169 -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/relay.ts +87 -0
- 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/jira/outbound.ts +5 -3
- package/src/kv-reserved-namespaces.ts +17 -2
- package/src/linear/outbound.ts +5 -1
- package/src/oauth/presets.ts +29 -2
- package/src/prompts/base-prompt.ts +25 -4
- package/src/prompts/session-templates.ts +102 -8
- package/src/providers/acp-targets.ts +1 -1
- 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/claude-managed-adapter.ts +5 -1
- package/src/providers/codex-adapter.ts +86 -4
- package/src/providers/codex-app-server.ts +11 -16
- package/src/providers/codex-oauth/auth-json.ts +1 -0
- package/src/providers/opencode-adapter.ts +7 -19
- package/src/providers/pi-mono-adapter.ts +35 -2
- package/src/providers/pricing-sources.md +32 -0
- package/src/providers/runtime-dependencies.ts +158 -0
- package/src/providers/types.ts +11 -0
- package/src/rbac/legacy-policy.ts +2 -0
- package/src/rbac/permissions.ts +10 -1
- package/src/runtime-providers/docker.ts +65 -1
- package/src/scheduler/deferred-task-waits.ts +18 -5
- 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/egress-secrets.ts +2 -2
- package/src/scripts-runtime/swarm-sdk.ts +3 -2
- package/src/scripts-runtime/types/stdlib.d.ts +11 -4
- package/src/scripts-runtime/types/swarm-extension.d.ts +9 -9
- package/src/scripts-runtime/types/swarm-sdk.d.ts +11 -4
- package/src/server.ts +4 -4
- package/src/slack/actions.ts +56 -0
- package/src/slack/app.ts +107 -59
- package/src/slack/assistant.ts +33 -7
- package/src/slack/handlers.ts +6 -4
- package/src/slack/http-receiver.ts +284 -0
- package/src/slack/inbound-dispatch.ts +43 -7
- package/src/slack/inbound-files.ts +35 -14
- package/src/slack/message-text.ts +47 -4
- package/src/slack/render-v2.ts +109 -24
- package/src/slack/responses.ts +3 -2
- package/src/slack/socket-ack.ts +17 -10
- package/src/slack/steering.ts +5 -0
- package/src/slack/thread-buffer-store.ts +58 -0
- package/src/slack/thread-buffer.ts +341 -57
- package/src/slack/work-objects.ts +4 -1
- package/src/tasks/context-key.ts +24 -0
- package/src/tasks/errors.ts +5 -0
- package/src/tasks/sibling-awareness.ts +13 -1
- package/src/tests/acp-adapter.test.ts +4 -6
- 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/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 +402 -0
- package/src/tests/approval-requests-notifications.test.ts +12 -2
- 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-page-frame.test.ts +49 -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 +261 -0
- package/src/tests/asset-key-invariants.test.ts +14 -0
- package/src/tests/base-prompt.test.ts +213 -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-relay.test.ts +149 -1
- 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 +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 +32 -0
- package/src/tests/codex-oauth.test.ts +3 -1
- package/src/tests/codex-rate-limits.test.ts +384 -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/credential-broker.test.ts +2 -2
- package/src/tests/credential-outcome-report.test.ts +20 -0
- package/src/tests/db-query.test.ts +87 -1
- package/src/tests/db-task-read-contract.test.ts +4 -0
- package/src/tests/db-task-write-contract.test.ts +6 -1
- package/src/tests/deferred-task-wake.test.ts +63 -1
- package/src/tests/docker-isolation-config-guard.test.ts +29 -0
- package/src/tests/docs-index-footprint.test.js +11 -3
- package/src/tests/e2e-visuals-comment.test.ts +82 -0
- package/src/tests/e2e-visuals-verify-pr.test.ts +138 -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 +201 -0
- package/src/tests/extensions-pre-task.test.ts +3 -3
- 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 +68 -0
- package/src/tests/fixtures/import-package.ts +32 -0
- package/src/tests/fixtures/runner-missing-dependency.ts +129 -0
- 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/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/gitleaks-download-retry.test.ts +85 -0
- package/src/tests/heartbeat-supersede-resume.test.ts +73 -0
- package/src/tests/heartbeat.test.ts +56 -0
- package/src/tests/human-thread-routing.test.ts +187 -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/jira-outbound-sync.test.ts +33 -1
- package/src/tests/key-window-usage.test.ts +831 -0
- package/src/tests/kv-http.test.ts +11 -0
- package/src/tests/linear-outbound-sync.test.ts +30 -1
- 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/pi-mono-adapter.test.ts +79 -0
- package/src/tests/pool-affinity.test.ts +50 -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 +53 -5
- package/src/tests/provider-quota-persistence.test.ts +362 -0
- package/src/tests/provider-registration.test.ts +2 -55
- package/src/tests/provider-runtime-dependencies.test.ts +212 -0
- package/src/tests/rate-limit-event.test.ts +22 -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/reasoning-events.test.ts +164 -0
- package/src/tests/routing-affinity-inventory.test.ts +22 -0
- package/src/tests/runner-missing-dependency.test.ts +61 -0
- package/src/tests/runtime-pool-reachability.test.ts +135 -1
- package/src/tests/runtime-pool-routing.test.ts +52 -0
- package/src/tests/runtime-providers-docker.test.ts +91 -0
- package/src/tests/runtime-stale-threshold.test.ts +40 -0
- package/src/tests/savings-fleet-slices.test.ts +122 -0
- package/src/tests/savings-read.test.ts +41 -0
- package/src/tests/savings-scripts.test.ts +9 -3
- package/src/tests/script-connections.test.ts +7 -0
- package/src/tests/script-executor-conformance.test.ts +41 -4
- package/src/tests/secret-canary-sweep.test.ts +41 -5
- package/src/tests/secret-scrub-gate.test.ts +257 -0
- package/src/tests/seed-registry.test.ts +142 -9
- 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/session-source-keys.test.ts +42 -1
- package/src/tests/sessions-detail-batch.test.ts +7 -0
- 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-http-receiver.test.ts +472 -0
- 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 +405 -0
- package/src/tests/slack-skip-reaction.test.ts +2 -2
- package/src/tests/slack-start-reload-race.test.ts +67 -0
- 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 +23 -5
- 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/subscription-plans.test.ts +20 -1
- 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/task-ui-action-route.test.ts +191 -0
- package/src/tests/task-ui-actions.test.ts +195 -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/workflow-agent-task-retry.test.ts +34 -1
- 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/defer-task.ts +1 -1
- 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/tools/store-progress.ts +69 -3
- package/src/types.ts +50 -4
- package/src/ui-spec/actions.ts +86 -0
- package/src/ui-spec/fallback.ts +19 -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/constants.ts +60 -138
- package/src/utils/credentials.ts +2 -0
- package/src/utils/error-tracker.ts +19 -0
- 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/provider-account-telemetry.ts +331 -0
- package/src/utils/reasoning-events.ts +107 -0
- package/src/utils/secret-scrubber.ts +331 -25
- package/src/utils/subscription-plans.ts +11 -59
- package/src/utils/task-attachment-links.ts +9 -12
- package/src/utils/task-ui-spec.ts +67 -0
- package/src/vcs/index.ts +3 -0
- package/src/workflows/approval-notifications.ts +188 -12
- package/src/workflows/executors/system-one-extraction.ts +14 -7
- package/src/workflows/executors/system-one-providers.ts +22 -1
- package/src/workflows/task-step-routing.ts +8 -3
- 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 +20 -0
- package/templates/extensions/sql-admin-only/hooks.ts +100 -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 +151 -14
- package/templates/skills/apps/content.md +151 -14
- 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 +13 -0
- package/templates/skills/swarm-scripts/content.md +13 -0
- package/templates/skills/ui-spec/config.json +14 -0
- package/templates/skills/ui-spec/content.md +127 -0
- 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 +2 -2
- package/dist/acp-adapter-xq6s2z6t.js +0 -14
- package/dist/claude-adapter-r33pqnzx.js +0 -24
- package/dist/cli-dns0y538.js +0 -194
- package/dist/cli-m2z8jagn.js +0 -12078
- package/dist/fx-adapter-1rnxnf56.js +0 -17
- package/dist/grok-adapter-efhmf1r8.js +0 -17
- package/dist/handlers-anrr3py9.js +0 -32
- package/dist/index-2skqtd76.js +0 -12795
- package/dist/index-8w2aznds.js +0 -33
- package/dist/index-qnjvr362.js +0 -37
- package/dist/index-yzxd3sn9.js +0 -32
- package/dist/lead-zhxqbfdv.js +0 -69
- package/dist/worker-7j2907g6.js +0 -69
- package/src/tests/entrypoint-acp-target-binary.test.ts +0 -439
- package/dist/{cli-4caa1x7d.js → cli-tsa40663.js} +4 -4
- 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
|
/**
|
|
@@ -425,6 +426,9 @@ const CURL_PASSWORD_RE = /(?<=^|[\s'"])(--password(?:[ \t]+|=)\\?["']?)([^\s"'\\
|
|
|
425
426
|
const CURL_USER_RE =
|
|
426
427
|
/(?<=^|[\s'"])((?:-u|-U|--user|--proxy-user)(?:[ \t]+|=)\\?["']?([^\s"'\\:@]+):)([^\s"'\\@]+)/g;
|
|
427
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
|
+
|
|
428
432
|
/** `scheme://user:<pw>@host`: only the password goes, the host survives. */
|
|
429
433
|
const URL_USERINFO_RE =
|
|
430
434
|
/(?<![a-z0-9+.-])([a-z][a-z0-9+.-]{0,31}:\/\/[^\s/:@?#"'\\]+:)([^\s/@?#"'\\]+)(?=@)/gi;
|
|
@@ -459,7 +463,7 @@ function scrubKeyContext(text: string): string {
|
|
|
459
463
|
isPlaceholderValue(pw) ? match : `${flag}[REDACTED:curl_password]`,
|
|
460
464
|
);
|
|
461
465
|
}
|
|
462
|
-
if (
|
|
466
|
+
if (CURL_USER_FLAG_RE.test(out)) {
|
|
463
467
|
out = out.replace(CURL_USER_RE, (match, prefix: string, user: string, pw: string) =>
|
|
464
468
|
// `-u 1000:1000` / `-u node:node` is a docker uid:gid, not a credential.
|
|
465
469
|
isPlaceholderValue(pw) || pw === user ? match : `${prefix}[REDACTED:curl_password]`,
|
|
@@ -486,6 +490,11 @@ function scrubKeyContext(text: string): string {
|
|
|
486
490
|
*
|
|
487
491
|
* Order matters when one pattern is a prefix of another (e.g. `sk-ant-` must
|
|
488
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).
|
|
489
498
|
*/
|
|
490
499
|
|
|
491
500
|
// Leading word boundary that also matches after JSON escape sequences (\n, \t,
|
|
@@ -495,46 +504,79 @@ const TB = String.raw`(?:(?<=\\[nrtbfu0])|(?<!\w))`;
|
|
|
495
504
|
// ending in `-` has no word boundary after it, so `\b` backtracks and leaves
|
|
496
505
|
// the last character behind.
|
|
497
506
|
|
|
498
|
-
const TOKEN_REGEXES: ReadonlyArray<{ name: string; re: RegExp }> = [
|
|
507
|
+
const TOKEN_REGEXES: ReadonlyArray<{ name: string; lits: string[]; re: RegExp }> = [
|
|
499
508
|
// GitHub fine-grained PATs
|
|
500
|
-
{ 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 },
|
|
501
510
|
// GitHub classic/OAuth tokens (ghp_, gho_, ghu_, ghs_, ghr_)
|
|
502
|
-
{
|
|
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
|
+
},
|
|
503
516
|
// ACP ephemeral session tokens (base62 payload)
|
|
504
|
-
{
|
|
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
|
+
},
|
|
505
522
|
// GitLab personal access tokens
|
|
506
|
-
{
|
|
523
|
+
{
|
|
524
|
+
name: "gitlab_pat",
|
|
525
|
+
lits: ["glpat-"],
|
|
526
|
+
re: new RegExp(String.raw`${TB}glpat-[A-Za-z0-9_-]{20,}(?!\w)`, "g"),
|
|
527
|
+
},
|
|
507
528
|
// Azure DevOps personal access tokens (84 chars, "AZDO" signature at offset 76)
|
|
508
529
|
{
|
|
509
530
|
name: "azure_devops_pat",
|
|
531
|
+
lits: ["AZDO"],
|
|
510
532
|
re: new RegExp(String.raw`${TB}[A-Za-z0-9]{76}AZDO[A-Za-z0-9]{4}\b`, "g"),
|
|
511
533
|
},
|
|
512
534
|
// Anthropic API keys (must match before the generic sk- rule below)
|
|
513
|
-
{
|
|
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
|
+
},
|
|
514
540
|
// OpenAI project keys
|
|
515
541
|
{
|
|
516
542
|
name: "openai_proj_key",
|
|
543
|
+
lits: ["sk-proj-"],
|
|
517
544
|
re: new RegExp(String.raw`${TB}sk-proj-[A-Za-z0-9_-]{20,}(?!\w)`, "g"),
|
|
518
545
|
},
|
|
519
546
|
// OpenRouter keys
|
|
520
547
|
{
|
|
521
548
|
name: "openrouter_key",
|
|
549
|
+
lits: ["sk-or-"],
|
|
522
550
|
re: new RegExp(String.raw`${TB}sk-or-(?:v1-)?[A-Za-z0-9_-]{20,}(?!\w)`, "g"),
|
|
523
551
|
},
|
|
524
552
|
// Generic sk- legacy OpenAI keys (must come AFTER the ant/proj/or variants)
|
|
525
|
-
{
|
|
553
|
+
{
|
|
554
|
+
name: "sk_key",
|
|
555
|
+
lits: ["sk-"],
|
|
556
|
+
re: new RegExp(String.raw`${TB}sk-[A-Za-z0-9]{20,}\b`, "g"),
|
|
557
|
+
},
|
|
526
558
|
// Slack tokens
|
|
527
559
|
{
|
|
528
560
|
name: "slack_token",
|
|
561
|
+
lits: ["xoxb-", "xoxa-", "xoxp-", "xoxr-", "xoxs-", "xoxe-", "xoxo-"],
|
|
529
562
|
re: new RegExp(String.raw`${TB}xox[baprseo]-[A-Za-z0-9-]{10,}(?!\w)`, "g"),
|
|
530
563
|
},
|
|
531
564
|
// AWS access key IDs
|
|
532
|
-
{
|
|
565
|
+
{
|
|
566
|
+
name: "aws_access_key",
|
|
567
|
+
lits: ["AKIA"],
|
|
568
|
+
re: new RegExp(String.raw`${TB}AKIA[0-9A-Z]{16}\b`, "g"),
|
|
569
|
+
},
|
|
533
570
|
// Google API keys
|
|
534
|
-
{
|
|
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
|
+
},
|
|
535
576
|
// JWTs (3 dot-separated base64url segments)
|
|
536
577
|
{
|
|
537
578
|
name: "jwt",
|
|
579
|
+
lits: ["eyJ"],
|
|
538
580
|
re: new RegExp(
|
|
539
581
|
String.raw`${TB}eyJ[A-Za-z0-9_-]{10,}\.eyJ[A-Za-z0-9_-]{10,}\.[A-Za-z0-9_-]{10,}(?!\w)`,
|
|
540
582
|
"g",
|
|
@@ -543,49 +585,79 @@ const TOKEN_REGEXES: ReadonlyArray<{ name: string; re: RegExp }> = [
|
|
|
543
585
|
// SigNoz Cloud OTLP auth header values.
|
|
544
586
|
{
|
|
545
587
|
name: "signoz_ingestion_key",
|
|
588
|
+
lits: ["signoz-ingestion-key="],
|
|
546
589
|
re: new RegExp(String.raw`${TB}signoz-ingestion-key=[A-Za-z0-9._~+/-]{20,}={0,2}\b`, "g"),
|
|
547
590
|
},
|
|
548
591
|
// Linear OAuth tokens and API keys
|
|
549
592
|
{
|
|
550
593
|
name: "linear_oauth",
|
|
594
|
+
lits: ["lin_oauth_"],
|
|
551
595
|
re: new RegExp(String.raw`${TB}lin_oauth_[A-Za-z0-9_-]{10,}(?!\w)`, "g"),
|
|
552
596
|
},
|
|
553
|
-
{
|
|
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
|
+
},
|
|
554
602
|
// npm tokens
|
|
555
|
-
{
|
|
603
|
+
{
|
|
604
|
+
name: "npm_token",
|
|
605
|
+
lits: ["npm_"],
|
|
606
|
+
re: new RegExp(String.raw`${TB}npm_[A-Za-z0-9_-]{20,}(?!\w)`, "g"),
|
|
607
|
+
},
|
|
556
608
|
// Jira API tokens (Atlassian cloud)
|
|
557
609
|
{
|
|
558
610
|
name: "atlassian_token",
|
|
611
|
+
lits: ["ATATT"],
|
|
559
612
|
re: new RegExp(String.raw`${TB}ATATT[A-Za-z0-9_=-]{20,}(?![\w=])`, "g"),
|
|
560
613
|
},
|
|
561
614
|
// Agent-swarm MCP user tokens (`aswt_<base62-20+>`). Schema lands in
|
|
562
615
|
// migration 064; mint/revoke endpoints ship with the MCP-token plan.
|
|
563
616
|
// Rule lives here now so plaintexts never leak into logs once endpoints
|
|
564
617
|
// come online.
|
|
565
|
-
{
|
|
618
|
+
{
|
|
619
|
+
name: "mcp_token",
|
|
620
|
+
lits: ["aswt_"],
|
|
621
|
+
re: new RegExp(String.raw`${TB}aswt_[A-Za-z0-9]{20,}\b`, "g"),
|
|
622
|
+
},
|
|
566
623
|
// Vendor shapes the gitleaks rule set (pass 5) has no rule for.
|
|
567
624
|
// Resend API keys: re_<8>_<24>, with a digit and an uppercase letter so
|
|
568
625
|
// snake_case identifiers never match.
|
|
569
626
|
{
|
|
570
627
|
name: "resend_key",
|
|
628
|
+
lits: ["re_"],
|
|
571
629
|
re: new RegExp(
|
|
572
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`,
|
|
573
631
|
"g",
|
|
574
632
|
),
|
|
575
633
|
},
|
|
576
634
|
// Google OAuth access tokens and refresh tokens
|
|
577
|
-
{
|
|
578
|
-
|
|
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
|
+
},
|
|
579
645
|
// Discord webhook URLs (the token is the last path segment)
|
|
580
646
|
{
|
|
581
647
|
name: "discord_webhook",
|
|
648
|
+
lits: ["/api/webhooks/"],
|
|
582
649
|
re: /https?:\/\/(?:ptb\.|canary\.)?discord(?:app)?\.com\/api\/webhooks\/\d+\/[A-Za-z0-9_-]{50,}/g,
|
|
583
650
|
},
|
|
584
651
|
// xAI API keys
|
|
585
|
-
{
|
|
652
|
+
{
|
|
653
|
+
name: "xai_key",
|
|
654
|
+
lits: ["xai-"],
|
|
655
|
+
re: new RegExp(String.raw`${TB}xai-[A-Za-z0-9]{40,}\b`, "g"),
|
|
656
|
+
},
|
|
586
657
|
// Telegram bot tokens without a "telegram" keyword nearby: <bot id>:AA<33>
|
|
587
658
|
{
|
|
588
659
|
name: "telegram_bot_token",
|
|
660
|
+
lits: [":AA"],
|
|
589
661
|
re: new RegExp(String.raw`${TB}\d{8,10}:AA[A-Za-z0-9_-]{33}(?![A-Za-z0-9_-])`, "g"),
|
|
590
662
|
},
|
|
591
663
|
];
|
|
@@ -1057,13 +1129,16 @@ export type ScrubbedText = string & { readonly __scrubbed: true };
|
|
|
1057
1129
|
export function scrubSecrets(text: string | null | undefined): ScrubbedText {
|
|
1058
1130
|
if (text == null) return "" as ScrubbedText;
|
|
1059
1131
|
if (text.length === 0) return text as ScrubbedText;
|
|
1132
|
+
return scrubWithMatcher(text, getMatcher());
|
|
1133
|
+
}
|
|
1060
1134
|
|
|
1135
|
+
function scrubWithMatcher(text: string, matcher: KnownValueMatcher): ScrubbedText {
|
|
1061
1136
|
let out = text;
|
|
1062
1137
|
|
|
1063
1138
|
// Pass 1: exact-match known values, env first then volatile (registered at
|
|
1064
1139
|
// runtime, incl. every stored secret the API's secret registry loads). The
|
|
1065
1140
|
// marker keeps the env-var / source name for debugging.
|
|
1066
|
-
const { re, names, fallback } =
|
|
1141
|
+
const { re, names, fallback } = matcher;
|
|
1067
1142
|
if (re) {
|
|
1068
1143
|
re.lastIndex = 0;
|
|
1069
1144
|
out = out.replace(re, (match) => `[REDACTED:${names.get(match) ?? "secret"}]`);
|
|
@@ -1079,20 +1154,249 @@ export function scrubSecrets(text: string | null | undefined): ScrubbedText {
|
|
|
1079
1154
|
const vendorSpans: VendorSpanCache = { spans: null };
|
|
1080
1155
|
for (const { name, re } of TOKEN_REGEXES) out = applyTokenRegex(out, name, re, vendorSpans);
|
|
1081
1156
|
|
|
1082
|
-
//
|
|
1083
|
-
// files, shell traces), including ones too short for pass 1
|
|
1084
|
-
|
|
1085
|
-
|
|
1086
|
-
|
|
1087
|
-
// Pass 4: credentials known by their context (JSON/YAML keys, auth headers,
|
|
1088
|
-
// curl flags, URL userinfo, PEM blocks).
|
|
1089
|
-
out = scrubKeyContext(out);
|
|
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);
|
|
1090
1162
|
|
|
1091
1163
|
// Pass 5: vendor token shapes from the gitleaks rule set, behind a keyword
|
|
1092
1164
|
// prefilter and each rule's entropy floor.
|
|
1093
1165
|
return scrubGitleaks(out) as ScrubbedText;
|
|
1094
1166
|
}
|
|
1095
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
|
+
|
|
1096
1400
|
/** What `findSecretsIn` found: names and rule ids only, never the values. */
|
|
1097
1401
|
export interface SecretFindings {
|
|
1098
1402
|
/** Names of known values (env + registered secrets, every encoded form). */
|
|
@@ -1258,6 +1562,7 @@ export function registerSensitiveKeyName(key: string): void {
|
|
|
1258
1562
|
if (registeredSensitiveKeys.has(key)) return;
|
|
1259
1563
|
registeredSensitiveKeys.add(key);
|
|
1260
1564
|
sensitiveKeyVerdicts.clear();
|
|
1565
|
+
keyNeedles = null;
|
|
1261
1566
|
cache = null;
|
|
1262
1567
|
}
|
|
1263
1568
|
|
|
@@ -1268,5 +1573,6 @@ export function clearVolatileSecretsForTesting(): void {
|
|
|
1268
1573
|
matcher = null;
|
|
1269
1574
|
registeredSensitiveKeys.clear();
|
|
1270
1575
|
sensitiveKeyVerdicts.clear();
|
|
1576
|
+
keyNeedles = null;
|
|
1271
1577
|
cache = null;
|
|
1272
1578
|
}
|
|
@@ -7,8 +7,7 @@
|
|
|
7
7
|
* (`chatgpt_plan_type`), see `codexPlanFromClaim`. A Claude token from
|
|
8
8
|
* `claude setup-token` has only the `user:inference` scope, so Anthropic's
|
|
9
9
|
* `/api/oauth/profile` answers 403 (checked 2026-09-25). The Claude plan is
|
|
10
|
-
*
|
|
11
|
-
* the operator can always pick it on the dashboard.
|
|
10
|
+
* unknown unless the operator selects it. Historical estimates remain uncertain.
|
|
12
11
|
*/
|
|
13
12
|
|
|
14
13
|
import type { ModelFamily } from "./model-rate-limit-windows";
|
|
@@ -24,20 +23,20 @@ export interface SubscriptionPlan {
|
|
|
24
23
|
excludedModelFamilies?: readonly ModelFamily[];
|
|
25
24
|
}
|
|
26
25
|
|
|
27
|
-
/** List prices from claude.com/pricing and chatgpt.com/pricing, checked 2026-
|
|
28
|
-
export const SUBSCRIPTION_PLANS_CHECKED_AT = "2026-
|
|
26
|
+
/** List prices from claude.com/pricing and chatgpt.com/pricing, checked 2026-11-08. */
|
|
27
|
+
export const SUBSCRIPTION_PLANS_CHECKED_AT = "2026-11-08";
|
|
29
28
|
|
|
30
29
|
export const SUBSCRIPTION_PLANS: readonly SubscriptionPlan[] = [
|
|
31
30
|
{ id: "claude_pro", label: "Claude Pro", keyType: "CLAUDE_CODE_OAUTH_TOKEN", monthlyUsd: 20 },
|
|
32
31
|
{
|
|
33
32
|
id: "claude_max_5x",
|
|
34
|
-
label: "Claude Max
|
|
33
|
+
label: "Claude Max",
|
|
35
34
|
keyType: "CLAUDE_CODE_OAUTH_TOKEN",
|
|
36
35
|
monthlyUsd: 100,
|
|
37
36
|
},
|
|
38
37
|
{
|
|
39
38
|
id: "claude_max_20x",
|
|
40
|
-
label: "Claude
|
|
39
|
+
label: "Claude Ultra",
|
|
41
40
|
keyType: "CLAUDE_CODE_OAUTH_TOKEN",
|
|
42
41
|
monthlyUsd: 200,
|
|
43
42
|
},
|
|
@@ -46,8 +45,8 @@ export const SUBSCRIPTION_PLANS: readonly SubscriptionPlan[] = [
|
|
|
46
45
|
label: "Claude Team, standard seat",
|
|
47
46
|
keyType: "CLAUDE_CODE_OAUTH_TOKEN",
|
|
48
47
|
monthlyUsd: 25,
|
|
49
|
-
//
|
|
50
|
-
//
|
|
48
|
+
// Preserve the existing routing policy. This label update does not
|
|
49
|
+
// establish whether paid usage credits permit a model.
|
|
51
50
|
excludedModelFamilies: ["fable"],
|
|
52
51
|
},
|
|
53
52
|
{
|
|
@@ -58,8 +57,9 @@ export const SUBSCRIPTION_PLANS: readonly SubscriptionPlan[] = [
|
|
|
58
57
|
},
|
|
59
58
|
{ id: "chatgpt_go", label: "ChatGPT Go", keyType: "CODEX_OAUTH", monthlyUsd: 8 },
|
|
60
59
|
{ id: "chatgpt_plus", label: "ChatGPT Plus", keyType: "CODEX_OAUTH", monthlyUsd: 20 },
|
|
61
|
-
{ id: "chatgpt_pro_5x", label: "ChatGPT Pro
|
|
62
|
-
{ id: "chatgpt_pro", label: "ChatGPT Pro
|
|
60
|
+
{ id: "chatgpt_pro_5x", label: "ChatGPT Pro 100", keyType: "CODEX_OAUTH", monthlyUsd: 100 },
|
|
61
|
+
{ id: "chatgpt_pro", label: "ChatGPT Pro 200", keyType: "CODEX_OAUTH", monthlyUsd: 200 },
|
|
62
|
+
{ id: "chatgpt_pro_500", label: "ChatGPT Pro 500", keyType: "CODEX_OAUTH", monthlyUsd: 500 },
|
|
63
63
|
{
|
|
64
64
|
id: "chatgpt_business",
|
|
65
65
|
label: "ChatGPT Business, standard seat",
|
|
@@ -96,20 +96,13 @@ export function planAllowsModelFamily(
|
|
|
96
96
|
return !record.excludedModelFamilies.includes(family);
|
|
97
97
|
}
|
|
98
98
|
|
|
99
|
-
/**
|
|
100
|
-
* Map the `chatgpt_plan_type` JWT claim to a plan id. The claim says `pro`
|
|
101
|
-
* for both Pro tiers, so `pro` maps to the 20x plan (the operator can change
|
|
102
|
-
* it). `free`, `enterprise`, `edu` and unknown values have no list price and
|
|
103
|
-
* return null.
|
|
104
|
-
*/
|
|
99
|
+
/** Map only unambiguous claims to priced plans. Preserve raw Pro identities separately. */
|
|
105
100
|
export function codexPlanFromClaim(claim: string | null | undefined): string | null {
|
|
106
101
|
switch (claim?.toLowerCase()) {
|
|
107
102
|
case "go":
|
|
108
103
|
return "chatgpt_go";
|
|
109
104
|
case "plus":
|
|
110
105
|
return "chatgpt_plus";
|
|
111
|
-
case "pro":
|
|
112
|
-
return "chatgpt_pro";
|
|
113
106
|
case "team":
|
|
114
107
|
case "business":
|
|
115
108
|
return "chatgpt_business";
|
|
@@ -117,44 +110,3 @@ export function codexPlanFromClaim(claim: string | null | undefined): string | n
|
|
|
117
110
|
return null;
|
|
118
111
|
}
|
|
119
112
|
}
|
|
120
|
-
|
|
121
|
-
/**
|
|
122
|
-
* A Claude token cannot tell its plan, but the provider reports how much of
|
|
123
|
-
* each rate-limit window the credential used. The API-priced spend it ran in
|
|
124
|
-
* the 7-day window, divided by that share, is the window's capacity in USD.
|
|
125
|
-
* Measured on production on 2026-09-25, 3 Max 20x credentials held about
|
|
126
|
-
* $2,000 per 7-day window (8 of 8 windows classified right). Max 5x has 1/4 of
|
|
127
|
-
* the Max 20x capacity and Pro 1/20. The 5-hour window was too noisy (15% of
|
|
128
|
-
* windows looked like Max 5x), so it is not used.
|
|
129
|
-
*/
|
|
130
|
-
const MAX_20X_WEEKLY_CAPACITY_USD = 2000;
|
|
131
|
-
/** Below this share of the week the spend is too small to classify. */
|
|
132
|
-
export const MIN_ESTIMATE_UTILIZATION = 0.25;
|
|
133
|
-
const CLAUDE_TIERS: readonly (readonly [plan: string, shareOfMax20x: number])[] = [
|
|
134
|
-
["claude_pro", 1 / 20],
|
|
135
|
-
["claude_max_5x", 1 / 4],
|
|
136
|
-
["claude_max_20x", 1],
|
|
137
|
-
];
|
|
138
|
-
|
|
139
|
-
/**
|
|
140
|
-
* Estimate a Claude plan from the 7-day window: the nearest tier on a log
|
|
141
|
-
* scale. Returns null when the window is too little used. Usage outside the
|
|
142
|
-
* swarm on the same account raises the utilization, so it can read a tier low.
|
|
143
|
-
*/
|
|
144
|
-
export function estimateClaudePlan(
|
|
145
|
-
weeklyUtilization: number,
|
|
146
|
-
weeklySpendUsd: number,
|
|
147
|
-
): string | null {
|
|
148
|
-
if (weeklyUtilization < MIN_ESTIMATE_UTILIZATION || weeklySpendUsd <= 0) return null;
|
|
149
|
-
const share = weeklySpendUsd / weeklyUtilization / MAX_20X_WEEKLY_CAPACITY_USD;
|
|
150
|
-
let best: string | null = null;
|
|
151
|
-
let bestDistance = Number.POSITIVE_INFINITY;
|
|
152
|
-
for (const [plan, tierShare] of CLAUDE_TIERS) {
|
|
153
|
-
const distance = Math.abs(Math.log(share / tierShare));
|
|
154
|
-
if (distance < bestDistance) {
|
|
155
|
-
best = plan;
|
|
156
|
-
bestDistance = distance;
|
|
157
|
-
}
|
|
158
|
-
}
|
|
159
|
-
return best;
|
|
160
|
-
}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
1
|
import type { TaskAttachment } from "../types";
|
|
2
2
|
import {
|
|
3
|
+
agentFsFileLinkQuery,
|
|
3
4
|
agentFsFileRoute,
|
|
4
5
|
buildAgentFsLiveUrl,
|
|
5
|
-
buildCombFileUrl,
|
|
6
6
|
getAppUrl,
|
|
7
7
|
resolveAgentFsLinkBase,
|
|
8
8
|
} from "./constants";
|
|
@@ -31,10 +31,9 @@ export function taskAttachmentFetchCommand(
|
|
|
31
31
|
|
|
32
32
|
/**
|
|
33
33
|
* The link a human (Slack, prompts, citations) sees for an attachment. An
|
|
34
|
-
* agent-fs file links to the
|
|
35
|
-
* set, else
|
|
36
|
-
*
|
|
37
|
-
* `resolveAgentFsLinkBase`). `comb: false` always links to the live UI.
|
|
34
|
+
* agent-fs file links to the base from `resolveAgentFsLinkBase` (the dashboard
|
|
35
|
+
* when Comb is on and `APP_URL` is set, else the agent-fs live UI), else to
|
|
36
|
+
* the raw `agent-fs:<path>`. `comb: false` always links to the live UI.
|
|
38
37
|
*/
|
|
39
38
|
export function taskAttachmentDisplayUrl(
|
|
40
39
|
attachment: TaskAttachment,
|
|
@@ -47,13 +46,11 @@ export function taskAttachmentDisplayUrl(
|
|
|
47
46
|
|
|
48
47
|
if (attachment.providerId === "agent-fs" || attachment.kind === "agent-fs") {
|
|
49
48
|
const file = { path: attachment.path, orgId: attachment.orgId, driveId: attachment.driveId };
|
|
50
|
-
const
|
|
51
|
-
if (
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
}
|
|
55
|
-
const combUrl = opts.comb === false ? null : buildCombFileUrl(file);
|
|
56
|
-
return combUrl ?? buildAgentFsLiveUrl(file) ?? `agent-fs:${attachment.path ?? ""}`;
|
|
49
|
+
const fallback = `agent-fs:${attachment.path ?? ""}`;
|
|
50
|
+
if (opts.comb === false) return buildAgentFsLiveUrl(file) ?? fallback;
|
|
51
|
+
const linkBase = resolveAgentFsLinkBase("attachment");
|
|
52
|
+
const route = agentFsFileRoute(file);
|
|
53
|
+
return route ? `${linkBase}/file/~/${route}${agentFsFileLinkQuery(linkBase)}` : fallback;
|
|
57
54
|
}
|
|
58
55
|
|
|
59
56
|
if (attachment.providerId === "local-fs" || attachment.kind === "shared-fs") {
|