very-happy-cli 0.2.191 → 0.2.193
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/{AcpBackend-CCy_9AfR.mjs → AcpBackend-B4PwjqHt.mjs} +3 -3
- package/dist/{AcpBackend-DgrIc1vH.cjs → AcpBackend-DtJCgftG.cjs} +3 -3
- package/dist/{AcpSessionManager-CQnxx7gD.mjs → AcpSessionManager-BzKWgkdP.mjs} +2 -2
- package/dist/{AcpSessionManager-DVOzCD3P.cjs → AcpSessionManager-D4qshX_H.cjs} +2 -2
- package/dist/{BasePermissionHandler-C9Ag7yvs.cjs → BasePermissionHandler-5iG-cvA2.cjs} +1 -1
- package/dist/{BasePermissionHandler-DYLN6Ec9.mjs → BasePermissionHandler-DV6UM6e9.mjs} +1 -1
- package/dist/account-Dco_nGT4.mjs +297 -0
- package/dist/account-DvpA60oU.cjs +302 -0
- package/dist/accountService-Cd7bnkfd.mjs +916 -0
- package/dist/accountService-CuUSJDhP.cjs +921 -0
- package/dist/{acpSessionResume-TvP_4Zq2.cjs → acpSessionResume-Bk9mjXZ9.cjs} +1 -1
- package/dist/{acpSessionResume-Bi7pA1n_.mjs → acpSessionResume-TQwN9ZZE.mjs} +1 -1
- package/dist/{agentHome-DGv105SR.mjs → agentHome-Bep8semY.mjs} +4 -4
- package/dist/{agentHome-DNUKJWOY.cjs → agentHome-c2dlgcw1.cjs} +4 -4
- package/dist/{api-BBxZ7y2z.cjs → api-CBE_a88I.cjs} +10 -10
- package/dist/{api-jfeMRg5R.mjs → api-DUfunY3x.mjs} +10 -10
- package/dist/{apiMachine-DqyjKBZG.cjs → apiMachine-BqtG0IWm.cjs} +83 -27
- package/dist/{apiMachine-DRJ7y-BB.mjs → apiMachine-CU_bw5nV.mjs} +78 -22
- package/dist/{attachmentContent-BO2njyza.cjs → attachmentContent-B3AzuYqk.cjs} +2 -2
- package/dist/{attachmentContent-Dm_RIs5L.mjs → attachmentContent-KNIZxwlu.mjs} +2 -2
- package/dist/{auth-BYDtjVNb.mjs → auth-CZ7pKS-j.mjs} +8 -8
- package/dist/{auth-DnxoVkkf.cjs → auth-DCjxpI6Z.cjs} +5 -5
- package/dist/{auth-DLR3ksCF.cjs → auth-SJ_dPw7H.cjs} +8 -8
- package/dist/{auth-DC6rg8lJ.mjs → auth-jN5dNqTO.mjs} +5 -5
- package/dist/{auto-CwO0u8hB.cjs → auto-B_59RYH1.cjs} +23 -21
- package/dist/{auto-D5Jhukq1.mjs → auto-DC0Sq-qB.mjs} +23 -21
- package/dist/{bootstrap-rLaL3kTa.mjs → bootstrap-B3gMpU9e.mjs} +2 -2
- package/dist/{bootstrap-sly4qPPY.cjs → bootstrap-CoJu9VnB.cjs} +2 -2
- package/dist/{browser-CHpVgyni.mjs → browser-LHW2hBH8.mjs} +1 -1
- package/dist/{browser-BTgZ9d4i.cjs → browser-v1pdPP1E.cjs} +1 -1
- package/dist/claudeAccountEnv-BL1pR_37.mjs +133 -0
- package/dist/claudeAccountEnv-CEX_EMZr.cjs +138 -0
- package/dist/{claudeLocal-Bgb5GGsq.mjs → claudeLocal-BZUgA5G2.mjs} +5 -5
- package/dist/{claudeLocal-1vuTFcL8.cjs → claudeLocal-BrzM2RBI.cjs} +5 -5
- package/dist/{claudeLocalLauncher-T7EfT68h.mjs → claudeLocalLauncher-A0AQyHFi.mjs} +10 -10
- package/dist/{claudeLocalLauncher-DOsL6HFY.cjs → claudeLocalLauncher-XAMpXUM7.cjs} +10 -10
- package/dist/{claudeSessionFork-Cko4SaVi.cjs → claudeSessionFork-Mhn2fYe_.cjs} +1 -1
- package/dist/{claudeSessionFork-CPvi6yDX.mjs → claudeSessionFork-_GwIlmMB.mjs} +1 -1
- package/dist/{client-BXD66ZF5.mjs → client-7RnI9J0W.mjs} +2 -2
- package/dist/{client-Bi20Ka0h.mjs → client-Bde4QVIn.mjs} +4 -2
- package/dist/{client-C5-C0t2a.cjs → client-CJr8Pjwm.cjs} +4 -2
- package/dist/{client-BscskEBk.cjs → client-D2GWkd-T.cjs} +2 -2
- package/dist/{client-C-OdTbrU.cjs → client-DLlnmAPL.cjs} +4 -4
- package/dist/{client-Bh1aUPh-.mjs → client-DwbhrX6D.mjs} +4 -4
- package/dist/codex/happyMcpStdioBridge.cjs +16 -16
- package/dist/codex/happyMcpStdioBridge.mjs +16 -16
- package/dist/codexAccount-BDQjRbtI.cjs +1028 -0
- package/dist/codexAccount-NOX5pmQf.mjs +1015 -0
- package/dist/{codexAppServerClient-DXhAf6i-.mjs → codexAppServerClient-B3QJV6Ey.mjs} +18 -7
- package/dist/{codexAppServerClient-DKXeikEe.cjs → codexAppServerClient-DWEsZUC4.cjs} +18 -7
- package/dist/{codexCommand-DvbbpYBS.cjs → codexCommand-Bg8AmxVm.cjs} +195 -63
- package/dist/{codexCommand-CIaOiiOj.mjs → codexCommand-D1xlj4sT.mjs} +196 -64
- package/dist/{codexTermination-BszWfyk5.cjs → codexTermination-ByX9GcEJ.cjs} +1 -1
- package/dist/{codexTermination-BcQdEDaw.mjs → codexTermination-CaWAVQjZ.mjs} +1 -1
- package/dist/{config-Di3Cf6js.cjs → config-B2GGbiTv.cjs} +3 -3
- package/dist/{config-OCEcVVK1.mjs → config-C2XYEwXz.mjs} +3 -3
- package/dist/{configuration-DfPBa-9d.cjs → configuration-BBK0rmmj.cjs} +1 -1
- package/dist/{configuration-ECqXu34R.mjs → configuration-ThKBP_zY.mjs} +1 -1
- package/dist/{connect-BTfAUhk8.mjs → connect-BirnCl9q.mjs} +13 -13
- package/dist/{connect-BPQRuOw5.cjs → connect-C3tZs_NC.cjs} +13 -13
- package/dist/{context-CfgTFpCB.mjs → context-C0EFLnOg.mjs} +1 -1
- package/dist/{context-Co7hUaW-.cjs → context-wDp0aZBK.cjs} +1 -1
- package/dist/{controlClient-ClI7A0qE.mjs → controlClient-Ckl8N1MS.mjs} +14 -5
- package/dist/{controlClient-C13_pSKG.cjs → controlClient-DwWTns3A.cjs} +15 -4
- package/dist/{createSessionMetadata-Cf78KHtt.cjs → createSessionMetadata-DqZ6h02H.cjs} +2 -2
- package/dist/{createSessionMetadata-B0eT_Kfj.mjs → createSessionMetadata-vug4Cv8z.mjs} +2 -2
- package/dist/daemonAccounts-CpGDY_4k.cjs +54 -0
- package/dist/daemonAccounts-DwPwKxvv.mjs +30 -0
- package/dist/{defaultPermissionMode-oqTupStc.cjs → defaultPermissionMode-BakXiqRr.cjs} +1 -1
- package/dist/{defaultPermissionMode-m6z2QVyP.mjs → defaultPermissionMode-DF5AfeBb.mjs} +1 -1
- package/dist/{deterministicJson-BtSwbsok.mjs → deterministicJson-BzX94gi3.mjs} +13 -13
- package/dist/{deterministicJson-CpFFgUL_.cjs → deterministicJson-t33SsuRC.cjs} +13 -13
- package/dist/{doctor-BEU0_1Xv.cjs → doctor-B9ug1LZb.cjs} +7 -7
- package/dist/{doctor-lsxmAK4o.mjs → doctor-C1zyOSXw.mjs} +7 -7
- package/dist/{downloadTarget-BXqXhNF7.mjs → downloadTarget-Baslc6jW.mjs} +6 -6
- package/dist/{downloadTarget-CikzJv1h.cjs → downloadTarget-T1id2Gh6.cjs} +6 -6
- package/dist/{ensureDaemonRunning-B_9WAlbU.mjs → ensureDaemonRunning-C6ERYK-O.mjs} +5 -5
- package/dist/{ensureDaemonRunning-BUuH-pbE.cjs → ensureDaemonRunning-CoAg11Zi.cjs} +5 -5
- package/dist/{handleResumeCommand-BK9XKH_l.mjs → handleResumeCommand-CrlqDuz7.mjs} +5 -5
- package/dist/{handleResumeCommand-Dj7oi2KO.cjs → handleResumeCommand-DPi-sPm7.cjs} +5 -5
- package/dist/{index-D3c7CLot.cjs → index-B1swQJUS.cjs} +4 -4
- package/dist/{index-CmZusg8Q.cjs → index-B2dJA8VG.cjs} +3 -3
- package/dist/{index-CLUHaPU8.cjs → index-BUFrKZeQ.cjs} +205 -5
- package/dist/{index-BjZnpGWX.mjs → index-BbdV2mzy.mjs} +3 -3
- package/dist/{index-BdOJOZ6J.mjs → index-BcSPg3c5.mjs} +4 -4
- package/dist/{index-CauRYQKr.cjs → index-Bkslzin5.cjs} +44 -40
- package/dist/{index-DuK9XYbZ.mjs → index-Cn73rdtQ.mjs} +4 -4
- package/dist/{index-Bq8NKSCF.mjs → index-D1YnIih6.mjs} +195 -6
- package/dist/{index-Cxso1rg4.mjs → index-fZO4nF6e.mjs} +45 -41
- package/dist/{index-Dg2NAF_-.cjs → index-rocrvOYG.cjs} +4 -4
- package/dist/index.cjs +2 -2
- package/dist/index.mjs +2 -2
- package/dist/{install-DXllkuy0.cjs → install-CArXjPfW.cjs} +3 -3
- package/dist/{install-DTIveLOS.mjs → install-CChhyV2G.mjs} +3 -3
- package/dist/lib.cjs +12 -12
- package/dist/lib.d.cts +354 -0
- package/dist/lib.d.mts +354 -0
- package/dist/lib.mjs +12 -12
- package/dist/{lidState-CD81ryTy.mjs → lidState-B6yYKjNK.mjs} +1 -1
- package/dist/{lidState-C9_DoF9i.cjs → lidState-B_v6qgfE.cjs} +1 -1
- package/dist/{localHappyAgentAuth-Cg-m1lwm.mjs → localHappyAgentAuth-KRlg_aI0.mjs} +1 -1
- package/dist/{localHappyAgentAuth-CCjUvOfi.cjs → localHappyAgentAuth-jJH0n67S.cjs} +1 -1
- package/dist/{logger-Ct2zvaq0.cjs → logger-CX3x2eI4.cjs} +2 -2
- package/dist/{logger-GcbI0eg2.mjs → logger-JV7-4Q_6.mjs} +2 -2
- package/dist/{machineMetadata-CXRmFNOV.mjs → machineMetadata-D5-SW9kv.mjs} +3 -3
- package/dist/{machineMetadata-DDCVWb_x.cjs → machineMetadata-DhZuM0iB.cjs} +3 -3
- package/dist/{main-BHC-WIcM.cjs → main-1x1HGQEy.cjs} +92 -48
- package/dist/{main-omGr_ONk.mjs → main-CFOdXbPD.mjs} +92 -48
- package/dist/{mcp-xUzii0m8.cjs → mcp-BnKBSEh7.cjs} +18 -15
- package/dist/{mcp-D5hxmRAq.mjs → mcp-R6lMcFLO.mjs} +18 -15
- package/dist/{mirrorProtocol-Lcx20Oby.mjs → mirrorProtocol-CD4ntuZJ.mjs} +3 -3
- package/dist/{mirrorProtocol-Dfl8Ahyf.cjs → mirrorProtocol-DO-KtvAL.cjs} +3 -3
- package/dist/{package-BsUHyqWe.mjs → package-Bw3H6VLn.mjs} +7 -7
- package/dist/{package-9n7wd2dT.cjs → package-uzlvxa5S.cjs} +7 -7
- package/dist/{panels-CpEKWWbI.mjs → panels-BamhZCoZ.mjs} +5 -5
- package/dist/{panels-BfknEmt7.cjs → panels-C46FxjmH.cjs} +5 -5
- package/dist/{peerTools-CElYh-5u.cjs → peerTools-D-VNNFw-.cjs} +5 -5
- package/dist/{peerTools-CwCe6tmJ.mjs → peerTools-WtRgTSqG.mjs} +5 -5
- package/dist/{persistence-Cpw4yJs8.mjs → persistence-Cg4sfjQV.mjs} +2 -2
- package/dist/{persistence-A2NeERZJ.cjs → persistence-CsmAgN-C.cjs} +2 -2
- package/dist/{piRunnerArgs-Bqmu16He.mjs → piRunnerArgs-BbaAQvb4.mjs} +2 -2
- package/dist/{piRunnerArgs-BnFU0K73.cjs → piRunnerArgs-vnFygygF.cjs} +1 -1
- package/dist/{piRuntime-Cgn1b0OX.mjs → piRuntime-Bid7TBf5.mjs} +1 -1
- package/dist/{piRuntime-DpS9TAIs.cjs → piRuntime-C2uj5Ucx.cjs} +1 -1
- package/dist/{piTerminal-rmve-VlI.cjs → piTerminal-Ckpjfoqa.cjs} +20 -17
- package/dist/{piTerminal-BGdps8f3.mjs → piTerminal-CqxgrI13.mjs} +20 -17
- package/dist/{pushNotifications-23YSd-0l.cjs → pushNotifications-BCg7YAiu.cjs} +5 -3
- package/dist/{pushNotifications-XAM8__Pg.mjs → pushNotifications-BbE-qV9I.mjs} +5 -3
- package/dist/{query-SZcYnJoW.mjs → query-Bfr9O_62.mjs} +1 -1
- package/dist/{query-u2GX-I0C.cjs → query-vQ-HG394.cjs} +1 -1
- package/dist/{rateLimitReporter-CaTzBe3x.cjs → rateLimitReporter-BZ8x0-6-.cjs} +3 -3
- package/dist/{rateLimitReporter-COUkf446.mjs → rateLimitReporter-CAz7VMw4.mjs} +3 -3
- package/dist/{rateLimitWindows-B2Kx6L0S.cjs → rateLimitWindows-BZl6GMwQ.cjs} +1 -1
- package/dist/{rateLimitWindows-j_qQk0KY.mjs → rateLimitWindows-CRARnKaI.mjs} +1 -1
- package/dist/reconnectEnv-B31lY4nR.cjs +27 -0
- package/dist/reconnectEnv-DeSvHl3q.mjs +24 -0
- package/dist/{registerCommonHandlers-D1MiSfcB.cjs → registerCommonHandlers-CZGmrPbT.cjs} +2 -2
- package/dist/{registerCommonHandlers-DRRfinzK.mjs → registerCommonHandlers-Cj3Nl9y-.mjs} +2 -2
- package/dist/{registerKillSessionHandler-Cpug_r5C.mjs → registerKillSessionHandler-Bg9t45Ub.mjs} +6 -6
- package/dist/{registerKillSessionHandler-hvCsEn7b.cjs → registerKillSessionHandler-C3EDnW4F.cjs} +6 -6
- package/dist/{remoteSessionClient-BdnJ_n8C.mjs → remoteSessionClient--0vfA7I5.mjs} +5 -5
- package/dist/{remoteSessionClient-6ymeMVa4.cjs → remoteSessionClient-CcSP24Zq.cjs} +5 -5
- package/dist/{reportProgressTool-XgQBzxoD.mjs → reportProgressTool-DVru7jc_.mjs} +3 -3
- package/dist/{reportProgressTool-tzQLCLIw.cjs → reportProgressTool-Ddg1yVq2.cjs} +3 -3
- package/dist/{run-DYL_wuj7.cjs → run-BTrIT_jU.cjs} +347 -856
- package/dist/{run-Bt0AklUU.mjs → run-HtvH6BLi.mjs} +346 -855
- package/dist/{runClaude-C3rii_S6.mjs → runClaude-DsHTk5Bu.mjs} +62 -44
- package/dist/{runClaude-CBEpYO4S.cjs → runClaude-ipjwAHPI.cjs} +62 -44
- package/dist/{runClaudeDeps-CYuozSC6.cjs → runClaudeDeps-BKpwL6ln.cjs} +51 -42
- package/dist/{runClaudeDeps-DlVfMG4F.mjs → runClaudeDeps-BV3vpeyY.mjs} +56 -47
- package/dist/{runGemini-CEI3b90u.cjs → runGemini-B-G0_7Ab.cjs} +33 -33
- package/dist/{runGemini-DkYhRk9S.mjs → runGemini-DhjK6_Fp.mjs} +33 -33
- package/dist/{runOpenClaw-DpprWCoz.mjs → runOpenClaw-B6lawk8n.mjs} +18 -18
- package/dist/{runOpenClaw-BgjD6E4d.cjs → runOpenClaw-BHIo8tkn.cjs} +18 -18
- package/dist/{sandbox-XCDUbH72.cjs → sandbox-BAsO0ILe.cjs} +4 -4
- package/dist/{sandbox-DJ7A7lsy.mjs → sandbox-CKb7pCXg.mjs} +4 -4
- package/dist/selfCheck-CZ-t1Xzq.mjs +88 -0
- package/dist/{selfCheck-BYUDB1Uq.cjs → selfCheck-D4VvVZNi.cjs} +39 -37
- package/dist/{send-CASDBCyJ.cjs → send-Cz5m39QR.cjs} +8 -8
- package/dist/{send-Ba63huxv.mjs → send-D8ipLKMY.mjs} +8 -8
- package/dist/{server-w3W0toNd.mjs → server-CjvgT3N9.mjs} +4 -4
- package/dist/{server-cZoV9XRt.cjs → server-CySyJKPH.cjs} +6 -6
- package/dist/{sessionLock-G2PMqvsh.mjs → sessionLock-B73fhgQN.mjs} +10 -4
- package/dist/{sessionLock-BmLA2S8K.cjs → sessionLock-DdDCuNUs.cjs} +10 -3
- package/dist/{sessionOps-DPw5k8vV.mjs → sessionOps-C65Iej_C.mjs} +50 -8
- package/dist/{sessionOps-DXlTmS7J.cjs → sessionOps-XSEjIqNq.cjs} +50 -8
- package/dist/sessionProvider-CLVNkfji.mjs +110 -0
- package/dist/sessionProvider-Dgsty8z_.cjs +115 -0
- package/dist/{sessionScanner-AHjnicxi.cjs → sessionScanner-D8IVXMMH.cjs} +3 -3
- package/dist/{sessionScanner-BCXpdZJN.mjs → sessionScanner-MW1P9Pm9.mjs} +3 -3
- package/dist/{sessions-BiBXOBx0.cjs → sessions-BKz7gZqg.cjs} +10 -10
- package/dist/{sessions-Clk8MR5Y.mjs → sessions-Dtk_agUL.mjs} +10 -10
- package/dist/{setupOfflineReconnection-DI-QZGYz.mjs → setupOfflineReconnection-Bvdy-2xd.mjs} +2 -2
- package/dist/{setupOfflineReconnection-BKLfOd-i.cjs → setupOfflineReconnection-DxMiW7OV.cjs} +2 -2
- package/dist/{spawn-D5omsx1Q.cjs → spawn-DiPkJcrQ.cjs} +36 -17
- package/dist/{spawn-4tsp1uhh.mjs → spawn-Dm4xsZBX.mjs} +36 -17
- package/dist/{spawnAgents-CtkkIFHd.cjs → spawnAgents-B9olJ8xn.cjs} +1 -1
- package/dist/{spawnAgents-CjoU6ZOS.mjs → spawnAgents-I29H9nO8.mjs} +1 -1
- package/dist/{spawnHappyCLI-CF_gLi92.cjs → spawnHappyCLI-BYGOUda1.cjs} +1 -1
- package/dist/{spawnHappyCLI-CIA9Sc_5.mjs → spawnHappyCLI-CnMwzjWX.mjs} +1 -1
- package/dist/{startFileWatcher-9Stpxe7p.cjs → startFileWatcher-D14W6gn-.cjs} +1 -1
- package/dist/{startFileWatcher-CDO6fb2m.mjs → startFileWatcher-DePAY1T5.mjs} +1 -1
- package/dist/{startupSessionCreate-BtR4iYEC.mjs → startupSessionCreate-DoK0IvJG.mjs} +3 -3
- package/dist/{startupSessionCreate-CcF7rGGB.cjs → startupSessionCreate-rBHd4tc1.cjs} +3 -3
- package/dist/store-CkNa6oj4.cjs +326 -0
- package/dist/store-Vej_738f.mjs +305 -0
- package/dist/{streamRelay-BhI6jqF-.cjs → streamRelay-C0G1HOOd.cjs} +1 -1
- package/dist/{streamRelay-DMwOMTKf.mjs → streamRelay-C5U-C4GS.mjs} +1 -1
- package/dist/{sync-C0PRuTMj.mjs → sync-BP6vnxVP.mjs} +1 -1
- package/dist/{sync-Ba8N6xba.cjs → sync-WYBwkJvG.cjs} +1 -1
- package/dist/{systemPrompt-DV5IReD4.cjs → systemPrompt-BkQlCk5_.cjs} +2 -2
- package/dist/{systemPrompt-D0q8eyjy.mjs → systemPrompt-aRqBmkpw.mjs} +2 -2
- package/dist/{teams-BO3_arwM.mjs → teams-CGmC4ygu.mjs} +7 -7
- package/dist/{teams-z3Gp-KlV.cjs → teams-phbpwAGD.cjs} +7 -7
- package/dist/{template-B_5l6pkc.cjs → template-B9pLEP8v.cjs} +2 -2
- package/dist/{template-DLR_0hfj.mjs → template-CL9EvQLQ.mjs} +2 -2
- package/dist/{time-Cy0a-7YX.cjs → time-BTLcO8jp.cjs} +1 -1
- package/dist/{time-D0jvDRhn.mjs → time-Cw0liIqB.mjs} +1 -1
- package/dist/{titleGenerator-RGHWP2YL.cjs → titleGenerator-Y1_7ceJC.cjs} +17 -13
- package/dist/{titleGenerator-AGQsXskb.mjs → titleGenerator-h6TmFe-c.mjs} +16 -12
- package/dist/{todo-CzIDPLFy.cjs → todo-BxiPiCvB.cjs} +6 -6
- package/dist/{todo-BZ954vsz.mjs → todo-OKcTC_VC.mjs} +6 -6
- package/dist/{tools-Bei5i03L.mjs → tools-BR-drXZ8.mjs} +3 -2
- package/dist/{tools-B1x1j6tz.cjs → tools-CcebYtLj.cjs} +3 -2
- package/dist/{uninstall-C3cnIvz1.cjs → uninstall-CnDeCC-M.cjs} +3 -3
- package/dist/{uninstall-B4T_e3Mr.mjs → uninstall-D3stWKD2.mjs} +3 -3
- package/dist/wrapperAccount-BkufO_9g.mjs +107 -0
- package/dist/wrapperAccount-D2A4DuZy.cjs +113 -0
- package/package.json +7 -7
- package/dist/providerBinding-B-Qbx9W2.cjs +0 -140
- package/dist/providerBinding-CYubGg-Z.mjs +0 -132
- package/dist/selfCheck-C-rNljKV.mjs +0 -86
- package/dist/sessionProvider-DUn91LhJ.mjs +0 -109
- package/dist/sessionProvider-Dg691XQ4.cjs +0 -114
|
@@ -1,27 +1,28 @@
|
|
|
1
1
|
'use strict';
|
|
2
2
|
|
|
3
|
-
var mirrorProtocol = require('./mirrorProtocol-
|
|
3
|
+
var mirrorProtocol = require('./mirrorProtocol-DO-KtvAL.cjs');
|
|
4
4
|
var fsMkdir = require('./fsMkdir-0K3yENml.cjs');
|
|
5
|
-
var piRunnerArgs = require('./piRunnerArgs-
|
|
5
|
+
var piRunnerArgs = require('./piRunnerArgs-vnFygygF.cjs');
|
|
6
6
|
var fs = require('fs/promises');
|
|
7
7
|
var os$1 = require('os');
|
|
8
8
|
var tmp = require('tmp');
|
|
9
9
|
var axios = require('axios');
|
|
10
10
|
var node_fs = require('node:fs');
|
|
11
11
|
var path = require('node:path');
|
|
12
|
-
var configuration = require('./configuration-
|
|
13
|
-
var api = require('./api-
|
|
14
|
-
var spawnAgents = require('./spawnAgents-
|
|
15
|
-
var logger = require('./logger-
|
|
16
|
-
var index$2 = require('./index-
|
|
17
|
-
var auth = require('./auth-
|
|
12
|
+
var configuration = require('./configuration-BBK0rmmj.cjs');
|
|
13
|
+
var api = require('./api-CBE_a88I.cjs');
|
|
14
|
+
var spawnAgents = require('./spawnAgents-B9olJ8xn.cjs');
|
|
15
|
+
var logger = require('./logger-CX3x2eI4.cjs');
|
|
16
|
+
var index$2 = require('./index-B2dJA8VG.cjs');
|
|
17
|
+
var auth = require('./auth-DCjxpI6Z.cjs');
|
|
18
18
|
var child_process = require('child_process');
|
|
19
|
-
var _package = require('./package-
|
|
20
|
-
var doctor = require('./doctor-
|
|
21
|
-
var spawnHappyCLI = require('./spawnHappyCLI-
|
|
22
|
-
var persistence = require('./persistence-
|
|
23
|
-
var controlClient = require('./controlClient-
|
|
24
|
-
var sessionOps = require('./sessionOps-
|
|
19
|
+
var _package = require('./package-uzlvxa5S.cjs');
|
|
20
|
+
var doctor = require('./doctor-B9ug1LZb.cjs');
|
|
21
|
+
var spawnHappyCLI = require('./spawnHappyCLI-BYGOUda1.cjs');
|
|
22
|
+
var persistence = require('./persistence-CsmAgN-C.cjs');
|
|
23
|
+
var controlClient = require('./controlClient-DwWTns3A.cjs');
|
|
24
|
+
var sessionOps = require('./sessionOps-XSEjIqNq.cjs');
|
|
25
|
+
var index = require('./index-BUFrKZeQ.cjs');
|
|
25
26
|
var fastify = require('fastify');
|
|
26
27
|
var z = require('zod');
|
|
27
28
|
var fastifyTypeProviderZod = require('fastify-type-provider-zod');
|
|
@@ -29,64 +30,70 @@ var authRelay = require('./authRelay-Dy1qU9td.cjs');
|
|
|
29
30
|
var node_crypto = require('node:crypto');
|
|
30
31
|
var previewPath = require('./previewPath-B0rBdhy1.cjs');
|
|
31
32
|
var backgroundTaskActivity = require('./backgroundTaskActivity-CBvUdj39.cjs');
|
|
32
|
-
var rateLimitWindows = require('./rateLimitWindows-
|
|
33
|
-
var peerTools = require('./peerTools-
|
|
33
|
+
var rateLimitWindows = require('./rateLimitWindows-BZl6GMwQ.cjs');
|
|
34
|
+
var peerTools = require('./peerTools-D-VNNFw-.cjs');
|
|
34
35
|
var os = require('node:os');
|
|
35
|
-
var remoteSessionClient = require('./remoteSessionClient-
|
|
36
|
-
var bootstrap = require('./bootstrap-
|
|
37
|
-
var index$1 = require('./index-
|
|
36
|
+
var remoteSessionClient = require('./remoteSessionClient-CcSP24Zq.cjs');
|
|
37
|
+
var bootstrap = require('./bootstrap-CoJu9VnB.cjs');
|
|
38
|
+
var index$1 = require('./index-B1swQJUS.cjs');
|
|
38
39
|
var require$$0 = require('fs');
|
|
39
40
|
var require$$1 = require('path');
|
|
40
41
|
var node_child_process = require('node:child_process');
|
|
41
42
|
var projectPath = require('./projectPath-C3ioB4Bu.cjs');
|
|
42
43
|
var doctorReadiness = require('./doctorReadiness-Dl6yRQCy.cjs');
|
|
43
|
-
var machineMetadata = require('./machineMetadata-
|
|
44
|
+
var machineMetadata = require('./machineMetadata-DhZuM0iB.cjs');
|
|
44
45
|
var fileStore = require('./fileStore-7qhnbs6N.cjs');
|
|
45
46
|
var pi = require('./pi-DlsrPCTa.cjs');
|
|
47
|
+
var codexAccount = require('./codexAccount-BDQjRbtI.cjs');
|
|
46
48
|
var require$$3 = require('crypto');
|
|
47
49
|
var detectCLI = require('./detectCLI-BuYR_Qxe.cjs');
|
|
48
|
-
var handleResumeCommand = require('./handleResumeCommand-
|
|
50
|
+
var handleResumeCommand = require('./handleResumeCommand-DPi-sPm7.cjs');
|
|
49
51
|
var webPanels = require('./webPanels-FCgFKvVe.cjs');
|
|
50
|
-
var index = require('./index-CLUHaPU8.cjs');
|
|
51
52
|
var promises = require('node:fs/promises');
|
|
52
53
|
var cliUpdate = require('./cliUpdate-DsKXPFYp.cjs');
|
|
53
|
-
var client = require('./client-
|
|
54
|
-
var sessionLock = require('./sessionLock-
|
|
55
|
-
var client$1 = require('./client-
|
|
54
|
+
var client = require('./client-CJr8Pjwm.cjs');
|
|
55
|
+
var sessionLock = require('./sessionLock-DdDCuNUs.cjs');
|
|
56
|
+
var client$1 = require('./client-D2GWkd-T.cjs');
|
|
56
57
|
var daemonSupervisor = require('./daemonSupervisor-alqGPANc.cjs');
|
|
58
|
+
var accountService = require('./accountService-CuUSJDhP.cjs');
|
|
59
|
+
var daemonAccounts = require('./daemonAccounts-CpGDY_4k.cjs');
|
|
57
60
|
var path$1 = require('./path-B7zW-WwE.cjs');
|
|
58
61
|
var editPaths = require('./editPaths-Bqp4OFPw.cjs');
|
|
59
|
-
var startFileWatcher = require('./startFileWatcher-
|
|
60
|
-
var sync = require('./sync-
|
|
62
|
+
var startFileWatcher = require('./startFileWatcher-D14W6gn-.cjs');
|
|
63
|
+
var sync = require('./sync-WYBwkJvG.cjs');
|
|
61
64
|
var types = require('./types-CRS-srZK.cjs');
|
|
62
65
|
var tmuxSocket = require('./tmuxSocket-D-Xt6Vn-.cjs');
|
|
63
66
|
var doctor$1 = require('./doctor-u46qYYKX.cjs');
|
|
64
67
|
var resources = require('./resources-BZ_Be0qM.cjs');
|
|
65
68
|
var node_util = require('node:util');
|
|
66
|
-
var template = require('./template-
|
|
69
|
+
var template = require('./template-B9pLEP8v.cjs');
|
|
67
70
|
var loginShellEnv = require('./loginShellEnv-BkuYtExZ.cjs');
|
|
68
|
-
require('./
|
|
69
|
-
require('./
|
|
71
|
+
var store = require('./store-CkNa6oj4.cjs');
|
|
72
|
+
require('./acpSessionResume-Bk9mjXZ9.cjs');
|
|
73
|
+
require('./lidState-B_v6qgfE.cjs');
|
|
70
74
|
require('node:events');
|
|
71
75
|
require('socket.io-client');
|
|
72
|
-
require('./pushNotifications-
|
|
76
|
+
require('./pushNotifications-BCg7YAiu.cjs');
|
|
73
77
|
require('./contentLogMetadata-ZSFk_NjQ.cjs');
|
|
74
78
|
require('./limits-C-a7gr04.cjs');
|
|
75
|
-
require('./time-
|
|
76
|
-
require('./registerCommonHandlers-
|
|
79
|
+
require('./time-BTLcO8jp.cjs');
|
|
80
|
+
require('./registerCommonHandlers-CZGmrPbT.cjs');
|
|
77
81
|
require('util');
|
|
78
82
|
require('cross-spawn');
|
|
79
83
|
require('@paralleldrive/cuid2');
|
|
80
84
|
require('chalk');
|
|
81
85
|
require('node:module');
|
|
82
86
|
require('tweetnacl');
|
|
83
|
-
require('./browser-
|
|
87
|
+
require('./browser-v1pdPP1E.cjs');
|
|
84
88
|
require('open');
|
|
85
89
|
require('./specialCommands-J3JFOq0J.cjs');
|
|
86
90
|
require('./ids-B6ZC0HGt.cjs');
|
|
87
91
|
require('url');
|
|
88
|
-
require('./localHappyAgentAuth-
|
|
92
|
+
require('./localHappyAgentAuth-jJH0n67S.cjs');
|
|
89
93
|
require('./processTreeSnapshot-mDbnuojn.cjs');
|
|
94
|
+
require('./claudeAccountEnv-CEX_EMZr.cjs');
|
|
95
|
+
require('node:readline');
|
|
96
|
+
require('node-pty');
|
|
90
97
|
require('ps-list');
|
|
91
98
|
|
|
92
99
|
function _interopNamespaceDefault(e) {
|
|
@@ -201,8 +208,34 @@ async function teamRelaunchEnv(input) {
|
|
|
201
208
|
const DEFAULT_LOG_PRUNE_POLICY = {
|
|
202
209
|
maxAgeMs: 14 * 24 * 60 * 6e4,
|
|
203
210
|
maxTotalBytes: 200 * 1024 * 1024,
|
|
204
|
-
keepRecentCount: 10
|
|
211
|
+
keepRecentCount: 10,
|
|
212
|
+
keepDaemonLogs: 3,
|
|
213
|
+
maxDaemonLogBytes: 64 * 1024 * 1024
|
|
205
214
|
};
|
|
215
|
+
const DAEMON_LOG_SUFFIX = "-daemon.log";
|
|
216
|
+
function planDaemonLogRetention(files, policy = DEFAULT_LOG_PRUNE_POLICY, protectedPaths = /* @__PURE__ */ new Set()) {
|
|
217
|
+
const keep = /* @__PURE__ */ new Set();
|
|
218
|
+
let trim = null;
|
|
219
|
+
const count = policy.keepDaemonLogs ?? 0;
|
|
220
|
+
let budget = policy.maxDaemonLogBytes ?? 0;
|
|
221
|
+
if (count <= 0 || budget <= 0) return { keep, trim };
|
|
222
|
+
const daemonLogs = files.filter((f) => f.path.endsWith(DAEMON_LOG_SUFFIX) && !protectedPaths.has(f.path)).sort((a, b) => b.mtimeMs - a.mtimeMs);
|
|
223
|
+
for (const f of daemonLogs) {
|
|
224
|
+
if (keep.size >= count || budget <= 0) break;
|
|
225
|
+
if (keep.size === 0) {
|
|
226
|
+
keep.add(f.path);
|
|
227
|
+
if (f.size > budget) {
|
|
228
|
+
trim = { path: f.path, keepBytes: budget };
|
|
229
|
+
budget = 0;
|
|
230
|
+
} else budget -= f.size;
|
|
231
|
+
continue;
|
|
232
|
+
}
|
|
233
|
+
if (f.size > budget) break;
|
|
234
|
+
keep.add(f.path);
|
|
235
|
+
budget -= f.size;
|
|
236
|
+
}
|
|
237
|
+
return { keep, trim };
|
|
238
|
+
}
|
|
206
239
|
function planLogPrune(files, now, policy = DEFAULT_LOG_PRUNE_POLICY, protectedPaths = /* @__PURE__ */ new Set()) {
|
|
207
240
|
const sorted = [...files].sort((a, b) => b.mtimeMs - a.mtimeMs);
|
|
208
241
|
const doomed = /* @__PURE__ */ new Set();
|
|
@@ -231,7 +264,9 @@ function pruneLogsDir(logsDir, protectedPaths = /* @__PURE__ */ new Set(), polic
|
|
|
231
264
|
} catch {
|
|
232
265
|
return 0;
|
|
233
266
|
}
|
|
234
|
-
const
|
|
267
|
+
const daemonLogs = planDaemonLogRetention(files, policy, protectedPaths);
|
|
268
|
+
if (daemonLogs.trim) trimToTail(daemonLogs.trim.path, daemonLogs.trim.keepBytes);
|
|
269
|
+
const doomed = planLogPrune(files.filter((f) => !daemonLogs.keep.has(f.path)), Date.now(), policy, protectedPaths);
|
|
235
270
|
let deleted = 0;
|
|
236
271
|
for (const p of doomed) {
|
|
237
272
|
try {
|
|
@@ -242,6 +277,36 @@ function pruneLogsDir(logsDir, protectedPaths = /* @__PURE__ */ new Set(), polic
|
|
|
242
277
|
}
|
|
243
278
|
return deleted;
|
|
244
279
|
}
|
|
280
|
+
function trimToTail(path, keepBytes) {
|
|
281
|
+
let fd = null;
|
|
282
|
+
try {
|
|
283
|
+
const st = node_fs.statSync(path);
|
|
284
|
+
if (st.size <= keepBytes) return;
|
|
285
|
+
const marker = Buffer.from(`[log trimmed to its last ${keepBytes} bytes by the daemon log retention]
|
|
286
|
+
`);
|
|
287
|
+
const tailBytes = Math.max(0, keepBytes - marker.length);
|
|
288
|
+
fd = node_fs.openSync(path, "r+");
|
|
289
|
+
const tail = Buffer.alloc(tailBytes);
|
|
290
|
+
let read = 0;
|
|
291
|
+
while (read < tailBytes) {
|
|
292
|
+
const n = node_fs.readSync(fd, tail, read, tailBytes - read, st.size - tailBytes + read);
|
|
293
|
+
if (n <= 0) break;
|
|
294
|
+
read += n;
|
|
295
|
+
}
|
|
296
|
+
node_fs.writeSync(fd, marker, 0, marker.length, 0);
|
|
297
|
+
node_fs.writeSync(fd, tail, 0, read, marker.length);
|
|
298
|
+
node_fs.ftruncateSync(fd, marker.length + read);
|
|
299
|
+
node_fs.closeSync(fd);
|
|
300
|
+
fd = null;
|
|
301
|
+
node_fs.utimesSync(path, st.atime, st.mtime);
|
|
302
|
+
} catch {
|
|
303
|
+
} finally {
|
|
304
|
+
if (fd !== null) try {
|
|
305
|
+
node_fs.closeSync(fd);
|
|
306
|
+
} catch {
|
|
307
|
+
}
|
|
308
|
+
}
|
|
309
|
+
}
|
|
245
310
|
|
|
246
311
|
function createSpawnTimer(clock = Date.now) {
|
|
247
312
|
const requestAt = clock();
|
|
@@ -527,6 +592,7 @@ function sanitizeResumeModel(value) {
|
|
|
527
592
|
}
|
|
528
593
|
|
|
529
594
|
const DEFAULT_MAX_RESTARTS = 3;
|
|
595
|
+
const DEFAULT_MAX_ACCOUNT_RESTARTS = 50;
|
|
530
596
|
function decideRestart(priorAttempts, max = DEFAULT_MAX_RESTARTS) {
|
|
531
597
|
if (priorAttempts >= max) {
|
|
532
598
|
return {
|
|
@@ -583,6 +649,19 @@ const BackgroundTaskInfoSchema = z.z.object({
|
|
|
583
649
|
description: z.z.string().max(backgroundTaskActivity.BACKGROUND_TASK_DESCRIPTION_MAX + 1),
|
|
584
650
|
startedAt: z.z.number()
|
|
585
651
|
});
|
|
652
|
+
const AutoRestartStatusSchema = z.z.object({
|
|
653
|
+
state: z.z.string(),
|
|
654
|
+
reason: z.z.string().optional(),
|
|
655
|
+
since: z.z.number(),
|
|
656
|
+
target: z.z.string(),
|
|
657
|
+
offline: z.z.boolean().optional(),
|
|
658
|
+
retryAt: z.z.number().optional()
|
|
659
|
+
});
|
|
660
|
+
const DaemonListInfoSchema = z.z.object({
|
|
661
|
+
version: z.z.string(),
|
|
662
|
+
upgradePending: z.z.string().nullable(),
|
|
663
|
+
autoRestartEnabled: z.z.boolean()
|
|
664
|
+
});
|
|
586
665
|
const BackgroundTasksReportSchema = z.z.object({
|
|
587
666
|
count: z.z.number().int().nonnegative(),
|
|
588
667
|
tasks: z.z.array(BackgroundTaskInfoSchema),
|
|
@@ -611,8 +690,11 @@ function startDaemonControlServer({
|
|
|
611
690
|
onSessionEdit,
|
|
612
691
|
listPeers,
|
|
613
692
|
isTurnActive,
|
|
693
|
+
getAutoRestartStatus,
|
|
694
|
+
getDaemonInfo,
|
|
614
695
|
onRateLimits,
|
|
615
|
-
onHibernateCheck
|
|
696
|
+
onHibernateCheck,
|
|
697
|
+
getAgentProfiles
|
|
616
698
|
}) {
|
|
617
699
|
return new Promise((resolve) => {
|
|
618
700
|
const app = fastify({
|
|
@@ -718,6 +800,16 @@ function startDaemonControlServer({
|
|
|
718
800
|
}
|
|
719
801
|
});
|
|
720
802
|
}
|
|
803
|
+
typed.post("/agent-profiles", {
|
|
804
|
+
schema: { response: { 200: index.AgentProfilesStateSchema, 503: z.z.object({ error: z.z.string() }) } }
|
|
805
|
+
}, async (_request, reply) => {
|
|
806
|
+
const state = getAgentProfiles?.() ?? null;
|
|
807
|
+
if (!state) {
|
|
808
|
+
reply.code(503);
|
|
809
|
+
return { error: "accounts are not available in this daemon yet" };
|
|
810
|
+
}
|
|
811
|
+
return state;
|
|
812
|
+
});
|
|
721
813
|
typed.post("/list", {
|
|
722
814
|
schema: {
|
|
723
815
|
response: {
|
|
@@ -728,8 +820,12 @@ function startDaemonControlServer({
|
|
|
728
820
|
pid: z.z.number(),
|
|
729
821
|
turnActive: z.z.boolean(),
|
|
730
822
|
// B-507: in-flight background tasks per the wrapper's last report (lease-expired = count 0).
|
|
731
|
-
backgroundTasks: BackgroundTasksReportSchema.optional()
|
|
732
|
-
|
|
823
|
+
backgroundTasks: BackgroundTasksReportSchema.optional(),
|
|
824
|
+
// B-856: the wrapper's own CLI version and its auto-restart status (null = nothing pending).
|
|
825
|
+
cliVersion: z.z.string().optional(),
|
|
826
|
+
autoRestart: AutoRestartStatusSchema.nullable().optional()
|
|
827
|
+
})),
|
|
828
|
+
daemon: DaemonListInfoSchema.optional()
|
|
733
829
|
})
|
|
734
830
|
}
|
|
735
831
|
}
|
|
@@ -742,8 +838,11 @@ function startDaemonControlServer({
|
|
|
742
838
|
happySessionId: child.happySessionId,
|
|
743
839
|
pid: child.pid,
|
|
744
840
|
turnActive: isTurnActive ? isTurnActive(child.happySessionId) : false,
|
|
745
|
-
...getBackgroundTasks ? { backgroundTasks: getBackgroundTasks(child.happySessionId) } : {}
|
|
746
|
-
|
|
841
|
+
...getBackgroundTasks ? { backgroundTasks: getBackgroundTasks(child.happySessionId) } : {},
|
|
842
|
+
...child.happySessionMetadataFromLocalWebhook?.version ? { cliVersion: child.happySessionMetadataFromLocalWebhook.version } : {},
|
|
843
|
+
...getAutoRestartStatus ? { autoRestart: getAutoRestartStatus(child.happySessionId) ?? null } : {}
|
|
844
|
+
})),
|
|
845
|
+
...getDaemonInfo ? { daemon: getDaemonInfo() } : {}
|
|
747
846
|
};
|
|
748
847
|
});
|
|
749
848
|
typed.post("/stop-session", {
|
|
@@ -786,7 +885,9 @@ function startDaemonControlServer({
|
|
|
786
885
|
// sends over the machine RPC. Old CLIs never send them.
|
|
787
886
|
resumeClaudeSessionId: z.z.string().regex(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i).optional(),
|
|
788
887
|
resumeCodexThreadId: z.z.string().min(1).max(200).optional(),
|
|
789
|
-
parentSessionId: z.z.string().min(1).max(200).optional()
|
|
888
|
+
parentSessionId: z.z.string().min(1).max(200).optional(),
|
|
889
|
+
// B-850a: `very-happy spawn --account` (null = machine login; absent = machine default).
|
|
890
|
+
agentProfileId: z.z.string().min(1).max(64).nullable().optional()
|
|
790
891
|
}),
|
|
791
892
|
response: {
|
|
792
893
|
200: z.z.object({
|
|
@@ -811,13 +912,13 @@ function startDaemonControlServer({
|
|
|
811
912
|
}
|
|
812
913
|
}
|
|
813
914
|
}, async (request, reply) => {
|
|
814
|
-
const { directory, sessionId, agent, environmentVariables, variant, forceNew, permissionMode, spawnedBy, resumeClaudeSessionId, resumeCodexThreadId, parentSessionId } = request.body;
|
|
915
|
+
const { directory, sessionId, agent, environmentVariables, variant, forceNew, permissionMode, spawnedBy, resumeClaudeSessionId, resumeCodexThreadId, parentSessionId, agentProfileId } = request.body;
|
|
815
916
|
if (!directory && variant !== "assistant") {
|
|
816
917
|
reply.code(500);
|
|
817
918
|
return { success: false, error: "directory is required" };
|
|
818
919
|
}
|
|
819
920
|
logger.logger.debug(`[CONTROL SERVER] Spawn session request: dir=${directory}, sessionId=${sessionId || "new"}, agent=${agent || "default"}, variant=${variant || "none"}, forceNew=${forceNew === true}, spawnedBy=${spawnedBy || "unset"}`);
|
|
820
|
-
const result = await spawnSession({ directory, sessionId, agent, environmentVariables, variant, forceNew, permissionMode, spawnedBy, resumeClaudeSessionId, resumeCodexThreadId, parentSessionId });
|
|
921
|
+
const result = await spawnSession({ directory, sessionId, agent, environmentVariables, variant, forceNew, permissionMode, spawnedBy, resumeClaudeSessionId, resumeCodexThreadId, parentSessionId, ...agentProfileId !== void 0 ? { agentProfileId } : {} });
|
|
821
922
|
const resumed = Boolean(resumeClaudeSessionId || resumeCodexThreadId);
|
|
822
923
|
switch (result.type) {
|
|
823
924
|
case "success":
|
|
@@ -908,7 +1009,7 @@ function startDaemonControlServer({
|
|
|
908
1009
|
return { success: false, error: "daemon is still starting up" };
|
|
909
1010
|
}
|
|
910
1011
|
logger.logger.debug(`[CONTROL SERVER] Restart session request: ${sessionId}`);
|
|
911
|
-
const result = await restartSession(sessionId, { keepPublishedPermissionMode: true });
|
|
1012
|
+
const result = await restartSession(sessionId, { keepPublishedPermissionMode: true, account: true });
|
|
912
1013
|
switch (result.type) {
|
|
913
1014
|
case "success":
|
|
914
1015
|
return { success: true, sessionId: result.sessionId };
|
|
@@ -2489,806 +2590,6 @@ const claudeAdapter = {
|
|
|
2489
2590
|
}
|
|
2490
2591
|
};
|
|
2491
2592
|
|
|
2492
|
-
/*!
|
|
2493
|
-
* Copyright (c) Squirrel Chat et al., All rights reserved.
|
|
2494
|
-
* SPDX-License-Identifier: BSD-3-Clause
|
|
2495
|
-
*
|
|
2496
|
-
* Redistribution and use in source and binary forms, with or without
|
|
2497
|
-
* modification, are permitted provided that the following conditions are met:
|
|
2498
|
-
*
|
|
2499
|
-
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
2500
|
-
* list of conditions and the following disclaimer.
|
|
2501
|
-
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
2502
|
-
* this list of conditions and the following disclaimer in the
|
|
2503
|
-
* documentation and/or other materials provided with the distribution.
|
|
2504
|
-
* 3. Neither the name of the copyright holder nor the names of its contributors
|
|
2505
|
-
* may be used to endorse or promote products derived from this software without
|
|
2506
|
-
* specific prior written permission.
|
|
2507
|
-
*
|
|
2508
|
-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
2509
|
-
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
2510
|
-
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
2511
|
-
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
|
2512
|
-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
2513
|
-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
|
2514
|
-
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
|
2515
|
-
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
2516
|
-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
2517
|
-
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
2518
|
-
*/
|
|
2519
|
-
function getLineColFromPtr(string, ptr) {
|
|
2520
|
-
let lines = string.slice(0, ptr).split(/\r?\n/);
|
|
2521
|
-
return [lines.length, lines.pop().length + 1];
|
|
2522
|
-
}
|
|
2523
|
-
function makeCodeBlock(string, line, column) {
|
|
2524
|
-
let lines = string.split(/\r?\n/);
|
|
2525
|
-
let codeblock = "";
|
|
2526
|
-
let numberLen = (Math.log10(line + 1) | 0) + 1;
|
|
2527
|
-
for (let i = line - 1; i <= line + 1; i++) {
|
|
2528
|
-
let l = lines[i - 1];
|
|
2529
|
-
if (!l)
|
|
2530
|
-
continue;
|
|
2531
|
-
codeblock += i.toString().padEnd(numberLen, " ");
|
|
2532
|
-
codeblock += ": ";
|
|
2533
|
-
codeblock += l;
|
|
2534
|
-
codeblock += "\n";
|
|
2535
|
-
if (i === line) {
|
|
2536
|
-
codeblock += " ".repeat(numberLen + column + 2);
|
|
2537
|
-
codeblock += "^\n";
|
|
2538
|
-
}
|
|
2539
|
-
}
|
|
2540
|
-
return codeblock;
|
|
2541
|
-
}
|
|
2542
|
-
class TomlError extends Error {
|
|
2543
|
-
line;
|
|
2544
|
-
column;
|
|
2545
|
-
codeblock;
|
|
2546
|
-
constructor(message, options) {
|
|
2547
|
-
const [line, column] = getLineColFromPtr(options.toml, options.ptr);
|
|
2548
|
-
const codeblock = makeCodeBlock(options.toml, line, column);
|
|
2549
|
-
super(`Invalid TOML document: ${message}
|
|
2550
|
-
|
|
2551
|
-
${codeblock}`, options);
|
|
2552
|
-
this.line = line;
|
|
2553
|
-
this.column = column;
|
|
2554
|
-
this.codeblock = codeblock;
|
|
2555
|
-
}
|
|
2556
|
-
/** @internal */
|
|
2557
|
-
static x(message, ctx, ptr) {
|
|
2558
|
-
throw new TomlError(message, { toml: ctx.s, ptr: ptr ?? ctx.p });
|
|
2559
|
-
}
|
|
2560
|
-
}
|
|
2561
|
-
|
|
2562
|
-
function parseString(ctx) {
|
|
2563
|
-
let startPtr = ctx.p;
|
|
2564
|
-
let c = ctx.s.charCodeAt(ctx.p++);
|
|
2565
|
-
let first = c;
|
|
2566
|
-
let isLiteral = c === 39;
|
|
2567
|
-
let isMultiline = c === ctx.s.charCodeAt(ctx.p) && c === ctx.s.charCodeAt(ctx.p + 1);
|
|
2568
|
-
if (isMultiline) {
|
|
2569
|
-
if ((c = ctx.s.charCodeAt(ctx.p += 2)) === 10)
|
|
2570
|
-
ctx.p++;
|
|
2571
|
-
else if (c === 13 && ctx.s.charCodeAt(ctx.p + 1) === 10)
|
|
2572
|
-
ctx.p += 2;
|
|
2573
|
-
}
|
|
2574
|
-
let parsed = "";
|
|
2575
|
-
let sliceStart = ctx.p;
|
|
2576
|
-
let state = 0;
|
|
2577
|
-
for (; ctx.p < ctx.s.length; ctx.p++) {
|
|
2578
|
-
c = ctx.s.charCodeAt(ctx.p);
|
|
2579
|
-
if (isMultiline && (c === 10 || c === 13 && ctx.s.charCodeAt(ctx.p + 1) === 10)) {
|
|
2580
|
-
state = state && 3;
|
|
2581
|
-
} else if (c < 32 && c !== 9 || c === 127) {
|
|
2582
|
-
TomlError.x("control characters are not allowed in strings", ctx);
|
|
2583
|
-
} else if ((!state || state === 3) && c === first && (!isMultiline || ctx.s.charCodeAt(ctx.p + 1) === first && ctx.s.charCodeAt(ctx.p + 2) === first)) {
|
|
2584
|
-
if (isMultiline) {
|
|
2585
|
-
if (ctx.s.charCodeAt(ctx.p + 3) === first)
|
|
2586
|
-
ctx.p++;
|
|
2587
|
-
if (ctx.s.charCodeAt(ctx.p + 3) === first)
|
|
2588
|
-
ctx.p++;
|
|
2589
|
-
}
|
|
2590
|
-
if (!state) {
|
|
2591
|
-
let s = ctx.s.slice(sliceStart, ctx.p);
|
|
2592
|
-
parsed = parsed ? parsed + s : s;
|
|
2593
|
-
}
|
|
2594
|
-
ctx.p += isMultiline ? 3 : 1;
|
|
2595
|
-
return parsed;
|
|
2596
|
-
} else if (!state) {
|
|
2597
|
-
if (!isLiteral && c === 92) {
|
|
2598
|
-
parsed += ctx.s.slice(sliceStart, sliceStart = ctx.p);
|
|
2599
|
-
state = 1;
|
|
2600
|
-
}
|
|
2601
|
-
} else if (state === 1) {
|
|
2602
|
-
if (c === 120 || c === 117 || c === 85) {
|
|
2603
|
-
let errPtr = ctx.p++ - 1;
|
|
2604
|
-
let value = 0;
|
|
2605
|
-
let len = c === 120 ? 2 : c === 117 ? 4 : 8;
|
|
2606
|
-
for (let j = 0; j < len; j++, ctx.p++) {
|
|
2607
|
-
let hex = ctx.s.charCodeAt(ctx.p);
|
|
2608
|
-
let digit = (
|
|
2609
|
-
/* 0-9 */
|
|
2610
|
-
hex >= 48 && hex <= 57 ? hex - 48 : (
|
|
2611
|
-
/* A-F */
|
|
2612
|
-
hex >= 65 && hex <= 70 ? hex - 65 + 10 : (
|
|
2613
|
-
/* a-f */
|
|
2614
|
-
hex >= 97 && hex <= 102 ? hex - 97 + 10 : -1
|
|
2615
|
-
)
|
|
2616
|
-
)
|
|
2617
|
-
);
|
|
2618
|
-
if (digit < 0)
|
|
2619
|
-
TomlError.x("invalid non-hex character in unicode escape", ctx);
|
|
2620
|
-
value = value << 4 | digit;
|
|
2621
|
-
}
|
|
2622
|
-
if (value < 0 || value > 1114111 || value >= 55296 && value <= 57343) {
|
|
2623
|
-
TomlError.x("invalid unicode escape", ctx, errPtr);
|
|
2624
|
-
}
|
|
2625
|
-
parsed += String.fromCodePoint(value);
|
|
2626
|
-
sliceStart = ctx.p--;
|
|
2627
|
-
state = 0;
|
|
2628
|
-
} else if (isMultiline && (c === 32 || c === 9)) {
|
|
2629
|
-
state = 2;
|
|
2630
|
-
} else {
|
|
2631
|
-
if (c === 98)
|
|
2632
|
-
parsed += "\b";
|
|
2633
|
-
else if (c === 116)
|
|
2634
|
-
parsed += " ";
|
|
2635
|
-
else if (c === 110)
|
|
2636
|
-
parsed += "\n";
|
|
2637
|
-
else if (c === 102)
|
|
2638
|
-
parsed += "\f";
|
|
2639
|
-
else if (c === 114)
|
|
2640
|
-
parsed += "\r";
|
|
2641
|
-
else if (c === 101)
|
|
2642
|
-
parsed += "\x1B";
|
|
2643
|
-
else if (c === 34)
|
|
2644
|
-
parsed += '"';
|
|
2645
|
-
else if (c === 92)
|
|
2646
|
-
parsed += "\\";
|
|
2647
|
-
else
|
|
2648
|
-
TomlError.x("unrecognised escape sequence", ctx);
|
|
2649
|
-
sliceStart = ctx.p + 1;
|
|
2650
|
-
state = 0;
|
|
2651
|
-
}
|
|
2652
|
-
} else if (c !== 32 && c !== 9) {
|
|
2653
|
-
if (state === 2)
|
|
2654
|
-
TomlError.x("invalid escape: only line-ending whitespace may be escaped", ctx, sliceStart);
|
|
2655
|
-
state = !isLiteral && c === 92 ? 1 : 0;
|
|
2656
|
-
sliceStart = ctx.p;
|
|
2657
|
-
}
|
|
2658
|
-
}
|
|
2659
|
-
TomlError.x("unfinished string", ctx, startPtr);
|
|
2660
|
-
}
|
|
2661
|
-
|
|
2662
|
-
/*!
|
|
2663
|
-
* Copyright (c) Squirrel Chat et al., All rights reserved.
|
|
2664
|
-
* SPDX-License-Identifier: BSD-3-Clause
|
|
2665
|
-
*
|
|
2666
|
-
* Redistribution and use in source and binary forms, with or without
|
|
2667
|
-
* modification, are permitted provided that the following conditions are met:
|
|
2668
|
-
*
|
|
2669
|
-
* 1. Redistributions of source code must retain the above copyright notice, this
|
|
2670
|
-
* list of conditions and the following disclaimer.
|
|
2671
|
-
* 2. Redistributions in binary form must reproduce the above copyright notice,
|
|
2672
|
-
* this list of conditions and the following disclaimer in the
|
|
2673
|
-
* documentation and/or other materials provided with the distribution.
|
|
2674
|
-
* 3. Neither the name of the copyright holder nor the names of its contributors
|
|
2675
|
-
* may be used to endorse or promote products derived from this software without
|
|
2676
|
-
* specific prior written permission.
|
|
2677
|
-
*
|
|
2678
|
-
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
|
|
2679
|
-
* ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
|
|
2680
|
-
* WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
|
|
2681
|
-
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
|
|
2682
|
-
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
|
|
2683
|
-
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
|
|
2684
|
-
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
|
|
2685
|
-
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
|
|
2686
|
-
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
2687
|
-
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
2688
|
-
*/
|
|
2689
|
-
let DATE_TIME_RE = /^(\d{4}-\d{2}-\d{2})?[Tt ]?(?:(\d{2}):\d{2}(?::\d{2}(?:\.\d+)?)?)?(Z|z|[-+]\d{2}:\d{2})?$/i;
|
|
2690
|
-
class TomlDate extends Date {
|
|
2691
|
-
#hasDate = false;
|
|
2692
|
-
#hasTime = false;
|
|
2693
|
-
#offset = null;
|
|
2694
|
-
constructor(date, fasttype, unsafeDelim) {
|
|
2695
|
-
let hasDate = true;
|
|
2696
|
-
let hasTime = true;
|
|
2697
|
-
let offset = "Z";
|
|
2698
|
-
let c;
|
|
2699
|
-
if (typeof date === "string") {
|
|
2700
|
-
if (fasttype)
|
|
2701
|
-
prep: {
|
|
2702
|
-
if (fasttype < 3) {
|
|
2703
|
-
if (+date.slice(11, 13) > 23) {
|
|
2704
|
-
date = "";
|
|
2705
|
-
break prep;
|
|
2706
|
-
}
|
|
2707
|
-
if (fasttype === 2) {
|
|
2708
|
-
offset = null;
|
|
2709
|
-
date += "Z";
|
|
2710
|
-
} else if ((c = date.charCodeAt(date.length - 1)) !== 90 && c !== 122) {
|
|
2711
|
-
offset = date.slice(date.length - 6);
|
|
2712
|
-
}
|
|
2713
|
-
if (unsafeDelim)
|
|
2714
|
-
date = date.slice(0, 10) + "T" + date.slice(11);
|
|
2715
|
-
} else if (fasttype === 4) {
|
|
2716
|
-
date = +date.slice(0, 2) > 23 ? "" : `0000-01-01T${date}Z`;
|
|
2717
|
-
}
|
|
2718
|
-
hasDate = fasttype !== 4;
|
|
2719
|
-
hasTime = fasttype !== 3;
|
|
2720
|
-
}
|
|
2721
|
-
else {
|
|
2722
|
-
let match = date.match(DATE_TIME_RE);
|
|
2723
|
-
if (match) {
|
|
2724
|
-
if (!match[1]) {
|
|
2725
|
-
hasDate = false;
|
|
2726
|
-
date = `0000-01-01T${date}`;
|
|
2727
|
-
}
|
|
2728
|
-
hasTime = !!match[2];
|
|
2729
|
-
hasTime && date[10] === " " && (date = date.replace(" ", "T"));
|
|
2730
|
-
if (match[2] && +match[2] > 23) {
|
|
2731
|
-
date = "";
|
|
2732
|
-
} else {
|
|
2733
|
-
offset = match[3] || null;
|
|
2734
|
-
if (!offset && hasTime)
|
|
2735
|
-
date += "Z";
|
|
2736
|
-
}
|
|
2737
|
-
} else {
|
|
2738
|
-
date = "";
|
|
2739
|
-
}
|
|
2740
|
-
}
|
|
2741
|
-
}
|
|
2742
|
-
super(date);
|
|
2743
|
-
if (!isNaN(this.getTime())) {
|
|
2744
|
-
this.#hasDate = hasDate;
|
|
2745
|
-
this.#hasTime = hasTime;
|
|
2746
|
-
this.#offset = offset;
|
|
2747
|
-
}
|
|
2748
|
-
}
|
|
2749
|
-
isDateTime() {
|
|
2750
|
-
return this.#hasDate && this.#hasTime;
|
|
2751
|
-
}
|
|
2752
|
-
isLocal() {
|
|
2753
|
-
return !this.#hasDate || !this.#hasTime || !this.#offset;
|
|
2754
|
-
}
|
|
2755
|
-
isDate() {
|
|
2756
|
-
return this.#hasDate && !this.#hasTime;
|
|
2757
|
-
}
|
|
2758
|
-
isTime() {
|
|
2759
|
-
return this.#hasTime && !this.#hasDate;
|
|
2760
|
-
}
|
|
2761
|
-
isValid() {
|
|
2762
|
-
return this.#hasDate || this.#hasTime;
|
|
2763
|
-
}
|
|
2764
|
-
toISOString() {
|
|
2765
|
-
let iso = super.toISOString();
|
|
2766
|
-
if (this.isDate())
|
|
2767
|
-
return iso.slice(0, 10);
|
|
2768
|
-
if (this.isTime())
|
|
2769
|
-
return iso.slice(11, 23);
|
|
2770
|
-
if (this.#offset === null)
|
|
2771
|
-
return iso.slice(0, -1);
|
|
2772
|
-
if (this.#offset === "Z" || this.#offset === "z")
|
|
2773
|
-
return iso;
|
|
2774
|
-
let offset = +this.#offset.slice(1, 3) * 60 + +this.#offset.slice(4, 6);
|
|
2775
|
-
offset = this.#offset[0] === "-" ? offset : -offset;
|
|
2776
|
-
let offsetDate = new Date(this.getTime() - offset * 6e4);
|
|
2777
|
-
return offsetDate.toISOString().slice(0, -1) + this.#offset;
|
|
2778
|
-
}
|
|
2779
|
-
static wrapAsOffsetDateTime(jsDate, offset = "Z") {
|
|
2780
|
-
let date = new TomlDate(jsDate);
|
|
2781
|
-
date.#offset = offset;
|
|
2782
|
-
return date;
|
|
2783
|
-
}
|
|
2784
|
-
static wrapAsLocalDateTime(jsDate) {
|
|
2785
|
-
let date = new TomlDate(jsDate);
|
|
2786
|
-
date.#offset = null;
|
|
2787
|
-
return date;
|
|
2788
|
-
}
|
|
2789
|
-
static wrapAsLocalDate(jsDate) {
|
|
2790
|
-
let date = new TomlDate(jsDate);
|
|
2791
|
-
date.#hasTime = false;
|
|
2792
|
-
date.#offset = null;
|
|
2793
|
-
return date;
|
|
2794
|
-
}
|
|
2795
|
-
static wrapAsLocalTime(jsDate) {
|
|
2796
|
-
let date = new TomlDate(jsDate);
|
|
2797
|
-
date.#hasDate = false;
|
|
2798
|
-
date.#offset = null;
|
|
2799
|
-
return date;
|
|
2800
|
-
}
|
|
2801
|
-
}
|
|
2802
|
-
|
|
2803
|
-
function isDigit(char, base = 10) {
|
|
2804
|
-
return base === 16 ? char > 47 && char < 58 || char > 64 && char < 71 || char > 96 && char < 103 : char > 47 && char < 48 + base;
|
|
2805
|
-
}
|
|
2806
|
-
function isEndOfValue(char, delim) {
|
|
2807
|
-
return char === 32 || char === 9 || char === 10 || char === 13 || // Structure end or next value delimiter
|
|
2808
|
-
delim && (char === delim || char === 44) || // Comment
|
|
2809
|
-
char === 35;
|
|
2810
|
-
}
|
|
2811
|
-
function extractValue(ctx, end) {
|
|
2812
|
-
let errPtr = ctx.p;
|
|
2813
|
-
let c = ctx.s.charCodeAt(ctx.p);
|
|
2814
|
-
if (c === 91 || c === 123) {
|
|
2815
|
-
ctx.d-- || TomlError.x("document contains excessively nested structures. aborting.", ctx);
|
|
2816
|
-
let value = c === 91 ? parseArray(ctx) : parseInlineTable(ctx);
|
|
2817
|
-
ctx.d++;
|
|
2818
|
-
return value;
|
|
2819
|
-
}
|
|
2820
|
-
if (c === 34 || c === 39) {
|
|
2821
|
-
return parseString(ctx);
|
|
2822
|
-
}
|
|
2823
|
-
if (c === 116) {
|
|
2824
|
-
if (ctx.s.charCodeAt(++ctx.p) !== 114 || ctx.s.charCodeAt(++ctx.p) !== 117 || ctx.s.charCodeAt(++ctx.p) !== 101)
|
|
2825
|
-
TomlError.x("invalid value", ctx, errPtr);
|
|
2826
|
-
return ctx.p++, true;
|
|
2827
|
-
}
|
|
2828
|
-
if (c === 102) {
|
|
2829
|
-
if (ctx.s.charCodeAt(++ctx.p) !== 97 || ctx.s.charCodeAt(++ctx.p) !== 108 || ctx.s.charCodeAt(++ctx.p) !== 115 || ctx.s.charCodeAt(++ctx.p) !== 101)
|
|
2830
|
-
TomlError.x("invalid value", ctx, errPtr);
|
|
2831
|
-
return ctx.p++, false;
|
|
2832
|
-
}
|
|
2833
|
-
if (c === 43 || c === 45) {
|
|
2834
|
-
return parseNumber(ctx, ctx.p, ctx.s.charCodeAt(++ctx.p), 44 - c, end);
|
|
2835
|
-
}
|
|
2836
|
-
if (ctx.s.charCodeAt(ctx.p + 4) === 45 && ctx.s.charCodeAt(ctx.p + 7) === 45) {
|
|
2837
|
-
return parseDate(ctx, c, end);
|
|
2838
|
-
}
|
|
2839
|
-
if (ctx.s.charCodeAt(ctx.p + 2) === 58) {
|
|
2840
|
-
return parseTime(ctx, c, end);
|
|
2841
|
-
}
|
|
2842
|
-
return parseNumber(ctx, ctx.p, c, 0, end);
|
|
2843
|
-
}
|
|
2844
|
-
function parseNumber(ctx, startPtr, startChr, sign, endChr) {
|
|
2845
|
-
let c = startChr;
|
|
2846
|
-
let state = 0;
|
|
2847
|
-
let hasUnderscores = false;
|
|
2848
|
-
if (c === 105) {
|
|
2849
|
-
if (ctx.s.charCodeAt(++ctx.p) !== 110 || ctx.s.charCodeAt(++ctx.p) !== 102)
|
|
2850
|
-
TomlError.x("invalid value", ctx, startPtr);
|
|
2851
|
-
return ctx.p++, (sign || 1) / 0;
|
|
2852
|
-
}
|
|
2853
|
-
if (c === 110) {
|
|
2854
|
-
if (ctx.s.charCodeAt(++ctx.p) !== 97 || ctx.s.charCodeAt(++ctx.p) !== 110)
|
|
2855
|
-
TomlError.x("invalid value", ctx, startPtr);
|
|
2856
|
-
return ctx.p++, NaN;
|
|
2857
|
-
}
|
|
2858
|
-
if (c === 48) {
|
|
2859
|
-
if (++ctx.p >= ctx.s.length || isEndOfValue(c = ctx.s.charCodeAt(ctx.p), endChr))
|
|
2860
|
-
return ctx.bi === true ? 0n : 0;
|
|
2861
|
-
if (!sign) {
|
|
2862
|
-
if (c === 120)
|
|
2863
|
-
return parseIntegerBaseN(ctx, startPtr, 16, endChr);
|
|
2864
|
-
else if (c === 98)
|
|
2865
|
-
return parseIntegerBaseN(ctx, startPtr, 2, endChr);
|
|
2866
|
-
else if (c === 111)
|
|
2867
|
-
return parseIntegerBaseN(ctx, startPtr, 8, endChr);
|
|
2868
|
-
}
|
|
2869
|
-
if (c === 46)
|
|
2870
|
-
state = 2;
|
|
2871
|
-
else if (c === 101 || c === 69)
|
|
2872
|
-
state = 4;
|
|
2873
|
-
else
|
|
2874
|
-
TomlError.x("illegal leading zero", ctx, startPtr);
|
|
2875
|
-
} else if (!isDigit(c))
|
|
2876
|
-
TomlError.x("invalid value", ctx, startPtr);
|
|
2877
|
-
while (++ctx.p < ctx.s.length && (c = ctx.s.charCodeAt(ctx.p), !isEndOfValue(c, endChr))) {
|
|
2878
|
-
if (!state)
|
|
2879
|
-
state = 1;
|
|
2880
|
-
if (c === 95) {
|
|
2881
|
-
if (!(state & 1))
|
|
2882
|
-
TomlError.x("illegal underscore", ctx);
|
|
2883
|
-
state += 11;
|
|
2884
|
-
hasUnderscores = true;
|
|
2885
|
-
} else if (state === 1 && c === 46)
|
|
2886
|
-
state = 2;
|
|
2887
|
-
else if ((state === 1 || state === 3) && (c === 101 || c === 69))
|
|
2888
|
-
state = 4;
|
|
2889
|
-
else if (state === 4 && (c === 43 || c === 45)) ; else if (!isDigit(c))
|
|
2890
|
-
TomlError.x(`illegal character in numeric literal`, ctx);
|
|
2891
|
-
else if (state > 9)
|
|
2892
|
-
state -= 11;
|
|
2893
|
-
else if (!(state & 1))
|
|
2894
|
-
state++;
|
|
2895
|
-
}
|
|
2896
|
-
if (!state) {
|
|
2897
|
-
let val = (startChr - 48) * (sign || 1);
|
|
2898
|
-
return ctx.bi === true ? BigInt(val) : val;
|
|
2899
|
-
}
|
|
2900
|
-
if (!(state & 1))
|
|
2901
|
-
TomlError.x("unfinished numeric value", ctx, startPtr);
|
|
2902
|
-
let str = ctx.s.slice(startPtr, ctx.p);
|
|
2903
|
-
if (hasUnderscores)
|
|
2904
|
-
str = str.replaceAll("_", "");
|
|
2905
|
-
return state > 1 ? parseFloat(str) : parseInteger(ctx, str, 10, startPtr);
|
|
2906
|
-
}
|
|
2907
|
-
function parseIntegerBaseN(ctx, startPtr, base, endChr) {
|
|
2908
|
-
let c, underscore = 1;
|
|
2909
|
-
while (++ctx.p < ctx.s.length && (c = ctx.s.charCodeAt(ctx.p), !isEndOfValue(c, endChr))) {
|
|
2910
|
-
if (c === 95) {
|
|
2911
|
-
if (underscore & 1)
|
|
2912
|
-
TomlError.x("illegal underscore", ctx);
|
|
2913
|
-
underscore = 3;
|
|
2914
|
-
} else if (!isDigit(c, base))
|
|
2915
|
-
TomlError.x(`illegal character in numeric literal`, ctx);
|
|
2916
|
-
else if (underscore & 1)
|
|
2917
|
-
underscore--;
|
|
2918
|
-
}
|
|
2919
|
-
if (underscore & 1)
|
|
2920
|
-
TomlError.x("unfinished numeric value", ctx);
|
|
2921
|
-
let str = ctx.s.slice(startPtr + 2, ctx.p);
|
|
2922
|
-
if (underscore)
|
|
2923
|
-
str = str.replaceAll("_", "");
|
|
2924
|
-
return parseInteger(ctx, str, base, startPtr);
|
|
2925
|
-
}
|
|
2926
|
-
function parseInteger(ctx, str, base, startPtr) {
|
|
2927
|
-
if (ctx.bi !== true)
|
|
2928
|
-
int: {
|
|
2929
|
-
let val = parseInt(str, base);
|
|
2930
|
-
if (!Number.isSafeInteger(val)) {
|
|
2931
|
-
if (ctx.bi)
|
|
2932
|
-
break int;
|
|
2933
|
-
TomlError.x("integer value cannot be represented losslessly", ctx, startPtr);
|
|
2934
|
-
}
|
|
2935
|
-
return val;
|
|
2936
|
-
}
|
|
2937
|
-
return base === 10 ? BigInt(str) : BigInt((base === 2 ? "0b" : base === 8 ? "0o" : "0x") + str);
|
|
2938
|
-
}
|
|
2939
|
-
function parseDate(ctx, c, endChr) {
|
|
2940
|
-
let startPtr = ctx.p++, unsafeSeparator;
|
|
2941
|
-
if (!isDigit(c) || !isDigit(ctx.s.charCodeAt(ctx.p++)) || !isDigit(ctx.s.charCodeAt(ctx.p++)) || !isDigit(ctx.s.charCodeAt(ctx.p++))) {
|
|
2942
|
-
return parseNumber(ctx, ctx.p = startPtr, c, 0, endChr);
|
|
2943
|
-
}
|
|
2944
|
-
ctx.p += 5;
|
|
2945
|
-
if (!isDigit(ctx.s.charCodeAt(ctx.p++)))
|
|
2946
|
-
TomlError.x("invalid date-time: date part is malformed", ctx, startPtr);
|
|
2947
|
-
if (ctx.p >= ctx.s.length || ((c = ctx.s.charCodeAt(ctx.p)) !== 32 || (unsafeSeparator = true, !isDigit(ctx.s.charCodeAt(ctx.p + 1)))) && c !== 84 && c !== 116) {
|
|
2948
|
-
let t2 = ctx.s.slice(startPtr, ctx.p);
|
|
2949
|
-
return readDate(ctx, t2, 3, false, startPtr);
|
|
2950
|
-
}
|
|
2951
|
-
if (ctx.s.charCodeAt(ctx.p += 3) !== 58)
|
|
2952
|
-
TomlError.x("invalid date-time: time part is malformed", ctx, startPtr);
|
|
2953
|
-
if (ctx.s.charCodeAt(ctx.p += 3) === 58)
|
|
2954
|
-
ctx.p += 3;
|
|
2955
|
-
if (ctx.s.charCodeAt(ctx.p) === 46)
|
|
2956
|
-
while (isDigit(ctx.s.charCodeAt(++ctx.p)))
|
|
2957
|
-
;
|
|
2958
|
-
if (c = ctx.s.charCodeAt(ctx.p)) {
|
|
2959
|
-
if (c === 90 || c === 122) {
|
|
2960
|
-
let t2 = ctx.s.slice(startPtr, ++ctx.p);
|
|
2961
|
-
return readDate(ctx, t2, 1, unsafeSeparator, startPtr, "[+00:00]");
|
|
2962
|
-
}
|
|
2963
|
-
if (c === 43 || c === 45) {
|
|
2964
|
-
let t2 = ctx.s.slice(startPtr, ctx.p += 6);
|
|
2965
|
-
return readDate(ctx, t2, 1, unsafeSeparator, startPtr, !ctx.ld && "[" + ctx.s.slice(ctx.p - 6, ctx.p) + "]");
|
|
2966
|
-
}
|
|
2967
|
-
}
|
|
2968
|
-
let t = ctx.s.slice(startPtr, ctx.p);
|
|
2969
|
-
return readDate(ctx, t, 2, unsafeSeparator, startPtr);
|
|
2970
|
-
}
|
|
2971
|
-
function parseTime(ctx, c, endChr) {
|
|
2972
|
-
let start = ctx.p;
|
|
2973
|
-
if (!isDigit(c) || !isDigit(ctx.s.charCodeAt(++ctx.p))) {
|
|
2974
|
-
return parseNumber(ctx, --ctx.p, c, 0, endChr);
|
|
2975
|
-
}
|
|
2976
|
-
if (ctx.s.charCodeAt(ctx.p += 4) === 58)
|
|
2977
|
-
ctx.p += 3;
|
|
2978
|
-
if (ctx.s.charCodeAt(ctx.p) === 46)
|
|
2979
|
-
while (isDigit(ctx.s.charCodeAt(++ctx.p)))
|
|
2980
|
-
;
|
|
2981
|
-
let t = ctx.s.slice(start, ctx.p);
|
|
2982
|
-
return readDate(ctx, t, 4, false, start);
|
|
2983
|
-
}
|
|
2984
|
-
function readDate(ctx, str, type, unsafeDelim, errPtr, temporalSuffix) {
|
|
2985
|
-
if (ctx.ld) {
|
|
2986
|
-
let date = new TomlDate(str, type, unsafeDelim);
|
|
2987
|
-
if (!date.isValid())
|
|
2988
|
-
TomlError.x("invalid date", ctx, errPtr);
|
|
2989
|
-
return date;
|
|
2990
|
-
}
|
|
2991
|
-
try {
|
|
2992
|
-
if (temporalSuffix)
|
|
2993
|
-
str += temporalSuffix;
|
|
2994
|
-
switch (type) {
|
|
2995
|
-
case 1:
|
|
2996
|
-
return Temporal.ZonedDateTime.from(str);
|
|
2997
|
-
case 2:
|
|
2998
|
-
return Temporal.PlainDateTime.from(str);
|
|
2999
|
-
case 3:
|
|
3000
|
-
return Temporal.PlainDate.from(str);
|
|
3001
|
-
case 4:
|
|
3002
|
-
return Temporal.PlainTime.from(str);
|
|
3003
|
-
}
|
|
3004
|
-
} catch (e) {
|
|
3005
|
-
TomlError.x(e instanceof Error ? e.message : "" + e, ctx, errPtr);
|
|
3006
|
-
}
|
|
3007
|
-
}
|
|
3008
|
-
|
|
3009
|
-
function skipComment(ctx) {
|
|
3010
|
-
for (; ctx.p < ctx.s.length; ctx.p++) {
|
|
3011
|
-
let c = ctx.s.charCodeAt(ctx.p);
|
|
3012
|
-
if (c === 10)
|
|
3013
|
-
break;
|
|
3014
|
-
if (c === 13 && ctx.s.charCodeAt(ctx.p + 1) === 10) {
|
|
3015
|
-
ctx.p++;
|
|
3016
|
-
break;
|
|
3017
|
-
}
|
|
3018
|
-
if (c < 32 && c !== 9 || c === 127) {
|
|
3019
|
-
TomlError.x("control characters are not allowed in comments", ctx);
|
|
3020
|
-
}
|
|
3021
|
-
}
|
|
3022
|
-
}
|
|
3023
|
-
function skipVoid(ctx, banNewLines, banComments) {
|
|
3024
|
-
let c;
|
|
3025
|
-
while (ctx.p < ctx.s.length) {
|
|
3026
|
-
while (ctx.p < ctx.s.length && ((c = ctx.s.charCodeAt(ctx.p)) === 32 || c === 9 || !banNewLines && (c === 10 || c === 13 && ctx.s.charCodeAt(ctx.p + 1) === 10)))
|
|
3027
|
-
ctx.p++;
|
|
3028
|
-
if (banComments || c !== 35)
|
|
3029
|
-
break;
|
|
3030
|
-
skipComment(ctx);
|
|
3031
|
-
}
|
|
3032
|
-
}
|
|
3033
|
-
|
|
3034
|
-
function parseKey(ctx, end = 61) {
|
|
3035
|
-
let startPtr;
|
|
3036
|
-
let state = 0;
|
|
3037
|
-
let parsed = [];
|
|
3038
|
-
let sliceStart;
|
|
3039
|
-
let c = ctx.s.charCodeAt(startPtr = ctx.p);
|
|
3040
|
-
do {
|
|
3041
|
-
if (c === end) {
|
|
3042
|
-
if (!state)
|
|
3043
|
-
TomlError.x("unexpected end of key", ctx);
|
|
3044
|
-
if (state === 1)
|
|
3045
|
-
parsed.push(ctx.s.slice(sliceStart, ctx.p));
|
|
3046
|
-
return ctx.p++, parsed;
|
|
3047
|
-
} else if (c === 46) {
|
|
3048
|
-
if (!state)
|
|
3049
|
-
TomlError.x("illegal empty bare key", ctx);
|
|
3050
|
-
if (state === 1)
|
|
3051
|
-
parsed.push(ctx.s.slice(sliceStart, ctx.p));
|
|
3052
|
-
state = 0;
|
|
3053
|
-
} else if (!state && (c === 34 || c === 39)) {
|
|
3054
|
-
if (c === ctx.s.charCodeAt(ctx.p + 1) && c === ctx.s.charCodeAt(ctx.p + 2))
|
|
3055
|
-
TomlError.x("illegal quoted key: multiline strings are not allowed", ctx);
|
|
3056
|
-
parsed.push(parseString(ctx));
|
|
3057
|
-
state = 2;
|
|
3058
|
-
ctx.p--;
|
|
3059
|
-
} else if (c === 32 || c === 9) {
|
|
3060
|
-
if (state === 1) {
|
|
3061
|
-
parsed.push(ctx.s.slice(sliceStart, ctx.p));
|
|
3062
|
-
state = 2;
|
|
3063
|
-
}
|
|
3064
|
-
} else if (state === 2 || c < 48 && c !== 45 || c > 57 && c < 65 || c > 90 && c < 97 && c !== 95 || c > 122) {
|
|
3065
|
-
TomlError.x("illegal character in key", ctx);
|
|
3066
|
-
} else if (!state) {
|
|
3067
|
-
state = 1;
|
|
3068
|
-
sliceStart = ctx.p;
|
|
3069
|
-
}
|
|
3070
|
-
} while (c = ctx.s.charCodeAt(++ctx.p));
|
|
3071
|
-
TomlError.x("incomplete key-value: cannot find end of key", ctx, startPtr);
|
|
3072
|
-
}
|
|
3073
|
-
function parseInlineTable(ctx) {
|
|
3074
|
-
let startPtr = ctx.p++;
|
|
3075
|
-
let res = /* @__PURE__ */ Object.create(null);
|
|
3076
|
-
let seen = /* @__PURE__ */ new Set();
|
|
3077
|
-
let c;
|
|
3078
|
-
while (ctx.p < ctx.s.length) {
|
|
3079
|
-
skipVoid(ctx);
|
|
3080
|
-
if ((c = ctx.s.charCodeAt(ctx.p)) === 125) {
|
|
3081
|
-
ctx.p++;
|
|
3082
|
-
return res;
|
|
3083
|
-
}
|
|
3084
|
-
let k;
|
|
3085
|
-
let t = res;
|
|
3086
|
-
let hasOwn = false;
|
|
3087
|
-
let errPtr = ctx.p;
|
|
3088
|
-
let key = parseKey(ctx);
|
|
3089
|
-
for (let i = 0; i < key.length; i++) {
|
|
3090
|
-
if (i)
|
|
3091
|
-
t = hasOwn ? t[k] : t[k] = /* @__PURE__ */ Object.create(null);
|
|
3092
|
-
k = key[i];
|
|
3093
|
-
if ((hasOwn = Object.hasOwn(t, k)) && (typeof t[k] !== "object" || seen.has(t[k]))) {
|
|
3094
|
-
TomlError.x("trying to redefine an already defined value", ctx, errPtr);
|
|
3095
|
-
}
|
|
3096
|
-
let unsafe = k === "__proto__";
|
|
3097
|
-
if (ctx.uk && (unsafe || k === "constructor")) {
|
|
3098
|
-
t = ctx.uk !== 1 && TomlError.x("document contains an unsafe property", ctx, errPtr);
|
|
3099
|
-
break;
|
|
3100
|
-
}
|
|
3101
|
-
if (!hasOwn && unsafe) {
|
|
3102
|
-
Object.defineProperty(t, k, { enumerable: true, configurable: true, writable: true });
|
|
3103
|
-
}
|
|
3104
|
-
}
|
|
3105
|
-
if (hasOwn) {
|
|
3106
|
-
TomlError.x("trying to redefine an already defined value", ctx, errPtr);
|
|
3107
|
-
}
|
|
3108
|
-
skipVoid(ctx, true, true);
|
|
3109
|
-
let value = extractValue(
|
|
3110
|
-
ctx,
|
|
3111
|
-
125
|
|
3112
|
-
/* } */
|
|
3113
|
-
);
|
|
3114
|
-
if (t && typeof (t[k] = value) === "object")
|
|
3115
|
-
seen.add(value);
|
|
3116
|
-
skipVoid(ctx);
|
|
3117
|
-
if ((c = ctx.s.charCodeAt(ctx.p++)) === 125) {
|
|
3118
|
-
return res;
|
|
3119
|
-
}
|
|
3120
|
-
if (c !== 44)
|
|
3121
|
-
TomlError.x("expected comma or end of structure", ctx, ctx.p - 1);
|
|
3122
|
-
}
|
|
3123
|
-
TomlError.x("unfinished table", ctx, startPtr);
|
|
3124
|
-
}
|
|
3125
|
-
function parseArray(ctx) {
|
|
3126
|
-
let startPtr = ctx.p++;
|
|
3127
|
-
let res = [];
|
|
3128
|
-
let c;
|
|
3129
|
-
while (ctx.p < ctx.s.length) {
|
|
3130
|
-
skipVoid(ctx);
|
|
3131
|
-
if ((c = ctx.s.charCodeAt(ctx.p)) === 93) {
|
|
3132
|
-
ctx.p++;
|
|
3133
|
-
return res;
|
|
3134
|
-
}
|
|
3135
|
-
res.push(extractValue(
|
|
3136
|
-
ctx,
|
|
3137
|
-
93
|
|
3138
|
-
/* ] */
|
|
3139
|
-
));
|
|
3140
|
-
skipVoid(ctx);
|
|
3141
|
-
if ((c = ctx.s.charCodeAt(ctx.p++)) === 93) {
|
|
3142
|
-
return res;
|
|
3143
|
-
}
|
|
3144
|
-
if (c !== 44)
|
|
3145
|
-
TomlError.x("expected comma or end of structure", ctx, ctx.p - 1);
|
|
3146
|
-
}
|
|
3147
|
-
TomlError.x("unfinished array", ctx, startPtr);
|
|
3148
|
-
}
|
|
3149
|
-
|
|
3150
|
-
function peekTable(ctx, key, table, meta, type) {
|
|
3151
|
-
let t = table;
|
|
3152
|
-
let m = meta;
|
|
3153
|
-
let k;
|
|
3154
|
-
let hasOwn = false;
|
|
3155
|
-
let state;
|
|
3156
|
-
for (let i = 0; i < key.length; i++) {
|
|
3157
|
-
if (i) {
|
|
3158
|
-
t = hasOwn ? t[k] : t[k] = /* @__PURE__ */ Object.create(null);
|
|
3159
|
-
m = (state = m[k]).c;
|
|
3160
|
-
if (type === 0 && (state.t === 1 || state.t === 2)) {
|
|
3161
|
-
return null;
|
|
3162
|
-
}
|
|
3163
|
-
if (state.t === 2) {
|
|
3164
|
-
let l = t.length - 1;
|
|
3165
|
-
t = t[l];
|
|
3166
|
-
m = m[l].c;
|
|
3167
|
-
}
|
|
3168
|
-
}
|
|
3169
|
-
k = key[i];
|
|
3170
|
-
if ((hasOwn = Object.hasOwn(t, k)) && m[k]?.t === 0 && m[k]?.d) {
|
|
3171
|
-
return null;
|
|
3172
|
-
}
|
|
3173
|
-
if (!hasOwn) {
|
|
3174
|
-
let unsafe = k === "__proto__";
|
|
3175
|
-
if (ctx.uk && (unsafe || k === "constructor"))
|
|
3176
|
-
return false;
|
|
3177
|
-
if (unsafe) {
|
|
3178
|
-
Object.defineProperty(t, k, { enumerable: true, configurable: true, writable: true });
|
|
3179
|
-
Object.defineProperty(m, k, { enumerable: true, configurable: true, writable: true });
|
|
3180
|
-
}
|
|
3181
|
-
m[k] = {
|
|
3182
|
-
t: i < key.length - 1 && type === 2 ? 3 : type,
|
|
3183
|
-
d: false,
|
|
3184
|
-
i: 0,
|
|
3185
|
-
c: /* @__PURE__ */ Object.create(null)
|
|
3186
|
-
};
|
|
3187
|
-
}
|
|
3188
|
-
}
|
|
3189
|
-
state = m[k];
|
|
3190
|
-
if (state.t !== type && !(type === 1 && state.t === 3)) {
|
|
3191
|
-
return null;
|
|
3192
|
-
}
|
|
3193
|
-
if (type === 2) {
|
|
3194
|
-
if (!state.d) {
|
|
3195
|
-
state.d = true;
|
|
3196
|
-
t[k] = [];
|
|
3197
|
-
}
|
|
3198
|
-
t[k].push(t = /* @__PURE__ */ Object.create(null));
|
|
3199
|
-
state.c[state.i++] = state = { t: 1, d: false, i: 0, c: /* @__PURE__ */ Object.create(null) };
|
|
3200
|
-
}
|
|
3201
|
-
if (state.d) {
|
|
3202
|
-
return null;
|
|
3203
|
-
}
|
|
3204
|
-
state.d = true;
|
|
3205
|
-
if (type === 1) {
|
|
3206
|
-
t = hasOwn ? t[k] : t[k] = /* @__PURE__ */ Object.create(null);
|
|
3207
|
-
} else if (type === 0 && hasOwn) {
|
|
3208
|
-
return null;
|
|
3209
|
-
}
|
|
3210
|
-
return [k, t, state.c];
|
|
3211
|
-
}
|
|
3212
|
-
function validateTablePeek(ctx, peek, ptr) {
|
|
3213
|
-
if (peek === null || ctx.uk === 2)
|
|
3214
|
-
TomlError.x(peek === null ? "trying to redefine an already defined table or value" : "document contains an unsafe property", ctx, ptr);
|
|
3215
|
-
}
|
|
3216
|
-
function parse(toml, options = {}) {
|
|
3217
|
-
let ctx = {
|
|
3218
|
-
s: toml,
|
|
3219
|
-
p: 0,
|
|
3220
|
-
d: options.maxDepth ?? 1e3,
|
|
3221
|
-
bi: options.integersAsBigInt ?? false,
|
|
3222
|
-
ld: options.useLegacyDate ?? true,
|
|
3223
|
-
uk: options.unsafeKeyBehaviour === "throw" ? 2 : options.unsafeKeyBehaviour === "drop" ? 1 : 0
|
|
3224
|
-
};
|
|
3225
|
-
let res = /* @__PURE__ */ Object.create(null);
|
|
3226
|
-
let meta = /* @__PURE__ */ Object.create(null);
|
|
3227
|
-
let tmp;
|
|
3228
|
-
let skipping = false;
|
|
3229
|
-
let tbl = res;
|
|
3230
|
-
let m = meta;
|
|
3231
|
-
if (toml.charCodeAt(0) === 65279)
|
|
3232
|
-
ctx.p++;
|
|
3233
|
-
skipVoid(ctx);
|
|
3234
|
-
while (ctx.p < toml.length) {
|
|
3235
|
-
if (toml.charCodeAt(ctx.p) === 91) {
|
|
3236
|
-
let isTableArray = toml.charCodeAt(++ctx.p) === 91;
|
|
3237
|
-
tmp = ctx.p += +isTableArray;
|
|
3238
|
-
skipping = false;
|
|
3239
|
-
let k = parseKey(
|
|
3240
|
-
ctx,
|
|
3241
|
-
93
|
|
3242
|
-
/* ] */
|
|
3243
|
-
);
|
|
3244
|
-
if (isTableArray) {
|
|
3245
|
-
if (toml.charCodeAt(ctx.p) !== 93) {
|
|
3246
|
-
TomlError.x("expected end of table array declaration", ctx);
|
|
3247
|
-
}
|
|
3248
|
-
ctx.p++;
|
|
3249
|
-
}
|
|
3250
|
-
let p = peekTable(
|
|
3251
|
-
ctx,
|
|
3252
|
-
k,
|
|
3253
|
-
res,
|
|
3254
|
-
meta,
|
|
3255
|
-
isTableArray ? 2 : 1
|
|
3256
|
-
/* Type.EXPLICIT */
|
|
3257
|
-
);
|
|
3258
|
-
if (!p) {
|
|
3259
|
-
validateTablePeek(ctx, p, tmp);
|
|
3260
|
-
skipping = true;
|
|
3261
|
-
} else {
|
|
3262
|
-
m = p[2];
|
|
3263
|
-
tbl = p[1];
|
|
3264
|
-
}
|
|
3265
|
-
} else {
|
|
3266
|
-
tmp = ctx.p;
|
|
3267
|
-
let k = parseKey(ctx);
|
|
3268
|
-
let p = peekTable(
|
|
3269
|
-
ctx,
|
|
3270
|
-
k,
|
|
3271
|
-
tbl,
|
|
3272
|
-
m,
|
|
3273
|
-
0
|
|
3274
|
-
/* Type.DOTTED */
|
|
3275
|
-
);
|
|
3276
|
-
if (!p && !skipping)
|
|
3277
|
-
validateTablePeek(ctx, p, tmp);
|
|
3278
|
-
skipVoid(ctx, true, true);
|
|
3279
|
-
let v = extractValue(ctx, void 0);
|
|
3280
|
-
if (p && !skipping)
|
|
3281
|
-
p[1][p[0]] = v;
|
|
3282
|
-
}
|
|
3283
|
-
skipVoid(ctx, true);
|
|
3284
|
-
if (ctx.p < toml.length && (tmp = toml.charCodeAt(ctx.p)) !== 10 && (tmp !== 13 || toml.charCodeAt(ctx.p + 1) !== 10)) {
|
|
3285
|
-
TomlError.x("each key-value declaration must be followed by an end-of-line", ctx);
|
|
3286
|
-
}
|
|
3287
|
-
skipVoid(ctx);
|
|
3288
|
-
}
|
|
3289
|
-
return res;
|
|
3290
|
-
}
|
|
3291
|
-
|
|
3292
2593
|
const BARE_KEY = /^[A-Za-z0-9_-]+$/;
|
|
3293
2594
|
function formatTomlKey(key) {
|
|
3294
2595
|
return BARE_KEY.test(key) ? key : JSON.stringify(key);
|
|
@@ -3453,7 +2754,7 @@ function applyOne(text, edit) {
|
|
|
3453
2754
|
}
|
|
3454
2755
|
function parseToml(text) {
|
|
3455
2756
|
try {
|
|
3456
|
-
return parse(text);
|
|
2757
|
+
return codexAccount.parse(text);
|
|
3457
2758
|
} catch (error) {
|
|
3458
2759
|
const message = error instanceof Error ? error.message.split("\n")[0] : String(error);
|
|
3459
2760
|
throw new fileStore.ModelConfigError("invalid-toml", `Not valid TOML: ${message}`);
|
|
@@ -3504,7 +2805,7 @@ function verifyTomlEdit(oldText, newText, edits) {
|
|
|
3504
2805
|
const before = parseToml(oldText);
|
|
3505
2806
|
let after;
|
|
3506
2807
|
try {
|
|
3507
|
-
after = parse(newText);
|
|
2808
|
+
after = codexAccount.parse(newText);
|
|
3508
2809
|
} catch (error) {
|
|
3509
2810
|
throw new fileStore.ModelConfigError("unsafe-edit", `Edit would produce invalid TOML (${error instanceof Error ? error.message.split("\n")[0] : String(error)}); the file layout is not one this editor can change safely`);
|
|
3510
2811
|
}
|
|
@@ -5355,6 +4656,12 @@ function createAutoRestart(deps) {
|
|
|
5355
4656
|
setStatus(sessionId, { state: "waiting", reason: "turn-active", since, target: staleness.target });
|
|
5356
4657
|
return;
|
|
5357
4658
|
}
|
|
4659
|
+
const pending = deps.upgradePending?.() ?? null;
|
|
4660
|
+
if (pending) {
|
|
4661
|
+
deps.log?.(`[auto-restart] ${sessionId} left to the next daemon: upgrade to ${pending} pending`);
|
|
4662
|
+
setStatus(sessionId, { state: "waiting", reason: "upgrade-pending", since, target: staleness.target });
|
|
4663
|
+
return;
|
|
4664
|
+
}
|
|
5358
4665
|
let result;
|
|
5359
4666
|
try {
|
|
5360
4667
|
result = await deps.restart(sessionId, staleness);
|
|
@@ -5444,6 +4751,7 @@ function createAutoRestart(deps) {
|
|
|
5444
4751
|
automationRunning: deps.automationRunning(request.sessionId),
|
|
5445
4752
|
resumable: false,
|
|
5446
4753
|
attempt,
|
|
4754
|
+
upgradePending: deps.upgradePending?.() ?? null,
|
|
5447
4755
|
inFlight,
|
|
5448
4756
|
lastStartedAt
|
|
5449
4757
|
};
|
|
@@ -5460,6 +4768,7 @@ function createAutoRestart(deps) {
|
|
|
5460
4768
|
automationRunning: deps.automationRunning(request.sessionId),
|
|
5461
4769
|
resumable,
|
|
5462
4770
|
attempt: attempts.get(request.sessionId) ?? null,
|
|
4771
|
+
upgradePending: deps.upgradePending?.() ?? null,
|
|
5463
4772
|
inFlight,
|
|
5464
4773
|
lastStartedAt
|
|
5465
4774
|
};
|
|
@@ -5801,6 +5110,28 @@ class ClaudeAuthService {
|
|
|
5801
5110
|
}
|
|
5802
5111
|
}
|
|
5803
5112
|
|
|
5113
|
+
function forkSpawnAccount(requested, parentSessionId, parentAccount) {
|
|
5114
|
+
if (requested !== void 0) return requested;
|
|
5115
|
+
if (!parentSessionId) return void 0;
|
|
5116
|
+
return parentAccount(parentSessionId);
|
|
5117
|
+
}
|
|
5118
|
+
const REASON_TEXT = {
|
|
5119
|
+
"missing": "does not exist on this machine",
|
|
5120
|
+
"missing-secret": "has no key / token on this machine",
|
|
5121
|
+
"expired": "sign-in has expired",
|
|
5122
|
+
"invalid": "key was rejected",
|
|
5123
|
+
"agent-mismatch": "is for a different agent"
|
|
5124
|
+
};
|
|
5125
|
+
function accountUnavailableError(error, scope) {
|
|
5126
|
+
const reason = index.agentProfileUnavailableReason(error);
|
|
5127
|
+
if (!reason) return null;
|
|
5128
|
+
const detail = error.replace(/^agent-profile-unavailable:[a-z-]+:?\s*/, "");
|
|
5129
|
+
return `Account unavailable (${reason}): ${detail ? `${detail} \u2014 ` : ""}${accountUnavailableHint(reason, scope)}`;
|
|
5130
|
+
}
|
|
5131
|
+
function accountUnavailableHint(reason, scope) {
|
|
5132
|
+
return `${REASON_TEXT[reason] ?? reason}. Not run on the machine login. Fix: sign in again (Settings \u2192 Models & accounts, or \`very-happy account login\` / \`very-happy account test\`), or choose another account for this ${scope}.`;
|
|
5133
|
+
}
|
|
5134
|
+
|
|
5804
5135
|
const INTERNAL_CLAUDE_EVENT_TYPES = /* @__PURE__ */ new Set(["file-history-snapshot", "change", "queue-operation"]);
|
|
5805
5136
|
function parseLines(lines) {
|
|
5806
5137
|
const out = [];
|
|
@@ -6621,6 +5952,27 @@ async function removeTeamWorktree(resource) {
|
|
|
6621
5952
|
function teamInitialModelMeta(model) {
|
|
6622
5953
|
return model ? { model, modelIntent: model } : { modelIntent: index.MODEL_INTENT_CONFIG };
|
|
6623
5954
|
}
|
|
5955
|
+
function teamOperationAccount(op) {
|
|
5956
|
+
if (op.agentProfile === void 0) return void 0;
|
|
5957
|
+
return op.agentProfile === null ? null : op.agentProfile.id;
|
|
5958
|
+
}
|
|
5959
|
+
function teamAccountRefusal(resolve, op) {
|
|
5960
|
+
const agent = op.assistant === "claude" || op.assistant === "codex" ? op.assistant : null;
|
|
5961
|
+
const requested = teamOperationAccount(op);
|
|
5962
|
+
if (!resolve) return null;
|
|
5963
|
+
if (!agent) return typeof requested === "string" ? `agent-profile-unavailable:agent-mismatch: accounts are not supported for ${op.assistant} yet` : null;
|
|
5964
|
+
try {
|
|
5965
|
+
resolve(agent, requested);
|
|
5966
|
+
return null;
|
|
5967
|
+
} catch (error) {
|
|
5968
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
5969
|
+
return index.agentProfileUnavailableReason(message) ? teamAccountError(message) : null;
|
|
5970
|
+
}
|
|
5971
|
+
}
|
|
5972
|
+
function teamAccountError(raw) {
|
|
5973
|
+
const reason = index.agentProfileUnavailableReason(raw);
|
|
5974
|
+
return `${raw}${reason ? ` \u2014 ${accountUnavailableHint(reason, "team member")}` : ""}`.slice(0, 1e3);
|
|
5975
|
+
}
|
|
6624
5976
|
function refusalCode(error) {
|
|
6625
5977
|
const code = axios.isAxiosError(error) ? error.response?.data?.error : void 0;
|
|
6626
5978
|
return typeof code === "string" && /^[a-z_]{1,64}$/.test(code) ? ` (${code})` : "";
|
|
@@ -6641,6 +5993,14 @@ function createTeamWorker(deps) {
|
|
|
6641
5993
|
await action(op.teamId, `complete-${op.id}`, { type: "complete-operation", operationId: op.id, machineId: deps.machineId, claimId: receipt.claimId, ...receipt.sessionId ? { sessionId: receipt.sessionId } : {}, ...op.type === "spawn" && receipt.directory ? { workingDirectory: receipt.directory } : {} });
|
|
6642
5994
|
writeReceipt$1(home, { ...receipt, phase: "completed" });
|
|
6643
5995
|
}
|
|
5996
|
+
async function refuseForAccount(op, receipt, error) {
|
|
5997
|
+
const { retryAt: _retryAt, sessionId: _sessionId, ...rest } = receipt;
|
|
5998
|
+
const next = { ...rest, phase: "prepared", spawnFailures: (receipt.spawnFailures ?? 0) + 1 };
|
|
5999
|
+
writeReceipt$1(home, next);
|
|
6000
|
+
await action(op.teamId, `account-refused-${op.id}-${receipt.retryConsumed ?? 0}`, { type: "fail-operation", operationId: op.id, machineId: deps.machineId, claimId: receipt.claimId, error }).catch(() => {
|
|
6001
|
+
});
|
|
6002
|
+
deps.log(`Teams operation ${op.id} refused: account unavailable`);
|
|
6003
|
+
}
|
|
6644
6004
|
async function execute(op) {
|
|
6645
6005
|
let receipt = readReceipt(home, op.id);
|
|
6646
6006
|
let credential;
|
|
@@ -6680,6 +6040,11 @@ function createTeamWorker(deps) {
|
|
|
6680
6040
|
return;
|
|
6681
6041
|
}
|
|
6682
6042
|
if (!op.directory) throw new Error("No repository selected for worker");
|
|
6043
|
+
const refusal = teamAccountRefusal(deps.resolveAccount, op);
|
|
6044
|
+
if (refusal) {
|
|
6045
|
+
await refuseForAccount(op, receipt, refusal);
|
|
6046
|
+
return;
|
|
6047
|
+
}
|
|
6683
6048
|
let resource;
|
|
6684
6049
|
try {
|
|
6685
6050
|
const repository = await resolveTeamRepository(home, op.directory, (id) => {
|
|
@@ -6706,7 +6071,12 @@ function createTeamWorker(deps) {
|
|
|
6706
6071
|
configuration.writePrivateFileSync(scopeFile, JSON.stringify({ serverUrl: server, scopeToken: credential.token, teamId: op.teamId, botId: op.botId, taskId: op.taskId, attemptId: op.attemptId }));
|
|
6707
6072
|
receipt = { ...receipt, ...resource, scopeFile, phase: "spawning" };
|
|
6708
6073
|
writeReceipt$1(home, receipt);
|
|
6709
|
-
const
|
|
6074
|
+
const account = teamOperationAccount(op);
|
|
6075
|
+
const spawned = await deps.spawn({ directory: resource.directory, agent: op.assistant === "pi-acp" ? "pi" : op.assistant, permissionMode: op.permissionMode === "bypassPermissions" ? "bypassPermissions" : "default", spawnedBy: "teams", environmentVariables: { VH_TEAM_SCOPE_FILE: scopeFile, VH_TEAM_OPERATION_ID: op.id }, ...account !== void 0 ? { agentProfileId: account } : {} });
|
|
6076
|
+
if (spawned.type === "error" && index.agentProfileUnavailableReason(spawned.errorMessage)) {
|
|
6077
|
+
await refuseForAccount(op, receipt, teamAccountError(spawned.errorMessage));
|
|
6078
|
+
return;
|
|
6079
|
+
}
|
|
6710
6080
|
if (spawned.type === "error" && spawned.startupExit?.exited) {
|
|
6711
6081
|
const now = Date.now();
|
|
6712
6082
|
receipt = machineMetadata.afterStartupFailure(receipt, now);
|
|
@@ -7153,6 +6523,30 @@ const AUTOMATION_LOG_READ_MS = 3e4;
|
|
|
7153
6523
|
const AUTOMATION_UNAVAILABLE_LOG_MS = 10 * 6e4;
|
|
7154
6524
|
const AUTOMATION_MAX_CONCURRENT = index.AUTOMATION_CLAIM_MAX_RUNS;
|
|
7155
6525
|
const AUTOMATION_SPAWNED_BY = "automation";
|
|
6526
|
+
const AUTOMATION_ACCOUNT_UNAVAILABLE = "account_unavailable";
|
|
6527
|
+
const AUTOMATION_ACCOUNT_HISTORY_REJECTED = "account_history_rejected";
|
|
6528
|
+
function turnFailureReason(turn) {
|
|
6529
|
+
if (turn.refusal === "agent-profile-unavailable") return AUTOMATION_ACCOUNT_UNAVAILABLE;
|
|
6530
|
+
if (turn.refusal === "agent-profile-history-rejected") return AUTOMATION_ACCOUNT_HISTORY_REJECTED;
|
|
6531
|
+
return `turn_${turn.status}`;
|
|
6532
|
+
}
|
|
6533
|
+
async function alignStickyAccount(accounts, agent, sessionId, requested) {
|
|
6534
|
+
const current = accounts.sessionAccount(sessionId);
|
|
6535
|
+
let target;
|
|
6536
|
+
try {
|
|
6537
|
+
target = accounts.resolve(agent, requested !== void 0 ? requested : current);
|
|
6538
|
+
} catch (error) {
|
|
6539
|
+
const message = error instanceof Error ? error.message : String(error);
|
|
6540
|
+
return { error: accountUnavailableError(message, "automation") ?? message, reason: AUTOMATION_ACCOUNT_UNAVAILABLE };
|
|
6541
|
+
}
|
|
6542
|
+
if (target === current) return null;
|
|
6543
|
+
try {
|
|
6544
|
+
await accounts.rebind(sessionId, target);
|
|
6545
|
+
} catch (error) {
|
|
6546
|
+
return { error: `Could not move the sticky session to the run's account: ${error instanceof Error ? error.message : String(error)}`, reason: "send_failed" };
|
|
6547
|
+
}
|
|
6548
|
+
return null;
|
|
6549
|
+
}
|
|
7156
6550
|
function automationPromptHeader(name, runId) {
|
|
7157
6551
|
return `[Very Happy automation "${name}" run ${runId}; finish with automation_report (runId ${runId}) or \`very-happy auto report --run ${runId}\`]`;
|
|
7158
6552
|
}
|
|
@@ -7316,6 +6710,7 @@ function createAutomationRunner(deps) {
|
|
|
7316
6710
|
function wakeThenSend(claimed, sessionId, text, stickyKey) {
|
|
7317
6711
|
const { run, automation } = claimed;
|
|
7318
6712
|
const item = track(claimed, "send", sessionId);
|
|
6713
|
+
if (stickyKey) item.stickyKey = stickyKey;
|
|
7319
6714
|
item.waking = true;
|
|
7320
6715
|
gating++;
|
|
7321
6716
|
void (async () => {
|
|
@@ -7400,8 +6795,17 @@ ${action.prompt}`, { localId: `automation-${run.id}` });
|
|
|
7400
6795
|
}
|
|
7401
6796
|
const permissionMode = spawnAgents.resolveSpawnPermissionMode(agent, action.permissionMode ?? void 0);
|
|
7402
6797
|
const stickyKey = action.sticky ? template.renderTemplate(action.sticky.key, context) : void 0;
|
|
6798
|
+
const requestedAccount = index.resolveLaunchAgentProfile({ explicit: action.agentProfile, project: claimed.projectAgentProfiles, agent, machineId: deps.machineId }).agentProfileId;
|
|
6799
|
+
const accountAgent = agent === "claude" || agent === "codex" ? agent : null;
|
|
7403
6800
|
if (stickyKey) {
|
|
7404
6801
|
const bound = claimed.stickies.find((sticky) => sticky.key === stickyKey);
|
|
6802
|
+
if (bound && (wakeable(bound.sessionId) || deps.live(bound.sessionId)) && deps.accounts && accountAgent) {
|
|
6803
|
+
const problem = await alignStickyAccount(deps.accounts, accountAgent, bound.sessionId, requestedAccount);
|
|
6804
|
+
if (problem) {
|
|
6805
|
+
await failNow(claimed, "send", problem.error, problem.reason, bound.sessionId);
|
|
6806
|
+
return;
|
|
6807
|
+
}
|
|
6808
|
+
}
|
|
7405
6809
|
if (bound && wakeable(bound.sessionId)) {
|
|
7406
6810
|
wakeThenSend(claimed, bound.sessionId, `${header}
|
|
7407
6811
|
${action.prompt}`, stickyKey);
|
|
@@ -7416,7 +6820,9 @@ ${action.prompt}`, { localId: `automation-${run.id}` });
|
|
|
7416
6820
|
await failNow(claimed, "send", `Sticky session delivery failed: ${error instanceof Error ? error.message : String(error)}`, "send_failed", bound.sessionId);
|
|
7417
6821
|
return;
|
|
7418
6822
|
}
|
|
7419
|
-
|
|
6823
|
+
const item2 = track(claimed, "send", bound.sessionId);
|
|
6824
|
+
item2.stickyKey = stickyKey;
|
|
6825
|
+
await reportRunning(item2, bound.sessionId, stickyKey);
|
|
7420
6826
|
return;
|
|
7421
6827
|
}
|
|
7422
6828
|
if (bound) await client.deleteSticky(automation.id, stickyKey).catch(() => deps.log(`Automation ${automation.name}: stale sticky ${stickyKey} not cleared`));
|
|
@@ -7435,8 +6841,13 @@ ${action.prompt}`, { localId: `automation-${run.id}` });
|
|
|
7435
6841
|
}
|
|
7436
6842
|
}
|
|
7437
6843
|
persist({ runId: run.id, automationId: automation.id, kind: "spawn", phase: "starting", claimId: run.claimId, stickyKey, ...action.worktree ? { directory } : {} });
|
|
7438
|
-
const spawned = await deps.spawn({ directory, agent, permissionMode, spawnedBy: AUTOMATION_SPAWNED_BY, environmentVariables: stickyKey ? { ...env, VH_AUTOMATION_STICKY: "1" } : env });
|
|
6844
|
+
const spawned = await deps.spawn({ directory, agent, permissionMode, spawnedBy: AUTOMATION_SPAWNED_BY, environmentVariables: stickyKey ? { ...env, VH_AUTOMATION_STICKY: "1" } : env, ...requestedAccount !== void 0 ? { agentProfileId: requestedAccount } : {} });
|
|
7439
6845
|
if (spawned.type !== "success") {
|
|
6846
|
+
const accountError = spawned.type === "error" ? accountUnavailableError(spawned.errorMessage, "automation") : null;
|
|
6847
|
+
if (accountError) {
|
|
6848
|
+
await failNow(claimed, "spawn", accountError, AUTOMATION_ACCOUNT_UNAVAILABLE);
|
|
6849
|
+
return;
|
|
6850
|
+
}
|
|
7440
6851
|
await failNow(claimed, "spawn", spawned.type === "error" ? spawned.errorMessage : "Directory approval required", "spawn_failed");
|
|
7441
6852
|
return;
|
|
7442
6853
|
}
|
|
@@ -7485,7 +6896,11 @@ ${action.prompt}`, { localId: `automation-${run.id}`, ...meta });
|
|
|
7485
6896
|
continue;
|
|
7486
6897
|
}
|
|
7487
6898
|
item.waitingOnBackground = false;
|
|
7488
|
-
|
|
6899
|
+
const reason = turn.status === "failed" || turn.status === "cancelled" ? turnFailureReason(turn) : null;
|
|
6900
|
+
if (reason === AUTOMATION_ACCOUNT_HISTORY_REJECTED && item.stickyKey) {
|
|
6901
|
+
await client.deleteSticky(item.automationId, item.stickyKey).catch(() => deps.log(`Automation run ${item.runId}: sticky ${item.stickyKey} not cleared`));
|
|
6902
|
+
}
|
|
6903
|
+
if (reason) await finish(item, { claimId: item.claimId, status: "failed", sessionId, error: turn.error ?? `Turn ${turn.status}`, needsAttention: true, attentionReason: reason });
|
|
7489
6904
|
else await finish(item, { claimId: item.claimId, status: "done", sessionId, summary: template.clipText(turn.answer, index.AUTOMATION_SUMMARY_MAX_CHARS) });
|
|
7490
6905
|
}
|
|
7491
6906
|
}
|
|
@@ -7677,6 +7092,7 @@ async function startDaemon() {
|
|
|
7677
7092
|
const initialMachineMetadata = machineMetadata.getInitialMachineMetadata();
|
|
7678
7093
|
const startupCliAvailability = machineMetadata.getStartupCliAvailability();
|
|
7679
7094
|
let claudeAuthServiceRef = null;
|
|
7095
|
+
let accountServiceRef = null;
|
|
7680
7096
|
let cliUpdateStateRef = null;
|
|
7681
7097
|
let lastHandoverHold = null;
|
|
7682
7098
|
let claudeCredentialStoreSetting = (await persistence.readSettings()).claudeCredentialStore === "file" ? "file" : "auto";
|
|
@@ -7805,6 +7221,7 @@ async function startDaemon() {
|
|
|
7805
7221
|
const sessionIdToFinishedSession = /* @__PURE__ */ new Map();
|
|
7806
7222
|
let teamWorker;
|
|
7807
7223
|
let autoRestart;
|
|
7224
|
+
let bundleReplacedSeen = false;
|
|
7808
7225
|
let automationRunner;
|
|
7809
7226
|
let projectPresence;
|
|
7810
7227
|
const persisted = persistence.readPersistedSessions();
|
|
@@ -8100,8 +7517,22 @@ async function startDaemon() {
|
|
|
8100
7517
|
if (options.spawnedBy) {
|
|
8101
7518
|
extraEnv.HAPPY_SPAWNED_BY = options.spawnedBy;
|
|
8102
7519
|
}
|
|
7520
|
+
let spawnAccountId = null;
|
|
7521
|
+
delete extraEnv[store.SPAWN_ACCOUNT_ENV];
|
|
7522
|
+
const accountAgent = (options.agent ?? "claude") === "claude" ? "claude" : options.agent === "codex" ? "codex" : null;
|
|
7523
|
+
if (accountAgent && accountServiceRef) {
|
|
7524
|
+
try {
|
|
7525
|
+
const requested = forkSpawnAccount(options.agentProfileId, options.parentSessionId, (id) => accountServiceRef.sessionAccount(id));
|
|
7526
|
+
spawnAccountId = accountServiceRef.resolveSpawnAccount(accountAgent, requested);
|
|
7527
|
+
} catch (error) {
|
|
7528
|
+
return { type: "error", errorMessage: error instanceof Error ? error.message : String(error) };
|
|
7529
|
+
}
|
|
7530
|
+
if (spawnAccountId) extraEnv[store.SPAWN_ACCOUNT_ENV] = spawnAccountId;
|
|
7531
|
+
} else if (options.agentProfileId) {
|
|
7532
|
+
return { type: "error", errorMessage: `agent-profile-unavailable:agent-mismatch: accounts are not supported for ${options.agent} yet` };
|
|
7533
|
+
}
|
|
8103
7534
|
const claudeAuthStatus = claudeAuthServiceRef?.current()?.status;
|
|
8104
|
-
if ((options.agent ?? "claude") === "claude" && claudeAuthStatus) {
|
|
7535
|
+
if ((options.agent ?? "claude") === "claude" && claudeAuthStatus && !spawnAccountId) {
|
|
8105
7536
|
extraEnv.HAPPY_CLAUDE_AUTH_STATUS = claudeAuthStatus;
|
|
8106
7537
|
}
|
|
8107
7538
|
logger.logger.debug(`[DAEMON RUN] Environment variable keys (before expansion) (${Object.keys(extraEnv).length}): ${Object.keys(extraEnv).join(", ")}`);
|
|
@@ -8545,6 +7976,7 @@ async function startDaemon() {
|
|
|
8545
7976
|
}
|
|
8546
7977
|
};
|
|
8547
7978
|
const restartCounts = /* @__PURE__ */ new Map();
|
|
7979
|
+
const accountRestartCounts = /* @__PURE__ */ new Map();
|
|
8548
7980
|
const autoRestartExits = /* @__PURE__ */ new Set();
|
|
8549
7981
|
const stopSessionAndWait = async (happySessionId, timeoutMs = 8e3) => {
|
|
8550
7982
|
const targets = /* @__PURE__ */ new Set();
|
|
@@ -8594,8 +8026,9 @@ async function startDaemon() {
|
|
|
8594
8026
|
};
|
|
8595
8027
|
const restartSessionImpl = async (happySessionId, options) => {
|
|
8596
8028
|
try {
|
|
8597
|
-
const
|
|
8598
|
-
const
|
|
8029
|
+
const counts = options?.account ? accountRestartCounts : restartCounts;
|
|
8030
|
+
const prior = counts.get(happySessionId) ?? 0;
|
|
8031
|
+
const decision = options?.auto ? { allowed: true } : decideRestart(prior, options?.account ? DEFAULT_MAX_ACCOUNT_RESTARTS : DEFAULT_MAX_RESTARTS);
|
|
8599
8032
|
if (!decision.allowed) {
|
|
8600
8033
|
return { type: "error", errorMessage: `restart:${decision.reason}` };
|
|
8601
8034
|
}
|
|
@@ -8646,7 +8079,7 @@ async function startDaemon() {
|
|
|
8646
8079
|
if (model) args.push("--model", model);
|
|
8647
8080
|
const permissionMode = spawnAgents.sanitizeSpawnPermissionMode(options?.permissionMode ?? (options?.keepPublishedPermissionMode ? publishedRelaunchPermissionMode(metadata) : void 0));
|
|
8648
8081
|
if (permissionMode) args.push("--permission-mode", permissionMode);
|
|
8649
|
-
if (!options?.auto)
|
|
8082
|
+
if (!options?.auto) counts.set(happySessionId, recordRestartAttempt(prior));
|
|
8650
8083
|
const teamEnv = await teamRelaunchEnvFor(happySessionId, metadata);
|
|
8651
8084
|
const result = await spawnTrackedHappyProcess({
|
|
8652
8085
|
args,
|
|
@@ -8812,6 +8245,11 @@ async function startDaemon() {
|
|
|
8812
8245
|
startedBy: metadata?.startedBy ?? null
|
|
8813
8246
|
};
|
|
8814
8247
|
};
|
|
8248
|
+
const upgradePending = () => sessionLock.pendingUpgradeVersion({
|
|
8249
|
+
daemonVersion: _package.packageJson.version,
|
|
8250
|
+
autoUpdate: cliUpdateStateRef?.autoUpdate,
|
|
8251
|
+
bundleReplaced: bundleReplacedSeen
|
|
8252
|
+
});
|
|
8815
8253
|
const autoRestartScheduler = createAutoRestart({
|
|
8816
8254
|
enabled: () => autoRestartSetting,
|
|
8817
8255
|
quietMs: sessionLock.resolveQuietMs(),
|
|
@@ -8866,6 +8304,7 @@ async function startDaemon() {
|
|
|
8866
8304
|
if (!row || typeof row.active !== "boolean") return null;
|
|
8867
8305
|
return { active: row.active, archived: row.archivedAt != null };
|
|
8868
8306
|
},
|
|
8307
|
+
upgradePending,
|
|
8869
8308
|
publish: (sessions) => {
|
|
8870
8309
|
void apiMachineRef?.setAutoRestartSessions(sessions);
|
|
8871
8310
|
},
|
|
@@ -8885,6 +8324,8 @@ async function startDaemon() {
|
|
|
8885
8324
|
// B-501: `very-happy send --resume`
|
|
8886
8325
|
restartSession,
|
|
8887
8326
|
// B-794: `very-happy session provider`
|
|
8327
|
+
getAgentProfiles: () => accountServiceRef?.state() ?? null,
|
|
8328
|
+
// B-850a: `very-happy account list`
|
|
8888
8329
|
requestShutdown: () => requestShutdown("happy-cli"),
|
|
8889
8330
|
onHappySessionWebhook,
|
|
8890
8331
|
onSessionStateEvent,
|
|
@@ -8912,6 +8353,9 @@ async function startDaemon() {
|
|
|
8912
8353
|
// B-505: `daemon list` shows which sessions have a turn in flight, so an
|
|
8913
8354
|
// operator can check the WHOLE machine before a supervised restart.
|
|
8914
8355
|
isTurnActive: (sessionId) => turnActivity.activeSessions().includes(sessionId),
|
|
8356
|
+
// B-856: the auto-restart classification, readable locally (it is encrypted on the server).
|
|
8357
|
+
getAutoRestartStatus: (sessionId) => autoRestartScheduler.statuses()[sessionId],
|
|
8358
|
+
getDaemonInfo: () => ({ version: _package.packageJson.version, upgradePending: upgradePending(), autoRestartEnabled: autoRestartSetting }),
|
|
8915
8359
|
pushClipboard: (text, terminalId) => {
|
|
8916
8360
|
if (!apiMachineRef) {
|
|
8917
8361
|
return { delivered: false, truncated: false, totalBytes: 0, error: "daemon is still starting up" };
|
|
@@ -9066,6 +8510,36 @@ async function startDaemon() {
|
|
|
9066
8510
|
return autoRestartSetting;
|
|
9067
8511
|
});
|
|
9068
8512
|
setTimeout(() => autoRestartScheduler.sweep(), 5e3).unref?.();
|
|
8513
|
+
const accountService$1 = new accountService.AccountService({
|
|
8514
|
+
home: configuration.configuration.happyHomeDir,
|
|
8515
|
+
env: process.env,
|
|
8516
|
+
daemonPid: process.pid,
|
|
8517
|
+
spawnPty: (env) => daemonAccounts.spawnSetupTokenPty(os$1.homedir(), env),
|
|
8518
|
+
restartSession: async (sessionId) => {
|
|
8519
|
+
const result = await restartSession(sessionId, { keepPublishedPermissionMode: true, account: true });
|
|
8520
|
+
if (result.type === "success") return { ok: true };
|
|
8521
|
+
const error = result.type === "error" ? result.errorMessage : "unexpected restart result";
|
|
8522
|
+
const stillRunning = [...pidToTrackedSession.values()].some((s) => s.happySessionId === sessionId && isPidAlive(s.pid));
|
|
8523
|
+
return { ok: false, notRunning: error.startsWith("restart-precheck:not-tracked"), stillRunning, error };
|
|
8524
|
+
},
|
|
8525
|
+
onChanged: () => {
|
|
8526
|
+
void apiMachine.publishAgentProfiles();
|
|
8527
|
+
},
|
|
8528
|
+
// B-850b: a Codex account never binds to a Claude session and vice versa.
|
|
8529
|
+
sessionAgent: (sessionId) => {
|
|
8530
|
+
for (const tracked of pidToTrackedSession.values()) {
|
|
8531
|
+
if (tracked.happySessionId !== sessionId) continue;
|
|
8532
|
+
const flavor = tracked.happySessionMetadataFromLocalWebhook?.flavor ?? "claude";
|
|
8533
|
+
return flavor === "codex" ? "codex" : flavor === "claude" ? "claude" : flavor;
|
|
8534
|
+
}
|
|
8535
|
+
return void 0;
|
|
8536
|
+
}
|
|
8537
|
+
});
|
|
8538
|
+
accountServiceRef = accountService$1;
|
|
8539
|
+
apiMachine.setAgentProfileService(accountService$1);
|
|
8540
|
+
const stopAccountWatch = daemonAccounts.watchAccountFiles(configuration.configuration.happyHomeDir, () => {
|
|
8541
|
+
void apiMachine.publishAgentProfiles();
|
|
8542
|
+
});
|
|
9069
8543
|
const webPanelsSync = startWebPanelsSync({
|
|
9070
8544
|
statMtime: async () => (await fs.stat(configuration.configuration.settingsFile).catch(() => null))?.mtimeMs ?? null,
|
|
9071
8545
|
readRaw: async () => (await persistence.readSettings()).webPanels,
|
|
@@ -9200,6 +8674,7 @@ async function startDaemon() {
|
|
|
9200
8674
|
try {
|
|
9201
8675
|
const currentMtimeMs = require$$0.statSync(bundlePath).mtimeMs;
|
|
9202
8676
|
bundleReplaced = currentMtimeMs !== initialBundleMtimeMs;
|
|
8677
|
+
if (bundleReplaced) bundleReplacedSeen = true;
|
|
9203
8678
|
} catch {
|
|
9204
8679
|
}
|
|
9205
8680
|
}
|
|
@@ -9226,6 +8701,8 @@ async function startDaemon() {
|
|
|
9226
8701
|
policyAnnouncements.stop();
|
|
9227
8702
|
stopAgentVersionChecks();
|
|
9228
8703
|
claudeAuthService.stop();
|
|
8704
|
+
stopAccountWatch();
|
|
8705
|
+
accountService$1.dispose();
|
|
9229
8706
|
apiMachine.shutdown();
|
|
9230
8707
|
await stopControlServer();
|
|
9231
8708
|
await controlClient.cleanupDaemonState();
|
|
@@ -9278,6 +8755,7 @@ async function startDaemon() {
|
|
|
9278
8755
|
if (remaining.some(isPidAlive)) throw new Error("Worker still running; cleanup retained");
|
|
9279
8756
|
},
|
|
9280
8757
|
live: (id) => [...pidToTrackedSession.values()].some((s) => s.happySessionId === id && isPidAlive(s.pid)),
|
|
8758
|
+
...accountServiceRef ? { resolveAccount: (agent, requested) => accountServiceRef.resolveSpawnAccount(agent, requested) } : {},
|
|
9281
8759
|
log: (message) => logger.logger.debug(`[DAEMON RUN] ${message}`)
|
|
9282
8760
|
});
|
|
9283
8761
|
automationRunner = createAutomationRunner({
|
|
@@ -9299,6 +8777,17 @@ async function startDaemon() {
|
|
|
9299
8777
|
return waitForSessionLive(id, (sid) => [...pidToTrackedSession.values()].some((s) => s.happySessionId === sid && isPidAlive(s.pid)));
|
|
9300
8778
|
},
|
|
9301
8779
|
joinProject: (sessionId, projectId) => spawnAgents.joinProject(projectsClient, sessionId, { kind: "explicit", projectId }, { via: "automation" }),
|
|
8780
|
+
// B-850d: sticky sessions follow the run's account; unusable → refused.
|
|
8781
|
+
...accountServiceRef ? {
|
|
8782
|
+
accounts: {
|
|
8783
|
+
sessionAccount: (id) => accountServiceRef.sessionAccount(id),
|
|
8784
|
+
resolve: (agent, requested) => accountServiceRef.resolveSpawnAccount(agent, requested),
|
|
8785
|
+
rebind: async (sessionId, accountId) => {
|
|
8786
|
+
const result = await accountServiceRef.bind({ sessionId, accountId });
|
|
8787
|
+
if (result.restart === "failed") throw new Error(result.error ?? "restart failed");
|
|
8788
|
+
}
|
|
8789
|
+
}
|
|
8790
|
+
} : {},
|
|
9302
8791
|
log: (message) => logger.logger.debug(`[DAEMON RUN] ${message}`)
|
|
9303
8792
|
});
|
|
9304
8793
|
projectPresence = createProjectPresenceReporter({
|
|
@@ -9357,6 +8846,8 @@ async function startDaemon() {
|
|
|
9357
8846
|
} catch (error) {
|
|
9358
8847
|
logger.logger.debug("[DAEMON RUN] Mirror shutdown failed:", error);
|
|
9359
8848
|
}
|
|
8849
|
+
stopAccountWatch();
|
|
8850
|
+
accountService$1.dispose();
|
|
9360
8851
|
apiMachine.shutdown();
|
|
9361
8852
|
await stopControlServer();
|
|
9362
8853
|
await controlClient.cleanupDaemonState();
|