reeval 0.18.0 → 0.19.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +1 -1
- package/THIRD_PARTY_NOTICES.md +5 -5
- package/dist/{adapter-CptK032x.js → adapter-C8xPuXYq.js} +5 -4
- package/dist/adapter-C8xPuXYq.js.map +1 -0
- package/dist/{agent-B63OzUX9.js → agent-CBoLndM7.js} +30 -10
- package/dist/{agent-B63OzUX9.js.map → agent-CBoLndM7.js.map} +1 -1
- package/dist/agents-C6zhkxp3.js +1151 -0
- package/dist/agents-C6zhkxp3.js.map +1 -0
- package/dist/{app-files-sgqwfjtn.js → app-files-DT5mJyV4.js} +3 -3
- package/dist/app-files-DT5mJyV4.js.map +1 -0
- package/dist/assemble-UPCRrtOz.js +1 -0
- package/dist/{assemble-Me7Whp-y.js → assemble-t6h018An.js} +152 -129
- package/dist/assemble-t6h018An.js.map +1 -0
- package/dist/{attempt-Dp7Wtm8M.js → attempt-CAdlwlNu.js} +2 -2
- package/dist/{attempt-Dp7Wtm8M.js.map → attempt-CAdlwlNu.js.map} +1 -1
- package/dist/{attempt-host-Cik0SoIn.js → attempt-host-CIm1-11m.js} +6 -6
- package/dist/{attempt-host-Cik0SoIn.js.map → attempt-host-CIm1-11m.js.map} +1 -1
- package/dist/boat-BjLqFJIZ.js +108 -0
- package/dist/boat-BjLqFJIZ.js.map +1 -0
- package/dist/boat-CJCtzfB1.js +322 -0
- package/dist/boat-CJCtzfB1.js.map +1 -0
- package/dist/bridge/index.mjs +300 -78
- package/dist/capture-DoxFUN3J.js +1 -0
- package/dist/{capture-C3RmjPph.js → capture-iBzFiC0j.js} +27 -25
- package/dist/capture-iBzFiC0j.js.map +1 -0
- package/dist/cases-Dy0mifal.js +1 -0
- package/dist/cases-z9E6DCd5.js +639 -0
- package/dist/cases-z9E6DCd5.js.map +1 -0
- package/dist/{cli-BBOlXKPG.js → cli-20Fpvs5H.js} +442 -707
- package/dist/cli-20Fpvs5H.js.map +1 -0
- package/dist/{cli-spec-DZ0bnP0_.js → cli-spec-Dsr79Qy1.js} +38 -11
- package/dist/cli-spec-Dsr79Qy1.js.map +1 -0
- package/dist/cli.js +2 -2
- package/dist/{client-tZ2WBDxf.js → client-KM4C5r5_.js} +93 -3
- package/dist/client-KM4C5r5_.js.map +1 -0
- package/dist/{command-qGS802uX.js → command-B5OyHpOu.js} +21 -80
- package/dist/command-B5OyHpOu.js.map +1 -0
- package/dist/{command-DhiwsZl1.js → command-BLNVDiIg.js} +9 -9
- package/dist/{command-DhiwsZl1.js.map → command-BLNVDiIg.js.map} +1 -1
- package/dist/{command-fO0BFsTq.js → command-CRh-cb6Z.js} +37 -37
- package/dist/command-CRh-cb6Z.js.map +1 -0
- package/dist/{command-CFQ9c1hk.js → command-aUJvENwy.js} +16 -16
- package/dist/command-aUJvENwy.js.map +1 -0
- package/dist/{commands-CC60TOT5.js → commands-CWy-WndG.js} +186 -85
- package/dist/commands-CWy-WndG.js.map +1 -0
- package/dist/{commands-xYTMNTPv.js → commands-CfdBX-mc.js} +1 -1
- package/dist/{config-C2UtS9vy.js → config-B9mB1kF5.js} +261 -1708
- package/dist/config-B9mB1kF5.js.map +1 -0
- package/dist/{context-BajfiH0S.js → context-Bkv3ndjq.js} +3 -2
- package/dist/context-Bkv3ndjq.js.map +1 -0
- package/dist/{cost-BuVDamui.js → cost-BdRgySQl.js} +2 -2
- package/dist/{cost-BuVDamui.js.map → cost-BdRgySQl.js.map} +1 -1
- package/dist/cost-Cr26Alhq.js +1 -0
- package/dist/{cursor-catalog-BTK_apL-.js → cursor-catalog-BSn9xjmo.js} +3 -3
- package/dist/{cursor-catalog-BTK_apL-.js.map → cursor-catalog-BSn9xjmo.js.map} +1 -1
- package/dist/db-P2fXw4nx.js +2 -0
- package/dist/{db-C5SZ0510.js → db-zgC1tvKB.js} +130 -84
- package/dist/db-zgC1tvKB.js.map +1 -0
- package/dist/debug-CF4p4Lp_.js +1 -0
- package/dist/{debug-B5jDImcW.js → debug-CIXzB4wK.js} +2 -2
- package/dist/{debug-B5jDImcW.js.map → debug-CIXzB4wK.js.map} +1 -1
- package/dist/{default-effort-FEidNAIi.js → default-effort-BAy8ixd1.js} +1 -1
- package/dist/{default-effort-BVmx7r7L.js → default-effort-DGhQmu95.js} +4 -4
- package/dist/{default-effort-BVmx7r7L.js.map → default-effort-DGhQmu95.js.map} +1 -1
- package/dist/{dist-ByYk_wAs.js → dist-CAFD1yfv.js} +28 -6
- package/dist/dist-CAFD1yfv.js.map +1 -0
- package/dist/{docker-B2F8-PGC.js → docker-Cqw-CyWz.js} +3 -3
- package/dist/{docker-B2F8-PGC.js.map → docker-Cqw-CyWz.js.map} +1 -1
- package/dist/{docker-Dto8ROCq.js → docker-DAMnm3L9.js} +103 -73
- package/dist/docker-DAMnm3L9.js.map +1 -0
- package/dist/{docker-BlSopHpZ.js → docker-Dr4XeDc8.js} +1 -1
- package/dist/{doctor-BcvfKpBX.js → doctor-B2PohneB.js} +84 -27
- package/dist/doctor-B2PohneB.js.map +1 -0
- package/dist/{environment-CC1RV21n.js → environment-DB8o3hGi.js} +79 -39
- package/dist/environment-DB8o3hGi.js.map +1 -0
- package/dist/{errors-BQV__TzH.js → errors-BZgLSZtV.js} +2 -2
- package/dist/{errors-BQV__TzH.js.map → errors-BZgLSZtV.js.map} +1 -1
- package/dist/{eval-source-CzxdgFBW.js → eval-source-D3sbAzt-.js} +10 -10
- package/dist/{eval-source-CzxdgFBW.js.map → eval-source-D3sbAzt-.js.map} +1 -1
- package/dist/{evaluate-DToSB2bt.d.ts → evaluate-COdzf7Hl.d.ts} +17 -26
- package/dist/{evaluate-NTNJ8T9H.js → evaluate-CwKeN_fo.js} +377 -142
- package/dist/evaluate-CwKeN_fo.js.map +1 -0
- package/dist/files-B4KQUiM7.js +1 -0
- package/dist/files-BEwfjD8J.js +64 -0
- package/dist/files-BEwfjD8J.js.map +1 -0
- package/dist/{files-DsXULUi5.js → files-BRzV7aPh.js} +5 -5
- package/dist/{files-DsXULUi5.js.map → files-BRzV7aPh.js.map} +1 -1
- package/dist/{files-aAzoGNCB.js → files-BiFU16BW.js} +5 -5
- package/dist/{files-aAzoGNCB.js.map → files-BiFU16BW.js.map} +1 -1
- package/dist/files-C1Rk9FYA.js +1 -0
- package/dist/files-C3mCC8Mn.js +1 -0
- package/dist/{files-CZXrkPja.js → files-Cl7BQ5gE.js} +54 -13
- package/dist/{files-CZXrkPja.js.map → files-Cl7BQ5gE.js.map} +1 -1
- package/dist/{files-BGlHnC46.js → files-DgXyaAg6.js} +2 -2
- package/dist/{files-BGlHnC46.js.map → files-DgXyaAg6.js.map} +1 -1
- package/dist/{files-p-uTdOjA.js → files-DlQshsks.js} +3 -2
- package/dist/files-DlQshsks.js.map +1 -0
- package/dist/files-DnlA1A7N.js +1 -0
- package/dist/gate-CgYdaprG.js +49 -0
- package/dist/gate-CgYdaprG.js.map +1 -0
- package/dist/gateway.d.ts +1 -1
- package/dist/{git-C1MB5bjr.js → git-fDiJ8UIV.js} +2 -2
- package/dist/{git-C1MB5bjr.js.map → git-fDiJ8UIV.js.map} +1 -1
- package/dist/{harness-DGsRZDSo.js → harness-C2berMiM.js} +3 -3
- package/dist/{harness-DGsRZDSo.js.map → harness-C2berMiM.js.map} +1 -1
- package/dist/{harness-DYSC4zMh.js → harness-DXv2gnaT.js} +4 -2
- package/dist/harness-DXv2gnaT.js.map +1 -0
- package/dist/harness.d.ts +1 -1
- package/dist/harness.js +1 -1
- package/dist/{ids-DuK6xl4w.js → ids-C_advdJA.js} +3 -8
- package/dist/ids-C_advdJA.js.map +1 -0
- package/dist/{images-CNayXCp2.js → images-BNgcR77K.js} +98 -10
- package/dist/images-BNgcR77K.js.map +1 -0
- package/dist/index.d.ts +23 -3
- package/dist/index.js +5 -5
- package/dist/init-4RPeD-K-.js +1 -0
- package/dist/{init-D5HtmyMI.js → init-DbuZVRrW.js} +7 -6
- package/dist/init-DbuZVRrW.js.map +1 -0
- package/dist/{ink-list-Ca-5dunO.js → ink-list-BpfidQ1h.js} +121 -31
- package/dist/ink-list-BpfidQ1h.js.map +1 -0
- package/dist/{invocations-DrGXF9dT.js → invocations-CxGNOlh0.js} +3 -3
- package/dist/{invocations-DrGXF9dT.js.map → invocations-CxGNOlh0.js.map} +1 -1
- package/dist/judge-COMXT1Hx.js +230 -0
- package/dist/judge-COMXT1Hx.js.map +1 -0
- package/dist/judge.d.ts +1 -1
- package/dist/judge.js +1 -1
- package/dist/{judgments-m-mb0zv8.js → judgments-CzgpsTqv.js} +2 -2
- package/dist/{judgments-m-mb0zv8.js.map → judgments-CzgpsTqv.js.map} +1 -1
- package/dist/kinds-C1oY3qyC.js +697 -0
- package/dist/kinds-C1oY3qyC.js.map +1 -0
- package/dist/{summary-Uzc9osfV.js → layout-Cm85tQYk.js} +39 -150
- package/dist/layout-Cm85tQYk.js.map +1 -0
- package/dist/list-DuThsE28.js +1348 -0
- package/dist/list-DuThsE28.js.map +1 -0
- package/dist/live-CJCK11nh.js +1 -0
- package/dist/{live-B71o2TkX.js → live-CgYbO4Te.js} +6 -4
- package/dist/{live-B71o2TkX.js.map → live-CgYbO4Te.js.map} +1 -1
- package/dist/{live-uRURFDMZ.js → live-CnGrRM6j.js} +7 -7
- package/dist/{live-uRURFDMZ.js.map → live-CnGrRM6j.js.map} +1 -1
- package/dist/{matchers-Cs8aDqdU.js → matchers-CXLn-1jm.js} +3 -2
- package/dist/{matchers-Cs8aDqdU.js.map → matchers-CXLn-1jm.js.map} +1 -1
- package/dist/{model-CXVVB4RK.js → model-047Dcd-a.js} +1 -1
- package/dist/model-Cv4GuTsZ.js +1 -0
- package/dist/{model-1L19Zukh.js → model-CwwkrCb7.js} +5 -5
- package/dist/{model-1L19Zukh.js.map → model-CwwkrCb7.js.map} +1 -1
- package/dist/{model-BxBWFOZn.js → model-DJjLw-0r.js} +5 -5
- package/dist/{model-BxBWFOZn.js.map → model-DJjLw-0r.js.map} +1 -1
- package/dist/{model-Ce9l9_rF.js → model-V3mMXp6x.js} +203 -313
- package/dist/model-V3mMXp6x.js.map +1 -0
- package/dist/{node-DhIRSrrK.js → node-D7pAU--0.js} +14 -10
- package/dist/node-D7pAU--0.js.map +1 -0
- package/dist/{opencode-providers-Co7plCea.js → opencode-providers-BGiXt8_B.js} +104 -35
- package/dist/opencode-providers-BGiXt8_B.js.map +1 -0
- package/dist/{openrouter-models-DNvLRYM7.js → openrouter-models-Cw1z8-sq.js} +2 -2
- package/dist/{openrouter-models-DNvLRYM7.js.map → openrouter-models-Cw1z8-sq.js.map} +1 -1
- package/dist/options-CHubslQf.js +1 -0
- package/dist/{gate-Cp_pQoEe.js → pairs-BGb134Vu.js} +2 -48
- package/dist/pairs-BGb134Vu.js.map +1 -0
- package/dist/{patch-ug5HpMOj.js → patch-DH4e_Gkd.js} +2 -2
- package/dist/{patch-ug5HpMOj.js.map → patch-DH4e_Gkd.js.map} +1 -1
- package/dist/plain-BYUf_fUV.js +267 -0
- package/dist/plain-BYUf_fUV.js.map +1 -0
- package/dist/{plan-DqnzfDH1.js → plan-Cgq9NCEX.js} +110 -39
- package/dist/plan-Cgq9NCEX.js.map +1 -0
- package/dist/{plugins-B2KQ0y3P.js → plugins-BkmPxDiY.js} +10 -267
- package/dist/plugins-BkmPxDiY.js.map +1 -0
- package/dist/preflight-4gWSy0Pe.js +1 -0
- package/dist/{preflight-DyzmvK7i.js → preflight-BElE_q0u.js} +16 -9
- package/dist/preflight-BElE_q0u.js.map +1 -0
- package/dist/preflight-CtlloeOQ.js +68 -0
- package/dist/preflight-CtlloeOQ.js.map +1 -0
- package/dist/{preflight-DVXEvzFU.js → preflight-R-InZCQb.js} +1 -1
- package/dist/{prepare-21WMQZyt.js → prepare-C7f5mPl5.js} +9 -9
- package/dist/{prepare-21WMQZyt.js.map → prepare-C7f5mPl5.js.map} +1 -1
- package/dist/{prepare-BcSRa7-3.js → prepare-CzkAdbXm.js} +2 -2
- package/dist/{prices-DYJA0tJN.js → prices-5m3SzMZ3.js} +2 -2
- package/dist/{prices-DYJA0tJN.js.map → prices-5m3SzMZ3.js.map} +1 -1
- package/dist/{provenance-iRxjp4Pu.js → provenance-zsc4--dP.js} +4 -3
- package/dist/provenance-zsc4--dP.js.map +1 -0
- package/dist/provider-BnUoz4KB.js +1 -0
- package/dist/{provider-DZd8t_XW.js → provider-BxzZq3Th.js} +2 -2
- package/dist/{provider-DZd8t_XW.js.map → provider-BxzZq3Th.js.map} +1 -1
- package/dist/{providers-vXMXuwn-.js → providers-B8xYMeah.js} +152 -9
- package/dist/providers-B8xYMeah.js.map +1 -0
- package/dist/providers-CVu8e0xS.js +1 -0
- package/dist/{query-BhaKQ07P.js → query-Bb3SYICk.js} +2 -2
- package/dist/{query-BhaKQ07P.js.map → query-Bb3SYICk.js.map} +1 -1
- package/dist/query-DIfkUcPh.js +1 -0
- package/dist/{questions-BzdLdV3C.js → questions-CWlR9ffu.js} +9 -9
- package/dist/{questions-BzdLdV3C.js.map → questions-CWlR9ffu.js.map} +1 -1
- package/dist/{record-DhzwkSXc.js → record-6IUzwP9K.js} +5 -3
- package/dist/record-6IUzwP9K.js.map +1 -0
- package/dist/{remarks-NMgPd30U.js → remarks-DPCONFxZ.js} +71 -50
- package/dist/remarks-DPCONFxZ.js.map +1 -0
- package/dist/{remarks-CauU408t.js → remarks-vtkPmQb9.js} +115 -35
- package/dist/remarks-vtkPmQb9.js.map +1 -0
- package/dist/{remote-Dwy3fyo3.js → remote-BgYWqogI.js} +6 -6
- package/dist/{remote-Dwy3fyo3.js.map → remote-BgYWqogI.js.map} +1 -1
- package/dist/{resolve-B1zMnPwK.js → resolve-Do0ZaYH6.js} +10 -9
- package/dist/resolve-Do0ZaYH6.js.map +1 -0
- package/dist/resolve-amw_2Odz.js +1 -0
- package/dist/{results-CfC0id_u.js → results-JyuM64gy.js} +6 -6
- package/dist/{results-CfC0id_u.js.map → results-JyuM64gy.js.map} +1 -1
- package/dist/{resume-Dkhrpjow.js → resume-AW5oXzUc.js} +169 -27
- package/dist/resume-AW5oXzUc.js.map +1 -0
- package/dist/retry-ChzISxmy.js +105 -0
- package/dist/retry-ChzISxmy.js.map +1 -0
- package/dist/{runtime-DcvQcr36.js → runtime-BpW1f1Mx.js} +26 -7
- package/dist/runtime-BpW1f1Mx.js.map +1 -0
- package/dist/sandbox/boat.d.ts +26 -0
- package/dist/sandbox/boat.js +37 -0
- package/dist/sandbox/boat.js.map +1 -0
- package/dist/{sandbox-8zCrtuCf.js → sandbox-kSgr7vo5.js} +31 -3
- package/dist/sandbox-kSgr7vo5.js.map +1 -0
- package/dist/sandbox.d.ts +20 -2
- package/dist/sandbox.js +1 -1
- package/dist/server-2_gUnVvf.js +1 -0
- package/dist/{server-Dplq8g0r.js → server-Cn8VqO9S.js} +9 -9
- package/dist/{server-Dplq8g0r.js.map → server-Cn8VqO9S.js.map} +1 -1
- package/dist/{shared-ogqPJ0uo.js → shared-Cfi45Bvy.js} +9 -2
- package/dist/shared-Cfi45Bvy.js.map +1 -0
- package/dist/slug-IHh3f770.js +136 -0
- package/dist/slug-IHh3f770.js.map +1 -0
- package/dist/source-CY3etKzw.js +1 -0
- package/dist/{source-NWHqn5-o.js → source-CYOhR98B.js} +2 -2
- package/dist/{source-NWHqn5-o.js.map → source-CYOhR98B.js.map} +1 -1
- package/dist/src-6Zzyg4Qd.js +2 -0
- package/dist/{src-B9oE_mNS.js → src-BDhcPtnI.js} +2 -2
- package/dist/{src-B-L8O1Ld.js → src-BNQznj4z.js} +2 -2
- package/dist/{src-B-L8O1Ld.js.map → src-BNQznj4z.js.map} +1 -1
- package/dist/src-BRMsk9nh.js +2 -0
- package/dist/{src-BQXdf-Gw.js → src-CV_7DkPa.js} +47 -45
- package/dist/{src-BQXdf-Gw.js.map → src-CV_7DkPa.js.map} +1 -1
- package/dist/{src-KlDOGD0B.js → src-Cb2MWozp.js} +3 -1
- package/dist/{src-KlDOGD0B.js.map → src-Cb2MWozp.js.map} +1 -1
- package/dist/{src-BQ6BiXoc.js → src-Ck2r_EMT.js} +607 -72
- package/dist/src-Ck2r_EMT.js.map +1 -0
- package/dist/{src-HTG2SoNz.js → src-DAzaCTcN.js} +2 -2
- package/dist/{src-HTG2SoNz.js.map → src-DAzaCTcN.js.map} +1 -1
- package/dist/src-DB7N8TYJ.js +2 -0
- package/dist/src-DPDaAYwh.js +2 -0
- package/dist/{src-CUpoVVb8.js → src-Dbk19BiP.js} +2 -2
- package/dist/src-DtodMT59.js +1 -0
- package/dist/{src-uluei5nU.js → src-DvGns8cz.js} +2 -2
- package/dist/{src-uluei5nU.js.map → src-DvGns8cz.js.map} +1 -1
- package/dist/{src-B_igzM1O.js → src-Dw79VLa3.js} +3 -1
- package/dist/{src-B_igzM1O.js.map → src-Dw79VLa3.js.map} +1 -1
- package/dist/{src-D5t4OiRt.js → src-KxS91P7L.js} +3 -1
- package/dist/{src-D5t4OiRt.js.map → src-KxS91P7L.js.map} +1 -1
- package/dist/src-T-OeuJLr.js +2 -0
- package/dist/{src-BvM0jWuZ.js → src-YvblOrBU.js} +2 -2
- package/dist/{src-BvM0jWuZ.js.map → src-YvblOrBU.js.map} +1 -1
- package/dist/src-zntEDlnx.js +3 -0
- package/dist/{state-DDCGUhva.js → state-BOLt8pJg.js} +17 -17
- package/dist/{state-DDCGUhva.js.map → state-BOLt8pJg.js.map} +1 -1
- package/dist/state-kimtIhBP.js +1 -0
- package/dist/suite-CKBa6MKt.js +2 -0
- package/dist/{suite-M8_7xio7.js → suite-COglUhPd.js} +70 -92
- package/dist/suite-COglUhPd.js.map +1 -0
- package/dist/summary-DU5zaibx.js +148 -0
- package/dist/summary-DU5zaibx.js.map +1 -0
- package/dist/tart-BTVXp8rz.js +373 -0
- package/dist/tart-BTVXp8rz.js.map +1 -0
- package/dist/tart-cli-BIC9HqPg.js +37 -0
- package/dist/tart-cli-BIC9HqPg.js.map +1 -0
- package/dist/tart-cli-BMrkmBjI.js +1 -0
- package/dist/tart-images-DZ_Mbh-g.js +233 -0
- package/dist/tart-images-DZ_Mbh-g.js.map +1 -0
- package/dist/tart-ref-7Qv3cm3B.js +1 -0
- package/dist/tart-ref-DYZijjrU.js +55 -0
- package/dist/tart-ref-DYZijjrU.js.map +1 -0
- package/dist/testing.d.ts +2 -2
- package/dist/testing.js +4 -4
- package/dist/trace-Dx2NBE1O.js +311 -0
- package/dist/trace-Dx2NBE1O.js.map +1 -0
- package/dist/traits-DKnYkqeK.js +66 -0
- package/dist/traits-DKnYkqeK.js.map +1 -0
- package/dist/{transcript-Cg4SeqRX.js → transcript-CCf07UmU.js} +2 -2
- package/dist/{transcript-Cg4SeqRX.js.map → transcript-CCf07UmU.js.map} +1 -1
- package/dist/{types-C4OkYhZg.js → types-C2mLpph3.js} +3 -2
- package/dist/types-C2mLpph3.js.map +1 -0
- package/dist/{types-DGvexkcp.d.ts → types-DBwFsGem.d.ts} +352 -76
- package/dist/{judge-DYOF69Oe.js → vercel-CGlSBv63.js} +3 -229
- package/dist/vercel-CGlSBv63.js.map +1 -0
- package/dist/{vertex-BLQMayc1.js → vertex-Eb2wqahk.js} +2 -2
- package/dist/{vertex-BLQMayc1.js.map → vertex-Eb2wqahk.js.map} +1 -1
- package/dist/vertex-O88TCwgY.js +1 -0
- package/dist/view/index.d.ts +101 -58
- package/dist/view/index.js +9 -8
- package/dist/{views-BISrsIjw.js → views-DAIiLiV3.js} +7 -6
- package/dist/views-DAIiLiV3.js.map +1 -0
- package/dist/views-DtRhj2Tn.js +2 -0
- package/dist/{worker-entry-DJD_nHkS.js → worker-entry-BIROTPX1.js} +11 -8
- package/dist/{worker-entry-DJD_nHkS.js.map → worker-entry-BIROTPX1.js.map} +1 -1
- package/dist/workspace-CcQRT31C.js +1 -0
- package/dist/{workspace-BO1VhUR9.js → workspace-uuE51x35.js} +6 -6
- package/dist/{workspace-BO1VhUR9.js.map → workspace-uuE51x35.js.map} +1 -1
- package/package.json +24 -11
- package/skills/eval-rubric/SKILL.md +15 -7
- package/dist/adapter-CptK032x.js.map +0 -1
- package/dist/app-files-sgqwfjtn.js.map +0 -1
- package/dist/assemble-CxBHkavM.js +0 -1
- package/dist/assemble-Me7Whp-y.js.map +0 -1
- package/dist/capture-C3RmjPph.js.map +0 -1
- package/dist/capture-YPwxp_iK.js +0 -1
- package/dist/cli-BBOlXKPG.js.map +0 -1
- package/dist/cli-spec-DZ0bnP0_.js.map +0 -1
- package/dist/client-tZ2WBDxf.js.map +0 -1
- package/dist/command-CFQ9c1hk.js.map +0 -1
- package/dist/command-fO0BFsTq.js.map +0 -1
- package/dist/command-qGS802uX.js.map +0 -1
- package/dist/commands-CC60TOT5.js.map +0 -1
- package/dist/config-C2UtS9vy.js.map +0 -1
- package/dist/context-BajfiH0S.js.map +0 -1
- package/dist/contrasts-BjOg7wyr.js +0 -101
- package/dist/contrasts-BjOg7wyr.js.map +0 -1
- package/dist/cost-BJU0MAji.js +0 -1
- package/dist/db-C5SZ0510.js.map +0 -1
- package/dist/db-puzLzX4k.js +0 -2
- package/dist/debug-BnXV7JbX.js +0 -1
- package/dist/dist-ByYk_wAs.js.map +0 -1
- package/dist/docker-Dto8ROCq.js.map +0 -1
- package/dist/doctor-BcvfKpBX.js.map +0 -1
- package/dist/environment-CC1RV21n.js.map +0 -1
- package/dist/evaluate-NTNJ8T9H.js.map +0 -1
- package/dist/files-COW5JBJM.js +0 -1
- package/dist/files-DFtuRQJx.js +0 -1
- package/dist/files-oOYNR7ZH.js +0 -1
- package/dist/files-p-uTdOjA.js.map +0 -1
- package/dist/gate-Cp_pQoEe.js.map +0 -1
- package/dist/harness-DYSC4zMh.js.map +0 -1
- package/dist/ids-DuK6xl4w.js.map +0 -1
- package/dist/images-CNayXCp2.js.map +0 -1
- package/dist/init-8o6W3_fn.js +0 -1
- package/dist/init-D5HtmyMI.js.map +0 -1
- package/dist/ink-list-Ca-5dunO.js.map +0 -1
- package/dist/judge-DYOF69Oe.js.map +0 -1
- package/dist/list-CM_YSJXq.js +0 -374
- package/dist/list-CM_YSJXq.js.map +0 -1
- package/dist/live-DQc8jr6o.js +0 -1
- package/dist/model-Ce9l9_rF.js.map +0 -1
- package/dist/model-Cxzo4cjw.js +0 -1
- package/dist/node-DhIRSrrK.js.map +0 -1
- package/dist/opencode-providers-Co7plCea.js.map +0 -1
- package/dist/plan-DqnzfDH1.js.map +0 -1
- package/dist/plugins-B2KQ0y3P.js.map +0 -1
- package/dist/preflight-DyzmvK7i.js.map +0 -1
- package/dist/provenance-iRxjp4Pu.js.map +0 -1
- package/dist/provider-DCdTHQpk.js +0 -1
- package/dist/providers-D0ob_tra.js +0 -1
- package/dist/providers-vXMXuwn-.js.map +0 -1
- package/dist/query-CvgUsvep.js +0 -1
- package/dist/record-DhzwkSXc.js.map +0 -1
- package/dist/remarks-CauU408t.js.map +0 -1
- package/dist/remarks-NMgPd30U.js.map +0 -1
- package/dist/resolve-B1zMnPwK.js.map +0 -1
- package/dist/resolve-BIIeVT12.js +0 -1
- package/dist/resume-Dkhrpjow.js.map +0 -1
- package/dist/runtime-DcvQcr36.js.map +0 -1
- package/dist/sandbox-8zCrtuCf.js.map +0 -1
- package/dist/server-0tuj8VSa.js +0 -1
- package/dist/shared-ogqPJ0uo.js.map +0 -1
- package/dist/source-llwLewOU.js +0 -1
- package/dist/src-BQ6BiXoc.js.map +0 -1
- package/dist/src-BXnv0ViU.js +0 -2
- package/dist/src-BiS8YNN_.js +0 -3
- package/dist/src-BkH4GOxu.js +0 -1
- package/dist/src-C-tH5ebd.js +0 -2
- package/dist/src-Cg1bFs9g.js +0 -2
- package/dist/src-DV_UorZv.js +0 -2
- package/dist/src-XxUpr2sa.js +0 -2
- package/dist/state-DZbAO95a.js +0 -1
- package/dist/suite-M8_7xio7.js.map +0 -1
- package/dist/suite-u2KJnGpY.js +0 -2
- package/dist/summary-Uzc9osfV.js.map +0 -1
- package/dist/types-C4OkYhZg.js.map +0 -1
- package/dist/vertex-h_peaZTN.js +0 -1
- package/dist/views-BISrsIjw.js.map +0 -1
- package/dist/views-Bfab8fM9.js +0 -2
- package/dist/workspace-B8EOCuxl.js +0 -1
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { n as UsageError } from "./errors-ttMTnIYX.js";
|
|
2
2
|
import { t as RUN_ID } from "./paths-Dwmi7L4X.js";
|
|
3
|
-
import {
|
|
4
|
-
import { c as readableInvocation, l 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-
|
|
3
|
+
import { o as recordFileName, s as relativeFile } from "./ids-C_advdJA.js";
|
|
4
|
+
import { c as readableInvocation, l as readableLiveProgress, n as LIVE_FILE, o as liveCounts } from "./live-CgYbO4Te.js";
|
|
5
|
+
import { p as scratchDir } from "./files-Cl7BQ5gE.js";
|
|
6
|
+
import { t as RefError } from "./views-DAIiLiV3.js";
|
|
7
7
|
import { existsSync, mkdirSync, readFileSync, renameSync, rmSync, unlinkSync, writeFileSync } from "node:fs";
|
|
8
8
|
import { hostname } from "node:os";
|
|
9
9
|
import { isAbsolute, join, resolve } from "node:path";
|
|
10
10
|
import { readFile, readdir, stat } from "node:fs/promises";
|
|
11
|
-
function finished(result) {
|
|
11
|
+
function finished$1(result) {
|
|
12
12
|
const outcome = result.meta?.outcome;
|
|
13
13
|
if (result.state === "skipped") return outcome === "fail" || outcome === "infra_error" ? outcome : "skipped";
|
|
14
14
|
if (outcome === "infra_error") return "infra_error";
|
|
@@ -123,7 +123,7 @@ function writeLiveProgress(options) {
|
|
|
123
123
|
end(result) {
|
|
124
124
|
const a = attempts.get(result.key);
|
|
125
125
|
if (!a || kept.has(result.key) && result.state === "skipped") return;
|
|
126
|
-
a.status = finished(result);
|
|
126
|
+
a.status = finished$1(result);
|
|
127
127
|
a.durationMs = result.durationMs;
|
|
128
128
|
write();
|
|
129
129
|
},
|
|
@@ -160,7 +160,7 @@ function writeCurrent(root, runId) {
|
|
|
160
160
|
throw error;
|
|
161
161
|
}
|
|
162
162
|
}
|
|
163
|
-
const stillRunning = (runId) => new UsageError(`run ${runId} is still running. Wait for it to finish or stop, then reeval run --resume ${runId}.`);
|
|
163
|
+
const stillRunning = (runId, flag = "--resume") => new UsageError(flag === "--resume" ? `run ${runId} is still running. Wait for it to finish or stop, then reeval run --resume ${runId}.` : `run ${runId} is still running. Wait for it to finish, then reeval run --retry-errors ${runId}; if it stops before then, reeval run --resume ${runId} finishes it and retries its infra errors.`);
|
|
164
164
|
/** Same host only: `kill(pid, 0)`. Another host cannot be probed. */
|
|
165
165
|
function processAlive(pid, host) {
|
|
166
166
|
if (host !== hostname()) return false;
|
|
@@ -188,7 +188,12 @@ const holderLive = (dir) => {
|
|
|
188
188
|
const holder = readHolder(dir);
|
|
189
189
|
return holder ? processAlive(holder.pid, holder.host) : false;
|
|
190
190
|
};
|
|
191
|
-
|
|
191
|
+
/** This process holds the run's staging. */
|
|
192
|
+
const holdsStaging = (staging) => {
|
|
193
|
+
const holder = readHolder(staging);
|
|
194
|
+
return holder?.pid === process.pid && holder.host === hostname();
|
|
195
|
+
};
|
|
196
|
+
function acquireHolder(staging, runId, flag) {
|
|
192
197
|
const file = join(staging, HOLDER_FILE);
|
|
193
198
|
const body = `${process.pid}\n${hostname()}\n`;
|
|
194
199
|
const create = () => writeFileSync(file, body, { flag: "wx" });
|
|
@@ -198,16 +203,16 @@ function acquireHolder(staging, runId) {
|
|
|
198
203
|
} catch (error) {
|
|
199
204
|
if (error.code !== "EEXIST") throw error;
|
|
200
205
|
}
|
|
201
|
-
if (holderLive(staging)) throw stillRunning(runId);
|
|
206
|
+
if (holderLive(staging)) throw stillRunning(runId, flag);
|
|
202
207
|
try {
|
|
203
208
|
unlinkSync(file);
|
|
204
209
|
} catch {
|
|
205
|
-
throw stillRunning(runId);
|
|
210
|
+
throw stillRunning(runId, flag);
|
|
206
211
|
}
|
|
207
212
|
try {
|
|
208
213
|
create();
|
|
209
214
|
} catch (error) {
|
|
210
|
-
if (error.code === "EEXIST") throw stillRunning(runId);
|
|
215
|
+
if (error.code === "EEXIST") throw stillRunning(runId, flag);
|
|
211
216
|
throw error;
|
|
212
217
|
}
|
|
213
218
|
}
|
|
@@ -225,7 +230,11 @@ function isCompletedAttempt(outcome, error) {
|
|
|
225
230
|
if (error?.kind === "aborted") return false;
|
|
226
231
|
return outcome === "pass" || outcome === "fail" || outcome === "infra_error";
|
|
227
232
|
}
|
|
228
|
-
|
|
233
|
+
/** Completed with a result a resume keeps, a pass or a fail; an infra error runs again. */
|
|
234
|
+
function isKeptAttempt(outcome, error) {
|
|
235
|
+
return outcome !== "infra_error" && isCompletedAttempt(outcome, error);
|
|
236
|
+
}
|
|
237
|
+
const keptFromRecord = (record) => record.evals.flatMap((e) => e.attempts.filter((a) => isKeptAttempt(a.outcome, a.error)).map((a) => a.key));
|
|
229
238
|
function readEvalRecord(path) {
|
|
230
239
|
try {
|
|
231
240
|
return JSON.parse(readFileSync(path, "utf8"));
|
|
@@ -233,21 +242,69 @@ function readEvalRecord(path) {
|
|
|
233
242
|
return null;
|
|
234
243
|
}
|
|
235
244
|
}
|
|
236
|
-
function stagingRecordComplete(staging, key) {
|
|
245
|
+
function stagingRecordComplete(staging, key, done = isCompletedAttempt) {
|
|
237
246
|
const record = readEvalRecord(join(staging, "evals", recordFileName(key)));
|
|
238
247
|
if (!record) return false;
|
|
239
|
-
return
|
|
248
|
+
return done(record.outcome, record.error);
|
|
240
249
|
}
|
|
241
250
|
/**
|
|
242
|
-
* Attempt keys that already
|
|
243
|
-
* resume skips them.
|
|
251
|
+
* Attempt keys that already passed or failed in `staging` or in the previous record, so a
|
|
252
|
+
* resume skips them and runs the rest, infra errors included.
|
|
244
253
|
*/
|
|
245
254
|
function completedKeysFor(planned, staging, previous) {
|
|
246
255
|
const keys = /* @__PURE__ */ new Set();
|
|
247
|
-
const fromPrevious = new Set(previous ?
|
|
248
|
-
for (const { key } of planned) if (stagingRecordComplete(staging, key) || fromPrevious.has(key)) keys.add(key);
|
|
256
|
+
const fromPrevious = new Set(previous ? keptFromRecord(previous) : []);
|
|
257
|
+
for (const { key } of planned) if (stagingRecordComplete(staging, key, isKeptAttempt) || fromPrevious.has(key)) keys.add(key);
|
|
249
258
|
return keys;
|
|
250
259
|
}
|
|
260
|
+
/** In staging: each attempt's earlier infra errors, by key, kept as the attempts run again. */
|
|
261
|
+
const RETRIES_FILE = "retries.json";
|
|
262
|
+
function readRetries(staging) {
|
|
263
|
+
try {
|
|
264
|
+
const parsed = JSON.parse(readFileSync(join(staging, RETRIES_FILE), "utf8"));
|
|
265
|
+
return new Map(Object.entries(parsed));
|
|
266
|
+
} catch {
|
|
267
|
+
return /* @__PURE__ */ new Map();
|
|
268
|
+
}
|
|
269
|
+
}
|
|
270
|
+
/**
|
|
271
|
+
* The planned attempts that ended in an infra error, in staging or the previous record, and so
|
|
272
|
+
* run again; and each one's earlier errors, which `retries.json` keeps once `write` is set, so
|
|
273
|
+
* the record still has them after the worker replaces the attempt's staged record.
|
|
274
|
+
*/
|
|
275
|
+
function noteRetries(planned, staging, previous, write) {
|
|
276
|
+
const retries = readRetries(staging);
|
|
277
|
+
const errored = /* @__PURE__ */ new Set();
|
|
278
|
+
const add = (key, retry) => {
|
|
279
|
+
const list = retries.get(key) ?? [];
|
|
280
|
+
const same = (r) => r.at === retry.at && r.error.message === retry.error.message;
|
|
281
|
+
if (!list.some(same)) list.push(retry);
|
|
282
|
+
retries.set(key, list);
|
|
283
|
+
};
|
|
284
|
+
for (const { key } of planned) {
|
|
285
|
+
const was = previousAttempt(previous, key);
|
|
286
|
+
if (was?.retries?.length && !retries.has(key)) retries.set(key, [...was.retries]);
|
|
287
|
+
const staged = readEvalRecord(join(staging, "evals", recordFileName(key)));
|
|
288
|
+
const last = staged ?? (was ? {
|
|
289
|
+
outcome: was.outcome,
|
|
290
|
+
error: was.error
|
|
291
|
+
} : null);
|
|
292
|
+
if (last?.outcome !== "infra_error" || !last.error || last.error.kind === "aborted") continue;
|
|
293
|
+
errored.add(key);
|
|
294
|
+
add(key, {
|
|
295
|
+
error: last.error,
|
|
296
|
+
at: staged?.startedAt ?? was?.startedAt ?? null
|
|
297
|
+
});
|
|
298
|
+
}
|
|
299
|
+
if (write && retries.size) {
|
|
300
|
+
mkdirSync(staging, { recursive: true });
|
|
301
|
+
writeFileSync(join(staging, RETRIES_FILE), `${JSON.stringify(Object.fromEntries(retries))}\n`);
|
|
302
|
+
}
|
|
303
|
+
return {
|
|
304
|
+
errored,
|
|
305
|
+
retries
|
|
306
|
+
};
|
|
307
|
+
}
|
|
251
308
|
/**
|
|
252
309
|
* The attempts the run planned, from the previous record and the progress file a quit left,
|
|
253
310
|
* that this resume's plan leaves out. The record keeps them, so the run stays incomplete until
|
|
@@ -344,7 +401,9 @@ async function listCandidates(root, now = Date.now()) {
|
|
|
344
401
|
live,
|
|
345
402
|
complete: false,
|
|
346
403
|
previous: null,
|
|
347
|
-
previousArtifacts: null
|
|
404
|
+
previousArtifacts: null,
|
|
405
|
+
record: null,
|
|
406
|
+
artifacts: null
|
|
348
407
|
});
|
|
349
408
|
}
|
|
350
409
|
const scratch = scratchDir(root);
|
|
@@ -361,6 +420,8 @@ async function listCandidates(root, now = Date.now()) {
|
|
|
361
420
|
existing.previous = record;
|
|
362
421
|
existing.previousArtifacts = previousArtifacts;
|
|
363
422
|
existing.complete = complete;
|
|
423
|
+
existing.record = record;
|
|
424
|
+
existing.artifacts = previousArtifacts;
|
|
364
425
|
continue;
|
|
365
426
|
}
|
|
366
427
|
found.set(runId, {
|
|
@@ -370,7 +431,9 @@ async function listCandidates(root, now = Date.now()) {
|
|
|
370
431
|
live: false,
|
|
371
432
|
complete,
|
|
372
433
|
previous: complete ? null : record,
|
|
373
|
-
previousArtifacts: complete ? null : previousArtifacts
|
|
434
|
+
previousArtifacts: complete ? null : previousArtifacts,
|
|
435
|
+
record,
|
|
436
|
+
artifacts: previousArtifacts
|
|
374
437
|
});
|
|
375
438
|
}
|
|
376
439
|
return [...found.values()].sort((a, b) => a.runId < b.runId ? -1 : 1);
|
|
@@ -425,14 +488,51 @@ async function resolveResume(root, ref) {
|
|
|
425
488
|
if (found.complete || !resumable(found)) throw new UsageError(`run ${found.runId} is complete and cannot be resumed. reeval run starts a new run.`);
|
|
426
489
|
return toTarget(found);
|
|
427
490
|
}
|
|
491
|
+
const finished = (c) => !c.live && c.complete && c.record !== null;
|
|
492
|
+
/**
|
|
493
|
+
* `--retry-errors` with no ref (or `latest`): the newest finished run, whose scratch record is
|
|
494
|
+
* `complete`; `latest~N` counts back over those. A ref is a run id or unique prefix, as for
|
|
495
|
+
* `--resume`. A run that didn't finish is left to `--resume`, which retries its infra errors too.
|
|
496
|
+
*/
|
|
497
|
+
async function resolveRetry(root, ref) {
|
|
498
|
+
const candidates = await listCandidates(root);
|
|
499
|
+
const done = candidates.filter(finished);
|
|
500
|
+
const target = (c) => ({
|
|
501
|
+
runId: c.runId,
|
|
502
|
+
startedAt: new Date(c.startedAt),
|
|
503
|
+
kind: c.kind,
|
|
504
|
+
previous: c.record,
|
|
505
|
+
previousArtifacts: c.artifacts
|
|
506
|
+
});
|
|
507
|
+
if (ref === void 0 || ref === "" || ref === "latest") {
|
|
508
|
+
const pick = done.at(-1);
|
|
509
|
+
const running = candidates.filter((c) => c.live && (!pick || c.runId > pick.runId)).at(-1);
|
|
510
|
+
if (running) throw new UsageError(`run ${running.runId} is still running, so --retry-errors can't tell which run to retry. Wait for it to finish, or pass the run id.`);
|
|
511
|
+
if (!pick) throw new UsageError("No finished run to retry. --retry-errors re-runs the infra errors of a complete run in .reeval/runs; reeval run --resume continues one that stopped.");
|
|
512
|
+
return target(pick);
|
|
513
|
+
}
|
|
514
|
+
const back = /^latest~(\d+)$/.exec(ref);
|
|
515
|
+
if (back) {
|
|
516
|
+
const entry = done[done.length - 1 - Number(back[1])];
|
|
517
|
+
if (!entry) throw new RefError(`There ${done.length === 1 ? "is only 1 finished run" : `are only ${done.length} finished runs`}, so ${ref} names none. reeval run --retry-errors retries the newest.`);
|
|
518
|
+
return target(entry);
|
|
519
|
+
}
|
|
520
|
+
const found = matchRef(candidates, ref);
|
|
521
|
+
if (!found) throw new RefError(`No run matches "${ref}". Pass a run id or a unique prefix of one, or leave --retry-errors empty for the newest finished run.`);
|
|
522
|
+
if (found.live) throw stillRunning(found.runId, "--retry-errors");
|
|
523
|
+
if (!finished(found)) throw new UsageError(`run ${found.runId} didn't finish. reeval run --resume ${found.runId} runs the rest and retries its infra errors.`);
|
|
524
|
+
return target(found);
|
|
525
|
+
}
|
|
526
|
+
/** The attempts of a run that ended in an infra error (not a cancel). */
|
|
527
|
+
const erroredAttempts = (record) => record.evals.flatMap((e) => e.attempts.filter((a) => a.outcome === "infra_error" && a.error?.kind !== "aborted"));
|
|
428
528
|
/**
|
|
429
529
|
* For a scratch resume: move the assembled record aside so the continuation can write the same
|
|
430
530
|
* id. Staging already in place is left alone.
|
|
431
531
|
*/
|
|
432
|
-
async function prepareResume(target, root) {
|
|
532
|
+
async function prepareResume(target, root, { held = false } = {}) {
|
|
433
533
|
const staging = stagingOf(root, target.runId);
|
|
434
534
|
mkdirSync(join(staging, "evals"), { recursive: true });
|
|
435
|
-
acquireHolder(staging, target.runId);
|
|
535
|
+
if (!(held && holdsStaging(staging))) acquireHolder(staging, target.runId);
|
|
436
536
|
if (!target.previous) return;
|
|
437
537
|
const scratch = scratchDir(root);
|
|
438
538
|
const recordPath = join(scratch, `${target.runId}.json`);
|
|
@@ -465,6 +565,47 @@ async function prepareResume(target, root) {
|
|
|
465
565
|
writeFileSync(path, `${JSON.stringify(record, null, 2)}\n`);
|
|
466
566
|
}
|
|
467
567
|
}
|
|
568
|
+
/**
|
|
569
|
+
* Holds a retry's run before it collects, so a second retry or resume of it stops as still
|
|
570
|
+
* running rather than racing this one to {@link prepareResume}.
|
|
571
|
+
*/
|
|
572
|
+
function holdRetry(target, root) {
|
|
573
|
+
const staging = stagingOf(root, target.runId);
|
|
574
|
+
mkdirSync(join(staging, "evals"), { recursive: true });
|
|
575
|
+
acquireHolder(staging, target.runId, "--retry-errors");
|
|
576
|
+
}
|
|
577
|
+
/**
|
|
578
|
+
* A run a `--retry-errors` stopped during, which a `--resume` finishes as that retry. Its
|
|
579
|
+
* interrupted record lists the retry in `retriedAt`, or a kill stopped the retry before it
|
|
580
|
+
* assembled one: then staging still has the finished record the retry moved aside (only a retry
|
|
581
|
+
* moves a `complete` one), and `began` is when the retry planned, from its `retries.json` (else
|
|
582
|
+
* now), which that record has no entry for. Null for any other run.
|
|
583
|
+
*/
|
|
584
|
+
async function stoppedRetry(root, target) {
|
|
585
|
+
if (target.previous?.retriedAt?.length) return { began: null };
|
|
586
|
+
const staging = stagingOf(root, target.runId);
|
|
587
|
+
const { record } = await loadPrevious(staging);
|
|
588
|
+
if (record?.status === "complete") return { began: (await stat(join(staging, "retries.json")).catch(() => null))?.mtime ?? /* @__PURE__ */ new Date() };
|
|
589
|
+
return record?.retriedAt?.length ? { began: null } : null;
|
|
590
|
+
}
|
|
591
|
+
/**
|
|
592
|
+
* Undoes a retry's {@link prepareResume} when it stops before the engine runs: the finished
|
|
593
|
+
* record and its artifacts go back to `.reeval/runs`, and its staging is removed.
|
|
594
|
+
*/
|
|
595
|
+
async function restoreRetry(root, runId) {
|
|
596
|
+
const staging = stagingOf(root, runId);
|
|
597
|
+
if (!holdsStaging(staging)) return;
|
|
598
|
+
const scratch = scratchDir(root);
|
|
599
|
+
const aside = join(staging, "previous.json");
|
|
600
|
+
const recordPath = join(scratch, `${runId}.json`);
|
|
601
|
+
if (existsSync(aside) && !existsSync(recordPath)) renameSync(aside, recordPath);
|
|
602
|
+
const artifacts = join(staging, "previous-artifacts");
|
|
603
|
+
if (existsSync(artifacts) && !existsSync(join(scratch, runId))) renameSync(artifacts, join(scratch, runId));
|
|
604
|
+
if (existsSync(recordPath)) rmSync(staging, {
|
|
605
|
+
recursive: true,
|
|
606
|
+
force: true
|
|
607
|
+
});
|
|
608
|
+
}
|
|
468
609
|
async function loadPrevious(staging) {
|
|
469
610
|
const file = join(staging, "previous.json");
|
|
470
611
|
const artifacts = join(staging, "previous-artifacts");
|
|
@@ -514,12 +655,12 @@ function savedFilters(root, filters, cwd = process.cwd()) {
|
|
|
514
655
|
/**
|
|
515
656
|
* The settings a resume plans with: each one left out is the run's saved one. `--runs` or a
|
|
516
657
|
* profile other than the run's is refused, since it plans other attempts than the ones kept;
|
|
517
|
-
* filters and `--
|
|
658
|
+
* filters, `--tag` and `--trait` replace the run's for this resume, and `--concurrency` wins with a note.
|
|
518
659
|
* A `--runs` that isn't a count is left for the usual check to refuse. Saved path filters are
|
|
519
660
|
* resolved from `root`, so the resume picks the same files from any directory.
|
|
520
661
|
*/
|
|
521
|
-
function resumeSettings(runId, saved, given, { root, env = process.env }) {
|
|
522
|
-
const refuse = (started, flag) => new UsageError(`run ${runId} was started ${started}, and
|
|
662
|
+
function resumeSettings(runId, saved, given, { root, env = process.env, flag: continued = "--resume" }) {
|
|
663
|
+
const refuse = (started, flag) => new UsageError(`run ${runId} was started ${started}, and ${continued} finishes the attempts it planned. Leave ${flag} out, or start a new run without ${continued}.`);
|
|
523
664
|
const runs = Number(given.runs);
|
|
524
665
|
const count = Number.isInteger(runs) && runs >= 1;
|
|
525
666
|
if (given.runs !== void 0 && count && runs !== saved.runs) throw refuse(saved.runs === void 0 ? "without --runs" : `with --runs ${saved.runs}`, "--runs");
|
|
@@ -538,12 +679,13 @@ function resumeSettings(runId, saved, given, { root, env = process.env }) {
|
|
|
538
679
|
if (profile === void 0 && saved.profile !== void 0) settings.profile = saved.profile;
|
|
539
680
|
if (concurrency === void 0 && saved.concurrency !== void 0) settings.concurrency = String(saved.concurrency);
|
|
540
681
|
if (!given.tag?.length && saved.tags.length) settings.tag = saved.tags;
|
|
682
|
+
if (!given.trait?.length && saved.traits?.length) settings.trait = saved.traits;
|
|
541
683
|
return {
|
|
542
684
|
settings,
|
|
543
685
|
notes
|
|
544
686
|
};
|
|
545
687
|
}
|
|
546
688
|
const previousAttempt = (previous, key) => previous?.evals.flatMap((e) => e.attempts).find((a) => a.key === key);
|
|
547
|
-
export {
|
|
689
|
+
export { writeLiveProgress as S, resumeSettings as _, isKeptAttempt as a, stoppedRetry as b, liveAttempts as c, prepareResume as d, previousAttempt as f, restoreRetry as g, resolveRetry as h, isCompletedAttempt as i, loadPrevious as l, resolveResume as m, erroredAttempts as n, keptAttempts as o, readRetries as p, holdRetry as r, leftOutAttempts as s, completedKeysFor as t, noteRetries as u, savedFilters as v, writeCurrent as x, savedInvocation as y };
|
|
548
690
|
|
|
549
|
-
//# sourceMappingURL=resume-
|
|
691
|
+
//# sourceMappingURL=resume-AW5oXzUc.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"resume-AW5oXzUc.js","names":["finished"],"sources":["../src/live.ts","../src/resume.ts"],"mappings":"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"}
|
|
@@ -0,0 +1,105 @@
|
|
|
1
|
+
import { o as recordFileName } from "./ids-C_advdJA.js";
|
|
2
|
+
import { r as gatePart } from "./gate-CgYdaprG.js";
|
|
3
|
+
import { i as evalFile, o as sourcesPart } from "./eval-source-D3sbAzt-.js";
|
|
4
|
+
import { a as gatewayPart, o as harnessPart } from "./assemble-t6h018An.js";
|
|
5
|
+
import { readFileSync } from "node:fs";
|
|
6
|
+
import { join } from "node:path";
|
|
7
|
+
// src/retry.ts
|
|
8
|
+
const PARTS = [
|
|
9
|
+
["sources", "eval source"],
|
|
10
|
+
["harness", "harness"],
|
|
11
|
+
["gateway", "gateway"],
|
|
12
|
+
["gate", "gate"],
|
|
13
|
+
["judge", "judge"]
|
|
14
|
+
];
|
|
15
|
+
const listed = (names) => names.length > 3 ? `${names.slice(0, 3).join(", ")} and ${names.length - 3} more` : names.join(", ");
|
|
16
|
+
/**
|
|
17
|
+
* How the plan differs from the run it would retry into, as sentences; none when it's the run's.
|
|
18
|
+
* The run's infra errors it no longer plans and the attempts it plans that the run didn't, then
|
|
19
|
+
* the fingerprint parts that the cell of an attempt it `runs` would get from this plan and its
|
|
20
|
+
* cell in the run doesn't have.
|
|
21
|
+
*/
|
|
22
|
+
async function retryChanges(previous, planned, runs, root, judge) {
|
|
23
|
+
const had = new Map(previous.evals.flatMap((e) => e.attempts.map((a) => [a.key, e])));
|
|
24
|
+
const now = new Map(planned.map((p) => [p.key, p]));
|
|
25
|
+
const changes = [];
|
|
26
|
+
const gone = previous.evals.flatMap((e) => e.attempts.filter((a) => a.outcome === "infra_error" && !now.has(a.key)).map((a) => a.key));
|
|
27
|
+
if (gone.length) changes.push(`it no longer plans ${listed(gone)}`);
|
|
28
|
+
const added = planned.filter((p) => !p.attempt.plan.skip && !had.has(p.key)).map((p) => p.key);
|
|
29
|
+
if (added.length) changes.push(`it plans ${listed(added)}, which the run didn't`);
|
|
30
|
+
const files = /* @__PURE__ */ new Map();
|
|
31
|
+
const parts = /* @__PURE__ */ new Map();
|
|
32
|
+
for (const key of runs) {
|
|
33
|
+
const p = now.get(key);
|
|
34
|
+
const cell = had.get(key)?.cells.find((c) => c.key === p?.attempt.cell.key);
|
|
35
|
+
if (!p || !cell?.fingerprintParts) continue;
|
|
36
|
+
if (!files.has(p.file)) files.set(p.file, await evalFile(root, p.file));
|
|
37
|
+
const { attempt } = p;
|
|
38
|
+
const current = {
|
|
39
|
+
sources: sourcesPart(attempt.source, attempt.revision, files.get(p.file) ?? []),
|
|
40
|
+
harness: harnessPart(attempt.harness),
|
|
41
|
+
...gatewayPart(attempt.gateway),
|
|
42
|
+
...gatePart(attempt.gate),
|
|
43
|
+
judge: judge.part
|
|
44
|
+
};
|
|
45
|
+
for (const [part, name] of PARTS) {
|
|
46
|
+
if (part === "judge" && judge.model === null) continue;
|
|
47
|
+
if (current[part] === cell.fingerprintParts[part]) continue;
|
|
48
|
+
parts.set(name, (parts.get(name) ?? /* @__PURE__ */ new Set()).add(p.id));
|
|
49
|
+
}
|
|
50
|
+
}
|
|
51
|
+
for (const [name, ids] of parts) changes.push(`the ${name} of ${listed([...ids])} changed`);
|
|
52
|
+
return changes;
|
|
53
|
+
}
|
|
54
|
+
/**
|
|
55
|
+
* The evals whose retried attempts resolved another environment than their cell had in the run:
|
|
56
|
+
* the environment's digest is only known once an attempt resolves it, so this is checked after
|
|
57
|
+
* the retry and before it's written back.
|
|
58
|
+
*/
|
|
59
|
+
function retryEnvironmentChanges(previous, staging, retried) {
|
|
60
|
+
const changed = /* @__PURE__ */ new Set();
|
|
61
|
+
for (const e of previous.evals) for (const a of e.attempts) {
|
|
62
|
+
if (!retried.has(a.key)) continue;
|
|
63
|
+
const was = e.cells.find((c) => c.key === a.cell)?.environmentDigest;
|
|
64
|
+
if (!was) continue;
|
|
65
|
+
let now;
|
|
66
|
+
try {
|
|
67
|
+
const text = readFileSync(join(staging, "evals", recordFileName(a.key)), "utf8");
|
|
68
|
+
now = JSON.parse(text).environment?.digest;
|
|
69
|
+
} catch {
|
|
70
|
+
continue;
|
|
71
|
+
}
|
|
72
|
+
if (now && now !== was) changed.add(e.id);
|
|
73
|
+
}
|
|
74
|
+
return [...changed].map((id) => `the environment of ${id} changed`);
|
|
75
|
+
}
|
|
76
|
+
/**
|
|
77
|
+
* How each attempt the run ran again came out, by its outcome in the record. A cancel either
|
|
78
|
+
* aborts an attempt or stops it before it ran again, so it still is the earlier try, with its
|
|
79
|
+
* `startedAt`: both count as not finished (`skipped`), not as an infra error.
|
|
80
|
+
*/
|
|
81
|
+
function retryCounts(record, retried, previous) {
|
|
82
|
+
const before = new Map((previous?.evals ?? []).flatMap((e) => e.attempts.map((a) => [a.key, a])));
|
|
83
|
+
const counts = { retried: 0 };
|
|
84
|
+
for (const a of record.evals.flatMap((e) => e.attempts)) {
|
|
85
|
+
if (!retried.has(a.key)) continue;
|
|
86
|
+
counts.retried++;
|
|
87
|
+
const was = before.get(a.key);
|
|
88
|
+
const outcome = a.outcome === "infra_error" && (a.error?.kind === "aborted" || was !== void 0 && a.startedAt === was.startedAt && a.error?.message === was.error?.message) ? "skipped" : a.outcome;
|
|
89
|
+
counts[outcome] = (counts[outcome] ?? 0) + 1;
|
|
90
|
+
}
|
|
91
|
+
return counts;
|
|
92
|
+
}
|
|
93
|
+
/** `retried 2 errored attempts: 1 now passes, 1 fails, 0 still errors`. */
|
|
94
|
+
function retryLine({ retried, ...counts }) {
|
|
95
|
+
const n = (outcome) => counts[outcome] ?? 0;
|
|
96
|
+
const passes = `${n("pass")} now ${n("pass") === 1 ? "passes" : "pass"}`;
|
|
97
|
+
const fails = `${n("fail")} ${n("fail") === 1 ? "fails" : "fail"}`;
|
|
98
|
+
const errors = `${n("infra_error")} still ${n("infra_error") === 1 ? "errors" : "error"}`;
|
|
99
|
+
const rest = retried - n("pass") - n("fail") - n("infra_error");
|
|
100
|
+
const left = rest ? `, ${rest} didn't finish` : "";
|
|
101
|
+
return `retried ${retried} errored attempt${retried === 1 ? "" : "s"}: ${passes}, ${fails}, ${errors}${left}`;
|
|
102
|
+
}
|
|
103
|
+
export { retryChanges, retryCounts, retryEnvironmentChanges, retryLine };
|
|
104
|
+
|
|
105
|
+
//# sourceMappingURL=retry-ChzISxmy.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"retry-ChzISxmy.js","names":[],"sources":["../src/retry.ts"],"mappings":"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"}
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import { r as isThenable } from "./object-CeQ8dgUC.js";
|
|
2
1
|
import { n as UsageError } from "./errors-ttMTnIYX.js";
|
|
3
|
-
import {
|
|
4
|
-
import { i as
|
|
5
|
-
import {
|
|
2
|
+
import { r as isThenable } from "./object-CeQ8dgUC.js";
|
|
3
|
+
import { i as fromCwd } from "./ids-C_advdJA.js";
|
|
4
|
+
import { i as originalStack } from "./adapter-C8xPuXYq.js";
|
|
5
|
+
import { n as comparable } from "./errors-BZgLSZtV.js";
|
|
6
6
|
import { fileURLToPath } from "node:url";
|
|
7
7
|
import { AsyncLocalStorage } from "node:async_hooks";
|
|
8
8
|
import { ASYMMETRIC_MATCHERS_OBJECT, GLOBAL_EXPECT, JestAsymmetricMatchers, JestChaiExpect, JestExtend, addCustomEqualityTesters, chai, customMatchers, getState, setState } from "@vitest/expect";
|
|
@@ -38,6 +38,14 @@ const flag = (assertion, name) => chai.util.flag(assertion, name);
|
|
|
38
38
|
const subjectOf = (value) => (typeof value === "object" || typeof value === "function") && value !== null ? value[SUBJECT] : void 0;
|
|
39
39
|
/** Can't answer either way: the harness doesn't report it, or the subject isn't one it reads. */
|
|
40
40
|
const isUnanswerable = (error) => error instanceof TypeError && Symbol.for("reeval.subjectError") in error || error?.name === "HarnessCapabilityError";
|
|
41
|
+
/** A matcher called wrong (reeval's `misuseError`): no check ran, so none is recorded. */
|
|
42
|
+
const isMisuse = (error) => error instanceof TypeError && Symbol.for("reeval.misuse") in error;
|
|
43
|
+
const unrecord = (list, entry) => {
|
|
44
|
+
for (const calls of [list, pollTry.getStore()]) {
|
|
45
|
+
const at = calls?.indexOf(entry) ?? -1;
|
|
46
|
+
if (at >= 0) calls?.splice(at, 1);
|
|
47
|
+
}
|
|
48
|
+
};
|
|
41
49
|
/** `path:line` of the first frame in `stack` that is in `file`, the eval file, when one is. */
|
|
42
50
|
function lineIn(stack, file) {
|
|
43
51
|
const want = comparable(file.startsWith("file:") ? fileURLToPath(file) : file);
|
|
@@ -120,6 +128,10 @@ function recording(target, list, file) {
|
|
|
120
128
|
try {
|
|
121
129
|
result = Reflect.apply(fn, target, args);
|
|
122
130
|
} catch (error) {
|
|
131
|
+
if (isMisuse(error)) {
|
|
132
|
+
unrecord(list, entry);
|
|
133
|
+
throw error;
|
|
134
|
+
}
|
|
123
135
|
settle(entry, error);
|
|
124
136
|
if (!carriesOn(entry, error)) throw error;
|
|
125
137
|
return /^to[A-Z]/.test(name) ? void 0 : chained(target);
|
|
@@ -234,13 +246,20 @@ function createPoll(expect, list, file, required) {
|
|
|
234
246
|
const signal = AbortSignal.timeout(timeout);
|
|
235
247
|
for (;;) {
|
|
236
248
|
const tried = [];
|
|
249
|
+
let polledValue = false;
|
|
237
250
|
try {
|
|
238
251
|
chai.util.flag(assertion, "object", await pollTry.run(tried, () => fn({ signal })));
|
|
252
|
+
polledValue = true;
|
|
239
253
|
const result = await Reflect.apply(matcher, assertion, args);
|
|
240
254
|
if (entry) settle(entry, void 0, startedAt);
|
|
241
255
|
outer?.push(...tried);
|
|
242
256
|
return result;
|
|
243
257
|
} catch (error) {
|
|
258
|
+
if (polledValue && isMisuse(error)) {
|
|
259
|
+
if (list && entry) unrecord(list, entry);
|
|
260
|
+
outer?.push(...tried);
|
|
261
|
+
throw error;
|
|
262
|
+
}
|
|
244
263
|
if (Date.now() + interval >= deadline) {
|
|
245
264
|
if (error instanceof Error && location.stack) error.stack = location.stack.replace(location.message, error.message);
|
|
246
265
|
if (entry) settle(entry, error, startedAt);
|
|
@@ -391,7 +410,7 @@ const registerTest = (name, options, body) => active().registerTest(name, option
|
|
|
391
410
|
const registerGroup = (name, mode, body) => active().registerGroup(name, mode, body);
|
|
392
411
|
const getRunContext = () => active().getRunContext();
|
|
393
412
|
const collectingFile = () => active().collectingFile();
|
|
394
|
-
const
|
|
395
|
-
export { registerTest as a, attemptExpectError as c, expect as d, extendExpect as f, withAttemptExpect as g, unawaitedError as h, registerGroup as i, attemptRecordings as l, rawAssertions as m,
|
|
413
|
+
const declarePlanned = (harnesses, traits) => active().declarePlanned(harnesses, traits);
|
|
414
|
+
export { registerTest as a, attemptExpectError as c, expect as d, extendExpect as f, withAttemptExpect as g, unawaitedError as h, registerGroup as i, attemptRecordings as l, rawAssertions as m, declarePlanned as n, useEngine as o, isUnanswerable as p, getRunContext as r, SUBJECT as s, collectingFile as t, createExpect as u };
|
|
396
415
|
|
|
397
|
-
//# sourceMappingURL=runtime-
|
|
416
|
+
//# sourceMappingURL=runtime-BpW1f1Mx.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"runtime-BpW1f1Mx.js","names":[],"sources":["../src/engine/expect.ts","../src/engine/runtime.ts"],"mappings":"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"}
|
|
@@ -0,0 +1,26 @@
|
|
|
1
|
+
import { d as BoatSandboxDescriptor, l as BoatApiKey, u as BoatMachineType } from "../types-DBwFsGem.js";
|
|
2
|
+
import "../shared-CHvO7eLi.js";
|
|
3
|
+
import { z } from "zod";
|
|
4
|
+
/** `createBoat()`'s argument: the account and naming every sandbox of the factory shares. */
|
|
5
|
+
type CreateBoatOptions = {
|
|
6
|
+
/** The host variable with the API key, as `secret.fromEnv('BOAT_API_KEY')`. Default `BOAT_API_KEY`. */
|
|
7
|
+
apiKey?: BoatApiKey;
|
|
8
|
+
/** The start of every sandbox name. Default `reeval`. */
|
|
9
|
+
prefix?: string;
|
|
10
|
+
};
|
|
11
|
+
/** `boat()`'s argument. */
|
|
12
|
+
type BoatOptions = Omit<BoatSandboxDescriptor, 'kind' | 'apiKey' | 'prefix'>;
|
|
13
|
+
/**
|
|
14
|
+
* A `boat()` for one Boat account and name prefix: `apiKey` names the host variable with the API
|
|
15
|
+
* key (`secret.fromEnv('BOAT_API_KEY')` by default), and `prefix` starts every sandbox name
|
|
16
|
+
* reeval gives Boat (`reeval` by default), so a run's cleanup deletes only its own.
|
|
17
|
+
*/
|
|
18
|
+
export declare function createBoat(options?: CreateBoatOptions): (options?: BoatOptions) => BoatSandboxDescriptor;
|
|
19
|
+
/**
|
|
20
|
+
* One boat.dev VM per attempt, on the account whose key is in `BOAT_API_KEY`. The agent, setup
|
|
21
|
+
* steps and checks run as an unprivileged user over SSH; credentials stay on the host behind the
|
|
22
|
+
* egress gateway, as in Docker. Needs `npm i @boatdev/sdk` and `egress: 'allow-all'`.
|
|
23
|
+
*/
|
|
24
|
+
export declare const boat: (options?: BoatOptions) => BoatSandboxDescriptor;
|
|
25
|
+
export type { BoatApiKey, BoatMachineType, BoatOptions, BoatSandboxDescriptor, CreateBoatOptions };
|
|
26
|
+
//# sourceMappingURL=boat.d.ts.map
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { n as UsageError } from "../errors-ttMTnIYX.js";
|
|
2
|
+
import { i as checkCreateBoatOptions, r as checkBoatOptions } from "../boat-BjLqFJIZ.js";
|
|
3
|
+
// src/sandbox-boat.ts
|
|
4
|
+
const isOptions = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
|
|
5
|
+
/**
|
|
6
|
+
* A `boat()` for one Boat account and name prefix: `apiKey` names the host variable with the API
|
|
7
|
+
* key (`secret.fromEnv('BOAT_API_KEY')` by default), and `prefix` starts every sandbox name
|
|
8
|
+
* reeval gives Boat (`reeval` by default), so a run's cleanup deletes only its own.
|
|
9
|
+
*/
|
|
10
|
+
function createBoat(options = {}) {
|
|
11
|
+
if (!isOptions(options)) throw new UsageError(`createBoat() takes an options object (got ${JSON.stringify(options)})`);
|
|
12
|
+
checkCreateBoatOptions(options);
|
|
13
|
+
const apiKey = {
|
|
14
|
+
kind: "secret",
|
|
15
|
+
from: options.apiKey?.from ?? "BOAT_API_KEY"
|
|
16
|
+
};
|
|
17
|
+
const prefix = options.prefix ?? "reeval";
|
|
18
|
+
return (sandbox = {}) => {
|
|
19
|
+
if (!isOptions(sandbox)) throw new UsageError(`boat() takes an options object (got ${JSON.stringify(sandbox)})`);
|
|
20
|
+
checkBoatOptions(sandbox);
|
|
21
|
+
return {
|
|
22
|
+
kind: "boat",
|
|
23
|
+
apiKey,
|
|
24
|
+
prefix,
|
|
25
|
+
...structuredClone(sandbox)
|
|
26
|
+
};
|
|
27
|
+
};
|
|
28
|
+
}
|
|
29
|
+
/**
|
|
30
|
+
* One boat.dev VM per attempt, on the account whose key is in `BOAT_API_KEY`. The agent, setup
|
|
31
|
+
* steps and checks run as an unprivileged user over SSH; credentials stay on the host behind the
|
|
32
|
+
* egress gateway, as in Docker. Needs `npm i @boatdev/sdk` and `egress: 'allow-all'`.
|
|
33
|
+
*/
|
|
34
|
+
const boat = createBoat();
|
|
35
|
+
export { boat, createBoat };
|
|
36
|
+
|
|
37
|
+
//# sourceMappingURL=boat.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"boat.js","names":[],"sources":["../../src/sandbox-boat.ts"],"mappings":";;;AAcA,MAAM,aAAa,UACjB,OAAO,UAAU,YAAY,UAAU,QAAQ,CAAC,MAAM,QAAQ,KAAK;;;;;;AAOrE,SAAgB,WACd,UAA6B,CAAC,GACoB;CAClD,IAAI,CAAC,UAAU,OAAO,GACpB,MAAM,IAAI,WAAW,6CAA6C,KAAK,UAAU,OAAO,EAAE,EAAE;CAE9F,uBAAuB,OAAO;CAC9B,MAAM,SAAS;EAAE,MAAM;EAAmB,MAAM,QAAQ,QAAQ,QAAQ;CAAe;CACvF,MAAM,SAAS,QAAQ,UAAU;CACjC,QAAQ,UAAuB,CAAC,MAAM;EACpC,IAAI,CAAC,UAAU,OAAO,GACpB,MAAM,IAAI,WAAW,uCAAuC,KAAK,UAAU,OAAO,EAAE,EAAE;EAExF,iBAAiB,OAAO;EACxB,OAAO;GAAE,MAAM;GAAQ;GAAQ;GAAQ,GAAG,gBAAgB,OAAO;EAAE;CACrE;AACF;;;;;;AAOA,MAAa,OAAO,WAAW"}
|