reeval 0.14.0 → 0.16.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/README.md +15 -15
- package/THIRD_PARTY_NOTICES.md +69 -69
- package/assets/gateway-models.mjs +74 -0
- package/dist/{adapter-BloGVZ_a.js → adapter-CRKYPkRt.js} +37 -8
- package/dist/adapter-CRKYPkRt.js.map +1 -0
- package/dist/{agent-m-_t-IuW.js → agent-BgH4-kFc.js} +58 -16
- package/dist/agent-BgH4-kFc.js.map +1 -0
- package/dist/{app-files-C-jwhRDt.js → app-files-BMVBr079.js} +4 -4
- package/dist/app-files-BMVBr079.js.map +1 -0
- package/dist/{assemble-BDEpelpi.js → assemble-BVbI6NW-.js} +214 -128
- package/dist/assemble-BVbI6NW-.js.map +1 -0
- package/dist/assemble-SiHa4__F.js +1 -0
- package/dist/{attempt-jI0OWxlz.js → attempt-CpbZ9arV.js} +10 -10
- package/dist/{attempt-jI0OWxlz.js.map → attempt-CpbZ9arV.js.map} +1 -1
- package/dist/{match-Bz0nSdzN.js → attempt-host-CIxjs2Be.js} +104 -6
- package/dist/attempt-host-CIxjs2Be.js.map +1 -0
- package/dist/{capture-CVRwRTnb.js → capture-iQ6kYJV0.js} +2360 -1523
- package/dist/capture-iQ6kYJV0.js.map +1 -0
- package/dist/capture-px7Ey95_.js +1 -0
- package/dist/{cli-C_4gaJ50.js → cli-1YQU-66F.js} +153 -180
- package/dist/cli-1YQU-66F.js.map +1 -0
- package/dist/{cli-spec-CpnbATtI.js → cli-spec-CPWT1mAG.js} +10 -21
- package/dist/cli-spec-CPWT1mAG.js.map +1 -0
- package/dist/cli.js +2 -2
- package/dist/{client-D5hNjpEx.js → client-DMmOkbRA.js} +14 -7
- package/dist/client-DMmOkbRA.js.map +1 -0
- package/dist/{command-BXLUfw4h.js → command-8_Cg5v6b.js} +35 -22
- package/dist/command-8_Cg5v6b.js.map +1 -0
- package/dist/{command-I1euLLio.js → command-BlYCAqu-.js} +7 -7
- package/dist/{command-I1euLLio.js.map → command-BlYCAqu-.js.map} +1 -1
- package/dist/{validate-BhwqrVsm.js → command-C-HeGlap.js} +388 -60
- package/dist/command-C-HeGlap.js.map +1 -0
- package/dist/{command-Bxdy62dW.js → command-Cr1zjRvl.js} +32 -31
- package/dist/command-Cr1zjRvl.js.map +1 -0
- package/dist/{commands-p1S4nw_H.js → commands-Bj9NbmsO.js} +1 -1
- package/dist/{commands-jzigbNFb.js → commands-BvTNZ2-b.js} +181 -73
- package/dist/commands-BvTNZ2-b.js.map +1 -0
- package/dist/{config-BrdHA9bJ.js → config-CneBZB84.js} +883 -433
- package/dist/config-CneBZB84.js.map +1 -0
- package/dist/{contrasts-DRxMQQTC.js → contrasts-lhFsekco.js} +3 -3
- package/dist/{contrasts-DRxMQQTC.js.map → contrasts-lhFsekco.js.map} +1 -1
- package/dist/cost-C5RBTTJr.js +1 -0
- package/dist/{cost-D4elx933.js → cost-ChPa8-Fp.js} +3 -3
- package/dist/cost-ChPa8-Fp.js.map +1 -0
- package/dist/db-BnXyamuj.js +2 -0
- package/dist/db-Cnh3jIv_.js +1530 -0
- package/dist/db-Cnh3jIv_.js.map +1 -0
- package/dist/debug-CAx3qcaP.js +1 -0
- package/dist/{debug-D24NOQH1.js → debug-CgG3T071.js} +5 -2
- package/dist/debug-CgG3T071.js.map +1 -0
- package/dist/{docker-BnRlTpZA.js → docker-BihzJwbV.js} +11 -6
- package/dist/docker-BihzJwbV.js.map +1 -0
- package/dist/{docker-D01slDF3.js → docker-Cqq03H72.js} +26 -8
- package/dist/docker-Cqq03H72.js.map +1 -0
- package/dist/{docker-DivfZl2u.js → docker-DCAtFMo9.js} +1 -1
- package/dist/{doctor-DQ2p0euG.js → doctor-Dl4vMeqt.js} +275 -37
- package/dist/doctor-Dl4vMeqt.js.map +1 -0
- package/dist/{env-BQqj93gu.js → env-CARj5Axq.js} +6 -3
- package/dist/env-CARj5Axq.js.map +1 -0
- package/dist/{environment-CO0P0soF.js → environment-Cf5HMjib.js} +116 -297
- package/dist/environment-Cf5HMjib.js.map +1 -0
- package/dist/{errors-r025B0Zb.js → errors-CHebohjc.js} +10 -4
- package/dist/{errors-r025B0Zb.js.map → errors-CHebohjc.js.map} +1 -1
- package/dist/eval-source-CAE4y2Sr.js +146 -0
- package/dist/eval-source-CAE4y2Sr.js.map +1 -0
- package/dist/{evaluate-BUmsN7yG.js → evaluate-CUtgyr43.js} +682 -150
- package/dist/evaluate-CUtgyr43.js.map +1 -0
- package/dist/evaluate-D35T51AC.d.ts +45 -0
- package/dist/files-BEnUJW1e.js +1 -0
- package/dist/{files-B-CJeeEh.js → files-BRViE7m-.js} +200 -87
- package/dist/files-BRViE7m-.js.map +1 -0
- package/dist/{files-kUCrswI6.js → files-BSqA2sZE.js} +20 -9
- package/dist/files-BSqA2sZE.js.map +1 -0
- package/dist/files-C3tQtD26.js +1 -0
- package/dist/files-CNiJ_fZf.js +37 -0
- package/dist/files-CNiJ_fZf.js.map +1 -0
- package/dist/{files-Ca0d6Uq3.js → files-D1y8Pg4Z.js} +35 -7
- package/dist/files-D1y8Pg4Z.js.map +1 -0
- package/dist/files-Dts7EY3H.js +1 -0
- package/dist/{pairs-CHfZNRT6.js → gate-BC6SdQZs.js} +58 -4
- package/dist/gate-BC6SdQZs.js.map +1 -0
- package/dist/gateway.d.ts +22 -9
- package/dist/gateway.js +30 -8
- package/dist/gateway.js.map +1 -1
- package/dist/{git-Bk8DSwHy.js → git-UNxT_3z0.js} +3 -3
- package/dist/{git-Bk8DSwHy.js.map → git-UNxT_3z0.js.map} +1 -1
- package/dist/harness-3NVyTSGK.js +392 -0
- package/dist/harness-3NVyTSGK.js.map +1 -0
- package/dist/harness.d.ts +12 -8
- package/dist/harness.js +1 -1
- package/dist/{images-DzLeFjLx.js → images-8A_LzVfw.js} +8 -8
- package/dist/{images-DzLeFjLx.js.map → images-8A_LzVfw.js.map} +1 -1
- package/dist/index.d.ts +99 -11
- package/dist/index.js +5 -5
- package/dist/init-okoALIah.js +1 -0
- package/dist/{init-SRalM5xF.js → init-sFBgODhu.js} +10 -11
- package/dist/init-sFBgODhu.js.map +1 -0
- package/dist/{invocations-DzyKSJBa.js → invocations-C9ejlOYl.js} +10 -6
- package/dist/invocations-C9ejlOYl.js.map +1 -0
- package/dist/{judge-yLvjC5A3.js → judge-Bg4v4e_K.js} +236 -46
- package/dist/judge-Bg4v4e_K.js.map +1 -0
- package/dist/judge.d.ts +5 -7
- package/dist/judge.js +4 -8
- package/dist/judge.js.map +1 -1
- package/dist/{live-DYd2QEyR.js → live-DeMvnDD5.js} +3 -3
- package/dist/{live-DYd2QEyR.js.map → live-DeMvnDD5.js.map} +1 -1
- package/dist/{matchers-D4eUqx4j.js → matchers-BKPuaXlj.js} +14 -13
- package/dist/matchers-BKPuaXlj.js.map +1 -0
- package/dist/{model-1ZLr9Dcv.js → model-2rBZrdZA.js} +29 -36
- package/dist/model-2rBZrdZA.js.map +1 -0
- package/dist/{model-B45lDUV1.js → model-3MJtpho8.js} +22 -13
- package/dist/model-3MJtpho8.js.map +1 -0
- package/dist/{model-CgnOpss4.js → model-Bz7-j71_.js} +245 -68
- package/dist/model-Bz7-j71_.js.map +1 -0
- package/dist/model-DkPwypN4.js +1 -0
- package/dist/model-bREXVXwT.js +1 -0
- package/dist/{node-BSq5qHnQ.js → node-fP-H2uxn.js} +72 -50
- package/dist/node-fP-H2uxn.js.map +1 -0
- package/dist/{object-CLf2-tNq.js → object-BkXGPKWY.js} +3 -2
- package/dist/object-BkXGPKWY.js.map +1 -0
- package/dist/opencode-providers-Bz0l7OZI.js +3276 -0
- package/dist/opencode-providers-Bz0l7OZI.js.map +1 -0
- package/dist/openrouter-models-Bo8PZ4Ew.js +34 -0
- package/dist/openrouter-models-Bo8PZ4Ew.js.map +1 -0
- package/dist/{patch-DWf-I_Q_.js → patch-6T9XAipm.js} +7 -9
- package/dist/patch-6T9XAipm.js.map +1 -0
- package/dist/patch-CquGAGX5.js +76 -0
- package/dist/patch-CquGAGX5.js.map +1 -0
- package/dist/{plan-BIwUzlB8.js → plan-Dw2BjafJ.js} +79 -35
- package/dist/plan-Dw2BjafJ.js.map +1 -0
- package/dist/{plugins-Dkp_H3pB.js → plugins-ngQEJBjJ.js} +274 -17
- package/dist/plugins-ngQEJBjJ.js.map +1 -0
- package/dist/{preflight-D9y-HvZQ.js → preflight-BYXkweNN.js} +1 -1
- package/dist/{preflight-DJCD_BDn.js → preflight-CDRpog9o.js} +3 -3
- package/dist/{preflight-DJCD_BDn.js.map → preflight-CDRpog9o.js.map} +1 -1
- package/dist/{prepare-BJG_pD54.js → prepare-B3btUlT6.js} +2 -2
- package/dist/{prepare-CIxCGG0M.js → prepare-PkARUGoF.js} +8 -8
- package/dist/{prepare-CIxCGG0M.js.map → prepare-PkARUGoF.js.map} +1 -1
- package/dist/{prices-BcLEXvdY.js → prices-QaS-kjSQ.js} +7 -4
- package/dist/prices-QaS-kjSQ.js.map +1 -0
- package/dist/{provenance-CfZpFpAh.js → provenance-7Hzg88f4.js} +4 -4
- package/dist/{provenance-CfZpFpAh.js.map → provenance-7Hzg88f4.js.map} +1 -1
- package/dist/{providers-D1Zxp2he.js → providers-DDNMbv1T.js} +1 -1
- package/dist/{providers-DFk_6W4K.js → providers-PKoJtGK0.js} +5 -5
- package/dist/{providers-DFk_6W4K.js.map → providers-PKoJtGK0.js.map} +1 -1
- package/dist/query-Bt6vLJ3m.js +1 -0
- package/dist/{query-CemclveB.js → query-nBXrgEwl.js} +3 -3
- package/dist/{query-CemclveB.js.map → query-nBXrgEwl.js.map} +1 -1
- package/dist/{questions-bAudIc04.js → questions-CkAwePPR.js} +110 -36
- package/dist/questions-CkAwePPR.js.map +1 -0
- package/dist/{record-kk9M1hj-.js → record-DZBCjuwm.js} +6 -6
- package/dist/{record-kk9M1hj-.js.map → record-DZBCjuwm.js.map} +1 -1
- package/dist/redact-DVIaahLv.js +658 -0
- package/dist/redact-DVIaahLv.js.map +1 -0
- package/dist/remarks-Bp6AwPgb.js +1 -0
- package/dist/{rules-VhftPOOT.js → remarks-Bt0zwiQB.js} +330 -66
- package/dist/remarks-Bt0zwiQB.js.map +1 -0
- package/dist/{header-BLPP6aCU.js → remarks-IFFe_oty.js} +35 -9
- package/dist/remarks-IFFe_oty.js.map +1 -0
- package/dist/{remarks-mujJv1Ey.js → remarks-eBcrIZRu.js} +10 -5
- package/dist/remarks-eBcrIZRu.js.map +1 -0
- package/dist/{remote-CKcEKja4.js → remote-DfJYiP-R.js} +39 -99
- package/dist/remote-DfJYiP-R.js.map +1 -0
- package/dist/resolve-CT4XZIfV.js +1 -0
- package/dist/{resolve-CBoKzQMP.js → resolve-D_cLa4tW.js} +46 -30
- package/dist/resolve-D_cLa4tW.js.map +1 -0
- package/dist/results-DrKJuIQF.js +63 -0
- package/dist/results-DrKJuIQF.js.map +1 -0
- package/dist/{resume-B9SOSnK9.js → resume-BmIM52MJ.js} +47 -17
- package/dist/resume-BmIM52MJ.js.map +1 -0
- package/dist/{runtime-BgQRyCLl.js → runtime-CZVpkr04.js} +139 -48
- package/dist/runtime-CZVpkr04.js.map +1 -0
- package/dist/{sandbox-BOYZ0hlo.js → sandbox-Cmi6IQML.js} +2 -2
- package/dist/{sandbox-BOYZ0hlo.js.map → sandbox-Cmi6IQML.js.map} +1 -1
- package/dist/sandbox.d.ts +1 -1
- package/dist/sandbox.js +1 -1
- package/dist/server-CKJOnIB0.js +1 -0
- package/dist/{server-TGW4WyAz.js → server-DS8BGhGU.js} +75 -33
- package/dist/server-DS8BGhGU.js.map +1 -0
- package/dist/{shared-BDUzStad.js → shared-B_lvGqWz.js} +19 -11
- package/dist/shared-B_lvGqWz.js.map +1 -0
- package/dist/source-CgUqpumI.js +1 -0
- package/dist/source-DcXv4de-.js +59 -0
- package/dist/source-DcXv4de-.js.map +1 -0
- package/dist/{src-CHIwOy0o.js → src-1lpTocbd.js} +75 -30
- package/dist/{src-CHIwOy0o.js.map → src-1lpTocbd.js.map} +1 -1
- package/dist/{src-DjF_M8_f.js → src-8yTF251P.js} +30 -8
- package/dist/{src-DjF_M8_f.js.map → src-8yTF251P.js.map} +1 -1
- package/dist/{src-DjRI-IeE.js → src-A8HLtO0a.js} +135 -35
- package/dist/{src-DjRI-IeE.js.map → src-A8HLtO0a.js.map} +1 -1
- package/dist/{src-NSdQ9zI6.js → src-BO8AYqJ5.js} +17 -5
- package/dist/src-BO8AYqJ5.js.map +1 -0
- package/dist/src-BTqJbvj6.js +2 -0
- package/dist/{src-DmUgeTlE.js → src-BYDOXw_Y.js} +23 -7
- package/dist/{src-DmUgeTlE.js.map → src-BYDOXw_Y.js.map} +1 -1
- package/dist/src-BkiComGh.js +2 -0
- package/dist/src-BvgeZ4tS.js +2 -0
- package/dist/{src-8zoX_qrb.js → src-C0ySiej5.js} +572 -1067
- package/dist/src-C0ySiej5.js.map +1 -0
- package/dist/src-CgJrz5p0.js +3 -0
- package/dist/src-Cp-2Hdib.js +2 -0
- package/dist/{src-CyaDNG9r.js → src-DMo2eCOJ.js} +1 -1
- package/dist/{src-ChhtI6BP.js → src-DSZyg0Uq.js} +177 -28
- package/dist/src-DSZyg0Uq.js.map +1 -0
- package/dist/src-Dk2Na0b-.js +2 -0
- package/dist/src-OESRtvOi.js +2 -0
- package/dist/{src-DKPVX2Us.js → src-gn7YlnRg.js} +34 -5
- package/dist/{src-DKPVX2Us.js.map → src-gn7YlnRg.js.map} +1 -1
- package/dist/src-h5uDlk3m.js +1 -0
- package/dist/state-C97udoh3.js +1 -0
- package/dist/{state-B1t143wG.js → state-C_kdhp5v.js} +15 -15
- package/dist/{state-B1t143wG.js.map → state-C_kdhp5v.js.map} +1 -1
- package/dist/{stats-DSy5HfOv.js → stats-hfpuYsAM.js} +2 -2
- package/dist/{stats-DSy5HfOv.js.map → stats-hfpuYsAM.js.map} +1 -1
- package/dist/suite-ByT1lsdD.js +2 -0
- package/dist/{suite-WgT7m6Vs.js → suite-DieLXvCT.js} +61 -65
- package/dist/suite-DieLXvCT.js.map +1 -0
- package/dist/{summary-DIGEVr08.js → summary-CSzyBVsF.js} +113 -277
- package/dist/summary-CSzyBVsF.js.map +1 -0
- package/dist/tarball-CHcahyNK.js +258 -0
- package/dist/tarball-CHcahyNK.js.map +1 -0
- package/dist/testing.d.ts +426 -143
- package/dist/testing.js +12 -10
- package/dist/testing.js.map +1 -1
- package/dist/{text-CrVy5ioL.js → text-DTigcA64.js} +9 -5
- package/dist/text-DTigcA64.js.map +1 -0
- package/dist/{tool-target-D2mcYlSQ.js → tool-target-CKWkd6QI.js} +2 -2
- package/dist/{tool-target-D2mcYlSQ.js.map → tool-target-CKWkd6QI.js.map} +1 -1
- package/dist/{transcript-BTxJpW4R.js → transcript-BJrKfgRW.js} +13 -5
- package/dist/transcript-BJrKfgRW.js.map +1 -0
- package/dist/types-C5vI3g1C.js.map +1 -1
- package/dist/{types-DXBbP9Mk.d.ts → types-DVvW66ci.d.ts} +569 -895
- package/dist/vertex-Bv7vhMgs.js +1 -0
- package/dist/vertex-C7PI-WPc.d.ts +3 -0
- package/dist/vertex-DypYjx71.js +456 -0
- package/dist/vertex-DypYjx71.js.map +1 -0
- package/dist/view/index.d.ts +548 -121
- package/dist/view/index.js +9 -9
- package/dist/{views-sXpGE6a2.js → views-B9STsLB4.js} +9 -10
- package/dist/{views-sXpGE6a2.js.map → views-B9STsLB4.js.map} +1 -1
- package/dist/views-Ca-rTixp.js +2 -0
- package/dist/{worker-entry-Duo9oAeT.js → worker-entry-C5bLCv6s.js} +48 -20
- package/dist/worker-entry-C5bLCv6s.js.map +1 -0
- package/dist/workspace-8uHtBSve.js +1 -0
- package/dist/{workspace-CDI68wtX.js → workspace-CBuI9Uds.js} +5 -5
- package/dist/{workspace-CDI68wtX.js.map → workspace-CBuI9Uds.js.map} +1 -1
- package/docker/seccomp-default.json +1 -0
- package/package.json +5 -1
- package/skills/eval-rubric/SKILL.md +46 -104
- package/dist/adapter-BloGVZ_a.js.map +0 -1
- package/dist/agent-m-_t-IuW.js.map +0 -1
- package/dist/app-files-C-jwhRDt.js.map +0 -1
- package/dist/assemble-BDEpelpi.js.map +0 -1
- package/dist/assemble-C5bfncHU.js +0 -1
- package/dist/capture-CVRwRTnb.js.map +0 -1
- package/dist/capture-CherbjzB.js +0 -1
- package/dist/cli-C_4gaJ50.js.map +0 -1
- package/dist/cli-spec-CpnbATtI.js.map +0 -1
- package/dist/client-D5hNjpEx.js.map +0 -1
- package/dist/command-BWAuwQNk.js +0 -91
- package/dist/command-BWAuwQNk.js.map +0 -1
- package/dist/command-BXLUfw4h.js.map +0 -1
- package/dist/command-Be6BSE2L.js +0 -335
- package/dist/command-Be6BSE2L.js.map +0 -1
- package/dist/command-Bxdy62dW.js.map +0 -1
- package/dist/commands-jzigbNFb.js.map +0 -1
- package/dist/config-BrdHA9bJ.js.map +0 -1
- package/dist/cost-D4elx933.js.map +0 -1
- package/dist/cost-DmnAod9x.js +0 -1
- package/dist/db-CAfksinX.js +0 -2
- package/dist/db-DO0p7xgP.js +0 -619
- package/dist/db-DO0p7xgP.js.map +0 -1
- package/dist/debug-D24NOQH1.js.map +0 -1
- package/dist/debug-D7bEv_UV.js +0 -1
- package/dist/docker-BnRlTpZA.js.map +0 -1
- package/dist/docker-D01slDF3.js.map +0 -1
- package/dist/doctor-DQ2p0euG.js.map +0 -1
- package/dist/env-BQqj93gu.js.map +0 -1
- package/dist/environment-CO0P0soF.js.map +0 -1
- package/dist/evaluate-BUmsN7yG.js.map +0 -1
- package/dist/evaluate-C_sgRA-V.d.ts +0 -134
- package/dist/facts-DzOUTreB.js +0 -906
- package/dist/facts-DzOUTreB.js.map +0 -1
- package/dist/files-B-CJeeEh.js.map +0 -1
- package/dist/files-BAt0i00X.js +0 -1
- package/dist/files-Bp5j5BqI.js +0 -1
- package/dist/files-C2sjmXhk.js +0 -1
- package/dist/files-C_gQNVB-.js +0 -65
- package/dist/files-C_gQNVB-.js.map +0 -1
- package/dist/files-Ca0d6Uq3.js.map +0 -1
- package/dist/files-kUCrswI6.js.map +0 -1
- package/dist/generate-DZ7vp69F.js +0 -1647
- package/dist/generate-DZ7vp69F.js.map +0 -1
- package/dist/harness-COVXSwJ6.js +0 -354
- package/dist/harness-COVXSwJ6.js.map +0 -1
- package/dist/header-BLPP6aCU.js.map +0 -1
- package/dist/init-RgCQXZhb.js +0 -1
- package/dist/init-SRalM5xF.js.map +0 -1
- package/dist/insights-TyAvz9aV.js +0 -68
- package/dist/insights-TyAvz9aV.js.map +0 -1
- package/dist/invocations-DzyKSJBa.js.map +0 -1
- package/dist/judge-yLvjC5A3.js.map +0 -1
- package/dist/match-Bz0nSdzN.js.map +0 -1
- package/dist/matchers-D4eUqx4j.js.map +0 -1
- package/dist/model-1ZLr9Dcv.js.map +0 -1
- package/dist/model-B45lDUV1.js.map +0 -1
- package/dist/model-BTZq8HIZ.js +0 -1
- package/dist/model-CgnOpss4.js.map +0 -1
- package/dist/model-Ch8kX87u.js +0 -1
- package/dist/node-BSq5qHnQ.js.map +0 -1
- package/dist/object-CLf2-tNq.js.map +0 -1
- package/dist/opencode-providers-klkqgzvb.js +0 -3276
- package/dist/opencode-providers-klkqgzvb.js.map +0 -1
- package/dist/pairs-CHfZNRT6.js.map +0 -1
- package/dist/patch-DWf-I_Q_.js.map +0 -1
- package/dist/plan-BIwUzlB8.js.map +0 -1
- package/dist/plugins-Dkp_H3pB.js.map +0 -1
- package/dist/prices-BcLEXvdY.js.map +0 -1
- package/dist/query-Cvbwl804.js +0 -1
- package/dist/questions-bAudIc04.js.map +0 -1
- package/dist/redact-CRGdfV2s.js +0 -240
- package/dist/redact-CRGdfV2s.js.map +0 -1
- package/dist/remarks-CXwSnSjR.js +0 -278
- package/dist/remarks-CXwSnSjR.js.map +0 -1
- package/dist/remarks-CyAu2DiB.js +0 -1
- package/dist/remarks-mujJv1Ey.js.map +0 -1
- package/dist/remote-CKcEKja4.js.map +0 -1
- package/dist/resolve-B5-uqmJ6.js +0 -1
- package/dist/resolve-CBoKzQMP.js.map +0 -1
- package/dist/results-CMgZEANy.js +0 -78
- package/dist/results-CMgZEANy.js.map +0 -1
- package/dist/resume-B9SOSnK9.js.map +0 -1
- package/dist/rules-VhftPOOT.js.map +0 -1
- package/dist/run-CwIEK16q.js +0 -88
- package/dist/run-CwIEK16q.js.map +0 -1
- package/dist/runtime-BgQRyCLl.js.map +0 -1
- package/dist/server-CHRSgKRp.js +0 -1
- package/dist/server-TGW4WyAz.js.map +0 -1
- package/dist/shared-BDUzStad.js.map +0 -1
- package/dist/source-B1WvBIQt.js +0 -40
- package/dist/source-B1WvBIQt.js.map +0 -1
- package/dist/source-DAzztZwU.js +0 -1
- package/dist/src-1jHbFaGW.js +0 -1
- package/dist/src-8zoX_qrb.js.map +0 -1
- package/dist/src-C_9wgowC.js +0 -2
- package/dist/src-ChhtI6BP.js.map +0 -1
- package/dist/src-D005Cbqz.js +0 -2
- package/dist/src-DIfRbp5a.js +0 -3
- package/dist/src-Dg8121Xy.js +0 -2
- package/dist/src-ElBqEN-S.js +0 -2
- package/dist/src-NSdQ9zI6.js.map +0 -1
- package/dist/src-YHGaUrGE.js +0 -2
- package/dist/src-mJVxw1Jm.js +0 -2
- package/dist/state-vznMh2wl.js +0 -1
- package/dist/suite-BsWGHzlG.js +0 -2
- package/dist/suite-WgT7m6Vs.js.map +0 -1
- package/dist/summary-DIGEVr08.js.map +0 -1
- package/dist/text-CrVy5ioL.js.map +0 -1
- package/dist/transcript-BTxJpW4R.js.map +0 -1
- package/dist/usage-DF3_p5pE.js +0 -1
- package/dist/validate-BhwqrVsm.js.map +0 -1
- package/dist/views-BW_C5eVH.js +0 -2
- package/dist/worker-entry-Duo9oAeT.js.map +0 -1
- package/dist/workspace-QZCacP8A.js +0 -1
|
@@ -1,98 +1,13 @@
|
|
|
1
1
|
import { n as UsageError } from "./errors-B6BSMs03.js";
|
|
2
2
|
import { t as InfraError } from "./types-C5vI3g1C.js";
|
|
3
|
-
import { r as runnerEnv, t as adapterForFile } from "./adapter-
|
|
4
|
-
import {
|
|
5
|
-
import { t as declareTree } from "./evaluate-
|
|
6
|
-
import {
|
|
7
|
-
import { n as recordCall, t as expectCall } from "./match-Bz0nSdzN.js";
|
|
3
|
+
import { r as runnerEnv, t as adapterForFile } from "./adapter-CRKYPkRt.js";
|
|
4
|
+
import { l as attemptRecordings } from "./runtime-CZVpkr04.js";
|
|
5
|
+
import { t as declareTree } from "./evaluate-CUtgyr43.js";
|
|
6
|
+
import { t as replyToAttempt } from "./attempt-host-CIxjs2Be.js";
|
|
8
7
|
import { relative } from "node:path";
|
|
9
8
|
import { spawn } from "node:child_process";
|
|
10
9
|
import { AsyncLocalStorage } from "node:async_hooks";
|
|
11
10
|
import { createInterface } from "node:readline";
|
|
12
|
-
//#region src/language-runner/attempt-host.ts
|
|
13
|
-
const isTurnRef = (value) => typeof value === "object" && value !== null && "turn" in value;
|
|
14
|
-
async function replyToAttempt(c, calls, handles, request) {
|
|
15
|
-
const { id, call } = request;
|
|
16
|
-
const problem = attemptRequestProblem({
|
|
17
|
-
id,
|
|
18
|
-
call
|
|
19
|
-
});
|
|
20
|
-
if (problem) {
|
|
21
|
-
const error = {
|
|
22
|
-
name: "UsageError",
|
|
23
|
-
message: problem
|
|
24
|
-
};
|
|
25
|
-
return {
|
|
26
|
-
id,
|
|
27
|
-
ok: false,
|
|
28
|
-
op: call?.op,
|
|
29
|
-
error
|
|
30
|
-
};
|
|
31
|
-
}
|
|
32
|
-
try {
|
|
33
|
-
const body = await perform(c, calls, handles, call);
|
|
34
|
-
return {
|
|
35
|
-
id,
|
|
36
|
-
ok: true,
|
|
37
|
-
op: call.op,
|
|
38
|
-
...body
|
|
39
|
-
};
|
|
40
|
-
} catch (error) {
|
|
41
|
-
const { name = "Error", message = String(error) } = error;
|
|
42
|
-
return {
|
|
43
|
-
id,
|
|
44
|
-
ok: false,
|
|
45
|
-
op: call.op,
|
|
46
|
-
error: {
|
|
47
|
-
name,
|
|
48
|
-
message
|
|
49
|
-
}
|
|
50
|
-
};
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
async function perform(c, matcherCalls, handles, call) {
|
|
54
|
-
switch (call.op) {
|
|
55
|
-
case "send": {
|
|
56
|
-
const { exec, readFile, ...data } = await c.send(call.prompt);
|
|
57
|
-
return { turn: data };
|
|
58
|
-
}
|
|
59
|
-
case "exec": {
|
|
60
|
-
if (call.background) {
|
|
61
|
-
const handle = await c.exec(call.command, { background: true });
|
|
62
|
-
const handleId = `h${handles.size + 1}`;
|
|
63
|
-
handles.set(handleId, handle);
|
|
64
|
-
return { result: { handle: handleId } };
|
|
65
|
-
}
|
|
66
|
-
const { retries, interval } = call;
|
|
67
|
-
return { result: await c.exec(call.command, {
|
|
68
|
-
...retries === void 0 ? {} : { retries },
|
|
69
|
-
...interval === void 0 ? {} : { interval }
|
|
70
|
-
}) };
|
|
71
|
-
}
|
|
72
|
-
case "kill":
|
|
73
|
-
await handles.get(call.handle)?.kill();
|
|
74
|
-
return {};
|
|
75
|
-
case "readFile": return { contents: await c.readFile(call.path) };
|
|
76
|
-
case "writeFile":
|
|
77
|
-
await c.writeFile(call.path, call.encoding === "base64" ? Buffer.from(call.contents, "base64") : call.contents);
|
|
78
|
-
return {};
|
|
79
|
-
case "expect": return await expectCall(c, matcherCalls, call);
|
|
80
|
-
case "record": return { assertion: recordCall(matcherCalls, call) };
|
|
81
|
-
case "judge": {
|
|
82
|
-
const { question, options } = call;
|
|
83
|
-
const opts = options ?? {};
|
|
84
|
-
const on = opts.on;
|
|
85
|
-
const target = isTurnRef(on) ? c.turns[on.turn] : on;
|
|
86
|
-
const { on: _drop, ...rest } = opts;
|
|
87
|
-
return { verdict: await c.judge(question, {
|
|
88
|
-
...rest,
|
|
89
|
-
...on !== void 0 ? { on: target } : {}
|
|
90
|
-
}) };
|
|
91
|
-
}
|
|
92
|
-
default: throw new Error(`The language runner called ${call.op}, which this reeval doesn't handle yet`);
|
|
93
|
-
}
|
|
94
|
-
}
|
|
95
|
-
//#endregion
|
|
96
11
|
//#region src/language-runner/protocol.ts
|
|
97
12
|
const isSessionFrom = (message) => "t" in message;
|
|
98
13
|
const isRunnerAttemptRequest = (message) => "id" in message && "call" in message && "key" in message && !("ok" in message);
|
|
@@ -120,14 +35,18 @@ function isFromRunner(value) {
|
|
|
120
35
|
//#endregion
|
|
121
36
|
//#region src/language-runner/transport.ts
|
|
122
37
|
var RunnerLoadError = class extends Error {};
|
|
123
|
-
|
|
38
|
+
const LINE_SHOWN = 200;
|
|
39
|
+
/**
|
|
40
|
+
* A runner's stdout line: a message, `undefined` for output that isn't one, or `unreadable` for
|
|
41
|
+
* a message that isn't JSON, which nothing could answer.
|
|
42
|
+
*/
|
|
124
43
|
function parsed(line) {
|
|
125
44
|
if (!line.startsWith("{")) return void 0;
|
|
126
45
|
try {
|
|
127
46
|
const value = JSON.parse(line);
|
|
128
47
|
return isFromRunner(value) ? value : void 0;
|
|
129
48
|
} catch {
|
|
130
|
-
return;
|
|
49
|
+
return "unreadable";
|
|
131
50
|
}
|
|
132
51
|
}
|
|
133
52
|
async function startLanguageRunner(command, cwd, env = process.env) {
|
|
@@ -160,10 +79,25 @@ async function startLanguageRunner(command, cwd, env = process.env) {
|
|
|
160
79
|
child.once("error", (error) => resolve(`it didn't start: ${error.message}`));
|
|
161
80
|
child.once("exit", (code, signal) => resolve(`it exited (${signal ?? `code ${code}`})${stderr.trim() ? `:\n${stderr.trim()}` : ""}`));
|
|
162
81
|
});
|
|
82
|
+
let unreadable = () => {};
|
|
83
|
+
const broken = new Promise((resolve) => {
|
|
84
|
+
unreadable = resolve;
|
|
85
|
+
});
|
|
86
|
+
const stopped = Promise.race([broken, exited]);
|
|
163
87
|
const listeners = [];
|
|
164
88
|
const lines = createInterface({ input: child.stdout });
|
|
89
|
+
let unreadLine = false;
|
|
165
90
|
lines.on("line", (line) => {
|
|
91
|
+
if (unreadLine) return;
|
|
166
92
|
const message = parsed(line);
|
|
93
|
+
if (message === "unreadable") {
|
|
94
|
+
unreadLine = true;
|
|
95
|
+
const shown = line.length > LINE_SHOWN ? `${line.slice(0, LINE_SHOWN)}…` : line;
|
|
96
|
+
unreadable(`it sent a message that isn't JSON (a NaN or Infinity in it, or a line cut short): ${shown}`);
|
|
97
|
+
lines.close();
|
|
98
|
+
child.kill();
|
|
99
|
+
return;
|
|
100
|
+
}
|
|
167
101
|
if (!message) return void (line && process.stderr.write(`${line}\n`));
|
|
168
102
|
for (const listener of [...listeners]) listener(message);
|
|
169
103
|
});
|
|
@@ -175,7 +109,7 @@ async function startLanguageRunner(command, cwd, env = process.env) {
|
|
|
175
109
|
};
|
|
176
110
|
listeners.push(listener);
|
|
177
111
|
});
|
|
178
|
-
const first = await Promise.race([greeted,
|
|
112
|
+
const first = await Promise.race([greeted, stopped]);
|
|
179
113
|
if (typeof first === "string") throw new RunnerLoadError(`The language runner (${command.join(" ")}) stopped before it said hello: ${first}\nAn SDK that speaks an older runner protocol than this reeval's (3) stops like this: update the SDK to the version that matches reeval.`);
|
|
180
114
|
const hello = first;
|
|
181
115
|
if (hello.protocol !== 3) {
|
|
@@ -186,7 +120,7 @@ async function startLanguageRunner(command, cwd, env = process.env) {
|
|
|
186
120
|
let goneReason;
|
|
187
121
|
const markGone = async () => {
|
|
188
122
|
if (goneReason !== void 0) return;
|
|
189
|
-
goneReason = await Promise.race([
|
|
123
|
+
goneReason = await Promise.race([stopped, new Promise((r) => setTimeout(() => r("it closed its stdout"), 1e3).unref())]);
|
|
190
124
|
for (const listener of gone) listener(goneReason);
|
|
191
125
|
};
|
|
192
126
|
lines.once("close", markGone);
|
|
@@ -209,7 +143,9 @@ async function startLanguageRunner(command, cwd, env = process.env) {
|
|
|
209
143
|
else resolve(message);
|
|
210
144
|
};
|
|
211
145
|
listeners.push(listener);
|
|
212
|
-
|
|
146
|
+
const stop = (reason) => reject(new RunnerLoadError(`The language runner stopped: ${reason}`));
|
|
147
|
+
if (goneReason !== void 0) stop(goneReason);
|
|
148
|
+
else gone.push(stop);
|
|
213
149
|
}),
|
|
214
150
|
close: () => {
|
|
215
151
|
child.stdin.end();
|
|
@@ -273,13 +209,15 @@ async function collectLanguageFile(file, root) {
|
|
|
273
209
|
});
|
|
274
210
|
} else if (isRunnerAttemptDone(message)) live.get(message.key)?.onDone(message);
|
|
275
211
|
});
|
|
212
|
+
let goneReason;
|
|
276
213
|
runner.onGone((reason) => {
|
|
214
|
+
goneReason = reason;
|
|
277
215
|
for (const attempt of live.values()) attempt.gone(reason);
|
|
278
216
|
});
|
|
279
|
-
declareTree(tree.children, (body) => remoteBody(liveRunner, live, body, rel));
|
|
217
|
+
declareTree(tree.children, (body) => remoteBody(liveRunner, live, body, rel, () => goneReason));
|
|
280
218
|
}
|
|
281
219
|
let started = 0;
|
|
282
|
-
function remoteBody(runner, live, body, file) {
|
|
220
|
+
function remoteBody(runner, live, body, file, gone) {
|
|
283
221
|
return (t) => new Promise((resolve, reject) => {
|
|
284
222
|
const attemptKey = `${body}:${t.attempt.id}:${++started}`;
|
|
285
223
|
const matcherCalls = attemptRecordings();
|
|
@@ -292,11 +230,11 @@ function remoteBody(runner, live, body, file) {
|
|
|
292
230
|
};
|
|
293
231
|
const onAbort = () => {
|
|
294
232
|
const reason = t.signal.reason;
|
|
295
|
-
const message = reason instanceof Error ? reason.message : String(reason ?? "The run was
|
|
233
|
+
const message = reason instanceof Error ? reason.message : String(reason ?? "The run was canceled");
|
|
296
234
|
runner.send({
|
|
297
235
|
type: "abort",
|
|
298
236
|
key: attemptKey,
|
|
299
|
-
reason: reason instanceof Error && reason.name === "TimeoutError" ? "timeout" : "
|
|
237
|
+
reason: reason instanceof Error && reason.name === "TimeoutError" ? "timeout" : "canceled",
|
|
300
238
|
message
|
|
301
239
|
});
|
|
302
240
|
finish(() => reject(reason));
|
|
@@ -316,6 +254,8 @@ function remoteBody(runner, live, body, file) {
|
|
|
316
254
|
gone: (reason) => finish(() => reject(new InfraError(`The language runner stopped mid-attempt: ${reason}`)))
|
|
317
255
|
});
|
|
318
256
|
if (t.signal.aborted) return onAbort();
|
|
257
|
+
const reason = gone();
|
|
258
|
+
if (reason !== void 0) return live.get(attemptKey)?.gone(reason);
|
|
319
259
|
t.signal.addEventListener("abort", onAbort, { once: true });
|
|
320
260
|
const start = {
|
|
321
261
|
type: "start",
|
|
@@ -330,4 +270,4 @@ function remoteBody(runner, live, body, file) {
|
|
|
330
270
|
//#endregion
|
|
331
271
|
export { collectLanguageFile };
|
|
332
272
|
|
|
333
|
-
//# sourceMappingURL=remote-
|
|
273
|
+
//# sourceMappingURL=remote-DfJYiP-R.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"remote-DfJYiP-R.js","names":[],"sources":["../src/language-runner/protocol.ts","../src/language-runner/transport.ts","../src/language-runner/remote.ts"],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { r as pluginSourceDir } from "./resolve-D_cLa4tW.js";
|
|
@@ -1,10 +1,11 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { C as
|
|
1
|
+
import { h as parseDuration } from "./shared-B_lvGqWz.js";
|
|
2
|
+
import { C as mcpHeaderHosts, P as workspaceLabel, S as maskedHeaderValue, b as isSecret, j as stepCommand, n as DEFAULT_SKILL_EXCLUDE, v as isHostFile, w as parseGitRepo, x as isSecretTemplate } from "./environment-Cf5HMjib.js";
|
|
3
|
+
import { A as readPlugin, D as pluginServerName, E as pluginParts, M as skillCall, O as pluginSourceLabel, T as pluginFiles, _ as localMarketplace, c as PluginProblem, g as leavesSource, j as samePluginTwice, k as readMarketplace, m as fetchesAtStart, w as pluginCall, x as marketplaceLabel } from "./plugins-ngQEJBjJ.js";
|
|
3
4
|
import { l as sha256 } from "./ids-Bp6ut7ZD.js";
|
|
4
|
-
import {
|
|
5
|
-
import {
|
|
6
|
-
import {
|
|
7
|
-
import {
|
|
5
|
+
import { Et as refusedPlugins, J as DEFAULT_EGRESS, wt as layoutOf } from "./config-CneBZB84.js";
|
|
6
|
+
import { _ as registerSecret, r as badCharacterAt } from "./redact-DVIaahLv.js";
|
|
7
|
+
import { s as withoutBom } from "./text-DTigcA64.js";
|
|
8
|
+
import { L as hostAllowed, ft as run, k as placeholder } from "./src-C0ySiej5.js";
|
|
8
9
|
import { t as InfraError } from "./types-C5vI3g1C.js";
|
|
9
10
|
import { existsSync, readFileSync, readdirSync, statSync } from "node:fs";
|
|
10
11
|
import { basename, isAbsolute, join, relative, sep } from "node:path";
|
|
@@ -27,32 +28,45 @@ function broker(secrets, name, value, hosts, where = ["header"], phase = "agent"
|
|
|
27
28
|
secrets.brokered.push(sub);
|
|
28
29
|
return sub.placeholder;
|
|
29
30
|
}
|
|
30
|
-
/**
|
|
31
|
-
|
|
31
|
+
/**
|
|
32
|
+
* The host value, or its placeholder when it's brokered to `hosts`. The record names it `as`: the
|
|
33
|
+
* variable it's set as in the sandbox, or for a header the host variable.
|
|
34
|
+
*/
|
|
35
|
+
function hostValue(name, secret, where, secrets, hosts, as = name) {
|
|
32
36
|
const from = secret.from ?? name;
|
|
33
37
|
const value = process.env[from];
|
|
34
38
|
if (!value) {
|
|
35
39
|
if (secret.optional) {
|
|
36
|
-
secrets.unset.push(
|
|
40
|
+
secrets.unset.push(as);
|
|
37
41
|
return;
|
|
38
42
|
}
|
|
39
43
|
const source = from === name ? name : `${name} (from ${from})`;
|
|
40
44
|
throw new InfraError(`Secret ${source} for ${where} isn't set. Set it in the environment or .env.local.`);
|
|
41
45
|
}
|
|
42
46
|
registerSecret(value);
|
|
43
|
-
if (secret.to === "checks") secrets.checks.push(
|
|
44
|
-
else secrets.names.push(
|
|
45
|
-
if (!hosts)
|
|
46
|
-
|
|
47
|
+
if (secret.to === "checks") secrets.checks.push(as);
|
|
48
|
+
else secrets.names.push(as);
|
|
49
|
+
if (!hosts) {
|
|
50
|
+
secrets.real.push(as);
|
|
51
|
+
return value;
|
|
52
|
+
}
|
|
53
|
+
return broker(secrets, as, value, hosts, secret.in, secret.to === "checks" ? "checks" : "agent");
|
|
47
54
|
}
|
|
48
|
-
/**
|
|
55
|
+
/**
|
|
56
|
+
* Each host variable in the template, or with `hosts` one placeholder per variable. The record
|
|
57
|
+
* names each by its host variable, as `hostValue` names a header's secret.
|
|
58
|
+
*/
|
|
49
59
|
function template(value, where, secrets, hosts) {
|
|
50
60
|
const placeholders = /* @__PURE__ */ new Map();
|
|
51
61
|
return value.template.replace(/\$\{([A-Za-z_][A-Za-z0-9_]*)\}/g, (_, name) => {
|
|
52
62
|
const v = process.env[name];
|
|
53
63
|
if (!v) throw new InfraError(`secret.template for ${where} needs ${name}, which isn't set. Set it in the environment or .env.local.`);
|
|
54
64
|
registerSecret(v);
|
|
55
|
-
|
|
65
|
+
secrets.names.push(name);
|
|
66
|
+
if (!hosts) {
|
|
67
|
+
secrets.real.push(name);
|
|
68
|
+
return v;
|
|
69
|
+
}
|
|
56
70
|
const p = placeholders.get(name) ?? broker(secrets, name, v, hosts);
|
|
57
71
|
placeholders.set(name, p);
|
|
58
72
|
return p;
|
|
@@ -60,7 +74,7 @@ function template(value, where, secrets, hosts) {
|
|
|
60
74
|
}
|
|
61
75
|
/** A `SKILL.md` split into its YAML frontmatter's `name` and `description` and its body. */
|
|
62
76
|
function parseSkillMd(text, where) {
|
|
63
|
-
const match = /^---\r?\n(?:([\s\S]*?)\r?\n)?---[ \t]*(?:\r?\n|$)([\s\S]*)$/.exec(text);
|
|
77
|
+
const match = /^---\r?\n(?:([\s\S]*?)\r?\n)?---[ \t]*(?:\r?\n|$)([\s\S]*)$/.exec(withoutBom(text));
|
|
64
78
|
if (!match) return { body: text };
|
|
65
79
|
let front;
|
|
66
80
|
try {
|
|
@@ -337,7 +351,7 @@ async function entrySourceDir(root, p) {
|
|
|
337
351
|
* A marketplace entry's is its marketplace's for a `./` entry, else the entry's own source.
|
|
338
352
|
*/
|
|
339
353
|
async function pluginSourceDir(root, p) {
|
|
340
|
-
const
|
|
354
|
+
const labeled = {
|
|
341
355
|
source: pluginSourceLabel(p, root),
|
|
342
356
|
marketplace: null
|
|
343
357
|
};
|
|
@@ -346,7 +360,7 @@ async function pluginSourceDir(root, p) {
|
|
|
346
360
|
context: p.path,
|
|
347
361
|
path: ".",
|
|
348
362
|
commit: null,
|
|
349
|
-
...
|
|
363
|
+
...labeled
|
|
350
364
|
};
|
|
351
365
|
case "git": {
|
|
352
366
|
const clone = await cloneSkills(root, parseGitRepo(p.repo).url, p.ref);
|
|
@@ -354,14 +368,14 @@ async function pluginSourceDir(root, p) {
|
|
|
354
368
|
context: clone.dir,
|
|
355
369
|
path: p.path ?? ".",
|
|
356
370
|
commit: clone.commit,
|
|
357
|
-
...
|
|
371
|
+
...labeled
|
|
358
372
|
};
|
|
359
373
|
}
|
|
360
374
|
case "npm": return {
|
|
361
375
|
context: await unpackNpm(root, p.spec),
|
|
362
376
|
path: p.path ?? ".",
|
|
363
377
|
commit: null,
|
|
364
|
-
...
|
|
378
|
+
...labeled
|
|
365
379
|
};
|
|
366
380
|
case "marketplace": return entrySourceDir(root, p);
|
|
367
381
|
}
|
|
@@ -536,7 +550,8 @@ async function resolveEnvironment(environment, optionsEnv, root, where, rulesFil
|
|
|
536
550
|
names: [],
|
|
537
551
|
checks: [],
|
|
538
552
|
unset: [],
|
|
539
|
-
brokered: []
|
|
553
|
+
brokered: [],
|
|
554
|
+
real: []
|
|
540
555
|
};
|
|
541
556
|
const vars = {};
|
|
542
557
|
const checkVars = {};
|
|
@@ -545,21 +560,22 @@ async function resolveEnvironment(environment, optionsEnv, root, where, rulesFil
|
|
|
545
560
|
vars[name] = value;
|
|
546
561
|
continue;
|
|
547
562
|
}
|
|
548
|
-
const resolved = hostValue(name, value, envWhere, secrets);
|
|
563
|
+
const resolved = hostValue(name, value, envWhere, secrets, value.hosts);
|
|
549
564
|
if (resolved === void 0) continue;
|
|
550
565
|
if (value.to === "checks") checkVars[name] = resolved;
|
|
551
566
|
else vars[name] = resolved;
|
|
552
567
|
}
|
|
553
|
-
const secretOf = (value, key, hosts) => {
|
|
568
|
+
const secretOf = (value, key, header, hosts) => {
|
|
554
569
|
if (typeof value === "string") return value;
|
|
555
570
|
if (isSecretTemplate(value)) return template(value, envWhere, secrets, hosts);
|
|
556
|
-
|
|
571
|
+
const as = header ? value.from ?? key : key;
|
|
572
|
+
return hostValue(key, value, envWhere, secrets, hosts, as);
|
|
557
573
|
};
|
|
558
574
|
const resolvedMcp = {};
|
|
559
575
|
for (const [name, s] of mcp) if (s.transport === "stdio") {
|
|
560
576
|
const e = {};
|
|
561
577
|
for (const [k, v] of Object.entries(s.env)) {
|
|
562
|
-
const r = secretOf(v, k);
|
|
578
|
+
const r = secretOf(v, k, false, isSecret(v) ? v.hosts : void 0);
|
|
563
579
|
if (r !== void 0) e[k] = r;
|
|
564
580
|
}
|
|
565
581
|
resolvedMcp[name] = {
|
|
@@ -570,9 +586,9 @@ async function resolveEnvironment(environment, optionsEnv, root, where, rulesFil
|
|
|
570
586
|
};
|
|
571
587
|
} else {
|
|
572
588
|
const h = {};
|
|
573
|
-
const hosts = mcpHosts(s.url);
|
|
574
589
|
for (const [k, v] of Object.entries(s.headers)) {
|
|
575
|
-
|
|
590
|
+
if (typeof v === "string" && maskedHeaderValue(k, v)) registerSecret(v);
|
|
591
|
+
const r = secretOf(v, k, true, typeof v === "string" ? void 0 : mcpHeaderHosts(v, s.url));
|
|
576
592
|
if (r !== void 0) h[k] = r;
|
|
577
593
|
}
|
|
578
594
|
resolvedMcp[name] = {
|
|
@@ -624,8 +640,8 @@ async function resolveEnvironment(environment, optionsEnv, root, where, rulesFil
|
|
|
624
640
|
b.in,
|
|
625
641
|
b.phase
|
|
626
642
|
])).sort();
|
|
627
|
-
const brokeredNames = [...new Set(secrets.brokered.map((b) => b.name))].sort();
|
|
628
|
-
const varNames = Object.keys(vars).filter((n) => !
|
|
643
|
+
const brokeredNames = [...new Set(secrets.brokered.map((b) => b.name))].filter((n) => !secrets.real.includes(n)).sort();
|
|
644
|
+
const varNames = Object.keys(vars).filter((n) => !isSecret(env[n])).sort();
|
|
629
645
|
const literalVars = Object.fromEntries(varNames.map((n) => [n, vars[n]]));
|
|
630
646
|
const mcpShape = Object.fromEntries(Object.entries(resolvedMcp).map(([name, s]) => s.transport === "stdio" ? [name, {
|
|
631
647
|
command: s.command,
|
|
@@ -720,4 +736,4 @@ function skillFiles(skill) {
|
|
|
720
736
|
//#endregion
|
|
721
737
|
export { skillFiles as a, resolveEnvironment as i, parseSkillMd as n, pluginSourceDir as r, excludeMatcher as t };
|
|
722
738
|
|
|
723
|
-
//# sourceMappingURL=resolve-
|
|
739
|
+
//# sourceMappingURL=resolve-D_cLa4tW.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resolve-D_cLa4tW.js","names":["parseYaml"],"sources":["../src/environment/resolve.ts"],"mappings":"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"}
|
|
@@ -0,0 +1,63 @@
|
|
|
1
|
+
import { t as REMARKS_FILE } from "./remarks-IFFe_oty.js";
|
|
2
|
+
import { h as writeRun, p as scratchDir } from "./files-BRViE7m-.js";
|
|
3
|
+
import { n as renderSummary } from "./summary-CSzyBVsF.js";
|
|
4
|
+
import { n as assembleRun } from "./assemble-BVbI6NW-.js";
|
|
5
|
+
import { join } from "node:path";
|
|
6
|
+
import { readdir, rm, stat } from "node:fs/promises";
|
|
7
|
+
//#region src/results.ts
|
|
8
|
+
const STALE_STAGING_MS = 864e5;
|
|
9
|
+
/** Where workers write raw per-eval records before the run is assembled. */
|
|
10
|
+
const stagingDir = (root, runId) => join(root, ".reeval", "staging", runId);
|
|
11
|
+
/** Removes staging left behind by runs that were killed before they could clean up. */
|
|
12
|
+
async function sweepStaging(root, keep) {
|
|
13
|
+
const dir = join(root, ".reeval", "staging");
|
|
14
|
+
const entries = await readdir(dir).catch(() => []);
|
|
15
|
+
for (const name of entries) {
|
|
16
|
+
if (name === keep) continue;
|
|
17
|
+
if (await stat(join(dir, name)).then((s) => Date.now() - s.mtimeMs, () => 0) > STALE_STAGING_MS) await rm(join(dir, name), {
|
|
18
|
+
recursive: true,
|
|
19
|
+
force: true
|
|
20
|
+
});
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
/**
|
|
24
|
+
* The run's remarks, each marked with whether the run's output prints it, or null when it raised
|
|
25
|
+
* none; they never stop the run being written.
|
|
26
|
+
*/
|
|
27
|
+
async function runRemarks(config, record, verbose) {
|
|
28
|
+
try {
|
|
29
|
+
const { remarksOf, remarksDoc } = await import("./remarks-Bt0zwiQB.js");
|
|
30
|
+
const { markPrinted } = await import("./remarks-Bp6AwPgb.js");
|
|
31
|
+
const marked = markPrinted(await remarksOf(config, record), record.runId, verbose);
|
|
32
|
+
return marked.length ? remarksDoc(record, marked) : null;
|
|
33
|
+
} catch (error) {
|
|
34
|
+
process.stderr.write(`warning: no remarks for this run: ${error.message}\n`);
|
|
35
|
+
return null;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
/**
|
|
39
|
+
* Assembles the run into `.reeval/runs/`, with every artifact, a summary.md and, when a finished
|
|
40
|
+
* run raised remarks, its remarks.json.
|
|
41
|
+
*/
|
|
42
|
+
async function writeScratchRun(input, landed) {
|
|
43
|
+
const { record, artifacts, moves } = await assembleRun(input);
|
|
44
|
+
const remarks = input.interrupted ? null : await runRemarks(input.ctx.config, record, (input.ctx.verbosity ?? 0) > 0);
|
|
45
|
+
if (remarks) artifacts.set(REMARKS_FILE, Buffer.from(`${JSON.stringify(remarks, null, 2)}\n`));
|
|
46
|
+
artifacts.set("summary.md", Buffer.from(renderSummary(record, { remarks })));
|
|
47
|
+
const scratch = scratchDir(input.ctx.config.root);
|
|
48
|
+
const written = await writeRun(scratch, record, artifacts, moves);
|
|
49
|
+
landed?.();
|
|
50
|
+
await rm(input.ctx.stagingDir, {
|
|
51
|
+
recursive: true,
|
|
52
|
+
force: true
|
|
53
|
+
});
|
|
54
|
+
return {
|
|
55
|
+
...written,
|
|
56
|
+
record,
|
|
57
|
+
remarks
|
|
58
|
+
};
|
|
59
|
+
}
|
|
60
|
+
//#endregion
|
|
61
|
+
export { stagingDir, sweepStaging, writeScratchRun };
|
|
62
|
+
|
|
63
|
+
//# sourceMappingURL=results-DrKJuIQF.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"results-DrKJuIQF.js","names":[],"sources":["../src/results.ts"],"mappings":";;;;;;;AASA,MAAM,mBAAmB;;AAGzB,MAAa,cAAc,MAAc,UAAkB,KAAK,MAAM,WAAW,WAAW,KAAK;;AAGjG,eAAsB,aAAa,MAAc,MAA8B;CAC7E,MAAM,MAAM,KAAK,MAAM,WAAW,SAAS;CAC3C,MAAM,UAAU,MAAM,QAAQ,GAAG,CAAC,CAAC,YAAY,CAAC,CAAC;CACjD,KAAK,MAAM,QAAQ,SAAS;EAC1B,IAAI,SAAS,MAAM;EAKnB,IAAI,MAJc,KAAK,KAAK,KAAK,IAAI,CAAC,CAAC,CAAC,MACrC,MAAM,KAAK,IAAI,IAAI,EAAE,eAChB,CACR,IACU,kBAAkB,MAAM,GAAG,KAAK,KAAK,IAAI,GAAG;GAAE,WAAW;GAAM,OAAO;EAAK,CAAC;CACxF;AACF;;;;;AAMA,eAAe,WACb,QACA,QACA,SAC4B;CAC5B,IAAI;EACF,MAAM,EAAE,WAAW,eAAe,MAAM,OAAO;EAC/C,MAAM,EAAE,gBAAgB,MAAM,OAAO;EACrC,MAAM,SAAS,YAAY,MAAM,UAAU,QAAQ,MAAM,GAAG,OAAO,OAAO,OAAO;EACjF,OAAO,OAAO,SAAS,WAAW,QAAQ,MAAM,IAAI;CACtD,SAAS,OAAO;EACd,QAAQ,OAAO,MAAM,qCAAsC,MAAgB,QAAQ,GAAG;EACtF,OAAO;CACT;AACF;;;;;AAMA,eAAsB,gBACpB,OACA,QACyE;CACzE,MAAM,EAAE,QAAQ,WAAW,UAAU,MAAM,YAAY,KAAK;CAC5D,MAAM,UAAU,MAAM,cAClB,OACA,MAAM,WAAW,MAAM,IAAI,QAAQ,SAAS,MAAM,IAAI,aAAa,KAAK,CAAC;CAC7E,IAAI,SAAS,UAAU,IAAI,cAAc,OAAO,KAAK,GAAG,KAAK,UAAU,SAAS,MAAM,CAAC,EAAE,GAAG,CAAC;CAC7F,UAAU,IAAI,cAAc,OAAO,KAAK,cAAc,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;CAC3E,MAAM,UAAU,WAAW,MAAM,IAAI,OAAO,IAAI;CAChD,MAAM,UAAU,MAAM,SAAS,SAAS,QAAQ,WAAW,KAAK;CAChE,SAAS;CACT,MAAM,GAAG,MAAM,IAAI,YAAY;EAAE,WAAW;EAAM,OAAO;CAAK,CAAC;CAC/D,OAAO;EAAE,GAAG;EAAS;EAAQ;CAAQ;AACvC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { n as UsageError } from "./errors-B6BSMs03.js";
|
|
2
2
|
import { t as RUN_ID } from "./paths-BmR-7tx3.js";
|
|
3
3
|
import { s as recordFileName } from "./ids-Bp6ut7ZD.js";
|
|
4
|
-
import { c as readableLiveProgress, n as LIVE_FILE, o as liveCounts } from "./live-
|
|
5
|
-
import { p as scratchDir } from "./files-
|
|
6
|
-
import { t as RefError } from "./views-
|
|
4
|
+
import { c as readableLiveProgress, n as LIVE_FILE, o as liveCounts } from "./live-DeMvnDD5.js";
|
|
5
|
+
import { p as scratchDir } from "./files-BRViE7m-.js";
|
|
6
|
+
import { t as RefError } from "./views-B9STsLB4.js";
|
|
7
7
|
import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, unlinkSync, writeFileSync } from "node:fs";
|
|
8
8
|
import { hostname } from "node:os";
|
|
9
9
|
import { join } from "node:path";
|
|
@@ -47,17 +47,21 @@ function writeLiveProgress(options) {
|
|
|
47
47
|
const now = options.now ?? (() => /* @__PURE__ */ new Date());
|
|
48
48
|
const file = join(options.dir, LIVE_FILE);
|
|
49
49
|
const tmp = `${file}.${process.pid}.tmp`;
|
|
50
|
-
const
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
50
|
+
const kept = options.kept ?? /* @__PURE__ */ new Map();
|
|
51
|
+
const attempts = new Map(options.planned.map((p) => {
|
|
52
|
+
const was = kept.get(p.key);
|
|
53
|
+
return [p.key, {
|
|
54
|
+
key: p.key,
|
|
55
|
+
evalId: p.id,
|
|
56
|
+
name: p.attempt.name,
|
|
57
|
+
file: p.file,
|
|
58
|
+
cell: p.attempt.cell.key,
|
|
59
|
+
n: p.attempt.n,
|
|
60
|
+
status: was?.outcome ?? (p.attempt.skip || p.attempt.plan.skip ? "skipped" : "queued"),
|
|
61
|
+
startedAt: was?.startedAt ?? null,
|
|
62
|
+
durationMs: was?.durationMs ?? null
|
|
63
|
+
}];
|
|
64
|
+
}));
|
|
61
65
|
let phase = "running";
|
|
62
66
|
let stopped = false;
|
|
63
67
|
const read = () => {
|
|
@@ -102,7 +106,7 @@ function writeLiveProgress(options) {
|
|
|
102
106
|
},
|
|
103
107
|
end(result) {
|
|
104
108
|
const a = attempts.get(result.key);
|
|
105
|
-
if (!a) return;
|
|
109
|
+
if (!a || kept.has(result.key) && result.state === "skipped") return;
|
|
106
110
|
a.status = finished(result);
|
|
107
111
|
a.durationMs = result.durationMs;
|
|
108
112
|
write();
|
|
@@ -229,6 +233,32 @@ function completedKeysFor(planned, staging, previous) {
|
|
|
229
233
|
for (const { key } of planned) if (stagingRecordComplete(staging, key) || fromPrevious.has(key)) keys.add(key);
|
|
230
234
|
return keys;
|
|
231
235
|
}
|
|
236
|
+
/**
|
|
237
|
+
* How each completed attempt finished, for the progress file: from the previous assemble when it
|
|
238
|
+
* has the attempt (as the record keeps it), else from its staged record, which has no duration.
|
|
239
|
+
*/
|
|
240
|
+
function keptAttempts(completed, staging, previous) {
|
|
241
|
+
const kept = /* @__PURE__ */ new Map();
|
|
242
|
+
for (const key of completed) {
|
|
243
|
+
const was = previousAttempt(previous, key);
|
|
244
|
+
if (was && was.outcome !== "skipped" && isCompletedAttempt(was.outcome, was.error)) {
|
|
245
|
+
kept.set(key, {
|
|
246
|
+
outcome: was.outcome,
|
|
247
|
+
startedAt: was.startedAt,
|
|
248
|
+
durationMs: was.durationMs
|
|
249
|
+
});
|
|
250
|
+
continue;
|
|
251
|
+
}
|
|
252
|
+
const record = readEvalRecord(join(staging, "evals", recordFileName(key)));
|
|
253
|
+
if (!record || !isCompletedAttempt(record.outcome, record.error)) continue;
|
|
254
|
+
kept.set(key, {
|
|
255
|
+
outcome: record.outcome,
|
|
256
|
+
startedAt: record.startedAt ?? null,
|
|
257
|
+
durationMs: null
|
|
258
|
+
});
|
|
259
|
+
}
|
|
260
|
+
return kept;
|
|
261
|
+
}
|
|
232
262
|
function progressLive(progress, now) {
|
|
233
263
|
if (processAlive(progress.pid, progress.host)) return true;
|
|
234
264
|
if (now - Date.parse(progress.heartbeatAt) > STALE_MS) return false;
|
|
@@ -401,6 +431,6 @@ async function loadPrevious(staging) {
|
|
|
401
431
|
}
|
|
402
432
|
const previousAttempt = (previous, key) => previous?.evals.flatMap((e) => e.attempts).find((a) => a.key === key);
|
|
403
433
|
//#endregion
|
|
404
|
-
export {
|
|
434
|
+
export { prepareResume as a, writeCurrent as c, loadPrevious as i, writeLiveProgress as l, isCompletedAttempt as n, previousAttempt as o, keptAttempts as r, resolveResume as s, completedKeysFor as t };
|
|
405
435
|
|
|
406
|
-
//# sourceMappingURL=resume-
|
|
436
|
+
//# sourceMappingURL=resume-BmIM52MJ.js.map
|