reeval 0.20.0 → 0.21.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/CHANGELOG.md +803 -0
- package/README.md +15 -15
- package/assets/gateway-models.mjs +65 -31
- package/dist/{adapter-C60z3wLq.js → adapter-BdzhdRYo.js} +8 -6
- package/dist/adapter-BdzhdRYo.js.map +1 -0
- package/dist/{agent-BmsMXZXx.js → agent-Dx-bDmlV.js} +179 -31
- package/dist/agent-Dx-bDmlV.js.map +1 -0
- package/dist/{agents-DXuFxtGC.js → agents-l0-k7vw3.js} +361 -101
- package/dist/agents-l0-k7vw3.js.map +1 -0
- package/dist/{app-files-DT5mJyV4.js → app-files-B-CQYB0c.js} +3 -3
- package/dist/app-files-B-CQYB0c.js.map +1 -0
- package/dist/{assemble-CE4pHKIa.js → assemble-CYMpN8LC.js} +1 -1
- package/dist/{assemble-DM2PNU4R.js → assemble-CsZIcJo8.js} +171 -18
- package/dist/assemble-CsZIcJo8.js.map +1 -0
- package/dist/{attempt-CAdlwlNu.js → attempt-CKfKsqqw.js} +2 -2
- package/dist/{attempt-CAdlwlNu.js.map → attempt-CKfKsqqw.js.map} +1 -1
- package/dist/{attempt-host-7VviAJrl.js → attempt-host-BwSmNYkX.js} +17 -8
- package/dist/attempt-host-BwSmNYkX.js.map +1 -0
- package/dist/{boat-BjLqFJIZ.js → boat-CZpAreTB.js} +3 -3
- package/dist/{boat-BjLqFJIZ.js.map → boat-CZpAreTB.js.map} +1 -1
- package/dist/{boat-DSNgZt-t.js → boat-su1Y7LPd.js} +17 -14
- package/dist/boat-su1Y7LPd.js.map +1 -0
- package/dist/bridge/index.mjs +6 -1
- package/dist/{capture-Ccf0Hmyx.js → capture-BqIAeFyC.js} +55 -29
- package/dist/{capture-Ccf0Hmyx.js.map → capture-BqIAeFyC.js.map} +1 -1
- package/dist/capture-D0Ln5aCP.js +1 -0
- package/dist/{cases-z9E6DCd5.js → cases-CM-MQRQp.js} +133 -19
- package/dist/cases-CM-MQRQp.js.map +1 -0
- package/dist/cases-FvhbM8M5.js +1 -0
- package/dist/{cli-DTuLSlmW.js → cli-s_3opn_I.js} +219 -109
- package/dist/cli-s_3opn_I.js.map +1 -0
- package/dist/{cli-spec-Dsr79Qy1.js → cli-spec-DxzIjmq_.js} +109 -26
- package/dist/cli-spec-DxzIjmq_.js.map +1 -0
- package/dist/cli.js +2 -2
- package/dist/client-C5fIzHQa.js +803 -0
- package/dist/client-C5fIzHQa.js.map +1 -0
- package/dist/{command-DSL7I-SI.js → command-B5OAIjp7.js} +25 -21
- package/dist/command-B5OAIjp7.js.map +1 -0
- package/dist/{command-C2C7P5qo.js → command-BJ7KqczP.js} +10 -10
- package/dist/{command-C2C7P5qo.js.map → command-BJ7KqczP.js.map} +1 -1
- package/dist/{command-D8oMB2fa.js → command-BXLZsEwQ.js} +16 -16
- package/dist/{command-D8oMB2fa.js.map → command-BXLZsEwQ.js.map} +1 -1
- package/dist/{command-Ff0T-1Hi.js → command-DA_SHQUQ.js} +16 -16
- package/dist/{command-Ff0T-1Hi.js.map → command-DA_SHQUQ.js.map} +1 -1
- package/dist/{commands-xAOi_VEk.js → commands-BKBamOcX.js} +174 -40
- package/dist/commands-BKBamOcX.js.map +1 -0
- package/dist/{commands-Bk9NG1s_.js → commands-BPvAOEmb.js} +1 -1
- package/dist/{config-SvK8pjEK.js → config-C0URar0t.js} +255 -89
- package/dist/config-C0URar0t.js.map +1 -0
- package/dist/{context-BdgCao9Q.js → context-Sj58aJEu.js} +2 -2
- package/dist/{context-BdgCao9Q.js.map → context-Sj58aJEu.js.map} +1 -1
- package/dist/{cost-BdRgySQl.js → cost-C21gGrju.js} +19 -9
- package/dist/cost-C21gGrju.js.map +1 -0
- package/dist/cost-IM80LyGD.js +1 -0
- package/dist/{cursor-catalog-DEzan4IT.js → cursor-catalog-FWgSo-T1.js} +4 -4
- package/dist/{cursor-catalog-DEzan4IT.js.map → cursor-catalog-FWgSo-T1.js.map} +1 -1
- package/dist/db-Bc4L-Wcr.js +2 -0
- package/dist/{db-BzOJ4Js4.js → db-BjAWxVAG.js} +142 -248
- package/dist/db-BjAWxVAG.js.map +1 -0
- package/dist/debug-CIXzB4wK.js.map +1 -1
- package/dist/{default-effort-BBDPbJ4D.js → default-effort-CWlhZ6U1.js} +1 -1
- package/dist/{default-effort-BDKIxJyC.js → default-effort-Ck2GYIxX.js} +4 -4
- package/dist/{default-effort-BDKIxJyC.js.map → default-effort-Ck2GYIxX.js.map} +1 -1
- package/dist/{dist-Db7ifchA.js → dist-DeqeCUZe.js} +5 -5
- package/dist/{dist-Db7ifchA.js.map → dist-DeqeCUZe.js.map} +1 -1
- package/dist/{docker-DG_uFgn2.js → docker-CDdK6Ity.js} +41 -16
- package/dist/docker-CDdK6Ity.js.map +1 -0
- package/dist/{docker-DFrjoNs-.js → docker-D74l67k8.js} +4 -4
- package/dist/{docker-DFrjoNs-.js.map → docker-D74l67k8.js.map} +1 -1
- package/dist/{docker--mukta3L.js → docker-DMug3l-a.js} +1 -1
- package/dist/{doctor-DWK4ttex.js → doctor-eFxyn6at.js} +85 -46
- package/dist/doctor-eFxyn6at.js.map +1 -0
- package/dist/{environment-cPMCOk-h.js → environment-CJIKz-Ud.js} +49 -11
- package/dist/environment-CJIKz-Ud.js.map +1 -0
- package/dist/{errors-BZgLSZtV.js → errors-C1GBcWE2.js} +2 -2
- package/dist/{errors-BZgLSZtV.js.map → errors-C1GBcWE2.js.map} +1 -1
- package/dist/{eval-source-C9b1h8L6.js → eval-source-CXIRJ91v.js} +24 -12
- package/dist/eval-source-CXIRJ91v.js.map +1 -0
- package/dist/{evaluate-B12Tosvq.js → evaluate-DA4QsrHO.js} +792 -281
- package/dist/evaluate-DA4QsrHO.js.map +1 -0
- package/dist/{evaluate-COdzf7Hl.d.ts → evaluate-DHrU4Wld.d.ts} +2 -2
- package/dist/fake-bootstrap-CnwWG3kP.js +15 -0
- package/dist/fake-bootstrap-CnwWG3kP.js.map +1 -0
- package/dist/{files-BOBdC0uI.js → files-BVVWAS0A.js} +6 -6
- package/dist/{files-BOBdC0uI.js.map → files-BVVWAS0A.js.map} +1 -1
- package/dist/files-BaqXvB88.js +1 -0
- package/dist/{files-tiNWe8Ih.js → files-Bey1VAex.js} +3 -3
- package/dist/{files-tiNWe8Ih.js.map → files-Bey1VAex.js.map} +1 -1
- package/dist/files-BjOJw4sn.js +1 -0
- package/dist/{files-DgXyaAg6.js → files-BrGVs4gY.js} +2 -2
- package/dist/{files-DgXyaAg6.js.map → files-BrGVs4gY.js.map} +1 -1
- package/dist/files-CNHhSyb3.js +1 -0
- package/dist/files-CW1lChNh.js +1 -0
- package/dist/{files-F5EG0WPT.js → files-D6j-XpaK.js} +5 -5
- package/dist/{files-F5EG0WPT.js.map → files-D6j-XpaK.js.map} +1 -1
- package/dist/{files-s28a6czq.js → files-F44NRCN0.js} +143 -20
- package/dist/files-F44NRCN0.js.map +1 -0
- package/dist/{files-DlQshsks.js → files-g1watgRC.js} +2 -2
- package/dist/{files-DlQshsks.js.map → files-g1watgRC.js.map} +1 -1
- package/dist/gateway.d.ts +1 -1
- package/dist/{git-BpoqEgDV.js → git-Jqkf9SBa.js} +3 -3
- package/dist/{git-BpoqEgDV.js.map → git-Jqkf9SBa.js.map} +1 -1
- package/dist/{harness-DXv2gnaT.js → harness-FcTyyPco.js} +17 -8
- package/dist/harness-FcTyyPco.js.map +1 -0
- package/dist/{harness-C2berMiM.js → harness-nwnyghJZ.js} +14 -11
- package/dist/{harness-C2berMiM.js.map → harness-nwnyghJZ.js.map} +1 -1
- package/dist/harness.d.ts +11 -8
- package/dist/harness.js +1 -1
- package/dist/{ids-C_advdJA.js → ids-B-JKTCP8.js} +2 -2
- package/dist/{ids-C_advdJA.js.map → ids-B-JKTCP8.js.map} +1 -1
- package/dist/{images-D2jFze2v.js → images-Dsc4Wi-F.js} +65 -30
- package/dist/images-Dsc4Wi-F.js.map +1 -0
- package/dist/index.d.ts +46 -7
- package/dist/index.js +6 -6
- package/dist/init-C0oUG3jh.js +1 -0
- package/dist/{init-Bi1Q3lRi.js → init-QB5ecPDA.js} +33 -14
- package/dist/init-QB5ecPDA.js.map +1 -0
- package/dist/{ink-list-BpfidQ1h.js → ink-list-mCJypk3d.js} +2 -2
- package/dist/{ink-list-BpfidQ1h.js.map → ink-list-mCJypk3d.js.map} +1 -1
- package/dist/{invocations-CxGNOlh0.js → invocations-BSr4lRzI.js} +5 -5
- package/dist/{invocations-CxGNOlh0.js.map → invocations-BSr4lRzI.js.map} +1 -1
- package/dist/{judge-COMXT1Hx.js → judge-eGH39PaP.js} +12 -10
- package/dist/{judge-COMXT1Hx.js.map → judge-eGH39PaP.js.map} +1 -1
- package/dist/judge.d.ts +3 -1
- package/dist/judge.js +1 -1
- package/dist/{judgments-CzgpsTqv.js → judgments-Cj8bFaDG.js} +2 -2
- package/dist/{judgments-CzgpsTqv.js.map → judgments-Cj8bFaDG.js.map} +1 -1
- package/dist/{layout-Cm85tQYk.js → layout-DfQa4mJs.js} +14 -11
- package/dist/layout-DfQa4mJs.js.map +1 -0
- package/dist/{list-DuThsE28.js → list-Dh6T0kdr.js} +23 -12
- package/dist/{list-DuThsE28.js.map → list-Dh6T0kdr.js.map} +1 -1
- package/dist/live-DwjWJTdn.js +1 -0
- package/dist/{live-CgYbO4Te.js → live-xTZs0c61.js} +2 -2
- package/dist/{live-CgYbO4Te.js.map → live-xTZs0c61.js.map} +1 -1
- package/dist/{live-DL0se4Zd.js → live-y1p3oNXH.js} +9 -9
- package/dist/{live-DL0se4Zd.js.map → live-y1p3oNXH.js.map} +1 -1
- package/dist/{model-CwwkrCb7.js → model-3pZZzloU.js} +7 -5
- package/dist/model-3pZZzloU.js.map +1 -0
- package/dist/{model-CkNVAxob.js → model-DEjwetkJ.js} +1 -1
- package/dist/{model-V3mMXp6x.js → model-DNpKiHqO.js} +6 -6
- package/dist/{model-V3mMXp6x.js.map → model-DNpKiHqO.js.map} +1 -1
- package/dist/model-calls-B0BoQfJ4.js +95 -0
- package/dist/model-calls-B0BoQfJ4.js.map +1 -0
- package/dist/{model-cgt5uvu8.js → model-jRKSQBg6.js} +5 -5
- package/dist/{model-cgt5uvu8.js.map → model-jRKSQBg6.js.map} +1 -1
- package/dist/model-nfewGTzB.js +1 -0
- package/dist/{node-D7pAU--0.js → node-DM-mLGdX.js} +7 -7
- package/dist/{node-D7pAU--0.js.map → node-DM-mLGdX.js.map} +1 -1
- package/dist/{opencode-providers-BGiXt8_B.js → opencode-providers-ChJTQRmz.js} +5 -2
- package/dist/{opencode-providers-BGiXt8_B.js.map → opencode-providers-ChJTQRmz.js.map} +1 -1
- package/dist/{openrouter-models-Cw1z8-sq.js → openrouter-models-C0aRo633.js} +2 -2
- package/dist/{openrouter-models-Cw1z8-sq.js.map → openrouter-models-C0aRo633.js.map} +1 -1
- package/dist/options-DpsJ_5CU.js +1 -0
- package/dist/{patch-DAi1nCuH.js → patch-Bx-qp8Li.js} +2 -2
- package/dist/{patch-DAi1nCuH.js.map → patch-Bx-qp8Li.js.map} +1 -1
- package/dist/pi-providers-HygmL1y-.js +552 -0
- package/dist/pi-providers-HygmL1y-.js.map +1 -0
- package/dist/{plain-BYUf_fUV.js → plain-Ctn8oUdp.js} +44 -10
- package/dist/plain-Ctn8oUdp.js.map +1 -0
- package/dist/{plan-CsPilzpk.js → plan-ChO0A-xn.js} +63 -12
- package/dist/plan-ChO0A-xn.js.map +1 -0
- package/dist/{plugins-BfnhazOv.js → plugins-BioMWncI.js} +636 -9
- package/dist/plugins-BioMWncI.js.map +1 -0
- package/dist/{preflight-D1C-iH0U.js → preflight-BUjk_6wT.js} +1 -1
- package/dist/{preflight-GkpgrBxP.js → preflight-CJSGzMzc.js} +8 -9
- package/dist/preflight-CJSGzMzc.js.map +1 -0
- package/dist/preflight-DD3fI4Hz.js +1 -0
- package/dist/{preflight-BixaE4BA.js → preflight-qFCXmxha.js} +4 -4
- package/dist/{preflight-BixaE4BA.js.map → preflight-qFCXmxha.js.map} +1 -1
- package/dist/{prepare-DQEDXoDp.js → prepare-D7oSSFNm.js} +9 -9
- package/dist/{prepare-DQEDXoDp.js.map → prepare-D7oSSFNm.js.map} +1 -1
- package/dist/{prepare-C--rM_wO.js → prepare-xHU2BpN-.js} +2 -2
- package/dist/prices-B1vm_lPk.js +1 -0
- package/dist/{prices-5m3SzMZ3.js → prices-BrY_ihLs.js} +80 -22
- package/dist/prices-BrY_ihLs.js.map +1 -0
- package/dist/{provenance-BXyYwUC8.js → provenance-B-flBAzR.js} +5 -5
- package/dist/{provenance-BXyYwUC8.js.map → provenance-B-flBAzR.js.map} +1 -1
- package/dist/provider-DHT20Gl8.js +1 -0
- package/dist/{provider-BxzZq3Th.js → provider-ieWOn4YS.js} +2 -2
- package/dist/{provider-BxzZq3Th.js.map → provider-ieWOn4YS.js.map} +1 -1
- package/dist/provider-stop-CxzWW7Ft.js +69 -0
- package/dist/provider-stop-CxzWW7Ft.js.map +1 -0
- package/dist/{providers-1p4HKYIp.js → providers-B6StVyfG.js} +215 -48
- package/dist/providers-B6StVyfG.js.map +1 -0
- package/dist/providers-Dljf6al6.js +1 -0
- package/dist/query-BAc2tQZj.js +1 -0
- package/dist/{query-DhhU9ADI.js → query-CkLmJv7R.js} +2 -2
- package/dist/{query-DhhU9ADI.js.map → query-CkLmJv7R.js.map} +1 -1
- package/dist/{questions-CMAq4pr8.js → questions-CJIh2FSX.js} +7 -7
- package/dist/{questions-CMAq4pr8.js.map → questions-CJIh2FSX.js.map} +1 -1
- package/dist/{record-6IUzwP9K.js → record-nVVujCW7.js} +2 -2
- package/dist/{record-6IUzwP9K.js.map → record-nVVujCW7.js.map} +1 -1
- package/dist/{redact-BhjtnjrU.js → redact-DL2BTykw.js} +17 -2
- package/dist/redact-DL2BTykw.js.map +1 -0
- package/dist/{remarks-BNABzemt.js → remarks-B3wjKscW.js} +46 -11
- package/dist/remarks-B3wjKscW.js.map +1 -0
- package/dist/{remarks-D9Lcd1fF.js → remarks-BpdM_2RC.js} +2 -1
- package/dist/remarks-BpdM_2RC.js.map +1 -0
- package/dist/remarks-CleoDlYw.js +1 -0
- package/dist/{remarks-DPCONFxZ.js → remarks-DqriPKxm.js} +3 -2
- package/dist/{remarks-DPCONFxZ.js.map → remarks-DqriPKxm.js.map} +1 -1
- package/dist/{remote-U7fNt0UP.js → remote-C88amFRN.js} +6 -6
- package/dist/{remote-U7fNt0UP.js.map → remote-C88amFRN.js.map} +1 -1
- package/dist/resolve-Bul8lHaa.js +205 -0
- package/dist/resolve-Bul8lHaa.js.map +1 -0
- package/dist/resolve-DW92wpIZ.js +1 -0
- package/dist/{resolve-Cx3a9UQ2.js → resolve-G576PiFJ.js} +14 -11
- package/dist/resolve-G576PiFJ.js.map +1 -0
- package/dist/{results-CQKXmHym.js → results-zVHIW6xw.js} +9 -22
- package/dist/results-zVHIW6xw.js.map +1 -0
- package/dist/{resume-POpZa1ge.js → resume-D_PcUXfG.js} +94 -16
- package/dist/resume-D_PcUXfG.js.map +1 -0
- package/dist/{retry-CmG809Mp.js → retry-BvTzCxdc.js} +4 -4
- package/dist/{retry-CmG809Mp.js.map → retry-BvTzCxdc.js.map} +1 -1
- package/dist/{root-Co0jhOT5.js → root-BzeoyfGd.js} +2 -2
- package/dist/{root-Co0jhOT5.js.map → root-BzeoyfGd.js.map} +1 -1
- package/dist/{vercel-CGlSBv63.js → routes-B0F2R-K7.js} +91 -56
- package/dist/routes-B0F2R-K7.js.map +1 -0
- package/dist/{runtime-Xm9oeC7o.js → runtime-B3r_pAq6.js} +4 -4
- package/dist/{runtime-Xm9oeC7o.js.map → runtime-B3r_pAq6.js.map} +1 -1
- package/dist/sandbox/boat.d.ts +1 -1
- package/dist/sandbox/boat.js +1 -1
- package/dist/{sandbox-DrlL4yqb.js → sandbox-Duh3z1TV.js} +3 -3
- package/dist/{sandbox-DrlL4yqb.js.map → sandbox-Duh3z1TV.js.map} +1 -1
- package/dist/sandbox.d.ts +1 -1
- package/dist/sandbox.js +1 -1
- package/dist/server-CGEsvVRG.js +1 -0
- package/dist/{server-C00zd6zl.js → server-DUWMRKik.js} +8 -8
- package/dist/{server-C00zd6zl.js.map → server-DUWMRKik.js.map} +1 -1
- package/dist/{shared-Cfi45Bvy.js → shared-DtZwIAfy.js} +7 -1
- package/dist/shared-DtZwIAfy.js.map +1 -0
- package/dist/{source-DDgr48Gn.js → source-CHuN4Nfg.js} +2 -2
- package/dist/{source-DDgr48Gn.js.map → source-CHuN4Nfg.js.map} +1 -1
- package/dist/source-Wz1Nrfue.js +1 -0
- package/dist/src--yl1OypK.js +2 -0
- package/dist/{src-Cb2MWozp.js → src-B-HuDqpH.js} +276 -41
- package/dist/src-B-HuDqpH.js.map +1 -0
- package/dist/{src-DAzaCTcN.js → src-B5r1d23Y.js} +176 -18
- package/dist/src-B5r1d23Y.js.map +1 -0
- package/dist/{src-y0nOeRRE.js → src-BHJ4MWvY.js} +494 -112
- package/dist/src-BHJ4MWvY.js.map +1 -0
- package/dist/{src-Dw79VLa3.js → src-BI0v8qlZ.js} +202 -56
- package/dist/src-BI0v8qlZ.js.map +1 -0
- package/dist/src-BL-_0QoE.js +1 -0
- package/dist/{src-YvblOrBU.js → src-BqNzHHWn.js} +87 -13
- package/dist/src-BqNzHHWn.js.map +1 -0
- package/dist/{src-CV_7DkPa.js → src-C-ChdnG6.js} +102 -13
- package/dist/src-C-ChdnG6.js.map +1 -0
- package/dist/src-C-mOSczH.js +2 -0
- package/dist/src-CZaYu6ER.js +3 -0
- package/dist/src-CeBhwD8k.js +2 -0
- package/dist/src-CkEiiyON.js +2 -0
- package/dist/{src-KxS91P7L.js → src-CmA5Yev6.js} +79 -11
- package/dist/src-CmA5Yev6.js.map +1 -0
- package/dist/src-CwH_nEaw.js +2 -0
- package/dist/src-DA95rM6v.js +4 -0
- package/dist/{src-DvGns8cz.js → src-DL-EE4DU.js} +299 -17
- package/dist/src-DL-EE4DU.js.map +1 -0
- package/dist/src-De0KY5S_.js +2 -0
- package/dist/{src-BNQznj4z.js → src-boB6D-5T.js} +124 -45
- package/dist/src-boB6D-5T.js.map +1 -0
- package/dist/state-B3jex5KU.js +1 -0
- package/dist/{state-328JpnHA.js → state-DUBRDyMk.js} +21 -21
- package/dist/{state-328JpnHA.js.map → state-DUBRDyMk.js.map} +1 -1
- package/dist/store/local.d.ts +8 -0
- package/dist/store/local.js +16 -0
- package/dist/store/local.js.map +1 -0
- package/dist/store/s3.d.ts +10 -0
- package/dist/store/s3.js +18 -0
- package/dist/store/s3.js.map +1 -0
- package/dist/{suite-COglUhPd.js → suite-B9J6Afg6.js} +6 -5
- package/dist/{suite-COglUhPd.js.map → suite-B9J6Afg6.js.map} +1 -1
- package/dist/suite-Bhs9-Z7O.js +2 -0
- package/dist/{summary-DDy9DfyJ.js → summary-CSp4cfnr.js} +25 -7
- package/dist/{summary-DDy9DfyJ.js.map → summary-CSp4cfnr.js.map} +1 -1
- package/dist/sync-CxAY6Dki.js +559 -0
- package/dist/sync-CxAY6Dki.js.map +1 -0
- package/dist/{tart-dWoJvWHc.js → tart-CcrrtSrp.js} +179 -61
- package/dist/tart-CcrrtSrp.js.map +1 -0
- package/dist/tart-CzViW3WZ.js +186 -0
- package/dist/tart-CzViW3WZ.js.map +1 -0
- package/dist/tart-DmVuVsmX.js +1 -0
- package/dist/tart-bake-F-6seRC9.js +192 -0
- package/dist/tart-bake-F-6seRC9.js.map +1 -0
- package/dist/tart-bake-RK7RaT9E.js +1 -0
- package/dist/tart-cli-B86Jqo1t.js +89 -0
- package/dist/tart-cli-B86Jqo1t.js.map +1 -0
- package/dist/tart-cli-ClvRniLQ.js +1 -0
- package/dist/tart-hosts-Brii7zHM.js +1 -0
- package/dist/tart-hosts-DPyZsg-1.js +313 -0
- package/dist/tart-hosts-DPyZsg-1.js.map +1 -0
- package/dist/{tart-images-DZ_Mbh-g.js → tart-images-CWSf03w8.js} +64 -6
- package/dist/tart-images-CWSf03w8.js.map +1 -0
- package/dist/testing.d.ts +36 -2
- package/dist/testing.js +4 -4
- package/dist/tool-class-CVDdJy0H.js +433 -0
- package/dist/tool-class-CVDdJy0H.js.map +1 -0
- package/dist/{trace-Dx2NBE1O.js → trace-BpXByD7W.js} +13 -2
- package/dist/{trace-Dx2NBE1O.js.map → trace-BpXByD7W.js.map} +1 -1
- package/dist/{traits-DKnYkqeK.js → traits-CCD8XsmI.js} +2 -2
- package/dist/{traits-DKnYkqeK.js.map → traits-CCD8XsmI.js.map} +1 -1
- package/dist/{transcript-CCf07UmU.js → transcript-BP_2hji-.js} +3 -3
- package/dist/{transcript-CCf07UmU.js.map → transcript-BP_2hji-.js.map} +1 -1
- package/dist/{types-DBwFsGem.d.ts → types-BJ0wh8wC.d.ts} +408 -44
- package/dist/{types-C2mLpph3.js → types-CbcnJxCy.js} +7 -1
- package/dist/types-CbcnJxCy.js.map +1 -0
- package/dist/{usage-DJiDnh2D.js → usage-CwIRPPZ9.js} +16 -3
- package/dist/usage-CwIRPPZ9.js.map +1 -0
- package/dist/{vertex-Eb2wqahk.js → vertex-BEWxHoxH.js} +22 -6
- package/dist/{vertex-Eb2wqahk.js.map → vertex-BEWxHoxH.js.map} +1 -1
- package/dist/vertex-DXfcXYKn.js +1 -0
- package/dist/view/index.d.ts +27 -3
- package/dist/view/index.js +8 -8
- package/dist/{views-BROacjBv.js → views-DRxXCyIH.js} +6 -6
- package/dist/{views-BROacjBv.js.map → views-DRxXCyIH.js.map} +1 -1
- package/dist/views-i67V1ly3.js +2 -0
- package/dist/{worker-entry-Smb4bNDc.js → worker-entry-C3Q4U63F.js} +12 -9
- package/dist/worker-entry-C3Q4U63F.js.map +1 -0
- package/dist/workspace-DhUOW8if.js +1 -0
- package/dist/{workspace-DNDTEk8v.js → workspace-P72SXLXr.js} +7 -7
- package/dist/{workspace-DNDTEk8v.js.map → workspace-P72SXLXr.js.map} +1 -1
- package/package.json +12 -1
- package/skills/eval-rubric/SKILL.md +10 -0
- package/skills/reeval/SKILL.md +370 -0
- package/skills/reeval/references/capture.md +48 -0
- package/skills/reeval/references/cli.md +162 -0
- package/skills/reeval/references/compare.md +180 -0
- package/skills/reeval/references/config.md +147 -0
- package/skills/reeval/references/environments.md +218 -0
- package/skills/reeval/references/evals.md +241 -0
- package/skills/reeval/references/mistakes.md +39 -0
- package/skills/reeval/references/vocabulary.md +19 -0
- package/skills/setup/SKILL.md +219 -0
- package/skills/setup/references/templates.md +258 -0
- package/dist/adapter-C60z3wLq.js.map +0 -1
- package/dist/agent-BmsMXZXx.js.map +0 -1
- package/dist/agents-DXuFxtGC.js.map +0 -1
- package/dist/app-files-DT5mJyV4.js.map +0 -1
- package/dist/assemble-DM2PNU4R.js.map +0 -1
- package/dist/attempt-host-7VviAJrl.js.map +0 -1
- package/dist/boat-DSNgZt-t.js.map +0 -1
- package/dist/capture-BzotD2hs.js +0 -1
- package/dist/cases-Dy0mifal.js +0 -1
- package/dist/cases-z9E6DCd5.js.map +0 -1
- package/dist/cli-DTuLSlmW.js.map +0 -1
- package/dist/cli-spec-Dsr79Qy1.js.map +0 -1
- package/dist/client-KM4C5r5_.js +0 -387
- package/dist/client-KM4C5r5_.js.map +0 -1
- package/dist/command-DSL7I-SI.js.map +0 -1
- package/dist/commands-xAOi_VEk.js.map +0 -1
- package/dist/config-SvK8pjEK.js.map +0 -1
- package/dist/cost-BdRgySQl.js.map +0 -1
- package/dist/cost-Cr26Alhq.js +0 -1
- package/dist/db-BzOJ4Js4.js.map +0 -1
- package/dist/db-CQRZ3URX.js +0 -2
- package/dist/docker-DG_uFgn2.js.map +0 -1
- package/dist/doctor-DWK4ttex.js.map +0 -1
- package/dist/environment-cPMCOk-h.js.map +0 -1
- package/dist/eval-source-C9b1h8L6.js.map +0 -1
- package/dist/evaluate-B12Tosvq.js.map +0 -1
- package/dist/files-C1Rk9FYA.js +0 -1
- package/dist/files-DMQ9-Vv5.js +0 -1
- package/dist/files-Di0xDbCc.js +0 -1
- package/dist/files-G5jf8wBp.js +0 -1
- package/dist/files-s28a6czq.js.map +0 -1
- package/dist/harness-DXv2gnaT.js.map +0 -1
- package/dist/images-D2jFze2v.js.map +0 -1
- package/dist/init-Bi1Q3lRi.js.map +0 -1
- package/dist/init-CUw65o36.js +0 -1
- package/dist/kinds-Bh2I35id.js +0 -698
- package/dist/kinds-Bh2I35id.js.map +0 -1
- package/dist/layout-Cm85tQYk.js.map +0 -1
- package/dist/live-DZLmj0iG.js +0 -1
- package/dist/matchers-CXLn-1jm.js +0 -148
- package/dist/matchers-CXLn-1jm.js.map +0 -1
- package/dist/model-Cv4GuTsZ.js +0 -1
- package/dist/model-CwwkrCb7.js.map +0 -1
- package/dist/options-DPUmk7v_.js +0 -1
- package/dist/plain-BYUf_fUV.js.map +0 -1
- package/dist/plan-CsPilzpk.js.map +0 -1
- package/dist/plugins-BfnhazOv.js.map +0 -1
- package/dist/preflight-Bn3ianye.js +0 -1
- package/dist/preflight-GkpgrBxP.js.map +0 -1
- package/dist/prices-5m3SzMZ3.js.map +0 -1
- package/dist/provider-BnUoz4KB.js +0 -1
- package/dist/providers-1p4HKYIp.js.map +0 -1
- package/dist/providers-B-ijCktf.js +0 -1
- package/dist/query-BYhyf0LR.js +0 -1
- package/dist/redact-BhjtnjrU.js.map +0 -1
- package/dist/remarks-BNABzemt.js.map +0 -1
- package/dist/remarks-CAvTSq16.js +0 -1
- package/dist/remarks-D9Lcd1fF.js.map +0 -1
- package/dist/resolve-C14Pmtej.js +0 -1
- package/dist/resolve-Cx3a9UQ2.js.map +0 -1
- package/dist/results-CQKXmHym.js.map +0 -1
- package/dist/resume-POpZa1ge.js.map +0 -1
- package/dist/server-C1UJcpUh.js +0 -1
- package/dist/shared-Cfi45Bvy.js.map +0 -1
- package/dist/source-DJHmQv_j.js +0 -1
- package/dist/src-1dBuXzs4.js +0 -3
- package/dist/src-BKpioayC.js +0 -2
- package/dist/src-BNQznj4z.js.map +0 -1
- package/dist/src-BY1cCaoJ.js +0 -2
- package/dist/src-BbZYaQ8b.js +0 -2
- package/dist/src-CDFH2vVN.js +0 -2
- package/dist/src-CMW5R9Q0.js +0 -1
- package/dist/src-CV_7DkPa.js.map +0 -1
- package/dist/src-Cb2MWozp.js.map +0 -1
- package/dist/src-CrV2WA2i.js +0 -2
- package/dist/src-CsFaawcZ.js +0 -2
- package/dist/src-DAzaCTcN.js.map +0 -1
- package/dist/src-DvGns8cz.js.map +0 -1
- package/dist/src-Dw79VLa3.js.map +0 -1
- package/dist/src-KxS91P7L.js.map +0 -1
- package/dist/src-YvblOrBU.js.map +0 -1
- package/dist/src-wKwznPgt.js +0 -2
- package/dist/src-y0nOeRRE.js.map +0 -1
- package/dist/state-Ca55Gk_O.js +0 -1
- package/dist/suite-CKBa6MKt.js +0 -2
- package/dist/tart-cli-C-GsbVsQ.js +0 -1
- package/dist/tart-cli-CU0nFS-L.js +0 -55
- package/dist/tart-cli-CU0nFS-L.js.map +0 -1
- package/dist/tart-dWoJvWHc.js.map +0 -1
- package/dist/tart-images-DZ_Mbh-g.js.map +0 -1
- package/dist/tool-target-DS5d72eH.js +0 -40
- package/dist/tool-target-DS5d72eH.js.map +0 -1
- package/dist/types-C2mLpph3.js.map +0 -1
- package/dist/usage-DJiDnh2D.js.map +0 -1
- package/dist/vercel-CGlSBv63.js.map +0 -1
- package/dist/vertex-O88TCwgY.js +0 -1
- package/dist/views-B0Yt_Q1S.js +0 -2
- package/dist/worker-entry-Smb4bNDc.js.map +0 -1
- package/dist/workspace-C0dDP75l.js +0 -1
|
@@ -1,12 +1,13 @@
|
|
|
1
|
-
import {
|
|
2
|
-
import { t as InfraError } from "./types-
|
|
3
|
-
import { n as attemptDebug } from "./attempt-
|
|
4
|
-
import { t as untraced } from "./docker-
|
|
5
|
-
import { i as
|
|
6
|
-
import {
|
|
1
|
+
import { I as startGateway, N as pathOperations, P as CA_PATH, dt as WORKSPACE_DIR, jt as shellQuote, kt as traceDocker, rt as BRIDGE_PORT } from "./src-BHJ4MWvY.js";
|
|
2
|
+
import { t as InfraError } from "./types-CbcnJxCy.js";
|
|
3
|
+
import { n as attemptDebug } from "./attempt-CKfKsqqw.js";
|
|
4
|
+
import { t as untraced } from "./docker-D74l67k8.js";
|
|
5
|
+
import { a as tartOk, c as tracedRunBytes, i as tartNames, n as runArgv, r as tartCli, s as tracedRun, t as LOCAL_TART } from "./tart-cli-B86Jqo1t.js";
|
|
6
|
+
import { i as sessionSandbox, n as gatewayGlue } from "./docker-CDdK6Ity.js";
|
|
7
|
+
import { c as TartBusyError, d as hostLoad, f as hostSlots, g as withHostClaim, l as claimHost, n as BUSY_COOLDOWN_MS, s as HostTaken, t as AT_VM_LIMIT, u as freeSlots } from "./tart-hosts-DPyZsg-1.js";
|
|
7
8
|
import { posix } from "node:path";
|
|
8
|
-
import { randomBytes } from "node:crypto";
|
|
9
9
|
import { spawn } from "node:child_process";
|
|
10
|
+
import { randomBytes } from "node:crypto";
|
|
10
11
|
import { Readable } from "node:stream";
|
|
11
12
|
// src/sandbox/tart.ts
|
|
12
13
|
/** How long a clone has to boot until a command runs in it. */
|
|
@@ -20,6 +21,8 @@ const PROBE_TIMEOUT_MS = 15e3;
|
|
|
20
21
|
const DEFAULT_SSH_USER = "admin";
|
|
21
22
|
/** Before the image's own PATH in every command, so Homebrew's tools (Node among them) are found. */
|
|
22
23
|
const GUEST_PATH = "/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin";
|
|
24
|
+
/** Where a baked image has reeval's pinned pnpm, relative to the image user's home; first on PATH. */
|
|
25
|
+
const PNPM_DIR = ".reeval-state/pnpm";
|
|
23
26
|
const SSH_OPTIONS = [
|
|
24
27
|
"-o",
|
|
25
28
|
"BatchMode=yes",
|
|
@@ -38,6 +41,12 @@ const UNITS = {
|
|
|
38
41
|
m: 1024 ** 2,
|
|
39
42
|
g: 1024 ** 3
|
|
40
43
|
};
|
|
44
|
+
/**
|
|
45
|
+
* Deletes the VM `$1` on a host once no `tart clone` is still making it, in the background: killing
|
|
46
|
+
* the local ssh leaves the remote clone running, and it would leave its VM behind. `[t]art` keeps
|
|
47
|
+
* the pattern from matching this shell's own command line.
|
|
48
|
+
*/
|
|
49
|
+
const DELETE_AFTER_CLONE = `( i=0; while [ $i -lt 600 ] && pgrep -f "[t]art clone .* $1\\$" >/dev/null; do sleep 1; i=$((i+1)); done; tart delete "$1" ) </dev/null >/dev/null 2>&1 &`;
|
|
41
50
|
/** The prefix of every VM a run clones, so a canceled run's VMs can be found and deleted. */
|
|
42
51
|
const vmPrefix = (runId) => `reeval-${runId}-`;
|
|
43
52
|
/** `tart set --memory` takes megabytes; `memory` is bytes, or a number with `b`, `k`, `m` or `g`. */
|
|
@@ -47,19 +56,22 @@ function memoryMb(memory) {
|
|
|
47
56
|
const unit = m?.[2]?.toLowerCase() ?? "b";
|
|
48
57
|
return Math.max(1, Math.round(Number(m?.[1] ?? 0) * UNITS[unit] / UNITS.m));
|
|
49
58
|
}
|
|
50
|
-
const tartGuest = (vm) => ({ argv: (argv) => [
|
|
51
|
-
"tart",
|
|
59
|
+
const tartGuest = (vm, on = LOCAL_TART) => ({ argv: (argv) => on.tart([
|
|
52
60
|
"exec",
|
|
53
61
|
"-i",
|
|
54
62
|
vm,
|
|
55
63
|
...argv
|
|
56
|
-
] });
|
|
57
|
-
/**
|
|
58
|
-
|
|
64
|
+
]) });
|
|
65
|
+
/**
|
|
66
|
+
* SSH joins its arguments into one command line for the remote shell, so each is quoted. A VM on
|
|
67
|
+
* another Mac is reached through that Mac: `proxy` is the `ProxyCommand` that gets there.
|
|
68
|
+
*/
|
|
69
|
+
const sshGuest = (host, key, user = DEFAULT_SSH_USER, proxy) => ({ argv: (argv) => [
|
|
59
70
|
"ssh",
|
|
60
71
|
"-i",
|
|
61
72
|
key,
|
|
62
73
|
...SSH_OPTIONS,
|
|
74
|
+
...proxy ? ["-o", `ProxyCommand=${proxy}`] : [],
|
|
63
75
|
`${user}@${host}`,
|
|
64
76
|
argv.map(shellQuote).join(" ")
|
|
65
77
|
] });
|
|
@@ -96,7 +108,7 @@ function execScript(o) {
|
|
|
96
108
|
const exports = Object.entries(o.env).filter(([k]) => NAME.test(k)).map(([k, v]) => `export ${k}=${shellQuote(v)}`);
|
|
97
109
|
return [[
|
|
98
110
|
`echo $$ > ${shellQuote(o.pidFile)}`,
|
|
99
|
-
`export PATH=${
|
|
111
|
+
`export PATH=${shellQuote(o.path ?? "/opt/homebrew/bin:/opt/homebrew/sbin:/usr/local/bin")}:"$PATH"`,
|
|
100
112
|
...exports,
|
|
101
113
|
"umask 022",
|
|
102
114
|
`cd ${shellQuote(o.cwd)} || exit 1`
|
|
@@ -124,77 +136,97 @@ const sleep = (ms, signal) => new Promise((resolve, reject) => {
|
|
|
124
136
|
}, { once: true });
|
|
125
137
|
});
|
|
126
138
|
/** Stops and deletes a VM, never throwing: one already gone is done. */
|
|
127
|
-
async function removeVm(vm) {
|
|
139
|
+
async function removeVm(vm, on) {
|
|
128
140
|
await tartCli([
|
|
129
141
|
"stop",
|
|
130
142
|
"--timeout",
|
|
131
143
|
"5",
|
|
132
144
|
vm
|
|
133
|
-
]).catch(() => {});
|
|
134
|
-
await tartCli(["delete", vm]).catch(() => {});
|
|
145
|
+
], { on }).catch(() => {});
|
|
146
|
+
await tartCli(["delete", vm], { on }).catch(() => {});
|
|
135
147
|
}
|
|
136
|
-
/**
|
|
137
|
-
|
|
138
|
-
|
|
148
|
+
/**
|
|
149
|
+
* Deletes every VM a run cloned and didn't delete, on this machine or each of `targets`: a worker
|
|
150
|
+
* killed mid-attempt leaves its own.
|
|
151
|
+
*/
|
|
152
|
+
async function removeRunVms(runId, targets = [LOCAL_TART]) {
|
|
139
153
|
const prefix = vmPrefix(runId);
|
|
140
|
-
|
|
154
|
+
await Promise.all(targets.map(async (on) => {
|
|
155
|
+
const names = await tartNames(void 0, on).catch(() => /* @__PURE__ */ new Set());
|
|
156
|
+
for (const vm of names) if (vm.startsWith(prefix)) await removeVm(vm, on);
|
|
157
|
+
}));
|
|
141
158
|
}
|
|
142
|
-
|
|
143
|
-
|
|
144
|
-
|
|
159
|
+
/**
|
|
160
|
+
* Clones `image` as `vm` on `on`, sizes and boots it headless, and waits until `tart exec` (or
|
|
161
|
+
* SSH, with the eval's key) runs a command in it. A clone that doesn't boot is stopped and
|
|
162
|
+
* deleted; one its host refuses for being at its VM limit throws {@link TartBusyError}.
|
|
163
|
+
*/
|
|
164
|
+
async function bootTartVm(descriptor, image, vm, signal, on = LOCAL_TART, o = {}) {
|
|
145
165
|
const debug = attemptDebug();
|
|
146
|
-
const vm = `${vmPrefix(options.runId)}${randomBytes(3).toString("hex")}`;
|
|
147
166
|
const started = performance.now();
|
|
148
167
|
let booted;
|
|
149
168
|
let ended = Promise.resolve();
|
|
150
|
-
let
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
removed ??= (async () => {
|
|
154
|
-
await gateway?.close();
|
|
169
|
+
let halted;
|
|
170
|
+
const halt = (timeoutS = 5) => {
|
|
171
|
+
halted ??= (async () => {
|
|
155
172
|
await tartCli([
|
|
156
173
|
"stop",
|
|
157
174
|
"--timeout",
|
|
158
|
-
|
|
175
|
+
String(timeoutS),
|
|
159
176
|
vm
|
|
160
|
-
]).catch(() => {});
|
|
177
|
+
], { on }).catch(() => {});
|
|
161
178
|
booted?.kill("SIGKILL");
|
|
162
179
|
await ended;
|
|
163
|
-
await tartCli(["delete", vm]).catch(() => {});
|
|
164
|
-
debug?.log("container", `deleted ${vm}`);
|
|
165
180
|
})();
|
|
166
|
-
return
|
|
181
|
+
return halted;
|
|
167
182
|
};
|
|
168
183
|
const fail = async (error) => {
|
|
169
|
-
await
|
|
184
|
+
await halt();
|
|
185
|
+
await tartCli(["delete", vm], { on }).catch(() => {});
|
|
170
186
|
if (signal.aborted) throw signal.reason;
|
|
171
187
|
throw error instanceof InfraError ? error : new InfraError(error.message);
|
|
172
188
|
};
|
|
173
189
|
try {
|
|
174
|
-
|
|
175
|
-
|
|
176
|
-
|
|
177
|
-
|
|
178
|
-
|
|
190
|
+
const clone = async () => {
|
|
191
|
+
await tartOk([
|
|
192
|
+
"clone",
|
|
193
|
+
image,
|
|
194
|
+
vm
|
|
195
|
+
], {
|
|
196
|
+
signal,
|
|
197
|
+
on
|
|
198
|
+
});
|
|
199
|
+
};
|
|
200
|
+
await (o.claim ? o.claim(clone) : clone());
|
|
179
201
|
} catch (error) {
|
|
180
|
-
if (
|
|
181
|
-
|
|
202
|
+
if (error instanceof HostTaken) throw error;
|
|
203
|
+
await tartCli(["delete", vm], { on }).catch(() => {});
|
|
204
|
+
if (signal.aborted) {
|
|
205
|
+
if (on.remote) await runArgv(on.sh(DELETE_AFTER_CLONE, [vm])).catch(() => {});
|
|
206
|
+
throw signal.reason;
|
|
207
|
+
}
|
|
208
|
+
throw new InfraError(`Couldn't clone ${image}: ${error.message}`);
|
|
182
209
|
}
|
|
183
|
-
let guest = tartGuest(vm);
|
|
210
|
+
let guest = tartGuest(vm, on);
|
|
184
211
|
try {
|
|
185
212
|
const set = [...descriptor.cpus !== void 0 ? ["--cpu", String(descriptor.cpus)] : [], ...descriptor.memory !== void 0 ? ["--memory", String(memoryMb(descriptor.memory))] : []];
|
|
186
213
|
if (set.length) await tartOk([
|
|
187
214
|
"set",
|
|
188
215
|
vm,
|
|
189
216
|
...set
|
|
190
|
-
], {
|
|
217
|
+
], {
|
|
218
|
+
signal,
|
|
219
|
+
on
|
|
220
|
+
});
|
|
191
221
|
let exited;
|
|
222
|
+
let busy = false;
|
|
192
223
|
let stderr = "";
|
|
193
|
-
|
|
224
|
+
const [bin = "", ...args] = on.tart([
|
|
194
225
|
"run",
|
|
195
226
|
vm,
|
|
196
227
|
"--no-graphics"
|
|
197
|
-
]
|
|
228
|
+
]);
|
|
229
|
+
booted = spawn(bin, args, {
|
|
198
230
|
stdio: [
|
|
199
231
|
"ignore",
|
|
200
232
|
"ignore",
|
|
@@ -213,10 +245,11 @@ async function createTartSandbox(descriptor, options) {
|
|
|
213
245
|
booted.once("error", (error) => {
|
|
214
246
|
exited = error.message;
|
|
215
247
|
});
|
|
216
|
-
booted.once("
|
|
248
|
+
booted.once("close", (code) => {
|
|
217
249
|
const why = stderr.trim();
|
|
218
250
|
exited = `tart run exited (${code})${why ? `: ${why}` : ""}`;
|
|
219
|
-
|
|
251
|
+
busy = on.remote && AT_VM_LIMIT.test(why);
|
|
252
|
+
if (AT_VM_LIMIT.test(why) && !on.remote) exited += `. macOS runs two macOS VMs at a time, and VMs outside this run hold the slots. Stop them (tart stop <name>), or run fewer: tart({ maxConcurrent: 1 })`;
|
|
220
253
|
});
|
|
221
254
|
const deadline = Date.now() + BOOT_TIMEOUT_MS;
|
|
222
255
|
/** Whether `g` runs a command within `ms`, and the boot deadline. */
|
|
@@ -233,21 +266,25 @@ async function createTartSandbox(descriptor, options) {
|
|
|
233
266
|
const ssh = descriptor.ssh;
|
|
234
267
|
/** `tart exec` when the image's Guest Agent answers, else SSH when the eval gave a key. */
|
|
235
268
|
const reach = async () => {
|
|
236
|
-
if (await answers(tartGuest(vm), ssh ? 5e3 : 15e3)) return tartGuest(vm);
|
|
269
|
+
if (await answers(tartGuest(vm, on), ssh ? 5e3 : 15e3)) return tartGuest(vm, on);
|
|
237
270
|
if (!ssh) return void 0;
|
|
238
271
|
const ip = await tartCli([
|
|
239
272
|
"ip",
|
|
240
273
|
vm,
|
|
241
274
|
"--wait",
|
|
242
275
|
"5"
|
|
243
|
-
], {
|
|
276
|
+
], {
|
|
277
|
+
signal,
|
|
278
|
+
on
|
|
279
|
+
});
|
|
244
280
|
const host = ip.stdout.trim();
|
|
245
281
|
if (ip.exitCode !== 0 || !host) return void 0;
|
|
246
|
-
const viaSsh = sshGuest(host, ssh.key, ssh.user);
|
|
282
|
+
const viaSsh = sshGuest(host, ssh.key, ssh.user, on.proxy);
|
|
247
283
|
return await answers(viaSsh) ? viaSsh : void 0;
|
|
248
284
|
};
|
|
249
285
|
for (;;) {
|
|
250
|
-
if (
|
|
286
|
+
if (busy) throw new TartBusyError(`${on.label} is at its VM limit: ${exited}`);
|
|
287
|
+
if (exited) throw new InfraError(`${vm} didn't boot${on.remote ? ` on ${on.label}` : ""}: ${exited}`);
|
|
251
288
|
const reached = await untraced(reach);
|
|
252
289
|
if (reached) {
|
|
253
290
|
guest = reached;
|
|
@@ -259,7 +296,7 @@ async function createTartSandbox(descriptor, options) {
|
|
|
259
296
|
} catch (error) {
|
|
260
297
|
return fail(error);
|
|
261
298
|
}
|
|
262
|
-
debug?.log("container", `booted ${vm} from ${
|
|
299
|
+
debug?.log("container", `booted ${vm} from ${image}${on.remote ? ` on ${on.label}` : ""} in ${Math.round(performance.now() - started)}ms, reached over ${guest.argv([])[0] === "ssh" ? "SSH" : "tart exec"}`);
|
|
263
300
|
let home;
|
|
264
301
|
try {
|
|
265
302
|
home = (await runIn(guest, [
|
|
@@ -271,6 +308,80 @@ async function createTartSandbox(descriptor, options) {
|
|
|
271
308
|
} catch (error) {
|
|
272
309
|
return fail(error);
|
|
273
310
|
}
|
|
311
|
+
return {
|
|
312
|
+
guest,
|
|
313
|
+
home,
|
|
314
|
+
halt
|
|
315
|
+
};
|
|
316
|
+
}
|
|
317
|
+
/**
|
|
318
|
+
* Boots the attempt's VM: on this machine, or with `tart({ hosts })` on the host with the most room,
|
|
319
|
+
* passing over one whose `tart run` says it's at its VM limit for a while and trying the next. The
|
|
320
|
+
* host's slot is claimed under its lock: counted again, then cloned into.
|
|
321
|
+
*/
|
|
322
|
+
async function bootOnHost(descriptor, image, vm, options, o = {}) {
|
|
323
|
+
const { signal } = options;
|
|
324
|
+
if (!descriptor.hosts) return {
|
|
325
|
+
...await bootTartVm(descriptor, image, vm, signal),
|
|
326
|
+
on: LOCAL_TART
|
|
327
|
+
};
|
|
328
|
+
const debug = attemptDebug();
|
|
329
|
+
const slots = hostSlots(descriptor, options.hosts, image);
|
|
330
|
+
if (!slots.length) throw new InfraError("tart() has no host left to run on: preflight skipped every one");
|
|
331
|
+
const busy = /* @__PURE__ */ new Map();
|
|
332
|
+
const deadline = { at: Date.now() + (o.waitMs ?? 12e5) };
|
|
333
|
+
const prefix = vmPrefix(options.runId);
|
|
334
|
+
const log = (line) => debug?.log("container", line);
|
|
335
|
+
for (;;) {
|
|
336
|
+
const slot = await claimHost(slots, {
|
|
337
|
+
signal,
|
|
338
|
+
busy,
|
|
339
|
+
prefix,
|
|
340
|
+
deadline,
|
|
341
|
+
log
|
|
342
|
+
});
|
|
343
|
+
const claim = (clone) => withHostClaim(slot.target, signal, async () => {
|
|
344
|
+
if (freeSlots(slot.vms, await hostLoad(slot.target, prefix, signal)) < 1) throw new HostTaken(`${slot.target.label} filled up`);
|
|
345
|
+
await clone();
|
|
346
|
+
});
|
|
347
|
+
try {
|
|
348
|
+
return {
|
|
349
|
+
...await bootTartVm(descriptor, slot.image, vm, signal, slot.target, { claim }),
|
|
350
|
+
on: slot.target
|
|
351
|
+
};
|
|
352
|
+
} catch (error) {
|
|
353
|
+
if (error instanceof HostTaken) {
|
|
354
|
+
log(`${error.message} before this attempt cloned there: picking again`);
|
|
355
|
+
continue;
|
|
356
|
+
}
|
|
357
|
+
if (!(error instanceof TartBusyError)) throw error;
|
|
358
|
+
log(`${error.message}: trying another host`);
|
|
359
|
+
busy.set(slot.target.label, Date.now() + BUSY_COOLDOWN_MS);
|
|
360
|
+
}
|
|
361
|
+
}
|
|
362
|
+
}
|
|
363
|
+
async function createTartSandbox(descriptor, options) {
|
|
364
|
+
const { signal } = options;
|
|
365
|
+
if (options.egress.policy !== "allow-all") throw new InfraError(`tart() runs under egress 'allow-all' only, and this attempt asked for ${JSON.stringify(options.egress.policy)}`);
|
|
366
|
+
const debug = attemptDebug();
|
|
367
|
+
const vm = `${vmPrefix(options.runId)}${randomBytes(3).toString("hex")}`;
|
|
368
|
+
let gateway;
|
|
369
|
+
let removed;
|
|
370
|
+
const { guest, home, halt, on } = await bootOnHost(descriptor, options.image ?? descriptor.image, vm, options);
|
|
371
|
+
const destroy = () => {
|
|
372
|
+
removed ??= (async () => {
|
|
373
|
+
await gateway?.close();
|
|
374
|
+
await halt();
|
|
375
|
+
await tartCli(["delete", vm], { on }).catch(() => {});
|
|
376
|
+
debug?.log("container", `deleted ${vm}${on.remote ? ` on ${on.label}` : ""}`);
|
|
377
|
+
})();
|
|
378
|
+
return removed;
|
|
379
|
+
};
|
|
380
|
+
const fail = async (error) => {
|
|
381
|
+
await destroy();
|
|
382
|
+
if (signal.aborted) throw signal.reason;
|
|
383
|
+
throw error instanceof InfraError ? error : new InfraError(error.message);
|
|
384
|
+
};
|
|
274
385
|
const workdir = posix.join(home, WORKSPACE_DIR);
|
|
275
386
|
const stateDir = posix.join(home, ".reeval-state");
|
|
276
387
|
const made = await runIn(guest, [
|
|
@@ -296,6 +407,7 @@ async function createTartSandbox(descriptor, options) {
|
|
|
296
407
|
debug?.log("container", `egress gateway not running: ${noGateway}`);
|
|
297
408
|
}
|
|
298
409
|
if (gateway) {
|
|
410
|
+
const trustStarted = Date.now();
|
|
299
411
|
const trusted = await runIn(guest, [
|
|
300
412
|
"sudo",
|
|
301
413
|
"-n",
|
|
@@ -304,8 +416,9 @@ async function createTartSandbox(descriptor, options) {
|
|
|
304
416
|
exitCode: 1,
|
|
305
417
|
stderr: error.message
|
|
306
418
|
}));
|
|
307
|
-
debug?.log("container", trusted.exitCode === 0 ? "the gateway CA is trusted in the System keychain" : `the gateway CA isn't in the System keychain (${trusted.stderr.trim().slice(-300) || `exit ${trusted.exitCode}`}): clients that read only the keychain don't trust the proxy`);
|
|
419
|
+
debug?.log("container", trusted.exitCode === 0 ? "the gateway CA is trusted in the System keychain" : `the gateway CA isn't in the System keychain after ${((Date.now() - trustStarted) / 1e3).toFixed(1)}s (${trusted.stderr.trim().slice(-300) || `exit ${trusted.exitCode}`}): clients that read only the keychain don't trust the proxy`);
|
|
308
420
|
if (signal.aborted) return fail(signal.reason);
|
|
421
|
+
if (trusted.exitCode !== 0 && options.keychainTrust) return fail(new InfraError(`This harness's CLI trusts only the macOS keychain, and sudo security add-trusted-cert couldn't add the egress gateway's CA to ${vm}'s System keychain (${trusted.stderr.trim().slice(-300) || `exit ${trusted.exitCode}`}). In the image, allow it without a prompt: sudo security authorizationdb write com.apple.trust-settings.admin allow`));
|
|
309
422
|
const bundle = posix.join(stateDir, "ca-bundle.pem");
|
|
310
423
|
const bundled = await runIn(guest, [
|
|
311
424
|
"/bin/sh",
|
|
@@ -331,7 +444,8 @@ async function createTartSandbox(descriptor, options) {
|
|
|
331
444
|
gateway,
|
|
332
445
|
noGateway,
|
|
333
446
|
caBundle,
|
|
334
|
-
destroy
|
|
447
|
+
destroy,
|
|
448
|
+
on
|
|
335
449
|
});
|
|
336
450
|
return await sessionSandbox(network, glue, {
|
|
337
451
|
stateDir,
|
|
@@ -376,6 +490,7 @@ umask 022
|
|
|
376
490
|
function tartSession(o) {
|
|
377
491
|
const { vm, guest, home, stateDir, gateway } = o;
|
|
378
492
|
const description = `tart VM ${vm}`;
|
|
493
|
+
const path = `${posix.join(home, PNPM_DIR, "bin")}:${GUEST_PATH}`;
|
|
379
494
|
let execs = 0;
|
|
380
495
|
const nextPidFile = () => posix.join(stateDir, `exec-${++execs}.pid`);
|
|
381
496
|
const at = (path) => path ? posix.resolve(home, path) : home;
|
|
@@ -404,7 +519,8 @@ function tartSession(o) {
|
|
|
404
519
|
command,
|
|
405
520
|
cwd,
|
|
406
521
|
env,
|
|
407
|
-
pidFile
|
|
522
|
+
pidFile,
|
|
523
|
+
path
|
|
408
524
|
}),
|
|
409
525
|
...signal && { signal }
|
|
410
526
|
});
|
|
@@ -452,7 +568,7 @@ function tartSession(o) {
|
|
|
452
568
|
id: vm,
|
|
453
569
|
description,
|
|
454
570
|
defaultWorkingDirectory: home,
|
|
455
|
-
ports: [],
|
|
571
|
+
ports: [BRIDGE_PORT],
|
|
456
572
|
get egress() {
|
|
457
573
|
if (!gateway) return o.noGateway ? {
|
|
458
574
|
active: false,
|
|
@@ -499,7 +615,8 @@ function tartSession(o) {
|
|
|
499
615
|
command: s.command,
|
|
500
616
|
cwd: at(s.workingDirectory),
|
|
501
617
|
env: envFor(s.env),
|
|
502
|
-
pidFile
|
|
618
|
+
pidFile,
|
|
619
|
+
path
|
|
503
620
|
}));
|
|
504
621
|
const exited = new Promise((resolve) => {
|
|
505
622
|
child.once("error", () => resolve({ exitCode: 127 }));
|
|
@@ -552,7 +669,8 @@ function tartSession(o) {
|
|
|
552
669
|
},
|
|
553
670
|
async getPortEndpoint({ port, protocol = "ws" }) {
|
|
554
671
|
const scheme = protocol === "ws" ? "ws" : "http";
|
|
555
|
-
if (gateway
|
|
672
|
+
if (gateway) return { url: await gateway.portUrl(port, scheme) };
|
|
673
|
+
if (o.on?.remote) throw new Error(`A port in ${description} on ${o.on.label} is reached through the egress gateway, which isn't running: ${o.noGateway ?? "it stopped"}`);
|
|
556
674
|
return { url: `${scheme}://${(await tartOk(["ip", vm])).trim()}:${port}` };
|
|
557
675
|
},
|
|
558
676
|
async getPortUrl(p) {
|
|
@@ -581,6 +699,6 @@ function tartSession(o) {
|
|
|
581
699
|
};
|
|
582
700
|
return session;
|
|
583
701
|
}
|
|
584
|
-
export { createTartSandbox, removeRunVms };
|
|
702
|
+
export { PNPM_DIR, bootTartVm, createTartSandbox, removeRunVms, tartSession };
|
|
585
703
|
|
|
586
|
-
//# sourceMappingURL=tart-
|
|
704
|
+
//# sourceMappingURL=tart-CcrrtSrp.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tart-CcrrtSrp.js","names":["q"],"sources":["../src/sandbox/tart.ts"],"mappings":"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"}
|
|
@@ -0,0 +1,186 @@
|
|
|
1
|
+
import { n as UsageError } from "./errors-ttMTnIYX.js";
|
|
2
|
+
import { d as refusal, l as nonEmpty, s as got, t as closest } from "./shared-DtZwIAfy.js";
|
|
3
|
+
import { z } from "zod";
|
|
4
|
+
/** A memory size as `docker({ memory })` takes it: bytes, or a number with `b`, `k`, `m` or `g`. */
|
|
5
|
+
const MEMORY = /^\d+(\.\d+)?[bkmg]?$/i;
|
|
6
|
+
const hostSchema = z.union([z.string(), z.strictObject({
|
|
7
|
+
host: z.string(),
|
|
8
|
+
user: z.string().optional(),
|
|
9
|
+
port: z.int().optional(),
|
|
10
|
+
identityFile: z.string().optional(),
|
|
11
|
+
vms: z.int().optional()
|
|
12
|
+
})]);
|
|
13
|
+
const fields = {
|
|
14
|
+
id: nonEmpty().optional(),
|
|
15
|
+
image: z.string().regex(/^\S+$/, "one word"),
|
|
16
|
+
maxConcurrent: z.number().optional(),
|
|
17
|
+
cpus: z.int().positive().optional(),
|
|
18
|
+
memory: z.union([z.string().regex(MEMORY), z.int().positive()]).optional(),
|
|
19
|
+
ssh: z.strictObject({
|
|
20
|
+
user: nonEmpty().optional(),
|
|
21
|
+
key: nonEmpty()
|
|
22
|
+
}).optional(),
|
|
23
|
+
hosts: z.array(hostSchema).optional()
|
|
24
|
+
};
|
|
25
|
+
const tartSandboxSchema = z.strictObject({
|
|
26
|
+
kind: z.literal("tart"),
|
|
27
|
+
...fields
|
|
28
|
+
});
|
|
29
|
+
/** `tart()`'s argument: the descriptor's fields, with `ssh.key` relative or a `file:` URL. */
|
|
30
|
+
const tartOptionsSchema = z.strictObject({
|
|
31
|
+
...fields,
|
|
32
|
+
ssh: z.strictObject({
|
|
33
|
+
user: nonEmpty().optional(),
|
|
34
|
+
key: z.union([nonEmpty(), z.instanceof(URL)])
|
|
35
|
+
}).optional()
|
|
36
|
+
});
|
|
37
|
+
/** A user or host name `ssh` takes as one word, which can't be read as an option. */
|
|
38
|
+
const SSH_WORD = /^[A-Za-z0-9_][A-Za-z0-9._-]*$/;
|
|
39
|
+
/** An IPv6 address in an `ssh://` URL's brackets. */
|
|
40
|
+
const IPV6 = /^\[[0-9A-Fa-f:.]+\]$/;
|
|
41
|
+
const HOST_EXAMPLES = `'mac-studio', 'elliot@mac-mini.local' or 'ssh://ci@10.0.0.5:2222'`;
|
|
42
|
+
/** `host`, one of `tart({ hosts })`, parsed; a sentence saying what's wrong with it otherwise. */
|
|
43
|
+
function parseTartHost(host) {
|
|
44
|
+
if (typeof host === "string") return parseHostString(host);
|
|
45
|
+
const { host: name, user, port, identityFile, vms } = host;
|
|
46
|
+
const what = `{ host: ${got(name)} }`;
|
|
47
|
+
if (!SSH_WORD.test(name)) return `${what}: host is a host name, address or ~/.ssh/config alias, with no user, port or spaces; put those in user and port`;
|
|
48
|
+
if (user !== void 0 && !SSH_WORD.test(user)) return `${what}: user is a login name with no spaces (got ${got(user)})`;
|
|
49
|
+
if (port !== void 0 && !(port >= 1 && port <= 65535)) return `${what}: port is a whole number from 1 to 65535 (got ${got(port)})`;
|
|
50
|
+
if (identityFile !== void 0 && !/^(\/|~\/)\S/.test(identityFile)) return `${what}: identityFile is the path of a private key on this machine, absolute or starting ~/ (got ${got(identityFile)})`;
|
|
51
|
+
if (vms !== void 0 && !(vms >= 1 && vms <= 2)) return `${what}: vms is 1 or 2, since macOS runs at most 2 macOS VMs at a time (got ${got(vms)})`;
|
|
52
|
+
return {
|
|
53
|
+
label: `${user ? `${user}@` : ""}${name}${port ? `:${port}` : ""}`,
|
|
54
|
+
host: name,
|
|
55
|
+
...user !== void 0 && { user },
|
|
56
|
+
...port !== void 0 && { port },
|
|
57
|
+
...identityFile !== void 0 && { identityFile },
|
|
58
|
+
vms: vms ?? 2
|
|
59
|
+
};
|
|
60
|
+
}
|
|
61
|
+
function parseHostString(spec) {
|
|
62
|
+
const what = got(spec);
|
|
63
|
+
if (spec.startsWith("ssh://")) {
|
|
64
|
+
let url;
|
|
65
|
+
try {
|
|
66
|
+
url = new URL(spec);
|
|
67
|
+
} catch {
|
|
68
|
+
return `${what} isn't an ssh:// URL: write ssh://[user@]host[:port]`;
|
|
69
|
+
}
|
|
70
|
+
if (url.password) return `${what} has a password: reeval reaches each host with plain ssh and no prompt, so use an ~/.ssh/config alias, the SSH agent or identityFile`;
|
|
71
|
+
if (url.pathname && url.pathname !== "/" || url.search || url.hash) return `${what} has a path: write ssh://[user@]host[:port]`;
|
|
72
|
+
const user = decodeURIComponent(url.username);
|
|
73
|
+
if (!url.hostname || !(SSH_WORD.test(url.hostname) || IPV6.test(url.hostname))) return `${what} names no host: write ssh://[user@]host[:port]`;
|
|
74
|
+
if (user && !SSH_WORD.test(user)) return `${what}: the user is a login name with no spaces`;
|
|
75
|
+
return {
|
|
76
|
+
label: spec,
|
|
77
|
+
host: url.hostname.replace(/^\[|\]$/g, ""),
|
|
78
|
+
...user && { user },
|
|
79
|
+
...url.port && { port: Number(url.port) },
|
|
80
|
+
vms: 2
|
|
81
|
+
};
|
|
82
|
+
}
|
|
83
|
+
const at = spec.lastIndexOf("@");
|
|
84
|
+
const user = at === -1 ? void 0 : spec.slice(0, at);
|
|
85
|
+
const host = spec.slice(at + 1);
|
|
86
|
+
if (user?.includes(":")) return `${what} has a password: reeval reaches each host with plain ssh and no prompt, so use an ~/.ssh/config alias, the SSH agent or identityFile`;
|
|
87
|
+
if (host.includes(":")) return `${what}: ssh takes no port in a destination; write ssh://${spec} or { host, port }`;
|
|
88
|
+
if (!SSH_WORD.test(host) || user !== void 0 && !SSH_WORD.test(user)) return `${what} isn't an SSH destination: write a host name or ~/.ssh/config alias, [user@]host, or ssh://[user@]host[:port]`;
|
|
89
|
+
return {
|
|
90
|
+
label: spec,
|
|
91
|
+
host,
|
|
92
|
+
...user !== void 0 && { user },
|
|
93
|
+
vms: 2
|
|
94
|
+
};
|
|
95
|
+
}
|
|
96
|
+
/** Every host of `hosts`, parsed; throws reeval's sentence for the first that's wrong. */
|
|
97
|
+
function parseTartHosts(hosts) {
|
|
98
|
+
const problem = tartHostsProblem(hosts);
|
|
99
|
+
if (problem) throw new UsageError(problem);
|
|
100
|
+
return hosts.map((h) => parseTartHost(h));
|
|
101
|
+
}
|
|
102
|
+
/** What's wrong with `tart({ hosts })`, or undefined. */
|
|
103
|
+
function tartHostsProblem(hosts) {
|
|
104
|
+
if (!hosts.length) return `tart({ hosts }) names no host: list at least one, such as ${HOST_EXAMPLES}, or leave hosts out to run the VMs on this machine`;
|
|
105
|
+
const seen = /* @__PURE__ */ new Map();
|
|
106
|
+
for (const [i, host] of hosts.entries()) {
|
|
107
|
+
const parsed = parseTartHost(host);
|
|
108
|
+
if (typeof parsed === "string") return `tart({ hosts }) entry ${i + 1}: ${parsed}`;
|
|
109
|
+
const key = `${parsed.user ?? ""}@${parsed.host}:${parsed.port ?? ""}`;
|
|
110
|
+
const first = seen.get(key);
|
|
111
|
+
if (first !== void 0) return `tart({ hosts }) entries ${first + 1} and ${i + 1} are the same Mac, ${parsed.label}: list each once, and set its vms to run more on it`;
|
|
112
|
+
seen.set(key, i);
|
|
113
|
+
}
|
|
114
|
+
}
|
|
115
|
+
/** The most VMs `hosts` run at once: each one's `vms`, added up. */
|
|
116
|
+
const tartHostsCapacity = (hosts) => hosts.reduce((n, h) => {
|
|
117
|
+
const parsed = parseTartHost(h);
|
|
118
|
+
return n + (typeof parsed === "string" ? 2 : parsed.vms);
|
|
119
|
+
}, 0);
|
|
120
|
+
/** What `docker()` takes that a VM has no use for, and why. */
|
|
121
|
+
const DOCKER_ONLY = {
|
|
122
|
+
from: "a Tart VM starts from its image, and reeval bakes only the harness onto it",
|
|
123
|
+
dockerfile: "a Tart VM starts from its image, and reeval bakes only the harness onto it",
|
|
124
|
+
install: "a Tart VM starts from its image, and reeval bakes only the harness onto it; put install commands in the environment setup",
|
|
125
|
+
root: "the VM runs everything as the image user",
|
|
126
|
+
capabilities: "a macOS VM has no Linux capabilities",
|
|
127
|
+
swap: "macOS manages its own swap",
|
|
128
|
+
pids: "a macOS VM has no process limit",
|
|
129
|
+
engine: "Tart is its only engine"
|
|
130
|
+
};
|
|
131
|
+
const FIELD = {
|
|
132
|
+
id: (v) => `tart({ id }) must be a non-empty string (got ${got(v)})`,
|
|
133
|
+
image: (v) => `tart({ image }) takes an OCI image or a local VM name with no spaces, e.g. image: 'ghcr.io/cirruslabs/macos-sequoia-base:latest' (got ${got(v)})`,
|
|
134
|
+
maxConcurrent: (v) => `tart({ maxConcurrent }) takes a number (got ${got(v)})`,
|
|
135
|
+
cpus: (v) => `tart({ cpus }) takes a whole number of CPUs above zero (got ${got(v)})`,
|
|
136
|
+
memory: (v) => `tart({ memory }) takes a size such as '8g' or '4096m', or bytes (got ${got(v)})`,
|
|
137
|
+
ssh: (v) => `tart({ ssh }) takes { user?, key }, where key is the path of a private key the image trusts (got ${got(v)})`,
|
|
138
|
+
hosts: (v) => `tart({ hosts }) takes a list of Macs to reach over SSH, each ${HOST_EXAMPLES}, or { host, user?, port?, identityFile?, vms? } (got ${got(v)})`,
|
|
139
|
+
kind: (v) => `a Tart sandbox's kind is "tart" (got ${got(v)})`
|
|
140
|
+
};
|
|
141
|
+
const ORDER = [
|
|
142
|
+
"kind",
|
|
143
|
+
"image",
|
|
144
|
+
"id",
|
|
145
|
+
"cpus",
|
|
146
|
+
"memory",
|
|
147
|
+
"ssh",
|
|
148
|
+
"hosts"
|
|
149
|
+
];
|
|
150
|
+
function explainTart(issue, value) {
|
|
151
|
+
const options = value;
|
|
152
|
+
if (issue.code === "unrecognized_keys" && issue.path.length === 0) {
|
|
153
|
+
const key = issue.keys[0];
|
|
154
|
+
if (DOCKER_ONLY[key]) return `tart() has no "${key}": ${DOCKER_ONLY[key]}.`;
|
|
155
|
+
if (key === "environment" || key === "env") return `Unknown tart() option "${key}". Variables and secrets belong in defineEnvironment({ env }).`;
|
|
156
|
+
const near = closest(key, Object.keys(fields));
|
|
157
|
+
return `Unknown tart() option "${key}".${near ? ` Did you mean "${near}"?` : ""}`;
|
|
158
|
+
}
|
|
159
|
+
const key = String(issue.path[0]);
|
|
160
|
+
return (FIELD[key] ?? ((v) => `tart({ ${key} }) is invalid (got ${got(v)})`))(options[key]);
|
|
161
|
+
}
|
|
162
|
+
/** The most VMs a run of `options` may have at once: two, or what its hosts run. */
|
|
163
|
+
const vmLimit = (options) => options.hosts ? tartHostsCapacity(options.hosts) : 2;
|
|
164
|
+
/** `tart()`'s options, checked; throws reeval's sentence for the first problem. */
|
|
165
|
+
function checkTartOptions(options) {
|
|
166
|
+
const problem = refusal(tartOptionsSchema, options, explainTart, { order: ORDER }) ?? (options.hosts && tartHostsProblem(options.hosts));
|
|
167
|
+
if (problem) throw new UsageError(problem);
|
|
168
|
+
const limit = vmLimit(options);
|
|
169
|
+
if ((options.maxConcurrent ?? 0) > limit) throw new UsageError(options.hosts ? `tart({ maxConcurrent }) is ${options.maxConcurrent}, but its hosts run at most ${limit} VMs at a time (each host's vms, 2 by default)` : `tart({ maxConcurrent }) is ${options.maxConcurrent}, but macOS runs at most 2 macOS VMs at a time`);
|
|
170
|
+
}
|
|
171
|
+
/** What's wrong with a Tart descriptor from any source, or undefined; `maxConcurrent` aside. */
|
|
172
|
+
const tartProblem = (value) => refusal(tartSandboxSchema, value, explainTart, {
|
|
173
|
+
order: ORDER,
|
|
174
|
+
skip: ["maxConcurrent"]
|
|
175
|
+
}) ?? (Array.isArray(value.hosts) ? tartHostsProblem(value.hosts) : void 0);
|
|
176
|
+
/** The most VMs a Tart descriptor runs at once across the run, and why. */
|
|
177
|
+
const tartVmLimit = (sandbox) => sandbox.hosts ? {
|
|
178
|
+
max: vmLimit(sandbox),
|
|
179
|
+
why: `its hosts run ${vmLimit(sandbox)} VMs at a time (each host's vms, 2 by default)`
|
|
180
|
+
} : {
|
|
181
|
+
max: 2,
|
|
182
|
+
why: "macOS runs two macOS VMs at a time"
|
|
183
|
+
};
|
|
184
|
+
export { tartHostsProblem as a, tartSandboxSchema as c, tartHostsCapacity as i, tartVmLimit as l, parseTartHost as n, tartOptionsSchema as o, parseTartHosts as r, tartProblem as s, checkTartOptions as t };
|
|
185
|
+
|
|
186
|
+
//# sourceMappingURL=tart-CzViW3WZ.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tart-CzViW3WZ.js","names":[],"sources":["../src/contract/tart.ts"],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
export { n as parseTartHost, r as parseTartHosts } from "./tart-CzViW3WZ.js";
|