git.iko.soy/vibebox
on main help sign in
feat: added list and clean cli cmd
c98bc78robcholz
Cargo.lock+169−244
compare with main
unifiedsplit
@@ -32,6 +32,56 @@ version = "0.2.21"
32source = "registry+https://github.com/rust-lang/crates.io-index"
32source = "registry+https://github.com/rust-lang/crates.io-index"
33checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
33checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
34
34
35+[[package]]
36+name = "anstream"
37+version = "0.6.21"
38+source = "registry+https://github.com/rust-lang/crates.io-index"
39+checksum = "43d5b281e737544384e969a5ccad3f1cdd24b48086a0fc1b2a5262a26b8f4f4a"
40+dependencies = [
41+ "anstyle",
42+ "anstyle-parse",
43+ "anstyle-query",
44+ "anstyle-wincon",
45+ "colorchoice",
46+ "is_terminal_polyfill",
47+ "utf8parse",
48+]
49+
50+[[package]]
51+name = "anstyle"
52+version = "1.0.13"
53+source = "registry+https://github.com/rust-lang/crates.io-index"
54+checksum = "5192cca8006f1fd4f7237516f40fa183bb07f8fbdfedaa0036de5ea9b0b45e78"
55+
56+[[package]]
57+name = "anstyle-parse"
58+version = "0.2.7"
59+source = "registry+https://github.com/rust-lang/crates.io-index"
60+checksum = "4e7644824f0aa2c7b9384579234ef10eb7efb6a0deb83f9630a49594dd9c15c2"
61+dependencies = [
62+ "utf8parse",
63+]
64+
65+[[package]]
66+name = "anstyle-query"
67+version = "1.1.5"
68+source = "registry+https://github.com/rust-lang/crates.io-index"
69+checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc"
70+dependencies = [
71+ "windows-sys 0.61.2",
72+]
73+
74+[[package]]
75+name = "anstyle-wincon"
76+version = "3.0.11"
77+source = "registry+https://github.com/rust-lang/crates.io-index"
78+checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d"
79+dependencies = [
80+ "anstyle",
81+ "once_cell_polyfill",
82+ "windows-sys 0.61.2",
83+]
84+
35[[package]]
85[[package]]
36name = "backtrace"
86name = "backtrace"
37version = "0.3.76"
87version = "0.3.76"
@@ -68,12 +118,6 @@ version = "3.19.1"
68source = "registry+https://github.com/rust-lang/crates.io-index"
118source = "registry+https://github.com/rust-lang/crates.io-index"
69checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"
119checksum = "5dd9dc738b7a8311c7ade152424974d8115f2cdad61e8dab8dac9f2362298510"
70
120
71−[[package]]
72−name = "bytes"
73−version = "1.11.1"
74−source = "registry+https://github.com/rust-lang/crates.io-index"
75−checksum = "1e748733b7cbc798e1434b6ac524f0c1ff2ab456fe201501e6497c8417a4fc33"
76−
77[[package]]
121[[package]]
78name = "cassowary"
122name = "cassowary"
79version = "0.3.0"
123version = "0.3.0"
@@ -95,6 +139,46 @@ version = "1.0.4"
95source = "registry+https://github.com/rust-lang/crates.io-index"
139source = "registry+https://github.com/rust-lang/crates.io-index"
96checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
140checksum = "9330f8b2ff13f34540b44e946ef35111825727b38d33286ef986142615121801"
97
141
142+[[package]]
143+name = "clap"
144+version = "4.5.57"
145+source = "registry+https://github.com/rust-lang/crates.io-index"
146+checksum = "6899ea499e3fb9305a65d5ebf6e3d2248c5fab291f300ad0a704fbe142eae31a"
147+dependencies = [
148+ "clap_builder",
149+ "clap_derive",
150+]
151+
152+[[package]]
153+name = "clap_builder"
154+version = "4.5.57"
155+source = "registry+https://github.com/rust-lang/crates.io-index"
156+checksum = "7b12c8b680195a62a8364d16b8447b01b6c2c8f9aaf68bee653be34d4245e238"
157+dependencies = [
158+ "anstream",
159+ "anstyle",
160+ "clap_lex",
161+ "strsim",
162+]
163+
164+[[package]]
165+name = "clap_derive"
166+version = "4.5.55"
167+source = "registry+https://github.com/rust-lang/crates.io-index"
168+checksum = "a92793da1a46a5f2a02a6f4c46c6496b28c43638adea8306fcb0caa1634f24e5"
169+dependencies = [
170+ "heck",
171+ "proc-macro2",
172+ "quote",
173+ "syn",
174+]
175+
176+[[package]]
177+name = "clap_lex"
178+version = "0.7.7"
179+source = "registry+https://github.com/rust-lang/crates.io-index"
180+checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32"
181+
98[[package]]
182[[package]]
99name = "color-eyre"
183name = "color-eyre"
100version = "0.6.5"
184version = "0.6.5"
@@ -122,6 +206,12 @@ dependencies = [
122 "tracing-error",
206 "tracing-error",
123]
207]
124
208
209+[[package]]
210+name = "colorchoice"
211+version = "1.0.4"
212+source = "registry+https://github.com/rust-lang/crates.io-index"
213+checksum = "b05b61dc5112cbb17e4b6cd61790d9845d13888356391624cbe7e41efeac1e75"
214+
125[[package]]
215[[package]]
126name = "compact_str"
216name = "compact_str"
127version = "0.8.1"
217version = "0.8.1"
@@ -136,6 +226,19 @@ dependencies = [
136 "static_assertions",
226 "static_assertions",
137]
227]
138
228
229+[[package]]
230+name = "console"
231+version = "0.16.2"
232+source = "registry+https://github.com/rust-lang/crates.io-index"
233+checksum = "03e45a4a8926227e4197636ba97a9fc9b00477e9f4bd711395687c5f0734bec4"
234+dependencies = [
235+ "encode_unicode",
236+ "libc",
237+ "once_cell",
238+ "unicode-width 0.2.0",
239+ "windows-sys 0.61.2",
240+]
241+
139[[package]]
242[[package]]
140name = "crossterm"
243name = "crossterm"
141version = "0.28.1"
244version = "0.28.1"
@@ -206,6 +309,18 @@ dependencies = [
206 "serde_core",
309 "serde_core",
207]
310]
208
311
312+[[package]]
313+name = "dialoguer"
314+version = "0.12.0"
315+source = "registry+https://github.com/rust-lang/crates.io-index"
316+checksum = "25f104b501bf2364e78d0d3974cbc774f738f5865306ed128e1e0d7499c0ad96"
317+dependencies = [
318+ "console",
319+ "shell-words",
320+ "tempfile",
321+ "zeroize",
322+]
323+
209[[package]]
324[[package]]
210name = "dispatch2"
325name = "dispatch2"
211version = "0.3.0"
326version = "0.3.0"
@@ -224,6 +339,12 @@ version = "1.15.0"
224source = "registry+https://github.com/rust-lang/crates.io-index"
339source = "registry+https://github.com/rust-lang/crates.io-index"
225checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
340checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
226
341
342+[[package]]
343+name = "encode_unicode"
344+version = "1.0.0"
345+source = "registry+https://github.com/rust-lang/crates.io-index"
346+checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0"
347+
227[[package]]
348[[package]]
228name = "equivalent"
349name = "equivalent"
229version = "1.0.2"
350version = "1.0.2"
@@ -262,95 +383,12 @@ version = "0.1.5"
262source = "registry+https://github.com/rust-lang/crates.io-index"
383source = "registry+https://github.com/rust-lang/crates.io-index"
263checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
384checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
264
385
265−[[package]]
266−name = "futures"
267−version = "0.3.31"
268−source = "registry+https://github.com/rust-lang/crates.io-index"
269−checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
270−dependencies = [
271− "futures-channel",
272− "futures-core",
273− "futures-executor",
274− "futures-io",
275− "futures-sink",
276− "futures-task",
277− "futures-util",
278−]
279−
280−[[package]]
281−name = "futures-channel"
282−version = "0.3.31"
283−source = "registry+https://github.com/rust-lang/crates.io-index"
284−checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
285−dependencies = [
286− "futures-core",
287− "futures-sink",
288−]
289−
290[[package]]
386[[package]]
291name = "futures-core"
387name = "futures-core"
292version = "0.3.31"
388version = "0.3.31"
293source = "registry+https://github.com/rust-lang/crates.io-index"
389source = "registry+https://github.com/rust-lang/crates.io-index"
294checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
390checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
295
391
296−[[package]]
297−name = "futures-executor"
298−version = "0.3.31"
299−source = "registry+https://github.com/rust-lang/crates.io-index"
300−checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
301−dependencies = [
302− "futures-core",
303− "futures-task",
304− "futures-util",
305−]
306−
307−[[package]]
308−name = "futures-io"
309−version = "0.3.31"
310−source = "registry+https://github.com/rust-lang/crates.io-index"
311−checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
312−
313−[[package]]
314−name = "futures-macro"
315−version = "0.3.31"
316−source = "registry+https://github.com/rust-lang/crates.io-index"
317−checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
318−dependencies = [
319− "proc-macro2",
320− "quote",
321− "syn",
322−]
323−
324−[[package]]
325−name = "futures-sink"
326−version = "0.3.31"
327−source = "registry+https://github.com/rust-lang/crates.io-index"
328−checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
329−
330−[[package]]
331−name = "futures-task"
332−version = "0.3.31"
333−source = "registry+https://github.com/rust-lang/crates.io-index"
334−checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
335−
336−[[package]]
337−name = "futures-util"
338−version = "0.3.31"
339−source = "registry+https://github.com/rust-lang/crates.io-index"
340−checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
341−dependencies = [
342− "futures-channel",
343− "futures-core",
344− "futures-io",
345− "futures-macro",
346− "futures-sink",
347− "futures-task",
348− "memchr",
349− "pin-project-lite",
350− "pin-utils",
351− "slab",
352−]
353−
354[[package]]
392[[package]]
355name = "getrandom"
393name = "getrandom"
356version = "0.3.4"
394version = "0.3.4"
@@ -436,6 +474,12 @@ dependencies = [
436 "syn",
474 "syn",
437]
475]
438
476
477+[[package]]
478+name = "is_terminal_polyfill"
479+version = "1.70.2"
480+source = "registry+https://github.com/rust-lang/crates.io-index"
481+checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695"
482+
439[[package]]
483[[package]]
440name = "itertools"
484name = "itertools"
441version = "0.13.0"
485version = "0.13.0"
@@ -467,12 +511,6 @@ version = "1.5.0"
467source = "registry+https://github.com/rust-lang/crates.io-index"
511source = "registry+https://github.com/rust-lang/crates.io-index"
468checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
512checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
469
513
470−[[package]]
471−name = "lexopt"
472−version = "0.3.1"
473−source = "registry+https://github.com/rust-lang/crates.io-index"
474−checksum = "9fa0e2a1fcbe2f6be6c42e342259976206b383122fc152e872795338b5a3f3a7"
475−
476[[package]]
514[[package]]
477name = "libc"
515name = "libc"
478version = "0.2.180"
516version = "0.2.180"
@@ -557,7 +595,7 @@ version = "0.50.3"
557source = "registry+https://github.com/rust-lang/crates.io-index"
595source = "registry+https://github.com/rust-lang/crates.io-index"
558checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
596checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5"
559dependencies = [
597dependencies = [
560− "windows-sys 0.59.0",
598+ "windows-sys 0.61.2",
561]
599]
562
600
563[[package]]
601[[package]]
@@ -646,6 +684,12 @@ version = "1.21.3"
646source = "registry+https://github.com/rust-lang/crates.io-index"
684source = "registry+https://github.com/rust-lang/crates.io-index"
647checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
685checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d"
648
686
687+[[package]]
688+name = "once_cell_polyfill"
689+version = "1.70.2"
690+source = "registry+https://github.com/rust-lang/crates.io-index"
691+checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe"
692+
649[[package]]
693[[package]]
650name = "owo-colors"
694name = "owo-colors"
651version = "4.2.3"
695version = "4.2.3"
@@ -687,12 +731,6 @@ version = "0.2.16"
687source = "registry+https://github.com/rust-lang/crates.io-index"
731source = "registry+https://github.com/rust-lang/crates.io-index"
688checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
732checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
689
733
690−[[package]]
691−name = "pin-utils"
692−version = "0.1.0"
693−source = "registry+https://github.com/rust-lang/crates.io-index"
694−checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
695−
696[[package]]
734[[package]]
697name = "powerfmt"
735name = "powerfmt"
698version = "0.2.0"
736version = "0.2.0"
@@ -868,6 +906,12 @@ dependencies = [
868 "lazy_static",
906 "lazy_static",
869]
907]
870
908
909+[[package]]
910+name = "shell-words"
911+version = "1.1.1"
912+source = "registry+https://github.com/rust-lang/crates.io-index"
913+checksum = "dc6fe69c597f9c37bfeeeeeb33da3530379845f10be461a66d16d03eca2ded77"
914+
871[[package]]
915[[package]]
872name = "signal-hook"
916name = "signal-hook"
873version = "0.3.18"
917version = "0.3.18"
@@ -899,28 +943,12 @@ dependencies = [
899 "libc",
943 "libc",
900]
944]
901
945
902−[[package]]
903−name = "slab"
904−version = "0.4.12"
905−source = "registry+https://github.com/rust-lang/crates.io-index"
906−checksum = "0c790de23124f9ab44544d7ac05d60440adc586479ce501c1d6d7da3cd8c9cf5"
907−
908[[package]]
946[[package]]
909name = "smallvec"
947name = "smallvec"
910version = "1.15.1"
948version = "1.15.1"
911source = "registry+https://github.com/rust-lang/crates.io-index"
949source = "registry+https://github.com/rust-lang/crates.io-index"
912checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
950checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
913
951
914−[[package]]
915−name = "socket2"
916−version = "0.6.2"
917−source = "registry+https://github.com/rust-lang/crates.io-index"
918−checksum = "86f4aa3ad99f2088c990dfa82d367e19cb29268ed67c574d10d0a4bfe71f07e0"
919−dependencies = [
920− "libc",
921− "windows-sys 0.60.2",
922−]
923−
924[[package]]
952[[package]]
925name = "static_assertions"
953name = "static_assertions"
926version = "1.1.0"
954version = "1.1.0"
@@ -1039,34 +1067,6 @@ dependencies = [
1039 "time-core",
1067 "time-core",
1040]
1068]
1041
1069
1042−[[package]]
1043−name = "tokio"
1044−version = "1.49.0"
1045−source = "registry+https://github.com/rust-lang/crates.io-index"
1046−checksum = "72a2903cd7736441aac9df9d7688bd0ce48edccaadf181c3b90be801e81d3d86"
1047−dependencies = [
1048− "bytes",
1049− "libc",
1050− "mio",
1051− "parking_lot",
1052− "pin-project-lite",
1053− "signal-hook-registry",
1054− "socket2",
1055− "tokio-macros",
1056− "windows-sys 0.61.2",
1057−]
1058−
1059−[[package]]
1060−name = "tokio-macros"
1061−version = "2.6.0"
1062−source = "registry+https://github.com/rust-lang/crates.io-index"
1063−checksum = "af407857209536a95c8e56f8231ef2c2e2aff839b22e07a1ffcbc617e9db9fa5"
1064−dependencies = [
1065− "proc-macro2",
1066− "quote",
1067− "syn",
1068−]
1069−
1070[[package]]
1070[[package]]
1071name = "toml"
1071name = "toml"
1072version = "0.9.11+spec-1.1.0"
1072version = "0.9.11+spec-1.1.0"
@@ -1177,16 +1177,6 @@ dependencies = [
1177 "tracing-log",
1177 "tracing-log",
1178]
1178]
1179
1179
1180−[[package]]
1181−name = "tui-textarea"
1182−version = "0.7.0"
1183−source = "registry+https://github.com/rust-lang/crates.io-index"
1184−checksum = "0a5318dd619ed73c52a9417ad19046724effc1287fb75cdcc4eca1d6ac1acbae"
1185−dependencies = [
1186− "ratatui",
1187− "unicode-width 0.2.0",
1188−]
1189−
1190[[package]]
1180[[package]]
1191name = "unicode-ident"
1181name = "unicode-ident"
1192version = "1.0.22"
1182version = "1.0.22"
@@ -1222,6 +1212,12 @@ version = "0.2.0"
1222source = "registry+https://github.com/rust-lang/crates.io-index"
1212source = "registry+https://github.com/rust-lang/crates.io-index"
1223checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
1213checksum = "1fc81956842c57dac11422a97c3b8195a1ff727f06e85c84ed2e8aa277c9a0fd"
1224
1214
1215+[[package]]
1216+name = "utf8parse"
1217+version = "0.2.2"
1218+source = "registry+https://github.com/rust-lang/crates.io-index"
1219+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
1220+
1225[[package]]
1221[[package]]
1226name = "uuid"
1222name = "uuid"
1227version = "1.20.0"
1223version = "1.20.0"
@@ -1245,11 +1241,11 @@ name = "vibebox"
1245version = "0.1.0"
1241version = "0.1.0"
1246dependencies = [
1242dependencies = [
1247 "block2",
1243 "block2",
1244+ "clap",
1248 "color-eyre",
1245 "color-eyre",
1249 "crossterm",
1246 "crossterm",
1247+ "dialoguer",
1250 "dispatch2",
1248 "dispatch2",
1251− "futures",
1252− "lexopt",
1253 "libc",
1249 "libc",
1254 "objc2",
1250 "objc2",
1255 "objc2-foundation",
1251 "objc2-foundation",
@@ -1259,12 +1255,9 @@ dependencies = [
1259 "tempfile",
1255 "tempfile",
1260 "thiserror",
1256 "thiserror",
1261 "time",
1257 "time",
1262− "tokio",
1263 "toml",
1258 "toml",
1264 "tracing",
1259 "tracing",
1265 "tracing-subscriber",
1260 "tracing-subscriber",
1266− "tui-textarea",
1267− "unicode-width 0.2.0",
1268 "uuid",
1261 "uuid",
1269]
1262]
1270
1263
@@ -1362,16 +1355,7 @@ version = "0.59.0"
1362source = "registry+https://github.com/rust-lang/crates.io-index"
1355source = "registry+https://github.com/rust-lang/crates.io-index"
1363checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
1356checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
1364dependencies = [
1357dependencies = [
1365− "windows-targets 0.52.6",
1358+ "windows-targets",
1366−]
1367−
1368−[[package]]
1369−name = "windows-sys"
1370−version = "0.60.2"
1371−source = "registry+https://github.com/rust-lang/crates.io-index"
1372−checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
1373−dependencies = [
1374− "windows-targets 0.53.5",
1375]
1359]
1376
1360
1377[[package]]
1361[[package]]
@@ -1389,31 +1373,14 @@ version = "0.52.6"
1389source = "registry+https://github.com/rust-lang/crates.io-index"
1373source = "registry+https://github.com/rust-lang/crates.io-index"
1390checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
1374checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
1391dependencies = [
1375dependencies = [
1392− "windows_aarch64_gnullvm 0.52.6",
1376+ "windows_aarch64_gnullvm",
1393− "windows_aarch64_msvc 0.52.6",
1377+ "windows_aarch64_msvc",
1394− "windows_i686_gnu 0.52.6",
1378+ "windows_i686_gnu",
1395− "windows_i686_gnullvm 0.52.6",
1379+ "windows_i686_gnullvm",
1396− "windows_i686_msvc 0.52.6",
1380+ "windows_i686_msvc",
1397− "windows_x86_64_gnu 0.52.6",
1381+ "windows_x86_64_gnu",
1398− "windows_x86_64_gnullvm 0.52.6",
1382+ "windows_x86_64_gnullvm",
1399− "windows_x86_64_msvc 0.52.6",
1383+ "windows_x86_64_msvc",
1400−]
1401−
1402−[[package]]
1403−name = "windows-targets"
1404−version = "0.53.5"
1405−source = "registry+https://github.com/rust-lang/crates.io-index"
1406−checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3"
1407−dependencies = [
1408− "windows-link",
1409− "windows_aarch64_gnullvm 0.53.1",
1410− "windows_aarch64_msvc 0.53.1",
1411− "windows_i686_gnu 0.53.1",
1412− "windows_i686_gnullvm 0.53.1",
1413− "windows_i686_msvc 0.53.1",
1414− "windows_x86_64_gnu 0.53.1",
1415− "windows_x86_64_gnullvm 0.53.1",
1416− "windows_x86_64_msvc 0.53.1",
1417]
1384]
1418
1385
1419[[package]]
1386[[package]]
@@ -1422,96 +1389,48 @@ version = "0.52.6"
1422source = "registry+https://github.com/rust-lang/crates.io-index"
1389source = "registry+https://github.com/rust-lang/crates.io-index"
1423checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
1390checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
1424
1391
1425−[[package]]
1426−name = "windows_aarch64_gnullvm"
1427−version = "0.53.1"
1428−source = "registry+https://github.com/rust-lang/crates.io-index"
1429−checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53"
1430−
1431[[package]]
1392[[package]]
1432name = "windows_aarch64_msvc"
1393name = "windows_aarch64_msvc"
1433version = "0.52.6"
1394version = "0.52.6"
1434source = "registry+https://github.com/rust-lang/crates.io-index"
1395source = "registry+https://github.com/rust-lang/crates.io-index"
1435checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
1396checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
1436
1397
1437−[[package]]
1438−name = "windows_aarch64_msvc"
1439−version = "0.53.1"
1440−source = "registry+https://github.com/rust-lang/crates.io-index"
1441−checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006"
1442−
1443[[package]]
1398[[package]]
1444name = "windows_i686_gnu"
1399name = "windows_i686_gnu"
1445version = "0.52.6"
1400version = "0.52.6"
1446source = "registry+https://github.com/rust-lang/crates.io-index"
1401source = "registry+https://github.com/rust-lang/crates.io-index"
1447checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
1402checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
1448
1403
1449−[[package]]
1450−name = "windows_i686_gnu"
1451−version = "0.53.1"
1452−source = "registry+https://github.com/rust-lang/crates.io-index"
1453−checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3"
1454−
1455[[package]]
1404[[package]]
1456name = "windows_i686_gnullvm"
1405name = "windows_i686_gnullvm"
1457version = "0.52.6"
1406version = "0.52.6"
1458source = "registry+https://github.com/rust-lang/crates.io-index"
1407source = "registry+https://github.com/rust-lang/crates.io-index"
1459checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
1408checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
1460
1409
1461−[[package]]
1462−name = "windows_i686_gnullvm"
1463−version = "0.53.1"
1464−source = "registry+https://github.com/rust-lang/crates.io-index"
1465−checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c"
1466−
1467[[package]]
1410[[package]]
1468name = "windows_i686_msvc"
1411name = "windows_i686_msvc"
1469version = "0.52.6"
1412version = "0.52.6"
1470source = "registry+https://github.com/rust-lang/crates.io-index"
1413source = "registry+https://github.com/rust-lang/crates.io-index"
1471checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
1414checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
1472
1415
1473−[[package]]
1474−name = "windows_i686_msvc"
1475−version = "0.53.1"
1476−source = "registry+https://github.com/rust-lang/crates.io-index"
1477−checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2"
1478−
1479[[package]]
1416[[package]]
1480name = "windows_x86_64_gnu"
1417name = "windows_x86_64_gnu"
1481version = "0.52.6"
1418version = "0.52.6"
1482source = "registry+https://github.com/rust-lang/crates.io-index"
1419source = "registry+https://github.com/rust-lang/crates.io-index"
1483checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
1420checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
1484
1421
1485−[[package]]
1486−name = "windows_x86_64_gnu"
1487−version = "0.53.1"
1488−source = "registry+https://github.com/rust-lang/crates.io-index"
1489−checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499"
1490−
1491[[package]]
1422[[package]]
1492name = "windows_x86_64_gnullvm"
1423name = "windows_x86_64_gnullvm"
1493version = "0.52.6"
1424version = "0.52.6"
1494source = "registry+https://github.com/rust-lang/crates.io-index"
1425source = "registry+https://github.com/rust-lang/crates.io-index"
1495checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
1426checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
1496
1427
1497−[[package]]
1498−name = "windows_x86_64_gnullvm"
1499−version = "0.53.1"
1500−source = "registry+https://github.com/rust-lang/crates.io-index"
1501−checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1"
1502−
1503[[package]]
1428[[package]]
1504name = "windows_x86_64_msvc"
1429name = "windows_x86_64_msvc"
1505version = "0.52.6"
1430version = "0.52.6"
1506source = "registry+https://github.com/rust-lang/crates.io-index"
1431source = "registry+https://github.com/rust-lang/crates.io-index"
1507checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
1432checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
1508
1433
1509−[[package]]
1510−name = "windows_x86_64_msvc"
1511−version = "0.53.1"
1512−source = "registry+https://github.com/rust-lang/crates.io-index"
1513−checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650"
1514−
1515[[package]]
1434[[package]]
1516name = "winnow"
1435name = "winnow"
1517version = "0.7.14"
1436version = "0.7.14"
@@ -1523,3 +1442,9 @@ name = "wit-bindgen"
1523version = "0.51.0"
1442version = "0.51.0"
1524source = "registry+https://github.com/rust-lang/crates.io-index"
1443source = "registry+https://github.com/rust-lang/crates.io-index"
1525checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
1444checksum = "d7249219f66ced02969388cf2bb044a09756a083d0fab1e566056b04d9fbcaa5"
1445+
1446+[[package]]
1447+name = "zeroize"
1448+version = "1.8.2"
1449+source = "registry+https://github.com/rust-lang/crates.io-index"
1450+checksum = "b97154e67e32c85465826e8bcc1c59429aaaf107c1e4a9e53c8d8ccd5eff88d0"
Cargo.toml+2−5
@@ -20,7 +20,7 @@ objc2-virtualization = "*"
20block2 = "*"
20block2 = "*"
21dispatch2 = "*"
21dispatch2 = "*"
22libc = "*"
22libc = "*"
23−lexopt = "0.3"
23+clap = { version = "4", features = ["derive"] }
24serde = { version = "1", features = ["derive"] }
24serde = { version = "1", features = ["derive"] }
25tempfile = "3"
25tempfile = "3"
26thiserror = "2.0.18"
26thiserror = "2.0.18"
@@ -29,10 +29,7 @@ toml = "0.9.8"
29uuid = { version = "1", features = ["v7", "serde"] }
29uuid = { version = "1", features = ["v7", "serde"] }
30color-eyre = "0.6.3"
30color-eyre = "0.6.3"
31crossterm = { version = "0.28.1", features = ["event-stream"] }
31crossterm = { version = "0.28.1", features = ["event-stream"] }
32−futures = "0.3.31"
33ratatui = { version = "0.29.0", features = ["unstable-rendered-line-info"] }
32ratatui = { version = "0.29.0", features = ["unstable-rendered-line-info"] }
34−tokio = { version = "1.40.0", features = ["full"] }
35−tui-textarea = { version = "0.7.0", default-features = false, features = ["ratatui"] }
36−unicode-width = "0.2"
37tracing = "0.1"
33tracing = "0.1"
38tracing-subscriber = { version = "0.3", features = ["env-filter"] }
34tracing-subscriber = { version = "0.3", features = ["env-filter"] }
35+dialoguer = "0.12.0"
src/bin/vibebox-cli.rs+155−6
@@ -2,24 +2,52 @@ use std::{
2 env,
2 env,
3 ffi::OsString,
3 ffi::OsString,
4 io::{self, IsTerminal, Write},
4 io::{self, IsTerminal, Write},
5+ path::PathBuf,
5 sync::{Arc, Mutex},
6 sync::{Arc, Mutex},
6};
7};
7
8
9+use clap::Parser;
8use color_eyre::Result;
10use color_eyre::Result;
11+use dialoguer::Confirm;
12+use time::OffsetDateTime;
13+use time::format_description::well_known::Rfc3339;
9use tracing_subscriber::EnvFilter;
14use tracing_subscriber::EnvFilter;
10
15
11use vibebox::tui::{AppState, VmInfo};
16use vibebox::tui::{AppState, VmInfo};
12−use vibebox::{SessionManager, commands, config, instance, tui, vm, vm_manager};
17+use vibebox::{SessionManager, commands, config, instance, session_manager, tui, vm, vm_manager};
18+
19+#[derive(Debug, Parser)]
20+#[command(name = "vibebox", version, about = "Vibebox CLI")]
21+struct Cli {
22+ /// Path to vibebox.toml (relative to the current directory)
23+ #[arg(short = 'c', long = "config", value_name = "PATH", global = true)]
24+ config: Option<PathBuf>,
25+ #[command(subcommand)]
26+ command: Option<Command>,
27+}
28+
29+#[derive(Debug, clap::Subcommand)]
30+enum Command {
31+ /// List all sessions
32+ List,
33+ /// Delete the current project's .vibebox directory
34+ Clean,
35+}
13
36
14fn main() -> Result<()> {
37fn main() -> Result<()> {
15 init_tracing();
38 init_tracing();
16 color_eyre::install()?;
39 color_eyre::install()?;
17
40
18− let raw_args: Vec<OsString> = env::args_os().collect();
41+ let cli = Cli::parse();
19−
20 let cwd = env::current_dir().map_err(|err| color_eyre::eyre::eyre!(err.to_string()))?;
42 let cwd = env::current_dir().map_err(|err| color_eyre::eyre::eyre!(err.to_string()))?;
21 tracing::info!(cwd = %cwd.display(), "starting vibebox cli");
43 tracing::info!(cwd = %cwd.display(), "starting vibebox cli");
22− let config = config::load_config(&cwd);
44+ if let Some(command) = cli.command {
45+ return handle_command(command, &cwd);
46+ }
47+
48+ let config_override = cli.config.clone();
49+ let raw_args: Vec<OsString> = env::args_os().collect();
50+ let config = config::load_config_with_path(&cwd, config_override.as_deref());
23
51
24 if env::var("VIBEBOX_VM_MANAGER").as_deref() == Ok("1") {
52 if env::var("VIBEBOX_VM_MANAGER").as_deref() == Ok("1") {
25 tracing::info!("starting vm manager mode");
53 tracing::info!("starting vm manager mode");
@@ -74,14 +102,135 @@ fn main() -> Result<()> {
74 }
102 }
75
103
76 tracing::info!(auto_shutdown_ms, "auto shutdown config");
104 tracing::info!(auto_shutdown_ms, "auto shutdown config");
105+ let manager_conn =
77− let manager_conn = vm_manager::ensure_manager(&raw_args, auto_shutdown_ms)
106+ vm_manager::ensure_manager(&raw_args, auto_shutdown_ms, config_override.as_deref())
78− .map_err(|err| color_eyre::eyre::eyre!(err.to_string()))?;
107+ .map_err(|err| color_eyre::eyre::eyre!(err.to_string()))?;
79
108
80 instance::run_with_ssh(manager_conn).map_err(|err| color_eyre::eyre::eyre!(err.to_string()))?;
109 instance::run_with_ssh(manager_conn).map_err(|err| color_eyre::eyre::eyre!(err.to_string()))?;
81
110
82 Ok(())
111 Ok(())
83}
112}
84
113
114+fn handle_command(command: Command, cwd: &PathBuf) -> Result<()> {
115+ match command {
116+ Command::List => {
117+ let manager = SessionManager::new()?;
118+ let sessions = manager.list_sessions()?;
119+ if sessions.is_empty() {
120+ println!("No sessions were found.");
121+ return Ok(());
122+ }
123+ let rows: Vec<tui::SessionListRow> = sessions
124+ .into_iter()
125+ .map(|session| tui::SessionListRow {
126+ name: project_name(&session.directory),
127+ id: session.id,
128+ directory: relative_to_home(&session.directory),
129+ last_active: format_last_active(session.last_active.as_deref()),
130+ active: if session.active {
131+ "yes".to_string()
132+ } else {
133+ "no".to_string()
134+ },
135+ })
136+ .collect();
137+ tui::render_sessions_table(&rows)?;
138+ Ok(())
139+ }
140+ Command::Clean => {
141+ let instance_dir = cwd.join(session_manager::INSTANCE_DIR_NAME);
142+ if !instance_dir.exists() {
143+ println!("No .vibebox directory found at {}", instance_dir.display());
144+ return Ok(());
145+ }
146+ let confirmed = Confirm::new()
147+ .with_prompt(format!(
148+ "Delete {} and all its contents?",
149+ instance_dir.display()
150+ ))
151+ .default(false)
152+ .interact()?;
153+ if !confirmed {
154+ println!("Cancelled.");
155+ return Ok(());
156+ }
157+ let manager = SessionManager::new()?;
158+ let summary = manager.clean_project(cwd)?;
159+ println!(
160+ "Deleted {} (removed={}, session_records_removed={})",
161+ summary.instance_dir.display(),
162+ summary.removed_instance_dir,
163+ summary.removed_sessions
164+ );
165+ Ok(())
166+ }
167+ }
168+}
169+
170+fn project_name(directory: &PathBuf) -> String {
171+ directory
172+ .file_name()
173+ .and_then(|name| name.to_str())
174+ .unwrap_or("-")
175+ .to_string()
176+}
177+
178+fn relative_to_home(directory: &PathBuf) -> String {
179+ let Ok(home) = env::var("HOME") else {
180+ return directory.display().to_string();
181+ };
182+ let home_path = PathBuf::from(home);
183+ if let Ok(stripped) = directory.strip_prefix(&home_path) {
184+ if stripped.components().next().is_none() {
185+ return "~".to_string();
186+ }
187+ return format!("~/{}", stripped.display());
188+ }
189+ directory.display().to_string()
190+}
191+
192+fn format_last_active(value: Option<&str>) -> String {
193+ let Some(raw) = value else {
194+ return "-".to_string();
195+ };
196+ let parsed = OffsetDateTime::parse(raw, &Rfc3339);
197+ let Ok(timestamp) = parsed else {
198+ return raw.to_string();
199+ };
200+ let now = OffsetDateTime::now_utc();
201+ let mut seconds = (now - timestamp).whole_seconds();
202+ if seconds < 0 {
203+ seconds = 0;
204+ }
205+ let seconds = seconds as i64;
206+ let week_seconds = 7 * 24 * 60 * 60;
207+ if seconds >= week_seconds {
208+ let formatted =
209+ match time::format_description::parse("[year]-[month]-[day] [hour]:[minute]Z") {
210+ Ok(format) => timestamp
211+ .format(&format)
212+ .unwrap_or_else(|_| raw.to_string()),
213+ Err(_) => timestamp
214+ .format(&Rfc3339)
215+ .unwrap_or_else(|_| raw.to_string()),
216+ };
217+ return formatted;
218+ }
219+ if seconds < 60 {
220+ return "just now".to_string();
221+ }
222+ if seconds < 60 * 60 {
223+ let mins = seconds / 60;
224+ return format!("{} min{} ago", mins, if mins == 1 { "" } else { "s" });
225+ }
226+ if seconds < 60 * 60 * 24 {
227+ let hours = seconds / (60 * 60);
228+ return format!("{} hour{} ago", hours, if hours == 1 { "" } else { "s" });
229+ }
230+ let days = seconds / (60 * 60 * 24);
231+ format!("{} day{} ago", days, if days == 1 { "" } else { "s" })
232+}
233+
85fn init_tracing() {
234fn init_tracing() {
86 let filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"));
235 let filter = EnvFilter::try_from_default_env().unwrap_or_else(|_| EnvFilter::new("info"));
87 let ansi = std::io::stderr().is_terminal() && env::var("VIBEBOX_LOG_NO_COLOR").is_err();
236 let ansi = std::io::stderr().is_terminal() && env::var("VIBEBOX_LOG_NO_COLOR").is_err();
src/config.rs+60−4
@@ -1,5 +1,5 @@
1use std::{
1use std::{
2− fs, io,
2+ env, fs, io,
3 path::{Path, PathBuf},
3 path::{Path, PathBuf},
4};
4};
5
5
@@ -8,6 +8,7 @@ use serde::{Deserialize, Serialize};
8use crate::vm::DirectoryShare;
8use crate::vm::DirectoryShare;
9
9
10pub const CONFIG_FILENAME: &str = "vibebox.toml";
10pub const CONFIG_FILENAME: &str = "vibebox.toml";
11+pub const CONFIG_PATH_ENV: &str = "VIBEBOX_CONFIG_PATH";
11
12
12const DEFAULT_CPU_COUNT: usize = 2;
13const DEFAULT_CPU_COUNT: usize = 2;
13const DEFAULT_RAM_MB: u64 = 2048;
14const DEFAULT_RAM_MB: u64 = 2048;
@@ -93,8 +94,11 @@ pub fn config_path(project_root: &Path) -> PathBuf {
93 project_root.join(CONFIG_FILENAME)
94 project_root.join(CONFIG_FILENAME)
94}
95}
95
96
96−pub fn ensure_config_file(project_root: &Path) -> Result<PathBuf, io::Error> {
97+pub fn ensure_config_file(
98+ project_root: &Path,
99+ override_path: Option<&Path>,
100+) -> Result<PathBuf, io::Error> {
97− let path = config_path(project_root);
101+ let path = resolve_config_path(project_root, override_path);
98 if !path.exists() {
102 if !path.exists() {
99 let default_config = Config::default();
103 let default_config = Config::default();
100 let contents = toml::to_string_pretty(&default_config).unwrap_or_default();
104 let contents = toml::to_string_pretty(&default_config).unwrap_or_default();
@@ -105,7 +109,11 @@ pub fn ensure_config_file(project_root: &Path) -> Result<PathBuf, io::Error> {
105}
109}
106
110
107pub fn load_config(project_root: &Path) -> Config {
111pub fn load_config(project_root: &Path) -> Config {
112+ load_config_with_path(project_root, None)
113+}
114+
115+pub fn load_config_with_path(project_root: &Path, override_path: Option<&Path>) -> Config {
108− let path = match ensure_config_file(project_root) {
116+ let path = match ensure_config_file(project_root, override_path) {
109 Ok(path) => path,
117 Ok(path) => path,
110 Err(err) => die(&format!("failed to create config: {err}")),
118 Err(err) => die(&format!("failed to create config: {err}")),
111 };
119 };
@@ -144,6 +152,54 @@ pub fn load_config(project_root: &Path) -> Config {
144 config
152 config
145}
153}
146
154
155+fn resolve_config_path(project_root: &Path, override_path: Option<&Path>) -> PathBuf {
156+ let root = match fs::canonicalize(project_root) {
157+ Ok(root) => root,
158+ Err(err) => die(&format!("failed to resolve project root: {err}")),
159+ };
160+
161+ let override_path = override_path
162+ .map(PathBuf::from)
163+ .or_else(|| env::var_os(CONFIG_PATH_ENV).map(PathBuf::from));
164+ let raw_path = if let Some(path) = override_path {
165+ if path.is_absolute() {
166+ path
167+ } else {
168+ project_root.join(path)
169+ }
170+ } else {
171+ config_path(project_root)
172+ };
173+
174+ let normalized = normalize_path(&raw_path);
175+ if !normalized.starts_with(&root) {
176+ die(&format!(
177+ "config path must be within {}: {}",
178+ root.display(),
179+ normalized.display()
180+ ));
181+ }
182+ normalized
183+}
184+
185+fn normalize_path(path: &Path) -> PathBuf {
186+ let mut normalized = PathBuf::new();
187+ for component in path.components() {
188+ match component {
189+ std::path::Component::Prefix(prefix) => normalized.push(prefix.as_os_str()),
190+ std::path::Component::RootDir => {
191+ normalized.push(std::path::MAIN_SEPARATOR.to_string());
192+ }
193+ std::path::Component::CurDir => {}
194+ std::path::Component::ParentDir => {
195+ let _ = normalized.pop();
196+ }
197+ std::path::Component::Normal(part) => normalized.push(part),
198+ }
199+ }
200+ normalized
201+}
202+
147fn validate_schema(value: &toml::Value) -> Vec<String> {
203fn validate_schema(value: &toml::Value) -> Vec<String> {
148 let mut errors = Vec::new();
204 let mut errors = Vec::new();
149 let root = match value.as_table() {
205 let root = match value.as_table() {
src/session_manager.rs+96
@@ -1,6 +1,7 @@
1use std::{
1use std::{
2 env, fs,
2 env, fs,
3 io::{self, Write},
3 io::{self, Write},
4+ os::unix::fs::FileTypeExt,
4 path::{Path, PathBuf},
5 path::{Path, PathBuf},
5};
6};
6
7
@@ -13,6 +14,8 @@ pub const GLOBAL_CACHE_DIR_NAME: &str = "vibebox";
13pub const GLOBAL_DIR_NAME: &str = ".vibebox";
14pub const GLOBAL_DIR_NAME: &str = ".vibebox";
14pub const INSTANCE_FILENAME: &str = "instance.toml";
15pub const INSTANCE_FILENAME: &str = "instance.toml";
15pub const SESSION_TOML_SUFFIX: &str = ".toml";
16pub const SESSION_TOML_SUFFIX: &str = ".toml";
17+pub const VM_MANAGER_SOCKET_NAME: &str = "vm.sock";
18+pub const VM_MANAGER_PID_NAME: &str = "vm.pid";
16const SESSIONS_DIR_NAME: &str = "sessions";
19const SESSIONS_DIR_NAME: &str = "sessions";
17
20
18#[derive(Debug, Clone, PartialEq, Eq)]
21#[derive(Debug, Clone, PartialEq, Eq)]
@@ -20,6 +23,7 @@ pub struct SessionRecord {
20 pub directory: PathBuf,
23 pub directory: PathBuf,
21 pub id: String,
24 pub id: String,
22 pub last_active: Option<String>,
25 pub last_active: Option<String>,
26+ pub active: bool,
23}
27}
24
28
25#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
29#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
@@ -41,6 +45,13 @@ pub struct SessionManager {
41 sessions_dir: PathBuf,
45 sessions_dir: PathBuf,
42}
46}
43
47
48+#[derive(Debug, Clone, PartialEq, Eq)]
49+pub struct CleanSummary {
50+ pub instance_dir: PathBuf,
51+ pub removed_instance_dir: bool,
52+ pub removed_sessions: usize,
53+}
54+
44#[derive(Debug, thiserror::Error)]
55#[derive(Debug, thiserror::Error)]
45pub enum SessionError {
56pub enum SessionError {
46 #[error("HOME environment variable is not set")]
57 #[error("HOME environment variable is not set")]
@@ -138,15 +149,33 @@ impl SessionManager {
138 let mut records = Vec::with_capacity(sessions.len());
149 let mut records = Vec::with_capacity(sessions.len());
139 for session in sessions {
150 for session in sessions {
140 let meta = read_instance_metadata(&session.directory)?;
151 let meta = read_instance_metadata(&session.directory)?;
152+ let active = is_session_active(&session.directory);
141 records.push(SessionRecord {
153 records.push(SessionRecord {
142 directory: session.directory,
154 directory: session.directory,
143 id: session.id,
155 id: session.id,
144 last_active: meta.last_active,
156 last_active: meta.last_active,
157+ active,
145 });
158 });
146 }
159 }
147 Ok(records)
160 Ok(records)
148 }
161 }
149
162
163+ pub fn clean_project(&self, directory: &Path) -> Result<CleanSummary, SessionError> {
164+ let directory = self.normalize_directory(directory)?;
165+ let instance_dir = directory.join(INSTANCE_DIR_NAME);
166+ let mut removed_instance_dir = false;
167+ if instance_dir.exists() {
168+ fs::remove_dir_all(&instance_dir)?;
169+ removed_instance_dir = true;
170+ }
171+ let removed_sessions = self.remove_session_records_for_directory(&directory)?;
172+ Ok(CleanSummary {
173+ instance_dir,
174+ removed_instance_dir,
175+ removed_sessions,
176+ })
177+ }
178+
150 fn normalize_directory(&self, directory: &Path) -> Result<PathBuf, SessionError> {
179 fn normalize_directory(&self, directory: &Path) -> Result<PathBuf, SessionError> {
151 if !directory.is_absolute() {
180 if !directory.is_absolute() {
152 return Err(SessionError::NonAbsoluteDirectory(directory.to_path_buf()));
181 return Err(SessionError::NonAbsoluteDirectory(directory.to_path_buf()));
@@ -206,6 +235,36 @@ impl SessionManager {
206
235
207 Ok((sessions, removed))
236 Ok((sessions, removed))
208 }
237 }
238+
239+ fn remove_session_records_for_directory(
240+ &self,
241+ directory: &Path,
242+ ) -> Result<usize, SessionError> {
243+ if !self.sessions_dir.exists() {
244+ return Ok(0);
245+ }
246+ let mut removed = 0usize;
247+ for entry in fs::read_dir(&self.sessions_dir)? {
248+ let entry = entry?;
249+ let path = entry.path();
250+ if !path.is_file() {
251+ continue;
252+ }
253+ let record = read_session_file(&path)?;
254+ if record.directory == directory {
255+ fs::remove_file(&path)?;
256+ removed += 1;
257+ }
258+ }
259+ if removed > 0 {
260+ tracing::info!(
261+ directory = %directory.display(),
262+ removed,
263+ "removed session records"
264+ );
265+ }
266+ Ok(removed)
267+ }
209}
268}
210
269
211fn is_vibebox_dir(directory: &Path) -> bool {
270fn is_vibebox_dir(directory: &Path) -> bool {
@@ -215,6 +274,43 @@ fn is_vibebox_dir(directory: &Path) -> bool {
215 directory.join(CONFIG_FILENAME).is_file()
274 directory.join(CONFIG_FILENAME).is_file()
216}
275}
217
276
277+fn is_session_active(directory: &Path) -> bool {
278+ let instance_dir = directory.join(INSTANCE_DIR_NAME);
279+ let pid_path = instance_dir.join(VM_MANAGER_PID_NAME);
280+ let socket_path = instance_dir.join(VM_MANAGER_SOCKET_NAME);
281+
282+ let pid = read_pid(&pid_path);
283+ let is_alive = pid.map(pid_is_alive).unwrap_or(false);
284+ if !is_alive {
285+ let _ = fs::remove_file(&pid_path);
286+ return false;
287+ }
288+
289+ if let Ok(metadata) = fs::metadata(&socket_path) {
290+ return metadata.file_type().is_socket();
291+ }
292+
293+ true
294+}
295+
296+fn read_pid(path: &Path) -> Option<u32> {
297+ let content = fs::read_to_string(path).ok()?;
298+ content.trim().parse::<u32>().ok()
299+}
300+
301+fn pid_is_alive(pid: u32) -> bool {
302+ let pid = pid as libc::pid_t;
303+ let result = unsafe { libc::kill(pid, 0) };
304+ if result == 0 {
305+ return true;
306+ }
307+ match std::io::Error::last_os_error().raw_os_error() {
308+ Some(code) if code == libc::EPERM => true,
309+ Some(code) if code == libc::ESRCH => false,
310+ _ => false,
311+ }
312+}
313+
218fn read_session_file(path: &Path) -> Result<SessionEntry, SessionError> {
314fn read_session_file(path: &Path) -> Result<SessionEntry, SessionError> {
219 let raw = fs::read_to_string(path)?;
315 let raw = fs::read_to_string(path)?;
220 let record: SessionEntry = toml::from_str(&raw)?;
316 let record: SessionEntry = toml::from_str(&raw)?;
src/tui.rs+62−1
@@ -20,7 +20,7 @@ use ratatui::{
20 layout::{Constraint, Direction, Layout, Rect},
20 layout::{Constraint, Direction, Layout, Rect},
21 style::{Color, Style},
21 style::{Color, Style},
22 text::{Line, Span, Text},
22 text::{Line, Span, Text},
23− widgets::{Block, Borders, List, ListItem, Paragraph, Widget},
23+ widgets::{Block, Borders, Cell, List, ListItem, Paragraph, Row, Table, Widget},
24};
24};
25
25
26use crate::vm;
26use crate::vm;
@@ -98,6 +98,15 @@ pub struct VibeboxCommand {
98 pub description: String,
98 pub description: String,
99}
99}
100
100
101+#[derive(Debug, Clone)]
102+pub struct SessionListRow {
103+ pub name: String,
104+ pub directory: String,
105+ pub last_active: String,
106+ pub active: String,
107+ pub id: String,
108+}
109+
101#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)]
110#[derive(Debug, Clone, Copy, Default, PartialEq, Eq)]
102struct PageLayout {
111struct PageLayout {
103 header: Rect,
112 header: Rect,
@@ -174,6 +183,58 @@ pub fn render_commands_component(app: &mut AppState) -> Result<()> {
174 Ok(())
183 Ok(())
175}
184}
176
185
186+pub fn render_sessions_table(rows: &[SessionListRow]) -> Result<()> {
187+ let (width, _) = crossterm::terminal::size()?;
188+ if width == 0 {
189+ return Ok(());
190+ }
191+
192+ let height = (rows.len() as u16).saturating_add(3);
193+ let mut buffer = Buffer::empty(Rect::new(0, 0, width, height));
194+ let area = Rect::new(0, 0, width, height);
195+
196+ let header = Row::new(vec![
197+ Cell::from("Name"),
198+ Cell::from("Last Active"),
199+ Cell::from("Active"),
200+ Cell::from("ID"),
201+ Cell::from("Directory"),
202+ ])
203+ .style(Style::default().fg(Color::Cyan));
204+
205+ let table_rows = rows.iter().map(|row| {
206+ Row::new(vec![
207+ Cell::from(row.name.clone()),
208+ Cell::from(row.last_active.clone()),
209+ Cell::from(row.active.clone()),
210+ Cell::from(row.id.clone()),
211+ Cell::from(row.directory.clone()),
212+ ])
213+ });
214+
215+ let table = Table::new(
216+ table_rows,
217+ [
218+ Constraint::Length(16),
219+ Constraint::Length(14),
220+ Constraint::Length(8),
221+ Constraint::Length(36),
222+ Constraint::Min(24),
223+ ],
224+ )
225+ .header(header)
226+ .block(Block::default().title("Sessions").borders(Borders::ALL))
227+ .column_spacing(2);
228+
229+ table.render(area, &mut buffer);
230+
231+ let mut stdout = io::stdout();
232+ execute!(stdout, Clear(ClearType::All), MoveTo(0, 0), Show)?;
233+ write_buffer_with_style(&buffer, &mut stdout)?;
234+ stdout.flush()?;
235+ Ok(())
236+}
237+
177pub fn passthrough_vm_io(
238pub fn passthrough_vm_io(
178 app: Arc<Mutex<AppState>>,
239 app: Arc<Mutex<AppState>>,
179 output_monitor: Arc<vm::OutputMonitor>,
240 output_monitor: Arc<vm::OutputMonitor>,
src/vm_manager.rs+50−3
@@ -15,26 +15,30 @@ use std::{
15};
15};
16
16
17use crate::{
17use crate::{
18+ config::CONFIG_PATH_ENV,
18 instance::SERIAL_LOG_NAME,
19 instance::SERIAL_LOG_NAME,
19 instance::{
20 instance::{
20 InstanceConfig, build_ssh_login_actions, ensure_instance_dir, ensure_ssh_keypair,
21 InstanceConfig, build_ssh_login_actions, ensure_instance_dir, ensure_ssh_keypair,
21 extract_ipv4, load_or_create_instance_config, write_instance_config,
22 extract_ipv4, load_or_create_instance_config, write_instance_config,
22 },
23 },
24+ session_manager::{
23− session_manager::{GLOBAL_DIR_NAME, INSTANCE_FILENAME},
25+ GLOBAL_DIR_NAME, INSTANCE_FILENAME, VM_MANAGER_PID_NAME, VM_MANAGER_SOCKET_NAME,
26+ },
24 vm::{self, DirectoryShare, LoginAction, VmInput},
27 vm::{self, DirectoryShare, LoginAction, VmInput},
25};
28};
26
29
27−const VM_MANAGER_SOCKET_NAME: &str = "vm.sock";
28const VM_MANAGER_LOCK_NAME: &str = "vm.lock";
30const VM_MANAGER_LOCK_NAME: &str = "vm.lock";
29const VM_MANAGER_LOG_NAME: &str = "vm_manager.log";
31const VM_MANAGER_LOG_NAME: &str = "vm_manager.log";
30
32
31pub fn ensure_manager(
33pub fn ensure_manager(
32 raw_args: &[std::ffi::OsString],
34 raw_args: &[std::ffi::OsString],
33 auto_shutdown_ms: u64,
35 auto_shutdown_ms: u64,
36+ config_path: Option<&Path>,
34) -> Result<UnixStream, Box<dyn std::error::Error>> {
37) -> Result<UnixStream, Box<dyn std::error::Error>> {
35 let project_root = env::current_dir()?;
38 let project_root = env::current_dir()?;
36 tracing::debug!(root = %project_root.display(), "ensure vm manager");
39 tracing::debug!(root = %project_root.display(), "ensure vm manager");
37 let instance_dir = ensure_instance_dir(&project_root)?;
40 let instance_dir = ensure_instance_dir(&project_root)?;
41+ cleanup_stale_manager(&instance_dir);
38 let socket_path = instance_dir.join(VM_MANAGER_SOCKET_NAME);
42 let socket_path = instance_dir.join(VM_MANAGER_SOCKET_NAME);
39
43
40 if let Ok(stream) = UnixStream::connect(&socket_path) {
44 if let Ok(stream) = UnixStream::connect(&socket_path) {
@@ -47,7 +51,7 @@ pub fn ensure_manager(
47 let mut lock_file = acquire_spawn_lock(&lock_path)?;
51 let mut lock_file = acquire_spawn_lock(&lock_path)?;
48 if lock_file.is_some() {
52 if lock_file.is_some() {
49 tracing::info!(path = %socket_path.display(), "spawning vm manager");
53 tracing::info!(path = %socket_path.display(), "spawning vm manager");
50− spawn_manager_process(raw_args, auto_shutdown_ms, &instance_dir)?;
54+ spawn_manager_process(raw_args, auto_shutdown_ms, &instance_dir, config_path)?;
51 } else {
55 } else {
52 tracing::info!(
56 tracing::info!(
53 path = %socket_path.display(),
57 path = %socket_path.display(),
@@ -96,6 +100,7 @@ pub fn run_manager(
96) -> Result<(), Box<dyn std::error::Error>> {
100) -> Result<(), Box<dyn std::error::Error>> {
97 let project_root = env::current_dir()?;
101 let project_root = env::current_dir()?;
98 tracing::info!(root = %project_root.display(), "vm manager starting");
102 tracing::info!(root = %project_root.display(), "vm manager starting");
103+ let _pid_guard = ensure_pid_file(&project_root)?;
99 run_manager_with(
104 run_manager_with(
100 &project_root,
105 &project_root,
101 args,
106 args,
@@ -113,6 +118,7 @@ fn spawn_manager_process(
113 raw_args: &[std::ffi::OsString],
118 raw_args: &[std::ffi::OsString],
114 auto_shutdown_ms: u64,
119 auto_shutdown_ms: u64,
115 instance_dir: &Path,
120 instance_dir: &Path,
121+ config_path: Option<&Path>,
116) -> Result<(), Box<dyn std::error::Error>> {
122) -> Result<(), Box<dyn std::error::Error>> {
117 let exe = env::current_exe()?;
123 let exe = env::current_exe()?;
118 let mut supervisor_exe = exe.clone();
124 let mut supervisor_exe = exe.clone();
@@ -133,6 +139,9 @@ fn spawn_manager_process(
133 }
139 }
134 cmd.env("VIBEBOX_LOG_NO_COLOR", "1");
140 cmd.env("VIBEBOX_LOG_NO_COLOR", "1");
135 cmd.env("VIBEBOX_AUTO_SHUTDOWN_MS", auto_shutdown_ms.to_string());
141 cmd.env("VIBEBOX_AUTO_SHUTDOWN_MS", auto_shutdown_ms.to_string());
142+ if let Some(path) = config_path {
143+ cmd.env(CONFIG_PATH_ENV, path);
144+ }
136 tracing::info!(auto_shutdown_ms, "vm manager process spawn requested");
145 tracing::info!(auto_shutdown_ms, "vm manager process spawn requested");
137 let log_path = instance_dir.join(VM_MANAGER_LOG_NAME);
146 let log_path = instance_dir.join(VM_MANAGER_LOG_NAME);
138 let log_file = fs::OpenOptions::new()
147 let log_file = fs::OpenOptions::new()
@@ -155,6 +164,44 @@ fn spawn_manager_process(
155 Ok(())
164 Ok(())
156}
165}
157
166
167+fn ensure_pid_file(project_root: &Path) -> Result<PidFileGuard, Box<dyn std::error::Error>> {
168+ let instance_dir = ensure_instance_dir(project_root)?;
169+ let pid_path = instance_dir.join(VM_MANAGER_PID_NAME);
170+ if let Ok(content) = fs::read_to_string(&pid_path) {
171+ if let Ok(pid) = content.trim().parse::<u32>() {
172+ if pid_is_alive(pid) {
173+ return Err(format!("vm manager already running (pid {pid})").into());
174+ }
175+ }
176+ let _ = fs::remove_file(&pid_path);
177+ }
178+ fs::write(&pid_path, format!("{}\n", std::process::id()))?;
179+ let _ = fs::set_permissions(&pid_path, fs::Permissions::from_mode(0o600));
180+ Ok(PidFileGuard { path: pid_path })
181+}
182+
183+fn cleanup_stale_manager(instance_dir: &Path) {
184+ let pid_path = instance_dir.join(VM_MANAGER_PID_NAME);
185+ if let Ok(content) = fs::read_to_string(&pid_path) {
186+ if let Ok(pid) = content.trim().parse::<u32>() {
187+ if pid_is_alive(pid) {
188+ return;
189+ }
190+ }
191+ }
192+ let _ = fs::remove_file(&pid_path);
193+}
194+
195+struct PidFileGuard {
196+ path: PathBuf,
197+}
198+
199+impl Drop for PidFileGuard {
200+ fn drop(&mut self) {
201+ let _ = fs::remove_file(&self.path);
202+ }
203+}
204+
158fn detach_from_terminal() {
205fn detach_from_terminal() {
159 unsafe {
206 unsafe {
160 libc::setsid();
207 libc::setsid();