Skip to content

Modern Docker Management, Designed for Everyone

refactor: update cli layouts for help commands (#1910)

Kyle Mendelld89541cc3173
diff --git a/cli/go.mod b/cli/go.mod
index e22cda955..3f0f9046c 100644
--- a/cli/go.mod
+++ b/cli/go.mod
@@ -3,15 +3,13 @@ module github.com/getarcaneapp/arcane/cli
go 1.26.0
require (
- github.com/charmbracelet/bubbles v1.0.0
- github.com/charmbracelet/bubbletea v1.3.10
- github.com/charmbracelet/fang v0.4.4
- github.com/charmbracelet/lipgloss v1.1.0
+ charm.land/bubbles/v2 v2.0.0
+ charm.land/bubbletea/v2 v2.0.0
+ charm.land/lipgloss/v2 v2.0.0
github.com/charmbracelet/x/term v0.2.2
github.com/fatih/color v1.18.0
github.com/getarcaneapp/arcane/types v1.15.3
github.com/go-viper/mapstructure/v2 v2.5.0
- github.com/mattn/go-runewidth v0.0.20
github.com/sirupsen/logrus v1.9.4
github.com/spf13/cobra v1.10.2
github.com/spf13/viper v1.21.0
@@ -19,41 +17,29 @@ require (
)
require (
- charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251106193318-19329a3e8410 // indirect
github.com/atotto/clipboard v0.1.4 // indirect
- github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
- github.com/charmbracelet/colorprofile v0.4.1 // indirect
+ github.com/charmbracelet/colorprofile v0.4.2 // indirect
github.com/charmbracelet/harmonica v0.2.0 // indirect
- github.com/charmbracelet/ultraviolet v0.0.0-20251106190538-99ea45596692 // indirect
+ github.com/charmbracelet/ultraviolet v0.0.0-20260205113103-524a6607adb8 // indirect
github.com/charmbracelet/x/ansi v0.11.6 // indirect
- github.com/charmbracelet/x/cellbuf v0.0.15 // indirect
- github.com/charmbracelet/x/exp/charmtone v0.0.0-20250603201427-c31516f43444 // indirect
github.com/charmbracelet/x/termios v0.1.1 // indirect
github.com/charmbracelet/x/windows v0.2.2 // indirect
- github.com/clipperhouse/displaywidth v0.9.0 // indirect
- github.com/clipperhouse/stringish v0.1.1 // indirect
+ github.com/clipperhouse/displaywidth v0.11.0 // indirect
github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
github.com/compose-spec/compose-go/v2 v2.10.1 // indirect
github.com/distribution/reference v0.6.0 // indirect
github.com/docker/docker v28.5.2+incompatible // indirect
github.com/docker/go-connections v0.6.0 // indirect
github.com/docker/go-units v0.5.0 // indirect
- github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
github.com/mattn/go-colorable v0.1.14 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
- github.com/mattn/go-localereader v0.0.1 // indirect
+ github.com/mattn/go-runewidth v0.0.20 // indirect
github.com/mattn/go-shellwords v1.0.12 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
- github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
github.com/muesli/cancelreader v0.2.2 // indirect
- github.com/muesli/mango v0.1.0 // indirect
- github.com/muesli/mango-cobra v1.2.0 // indirect
- github.com/muesli/mango-pflag v0.1.0 // indirect
- github.com/muesli/roff v0.1.0 // indirect
- github.com/muesli/termenv v0.16.0 // indirect
github.com/opencontainers/go-digest v1.0.0 // indirect
github.com/opencontainers/image-spec v1.1.1 // indirect
github.com/pelletier/go-toml/v2 v2.2.4 // indirect
diff --git a/cli/go.sum b/cli/go.sum
index ea5b808f2..195a0a1fb 100644
--- a/cli/go.sum
+++ b/cli/go.sum
@@ -1,31 +1,17 @@
-charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251106193318-19329a3e8410 h1:D9PbaszZYpB4nj+d6HTWr1onlmlyuGVNfL9gAi8iB3k=
-charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251106193318-19329a3e8410/go.mod h1:1qZyvvVCenJO2M1ac2mX0yyiIZJoZmDM4DG4s0udJkU=
+charm.land/bubbles/v2 v2.0.0 h1:tE3eK/pHjmtrDiRdoC9uGNLgpopOd8fjhEe31B/ai5s=
+charm.land/bubbletea/v2 v2.0.0 h1:p0d6CtWyJXJ9GfzMpUUqbP/XUUhhlk06+vCKWmox1wQ=
+charm.land/lipgloss/v2 v2.0.0 h1:sd8N/B3x892oiOjFfBQdXBQp3cAkvjGaU5TvVZC3ivo=
+charm.land/lipgloss/v2 v2.0.0/go.mod h1:w6SnmsBFBmEFBodiEDurGS/sdUY/u1+v72DqUzc6J14=
github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
-github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
-github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
-github.com/aymanbagabas/go-udiff v0.3.1 h1:LV+qyBQ2pqe0u42ZsUEtPiCaUoqgA9gYRDs3vj1nolY=
-github.com/aymanbagabas/go-udiff v0.3.1/go.mod h1:G0fsKmG+P6ylD0r6N/KgQD/nWzgfnl8ZBcNLgcbrw8E=
-github.com/charmbracelet/bubbles v1.0.0 h1:12J8/ak/uCZEMQ6KU7pcfwceyjLlWsDLAxB5fXonfvc=
-github.com/charmbracelet/bubbles v1.0.0/go.mod h1:9d/Zd5GdnauMI5ivUIVisuEm3ave1XwXtD1ckyV6r3E=
-github.com/charmbracelet/bubbletea v1.3.10 h1:otUDHWMMzQSB0Pkc87rm691KZ3SWa4KUlvF9nRvCICw=
-github.com/charmbracelet/bubbletea v1.3.10/go.mod h1:ORQfo0fk8U+po9VaNvnV95UPWA1BitP1E0N6xJPlHr4=
-github.com/charmbracelet/colorprofile v0.4.1 h1:a1lO03qTrSIRaK8c3JRxJDZOvhvIeSco3ej+ngLk1kk=
-github.com/charmbracelet/colorprofile v0.4.1/go.mod h1:U1d9Dljmdf9DLegaJ0nGZNJvoXAhayhmidOdcBwAvKk=
-github.com/charmbracelet/fang v0.4.4 h1:G4qKxF6or/eTPgmAolwPuRNyuci3hTUGGX1rj1YkHJY=
-github.com/charmbracelet/fang v0.4.4/go.mod h1:P5/DNb9DddQ0Z0dbc0P3ol4/ix5Po7Ofr2KMBfAqoCo=
+github.com/aymanbagabas/go-udiff v0.4.0 h1:TKnLPh7IbnizJIBKFWa9mKayRUBQ9Kh1BPCk6w2PnYM=
+github.com/charmbracelet/colorprofile v0.4.2 h1:BdSNuMjRbotnxHSfxy+PCSa4xAmz7szw70ktAtWRYrY=
+github.com/charmbracelet/colorprofile v0.4.2/go.mod h1:0rTi81QpwDElInthtrQ6Ni7cG0sDtwAd4C4le060fT8=
github.com/charmbracelet/harmonica v0.2.0 h1:8NxJWRWg/bzKqqEaaeFNipOu77YR5t8aSwG4pgaUBiQ=
github.com/charmbracelet/harmonica v0.2.0/go.mod h1:KSri/1RMQOZLbw7AHqgcBycp8pgJnQMYYT8QZRqZ1Ao=
-github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
-github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
-github.com/charmbracelet/ultraviolet v0.0.0-20251106190538-99ea45596692 h1:r/3jQZ1LjWW6ybp8HHfhrKrwHIWiJhUuY7wwYIWZulQ=
-github.com/charmbracelet/ultraviolet v0.0.0-20251106190538-99ea45596692/go.mod h1:Y8B4DzWeTb0ama8l3+KyopZtkE8fZjwRQ3aEAPEXHE0=
+github.com/charmbracelet/ultraviolet v0.0.0-20260205113103-524a6607adb8 h1:eyFRbAmexyt43hVfeyBofiGSEmJ7krjLOYt/9CF5NKA=
github.com/charmbracelet/x/ansi v0.11.6 h1:GhV21SiDz/45W9AnV2R61xZMRri5NlLnl6CVF7ihZW8=
github.com/charmbracelet/x/ansi v0.11.6/go.mod h1:2JNYLgQUsyqaiLovhU2Rv/pb8r6ydXKS3NIttu3VGZQ=
-github.com/charmbracelet/x/cellbuf v0.0.15 h1:ur3pZy0o6z/R7EylET877CBxaiE1Sp1GMxoFPAIztPI=
-github.com/charmbracelet/x/cellbuf v0.0.15/go.mod h1:J1YVbR7MUuEGIFPCaaZ96KDl5NoS0DAWkskup+mOY+Q=
-github.com/charmbracelet/x/exp/charmtone v0.0.0-20250603201427-c31516f43444 h1:IJDiTgVE56gkAGfq0lBEloWgkXMk4hl/bmuPoicI4R0=
-github.com/charmbracelet/x/exp/charmtone v0.0.0-20250603201427-c31516f43444/go.mod h1:T9jr8CzFpjhFVHjNjKwbAD7KwBNyFnj2pntAO7F2zw0=
github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f h1:pk6gmGpCE7F3FcjaOEKYriCvpmIN4+6OS/RD0vm4uIA=
github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f/go.mod h1:IfZAMTHB6XkZSeXUqriemErjAWCCzT0LwjKFYCZyw0I=
github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
@@ -34,10 +20,8 @@ github.com/charmbracelet/x/termios v0.1.1 h1:o3Q2bT8eqzGnGPOYheoYS8eEleT5ZVNYNy8
github.com/charmbracelet/x/termios v0.1.1/go.mod h1:rB7fnv1TgOPOyyKRJ9o+AsTU/vK5WHJ2ivHeut/Pcwo=
github.com/charmbracelet/x/windows v0.2.2 h1:IofanmuvaxnKHuV04sC0eBy/smG6kIKrWG2/jYn2GuM=
github.com/charmbracelet/x/windows v0.2.2/go.mod h1:/8XtdKZzedat74NQFn0NGlGL4soHB0YQZrETF96h75k=
-github.com/clipperhouse/displaywidth v0.9.0 h1:Qb4KOhYwRiN3viMv1v/3cTBlz3AcAZX3+y9OLhMtAtA=
-github.com/clipperhouse/displaywidth v0.9.0/go.mod h1:aCAAqTlh4GIVkhQnJpbL0T/WfcrJXHcj8C0yjYcjOZA=
-github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
-github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
+github.com/clipperhouse/displaywidth v0.11.0 h1:lBc6kY44VFw+TDx4I8opi/EtL9m20WSEFgwIwO+UVM8=
+github.com/clipperhouse/displaywidth v0.11.0/go.mod h1:bkrFNkf81G8HyVqmKGxsPufD3JhNl3dSqnGhOoSD/o0=
github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJv2v7Vk=
github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
github.com/compose-spec/compose-go/v2 v2.10.1 h1:mFbXobojGRFIVi1UknrvaDAZ+PkJfyjqkA1yseh+vAU=
@@ -53,8 +37,6 @@ github.com/docker/go-connections v0.6.0 h1:LlMG9azAe1TqfR7sO+NJttz1gy6KO7VJBh+pM
github.com/docker/go-connections v0.6.0/go.mod h1:AahvXYshr6JgfUJGdDCs2b5EZG/vmaMAntpSFH5BFKE=
github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4=
github.com/docker/go-units v0.5.0/go.mod h1:fgPhTUdO+D/Jk86RDLlptpiXQzgHJF7gydDDbaIK4Dk=
-github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
-github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
github.com/frankban/quicktest v1.14.6 h1:7Xjx+VpznH+oBnejlPUj8oUpdxnVs4f8XU8WnHkI4W8=
@@ -84,28 +66,14 @@ github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHP
github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
-github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
github.com/mattn/go-runewidth v0.0.20 h1:WcT52H91ZUAwy8+HUkdM3THM6gXqXuLJi9O3rjcQQaQ=
github.com/mattn/go-runewidth v0.0.20/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
github.com/mattn/go-shellwords v1.0.12 h1:M2zGm7EW6UQJvDeQxo4T51eKPurbeFbe8WtebGE2xrk=
github.com/mattn/go-shellwords v1.0.12/go.mod h1:EZzvwXDESEeg03EKmM+RmDnNOPKG4lLtQsUlTZDWQ8Y=
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
-github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
-github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
-github.com/muesli/mango v0.1.0 h1:DZQK45d2gGbql1arsYA4vfg4d7I9Hfx5rX/GCmzsAvI=
-github.com/muesli/mango v0.1.0/go.mod h1:5XFpbC8jY5UUv89YQciiXNlbi+iJgt29VDC5xbzrLL4=
-github.com/muesli/mango-cobra v1.2.0 h1:DQvjzAM0PMZr85Iv9LIMaYISpTOliMEg+uMFtNbYvWg=
-github.com/muesli/mango-cobra v1.2.0/go.mod h1:vMJL54QytZAJhCT13LPVDfkvCUJ5/4jNUKF/8NC2UjA=
-github.com/muesli/mango-pflag v0.1.0 h1:UADqbYgpUyRoBja3g6LUL+3LErjpsOwaC9ywvBWe7Sg=
-github.com/muesli/mango-pflag v0.1.0/go.mod h1:YEQomTxaCUp8PrbhFh10UfbhbQrM/xJ4i2PB8VTLLW0=
-github.com/muesli/roff v0.1.0 h1:YD0lalCotmYuF5HhZliKWlIx7IEhiXeSfq7hNjFqGF8=
-github.com/muesli/roff v0.1.0/go.mod h1:pjAHQM9hdUUwm/krAfrLGgJkXJ+YuhtsfZ42kieB2Ig=
-github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
-github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
github.com/opencontainers/go-digest v1.0.0 h1:apOUWs51W5PlhuyGyz9FCeeBIOUDA/6nW8Oi/yOhh5U=
github.com/opencontainers/go-digest v1.0.0/go.mod h1:0JzlMkj0TRzQZfJkVvzbP0HBR3IKzErnv2BNG4W4MAM=
github.com/opencontainers/image-spec v1.1.1 h1:y0fUlFfIZhPF1W537XOLg0/fcx6zcHCJwooC2xJA040=
@@ -120,6 +88,7 @@ github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0t
github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
github.com/sagikazarmark/locafero v0.12.0 h1:/NQhBAkUb4+fH1jivKHWusDYFjMOOKU88eegjfxfHb4=
+github.com/sagikazarmark/locafero v0.12.0/go.mod h1:sZh36u/YSZ918v0Io+U9ogLYQJ9tLLBmM4eneO6WwsI=
github.com/sahilm/fuzzy v0.1.1 h1:ceu5RHF8DGgoi+/dR5PsECjCDH1BE3Fnmpo7aVXOdRA=
github.com/sahilm/fuzzy v0.1.1/go.mod h1:VFvziUEIMCrT6A6tw2RFIXPXXmzXbOsSHF0DOI8ZK9Y=
github.com/sirupsen/logrus v1.9.4 h1:TsZE7l11zFCLZnZ+teH4Umoq5BhEIfIzfRDZ1Uzql2w=
@@ -148,11 +117,11 @@ go.withmatt.com/size v0.0.0-20250220224316-11aee5773e67/go.mod h1:WFmSrzphcXaSV4
go.yaml.in/yaml/v3 v3.0.4 h1:tfq32ie2Jv2UxXFdLJdh3jXuOzWiL1fo0bu/FbuKpbc=
go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg=
go.yaml.in/yaml/v4 v4.0.0-rc.4 h1:UP4+v6fFrBIb1l934bDl//mmnoIZEDK0idg1+AIvX5U=
+go.yaml.in/yaml/v4 v4.0.0-rc.4/go.mod h1:aZqd9kCMsGL7AuUv/m/PvWLdg5sjJsZ4oHDEnfPPfY0=
golang.org/x/exp v0.0.0-20250911091902-df9299821621 h1:2id6c1/gto0kaHYyrixvknJ8tUK/Qs5IsmBtrc+FtgU=
golang.org/x/exp v0.0.0-20250911091902-df9299821621/go.mod h1:TwQYMMnGpvZyc+JpB/UAuTNIsVJifOlSkrZkhcvpVUk=
golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
-golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.41.0 h1:Ivj+2Cp/ylzLiEU89QhWblYnOE9zerudt9Ftecq2C6k=
golang.org/x/sys v0.41.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
diff --git a/cli/internal/output/output.go b/cli/internal/output/output.go
index 972d78938..2b996e3f7 100644
--- a/cli/internal/output/output.go
+++ b/cli/internal/output/output.go
@@ -18,35 +18,36 @@ import (
"regexp"
"strings"
- "github.com/charmbracelet/lipgloss"
+ "charm.land/lipgloss/v2"
+ "charm.land/lipgloss/v2/compat"
+ "charm.land/lipgloss/v2/table"
"github.com/charmbracelet/x/term"
- "github.com/mattn/go-runewidth"
)
var (
- arcanePurple = lipgloss.AdaptiveColor{
- Light: "#6d28d9",
- Dark: "#a78bfa",
+ arcanePurple = compat.AdaptiveColor{
+ Light: lipgloss.Color("#6d28d9"),
+ Dark: lipgloss.Color("#a78bfa"),
}
- textPrimary = lipgloss.AdaptiveColor{
- Light: "#1f2937",
- Dark: "#e5e7eb",
+ textPrimary = compat.AdaptiveColor{
+ Light: lipgloss.Color("#1f2937"),
+ Dark: lipgloss.Color("#e5e7eb"),
}
- textMuted = lipgloss.AdaptiveColor{
- Light: "#64748b",
- Dark: "#cbd5e1",
+ textMuted = compat.AdaptiveColor{
+ Light: lipgloss.Color("#64748b"),
+ Dark: lipgloss.Color("#cbd5e1"),
}
- statusOnline = lipgloss.AdaptiveColor{
- Light: "#15803d",
- Dark: "#4ade80",
+ statusOnline = compat.AdaptiveColor{
+ Light: lipgloss.Color("#15803d"),
+ Dark: lipgloss.Color("#4ade80"),
}
- statusOffline = lipgloss.AdaptiveColor{
- Light: "#b91c1c",
- Dark: "#f87171",
+ statusOffline = compat.AdaptiveColor{
+ Light: lipgloss.Color("#b91c1c"),
+ Dark: lipgloss.Color("#f87171"),
}
- statusWarn = lipgloss.AdaptiveColor{
- Light: "#b45309",
- Dark: "#fbbf24",
+ statusWarn = compat.AdaptiveColor{
+ Light: lipgloss.Color("#b45309"),
+ Dark: lipgloss.Color("#fbbf24"),
}
)
@@ -59,15 +60,22 @@ var (
keyStyle = lipgloss.NewStyle().Bold(true).Foreground(textPrimary)
valueStyle = lipgloss.NewStyle().Foreground(arcanePurple)
- // Keep purple as accent in headers, but avoid purple body cells for readability.
- columnStyle = lipgloss.NewStyle().Foreground(textPrimary)
- columnHeader = lipgloss.NewStyle().Bold(true).Foreground(arcanePurple)
-
statusOnlineStyle = lipgloss.NewStyle().Foreground(statusOnline)
statusOfflineStyle = lipgloss.NewStyle().Foreground(statusOffline)
statusWarnStyle = lipgloss.NewStyle().Foreground(statusWarn)
statusMutedStyle = lipgloss.NewStyle().Foreground(textMuted)
enabledStyle = lipgloss.NewStyle().Foreground(arcanePurple)
+
+ tablePurple = lipgloss.Color("99")
+ tableGray = lipgloss.Color("245")
+ tableLightGray = lipgloss.Color("241")
+ tableHeader = lipgloss.NewStyle().Foreground(tablePurple).Bold(true).Align(lipgloss.Center).Padding(0, 1)
+ tableCell = lipgloss.NewStyle().Padding(0, 1)
+ tableOddRow = tableCell.Foreground(tableGray)
+ tableEvenRow = tableCell.Foreground(tableLightGray)
+ tableBorder = lipgloss.NewStyle().Foreground(tablePurple)
+ tablePlainCell = lipgloss.NewStyle().Padding(0, 1)
+ tablePlainHead = lipgloss.NewStyle().Bold(true).Padding(0, 1)
)
var ansiRegexp = regexp.MustCompile("\x1b\\[[0-9;]*[a-zA-Z]")
@@ -145,13 +153,6 @@ func KeyValue(key string, value any) {
fmt.Printf("%s: %v\n", render(keyStyle, keyText), render(valueStyle, valueText))
}
-func stripAnsi(s string) string {
- if s == "" {
- return s
- }
- return ansiRegexp.ReplaceAllString(s, "")
-}
-
func hasAnsi(s string) bool {
if s == "" {
return false
@@ -231,8 +232,7 @@ func TintInsecure(value string) string {
}
// Table prints a formatted table with headers and rows.
-// Headers are displayed in bold cyan. The table is rendered with borders
-// for a clean terminal appearance. Columns are automatically aligned.
+// Rendering uses Lip Gloss table styles with zebra-striped rows.
func Table(headers []string, rows [][]string) {
fmt.Println()
@@ -242,12 +242,52 @@ func Table(headers []string, rows [][]string) {
}
rows = tintTableRows(headers, rows)
+ rows = normalizeTableRows(rows, n)
+
+ t := table.New().Border(lipgloss.NormalBorder()).Headers(headers...)
+
+ if shouldColor() {
+ t = t.
+ BorderStyle(tableBorder).
+ StyleFunc(func(row, col int) lipgloss.Style {
+ switch {
+ case row == table.HeaderRow:
+ return tableHeader
+ case row%2 == 0:
+ return tableEvenRow
+ default:
+ return tableOddRow
+ }
+ })
+ } else {
+ t = t.StyleFunc(func(row, col int) lipgloss.Style {
+ if row == table.HeaderRow {
+ return tablePlainHead
+ }
+ return tablePlainCell
+ })
+ }
+
+ if len(rows) > 0 {
+ t = t.Rows(rows...)
+ }
+
+ lipgloss.Println(t)
+}
+
+func normalizeTableRows(rows [][]string, width int) [][]string {
+ if width == 0 || len(rows) == 0 {
+ return rows
+ }
- widths := computeWidths(headers, rows)
- printHeader(headers, widths)
- for _, row := range rows {
- printRow(row, widths, n)
+ normalized := make([][]string, len(rows))
+ for i, row := range rows {
+ cells := make([]string, width)
+ copy(cells, row)
+ normalized[i] = cells
}
+
+ return normalized
}
func tintTableRows(headers []string, rows [][]string) [][]string {
@@ -283,87 +323,3 @@ func tintTableRows(headers []string, rows [][]string) [][]string {
}
return result
}
-
-func computeWidths(headers []string, rows [][]string) []int {
- n := len(headers)
- widths := make([]int, n)
- for i, h := range headers {
- widths[i] = runewidth.StringWidth(stripAnsi(h))
- }
- for _, row := range rows {
- for i := range n {
- var cell string
- if i < len(row) {
- cell = row[i]
- }
- lines := strings.SplitSeq(cell, "\n")
- for ln := range lines {
- w := runewidth.StringWidth(stripAnsi(ln))
- if w > widths[i] {
- widths[i] = w
- }
- }
- }
- }
- return widths
-}
-
-func printHeader(headers []string, widths []int) {
- sep := " "
- n := len(headers)
- for i, h := range headers {
- visible := stripAnsi(h)
- colored := render(columnHeader, h)
- padLen := max(widths[i]-runewidth.StringWidth(visible), 0)
- if i < n-1 {
- fmt.Print(colored + strings.Repeat(" ", padLen) + sep)
- } else {
- fmt.Print(colored + strings.Repeat(" ", padLen))
- }
- }
- fmt.Println()
-}
-
-func printRow(row []string, widths []int, n int) {
- sep := " "
-
- // Prepare lines per column
- cellLines := make([][]string, n)
- maxLines := 1
- for i := range n {
- var cell string
- if i < len(row) {
- cell = row[i]
- }
- lines := strings.Split(cell, "\n")
- cellLines[i] = lines
- if len(lines) > maxLines {
- maxLines = len(lines)
- }
- }
-
- for li := 0; li < maxLines; li++ {
- for i := range n {
- var val string
- if li < len(cellLines[i]) {
- val = cellLines[i][li]
- }
-
- var rendered string
- if i == 0 {
- rendered = render(columnStyle, val)
- } else {
- rendered = fmt.Sprint(val)
- }
-
- padLen := max(widths[i]-runewidth.StringWidth(stripAnsi(val)), 0)
-
- if i < n-1 {
- fmt.Print(rendered + strings.Repeat(" ", padLen) + sep)
- } else {
- fmt.Print(rendered + strings.Repeat(" ", padLen))
- }
- }
- fmt.Println()
- }
-}
diff --git a/cli/internal/output/tui.go b/cli/internal/output/tui.go
index 3c0c0030b..69f1fa024 100644
--- a/cli/internal/output/tui.go
+++ b/cli/internal/output/tui.go
@@ -5,10 +5,9 @@ import (
"io"
"sync"
- "github.com/charmbracelet/bubbles/progress"
- "github.com/charmbracelet/bubbles/spinner"
- tea "github.com/charmbracelet/bubbletea"
- "github.com/charmbracelet/lipgloss"
+ "charm.land/bubbles/v2/progress"
+ "charm.land/bubbles/v2/spinner"
+ tea "charm.land/bubbletea/v2"
"go.withmatt.com/size"
)
@@ -22,7 +21,6 @@ type spinnerModel struct {
func newSpinnerModel(label string) spinnerModel {
s := spinner.New()
s.Spinner = spinner.Dot
- s.Style = lipgloss.NewStyle().Foreground(arcanePurple)
return spinnerModel{spinner: s, label: label}
}
@@ -34,7 +32,7 @@ func (m spinnerModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
switch msg := msg.(type) {
case spinnerDoneMsg:
return m, tea.Quit
- case tea.KeyMsg:
+ case tea.KeyPressMsg:
switch msg.String() {
case "q", "esc", "ctrl+c":
return m, tea.Quit
@@ -46,8 +44,8 @@ func (m spinnerModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
return m, cmd
}
-func (m spinnerModel) View() string {
- return fmt.Sprintf("%s %s", m.spinner.View(), m.label)
+func (m spinnerModel) View() tea.View {
+ return tea.NewView(fmt.Sprintf("%s %s", m.spinner.View(), m.label))
}
// Spinner renders a Bubble Tea spinner inline.
@@ -98,8 +96,7 @@ type progressModel struct {
}
func newProgressModel(label string, total int64) progressModel {
- p := progress.New(progress.WithDefaultGradient())
- p.Width = 40
+ p := progress.New(progress.WithDefaultBlend(), progress.WithWidth(40))
return progressModel{progress: p, label: label, total: total}
}
@@ -118,26 +115,23 @@ func (m progressModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
m.label = string(msg)
case progressDoneMsg:
return m, tea.Quit
- case tea.KeyMsg:
+ case tea.KeyPressMsg:
switch msg.String() {
case "q", "esc", "ctrl+c":
return m, tea.Quit
}
case tea.WindowSizeMsg:
if msg.Width > 10 {
- m.progress.Width = msg.Width - 10
+ m.progress.SetWidth(msg.Width - 10)
}
}
var cmd tea.Cmd
- updated, cmd := m.progress.Update(msg)
- if model, ok := updated.(progress.Model); ok {
- m.progress = model
- }
+ m.progress, cmd = m.progress.Update(msg)
return m, cmd
}
-func (m progressModel) View() string {
+func (m progressModel) View() tea.View {
percent := 0.0
if m.total > 0 {
percent = float64(m.current) / float64(m.total)
@@ -150,9 +144,9 @@ func (m progressModel) View() string {
bar := m.progress.ViewAs(percent)
if m.total > 0 {
- return fmt.Sprintf("%s\n%s %s/%s", m.label, bar, safeCapacity(m.current), safeCapacity(m.total))
+ return tea.NewView(fmt.Sprintf("%s\n%s %s/%s", m.label, bar, safeCapacity(m.current), safeCapacity(m.total)))
}
- return fmt.Sprintf("%s\n%s", m.label, bar)
+ return tea.NewView(fmt.Sprintf("%s\n%s", m.label, bar))
}
func safeCapacity(value int64) size.Capacity {
diff --git a/cli/internal/prompt/prompt.go b/cli/internal/prompt/prompt.go
index 681234b79..a6f0dec01 100644
--- a/cli/internal/prompt/prompt.go
+++ b/cli/internal/prompt/prompt.go
@@ -4,8 +4,8 @@ import (
"fmt"
"os"
- "github.com/charmbracelet/bubbles/list"
- tea "github.com/charmbracelet/bubbletea"
+ "charm.land/bubbles/v2/list"
+ tea "charm.land/bubbletea/v2"
"github.com/charmbracelet/x/term"
)
@@ -87,7 +87,7 @@ func (m selectModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
}
m.list.SetSize(width, height)
return m, nil
- case tea.KeyMsg:
+ case tea.KeyPressMsg:
switch msg.String() {
case "q", "esc", "ctrl+c":
m.canceled = true
@@ -106,6 +106,6 @@ func (m selectModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
return m, cmd
}
-func (m selectModel) View() string {
- return "\n" + m.list.View()
+func (m selectModel) View() tea.View {
+ return tea.NewView("\n" + m.list.View())
}
diff --git a/cli/internal/types/endpoints.go b/cli/internal/types/endpoints.go
index caf2375bd..0f1bd734c 100644
--- a/cli/internal/types/endpoints.go
+++ b/cli/internal/types/endpoints.go
@@ -5,23 +5,16 @@ import "fmt"
// ArcaneApiEndpoints holds the API endpoint path templates for the Arcane API.
// Endpoint paths may contain format specifiers (e.g., %s) for environment IDs or resource IDs.
type ArcaneApiEndpoints struct {
- // Version & Health
- AppVersionEndpoint string
- VersionEndpoint string
- HealthEndpoint string
+ // Version
+ VersionEndpoint string
// Authentication
- AuthLoginEndpoint string
AuthLogoutEndpoint string
AuthMeEndpoint string
AuthPasswordEndpoint string
AuthRefreshEndpoint string
// OIDC
- OIDCStatusEndpoint string
- OIDCConfigEndpoint string
- OIDCUrlEndpoint string
- OIDCCallbackEndpoint string
OIDCDeviceCodeEndpoint string
OIDCDeviceTokenEndpoint string
@@ -34,11 +27,9 @@ type ArcaneApiEndpoints struct {
UserEndpoint string
// Environments
- EnvironmentsEndpoint string
- EnvironmentEndpoint string
- EnvironmentPairEndpoint string
- EnvironmentAgentEndpoint string
- EnvironmentTestEndpoint string
+ EnvironmentsEndpoint string
+ EnvironmentEndpoint string
+ EnvironmentTestEndpoint string
// Containers
ContainersEndpoint string
@@ -58,11 +49,10 @@ type ArcaneApiEndpoints struct {
ImagesUploadEndpoint string
// Image Updates
- ImageUpdatesCheckEndpoint string
- ImageUpdatesCheckAllEndpoint string
- ImageUpdatesCheckBatchEndpoint string
- ImageUpdatesCheckByIdEndpoint string
- ImageUpdatesSummaryEndpoint string
+ ImageUpdatesCheckEndpoint string
+ ImageUpdatesCheckAllEndpoint string
+ ImageUpdatesCheckByIdEndpoint string
+ ImageUpdatesSummaryEndpoint string
// Networks
NetworksEndpoint string
@@ -88,18 +78,12 @@ type ArcaneApiEndpoints struct {
ProjectRestartEndpoint string
ProjectRedeployEndpoint string
ProjectPullEndpoint string
- ProjectIncludesEndpoint string
// System
- SystemPruneEndpoint string
- SystemHealthEndpoint string
- SystemDockerInfoEndpoint string
- SystemConvertEndpoint string
- SystemContainersStartAllEndpoint string
- SystemContainersStopAllEndpoint string
- SystemContainersStartStoppedEndpoint string
- SystemUpgradeCheckEndpoint string
- SystemUpgradeEndpoint string
+ SystemPruneEndpoint string
+ SystemDockerInfoEndpoint string
+ SystemContainersStartAllEndpoint string
+ SystemContainersStopAllEndpoint string
// Updater
UpdaterStatusEndpoint string
@@ -110,24 +94,17 @@ type ArcaneApiEndpoints struct {
JobSchedulesEndpoint string
// Settings
- SettingsEndpoint string
- SettingsPublicEndpoint string
- SettingsCategoriesEndpoint string
- SettingsSearchEndpoint string
+ SettingsEndpoint string
// Notifications
- NotificationsAppriseEndpoint string
- NotificationsAppriseTestEndpoint string
- NotificationsSettingsEndpoint string
- NotificationSettingEndpoint string
- NotificationTestEndpoint string
+ NotificationsAppriseEndpoint string
+ NotificationsSettingsEndpoint string
// Container Registries
- ContainerRegistriesEndpoint string
- ContainerRegistryEndpoint string
- ContainerRegistrySyncEndpoint string
- ContainerRegistryTestEndpoint string
- EnvironmentSyncRegistriesEndpoint string
+ ContainerRegistriesEndpoint string
+ ContainerRegistryEndpoint string
+ ContainerRegistrySyncEndpoint string
+ ContainerRegistryTestEndpoint string
// Events
EventsEndpoint string
@@ -139,16 +116,10 @@ type ArcaneApiEndpoints struct {
TemplateEndpoint string
TemplatesAllEndpoint string
TemplatesDefaultEndpoint string
- TemplatesFetchEndpoint string
TemplatesRegistriesEndpoint string
TemplateRegistryEndpoint string
TemplatesVariablesEndpoint string
TemplateContentEndpoint string
- TemplateDownloadEndpoint string
-
- // Deployment
- DeploymentEndpoint string
- HeartbeatEndpoint string
// Dashboard
DashboardActionItemsEndpoint string
@@ -168,23 +139,16 @@ type ArcaneApiEndpoints struct {
// Endpoints contains the defined API endpoints
var Endpoints = ArcaneApiEndpoints{ //nolint:gosec // static endpoint paths; auth-related names are not credentials
- // Version & Health
- AppVersionEndpoint: "/api/app-version",
- VersionEndpoint: "/api/version",
- HealthEndpoint: "/api/health",
+ // Version
+ VersionEndpoint: "/api/version",
// Authentication
- AuthLoginEndpoint: "/api/auth/login",
AuthLogoutEndpoint: "/api/auth/logout",
AuthMeEndpoint: "/api/auth/me",
AuthPasswordEndpoint: "/api/auth/password",
AuthRefreshEndpoint: "/api/auth/refresh",
// OIDC
- OIDCStatusEndpoint: "/api/oidc/status",
- OIDCConfigEndpoint: "/api/oidc/config",
- OIDCUrlEndpoint: "/api/oidc/url",
- OIDCCallbackEndpoint: "/api/oidc/callback",
OIDCDeviceCodeEndpoint: "/api/oidc/device/code",
OIDCDeviceTokenEndpoint: "/api/oidc/device/token",
@@ -197,11 +161,9 @@ var Endpoints = ArcaneApiEndpoints{ //nolint:gosec // static endpoint paths; aut
UserEndpoint: "/api/users/%s",
// Environments
- EnvironmentsEndpoint: "/api/environments",
- EnvironmentEndpoint: "/api/environments/%s",
- EnvironmentPairEndpoint: "/api/environments/pair",
- EnvironmentAgentEndpoint: "/api/environments/%s/agent/pair",
- EnvironmentTestEndpoint: "/api/environments/%s/test",
+ EnvironmentsEndpoint: "/api/environments",
+ EnvironmentEndpoint: "/api/environments/%s",
+ EnvironmentTestEndpoint: "/api/environments/%s/test",
// Containers
ContainersEndpoint: "/api/environments/%s/containers",
@@ -221,11 +183,10 @@ var Endpoints = ArcaneApiEndpoints{ //nolint:gosec // static endpoint paths; aut
ImagesUploadEndpoint: "/api/environments/%s/images/upload",
// Image Updates
- ImageUpdatesCheckEndpoint: "/api/environments/%s/image-updates/check",
- ImageUpdatesCheckAllEndpoint: "/api/environments/%s/image-updates/check-all",
- ImageUpdatesCheckBatchEndpoint: "/api/environments/%s/image-updates/check-batch",
- ImageUpdatesCheckByIdEndpoint: "/api/environments/%s/image-updates/check/%s",
- ImageUpdatesSummaryEndpoint: "/api/environments/%s/image-updates/summary",
+ ImageUpdatesCheckEndpoint: "/api/environments/%s/image-updates/check",
+ ImageUpdatesCheckAllEndpoint: "/api/environments/%s/image-updates/check-all",
+ ImageUpdatesCheckByIdEndpoint: "/api/environments/%s/image-updates/check/%s",
+ ImageUpdatesSummaryEndpoint: "/api/environments/%s/image-updates/summary",
// Networks
NetworksEndpoint: "/api/environments/%s/networks",
@@ -251,18 +212,12 @@ var Endpoints = ArcaneApiEndpoints{ //nolint:gosec // static endpoint paths; aut
ProjectRestartEndpoint: "/api/environments/%s/projects/%s/restart",
ProjectRedeployEndpoint: "/api/environments/%s/projects/%s/redeploy",
ProjectPullEndpoint: "/api/environments/%s/projects/%s/pull",
- ProjectIncludesEndpoint: "/api/environments/%s/projects/%s/includes",
// System
- SystemPruneEndpoint: "/api/environments/%s/system/prune",
- SystemHealthEndpoint: "/api/environments/%s/system/health",
- SystemDockerInfoEndpoint: "/api/environments/%s/system/docker/info",
- SystemConvertEndpoint: "/api/environments/%s/system/convert",
- SystemContainersStartAllEndpoint: "/api/environments/%s/system/containers/start-all",
- SystemContainersStopAllEndpoint: "/api/environments/%s/system/containers/stop-all",
- SystemContainersStartStoppedEndpoint: "/api/environments/%s/system/containers/start-stopped",
- SystemUpgradeCheckEndpoint: "/api/environments/%s/system/upgrade/check",
- SystemUpgradeEndpoint: "/api/environments/%s/system/upgrade",
+ SystemPruneEndpoint: "/api/environments/%s/system/prune",
+ SystemDockerInfoEndpoint: "/api/environments/%s/system/docker/info",
+ SystemContainersStartAllEndpoint: "/api/environments/%s/system/containers/start-all",
+ SystemContainersStopAllEndpoint: "/api/environments/%s/system/containers/stop-all",
// Updater
UpdaterStatusEndpoint: "/api/environments/%s/updater/status",
@@ -273,24 +228,17 @@ var Endpoints = ArcaneApiEndpoints{ //nolint:gosec // static endpoint paths; aut
JobSchedulesEndpoint: "/api/job-schedules",
// Settings
- SettingsEndpoint: "/api/environments/%s/settings",
- SettingsPublicEndpoint: "/api/environments/%s/settings/public",
- SettingsCategoriesEndpoint: "/api/settings/categories",
- SettingsSearchEndpoint: "/api/settings/search",
+ SettingsEndpoint: "/api/environments/%s/settings",
// Notifications
- NotificationsAppriseEndpoint: "/api/environments/%s/notifications/apprise",
- NotificationsAppriseTestEndpoint: "/api/environments/%s/notifications/apprise/test",
- NotificationsSettingsEndpoint: "/api/environments/%s/notifications/settings",
- NotificationSettingEndpoint: "/api/environments/%s/notifications/settings/%s",
- NotificationTestEndpoint: "/api/environments/%s/notifications/test/%s",
+ NotificationsAppriseEndpoint: "/api/environments/%s/notifications/apprise",
+ NotificationsSettingsEndpoint: "/api/environments/%s/notifications/settings",
// Container Registries
- ContainerRegistriesEndpoint: "/api/container-registries",
- ContainerRegistryEndpoint: "/api/container-registries/%s",
- ContainerRegistrySyncEndpoint: "/api/container-registries/sync",
- ContainerRegistryTestEndpoint: "/api/container-registries/%s/test",
- EnvironmentSyncRegistriesEndpoint: "/api/environments/%s/sync-registries",
+ ContainerRegistriesEndpoint: "/api/container-registries",
+ ContainerRegistryEndpoint: "/api/container-registries/%s",
+ ContainerRegistrySyncEndpoint: "/api/container-registries/sync",
+ ContainerRegistryTestEndpoint: "/api/container-registries/%s/test",
// Events
EventsEndpoint: "/api/events",
@@ -302,16 +250,10 @@ var Endpoints = ArcaneApiEndpoints{ //nolint:gosec // static endpoint paths; aut
TemplateEndpoint: "/api/templates/%s",
TemplatesAllEndpoint: "/api/templates/all",
TemplatesDefaultEndpoint: "/api/templates/default",
- TemplatesFetchEndpoint: "/api/templates/fetch",
TemplatesRegistriesEndpoint: "/api/templates/registries",
TemplateRegistryEndpoint: "/api/templates/registries/%s",
TemplatesVariablesEndpoint: "/api/templates/variables",
TemplateContentEndpoint: "/api/templates/%s/content",
- TemplateDownloadEndpoint: "/api/templates/%s/download",
-
- // Deployment & Heartbeat
- DeploymentEndpoint: "/api/environments/%s/deployment",
- HeartbeatEndpoint: "/api/environments/%s/heartbeat",
// Dashboard
DashboardActionItemsEndpoint: "/api/environments/%s/dashboard/action-items",
@@ -330,17 +272,12 @@ var Endpoints = ArcaneApiEndpoints{ //nolint:gosec // static endpoint paths; aut
}
// Auth endpoints
-func (e ArcaneApiEndpoints) AuthLogin() string { return e.AuthLoginEndpoint }
func (e ArcaneApiEndpoints) AuthLogout() string { return e.AuthLogoutEndpoint }
func (e ArcaneApiEndpoints) AuthMe() string { return e.AuthMeEndpoint }
func (e ArcaneApiEndpoints) AuthPassword() string { return e.AuthPasswordEndpoint }
func (e ArcaneApiEndpoints) AuthRefresh() string { return e.AuthRefreshEndpoint }
// OIDC endpoints
-func (e ArcaneApiEndpoints) OIDCStatus() string { return e.OIDCStatusEndpoint }
-func (e ArcaneApiEndpoints) OIDCConfig() string { return e.OIDCConfigEndpoint }
-func (e ArcaneApiEndpoints) OIDCUrl() string { return e.OIDCUrlEndpoint }
-func (e ArcaneApiEndpoints) OIDCCallback() string { return e.OIDCCallbackEndpoint }
func (e ArcaneApiEndpoints) OIDCDeviceCode() string { return e.OIDCDeviceCodeEndpoint }
func (e ArcaneApiEndpoints) OIDCDeviceToken() string { return e.OIDCDeviceTokenEndpoint }
@@ -358,10 +295,6 @@ func (e ArcaneApiEndpoints) Environments() string { return e.EnvironmentsEndpoin
func (e ArcaneApiEndpoints) Environment(id string) string {
return fmt.Sprintf(e.EnvironmentEndpoint, id)
}
-func (e ArcaneApiEndpoints) EnvironmentPair() string { return e.EnvironmentPairEndpoint }
-func (e ArcaneApiEndpoints) EnvironmentAgent(envID string) string {
- return fmt.Sprintf(e.EnvironmentAgentEndpoint, envID)
-}
func (e ArcaneApiEndpoints) EnvironmentTest(envID string) string {
return fmt.Sprintf(e.EnvironmentTestEndpoint, envID)
@@ -428,10 +361,6 @@ func (e ArcaneApiEndpoints) ImageUpdatesCheckAll(envID string) string {
return fmt.Sprintf(e.ImageUpdatesCheckAllEndpoint, envID)
}
-func (e ArcaneApiEndpoints) ImageUpdatesCheckBatch(envID string) string {
- return fmt.Sprintf(e.ImageUpdatesCheckBatchEndpoint, envID)
-}
-
func (e ArcaneApiEndpoints) ImageUpdatesCheckById(envID, imageID string) string {
return fmt.Sprintf(e.ImageUpdatesCheckByIdEndpoint, envID, imageID)
}
@@ -519,27 +448,15 @@ func (e ArcaneApiEndpoints) ProjectPull(envID, projectID string) string {
return fmt.Sprintf(e.ProjectPullEndpoint, envID, projectID)
}
-func (e ArcaneApiEndpoints) ProjectIncludes(envID, projectID string) string {
- return fmt.Sprintf(e.ProjectIncludesEndpoint, envID, projectID)
-}
-
// System endpoints
func (e ArcaneApiEndpoints) SystemPrune(envID string) string {
return fmt.Sprintf(e.SystemPruneEndpoint, envID)
}
-func (e ArcaneApiEndpoints) SystemHealth(envID string) string {
- return fmt.Sprintf(e.SystemHealthEndpoint, envID)
-}
-
func (e ArcaneApiEndpoints) SystemDockerInfo(envID string) string {
return fmt.Sprintf(e.SystemDockerInfoEndpoint, envID)
}
-func (e ArcaneApiEndpoints) SystemConvert(envID string) string {
- return fmt.Sprintf(e.SystemConvertEndpoint, envID)
-}
-
func (e ArcaneApiEndpoints) SystemContainersStartAll(envID string) string {
return fmt.Sprintf(e.SystemContainersStartAllEndpoint, envID)
}
@@ -548,18 +465,6 @@ func (e ArcaneApiEndpoints) SystemContainersStopAll(envID string) string {
return fmt.Sprintf(e.SystemContainersStopAllEndpoint, envID)
}
-func (e ArcaneApiEndpoints) SystemContainersStartStopped(envID string) string {
- return fmt.Sprintf(e.SystemContainersStartStoppedEndpoint, envID)
-}
-
-func (e ArcaneApiEndpoints) SystemUpgradeCheck(envID string) string {
- return fmt.Sprintf(e.SystemUpgradeCheckEndpoint, envID)
-}
-
-func (e ArcaneApiEndpoints) SystemUpgrade(envID string) string {
- return fmt.Sprintf(e.SystemUpgradeEndpoint, envID)
-}
-
// Updater endpoints
func (e ArcaneApiEndpoints) UpdaterStatus(envID string) string {
return fmt.Sprintf(e.UpdaterStatusEndpoint, envID)
@@ -581,33 +486,15 @@ func (e ArcaneApiEndpoints) Settings(envID string) string {
return fmt.Sprintf(e.SettingsEndpoint, envID)
}
-func (e ArcaneApiEndpoints) SettingsPublic(envID string) string {
- return fmt.Sprintf(e.SettingsPublicEndpoint, envID)
-}
-func (e ArcaneApiEndpoints) SettingsCategories() string { return e.SettingsCategoriesEndpoint }
-func (e ArcaneApiEndpoints) SettingsSearch() string { return e.SettingsSearchEndpoint }
-
// Notification endpoints
func (e ArcaneApiEndpoints) NotificationsApprise(envID string) string {
return fmt.Sprintf(e.NotificationsAppriseEndpoint, envID)
}
-func (e ArcaneApiEndpoints) NotificationsAppriseTest(envID string) string {
- return fmt.Sprintf(e.NotificationsAppriseTestEndpoint, envID)
-}
-
func (e ArcaneApiEndpoints) NotificationsSettings(envID string) string {
return fmt.Sprintf(e.NotificationsSettingsEndpoint, envID)
}
-func (e ArcaneApiEndpoints) NotificationSetting(envID, provider string) string {
- return fmt.Sprintf(e.NotificationSettingEndpoint, envID, provider)
-}
-
-func (e ArcaneApiEndpoints) NotificationTest(envID, provider string) string {
- return fmt.Sprintf(e.NotificationTestEndpoint, envID, provider)
-}
-
// Container Registry endpoints
func (e ArcaneApiEndpoints) ContainerRegistries() string { return e.ContainerRegistriesEndpoint }
@@ -619,10 +506,6 @@ func (e ArcaneApiEndpoints) ContainerRegistryTest(id string) string {
return fmt.Sprintf(e.ContainerRegistryTestEndpoint, id)
}
-func (e ArcaneApiEndpoints) EnvironmentSyncRegistries(envID string) string {
- return fmt.Sprintf(e.EnvironmentSyncRegistriesEndpoint, envID)
-}
-
// Event endpoints
func (e ArcaneApiEndpoints) Events() string { return e.EventsEndpoint }
func (e ArcaneApiEndpoints) Event(id string) string { return fmt.Sprintf(e.EventEndpoint, id) }
@@ -635,7 +518,6 @@ func (e ArcaneApiEndpoints) Templates() string { return e.TemplatesEnd
func (e ArcaneApiEndpoints) Template(id string) string { return fmt.Sprintf(e.TemplateEndpoint, id) }
func (e ArcaneApiEndpoints) TemplatesAll() string { return e.TemplatesAllEndpoint }
func (e ArcaneApiEndpoints) TemplatesDefault() string { return e.TemplatesDefaultEndpoint }
-func (e ArcaneApiEndpoints) TemplatesFetch() string { return e.TemplatesFetchEndpoint }
func (e ArcaneApiEndpoints) TemplatesRegistries() string { return e.TemplatesRegistriesEndpoint }
func (e ArcaneApiEndpoints) TemplateRegistry(id string) string {
return fmt.Sprintf(e.TemplateRegistryEndpoint, id)
@@ -645,51 +527,7 @@ func (e ArcaneApiEndpoints) TemplateContent(id string) string {
return fmt.Sprintf(e.TemplateContentEndpoint, id)
}
-func (e ArcaneApiEndpoints) TemplateDownload(id string) string {
- return fmt.Sprintf(e.TemplateDownloadEndpoint, id)
-}
-
-// Deployment & Heartbeat endpoints
-func (e ArcaneApiEndpoints) Deployment(envID string) string {
- return fmt.Sprintf(e.DeploymentEndpoint, envID)
-}
-
-func (e ArcaneApiEndpoints) Heartbeat(envID string) string {
- return fmt.Sprintf(e.HeartbeatEndpoint, envID)
-}
-
// Dashboard endpoints
func (e ArcaneApiEndpoints) DashboardActionItems(envID string) string {
return fmt.Sprintf(e.DashboardActionItemsEndpoint, envID)
}
-
-// Version & Health endpoints
-func (e ArcaneApiEndpoints) AppVersion() string { return e.AppVersionEndpoint }
-func (e ArcaneApiEndpoints) Version() string { return e.VersionEndpoint }
-func (e ArcaneApiEndpoints) Health() string { return e.HealthEndpoint }
-
-// Legacy methods for backwards compatibility
-func (e ArcaneApiEndpoints) FormatContainers(envID string) string {
- return e.Containers(envID)
-}
-
-func (e ArcaneApiEndpoints) UseImageEndpoint(action string, envID string) string {
- switch action {
- case "list":
- return e.Images(envID)
- case "get":
- return e.Images(envID)
- case "pull":
- return e.ImagesPull(envID)
- case "delete":
- return e.Images(envID)
- case "prune":
- return e.ImagesPrune(envID)
- case "counts":
- return e.ImagesCounts(envID)
- case "upload":
- return e.ImagesUpload(envID)
- default:
- return ""
- }
-}
diff --git a/cli/pkg/environments/cmd.go b/cli/pkg/environments/cmd.go
index 100750cb4..ec306bdd8 100644
--- a/cli/pkg/environments/cmd.go
+++ b/cli/pkg/environments/cmd.go
@@ -6,7 +6,7 @@ import (
"sort"
"strings"
- "github.com/charmbracelet/lipgloss"
+ "charm.land/lipgloss/v2"
"github.com/getarcaneapp/arcane/cli/internal/client"
"github.com/getarcaneapp/arcane/cli/internal/cmdutil"
"github.com/getarcaneapp/arcane/cli/internal/config"
diff --git a/cli/pkg/root.go b/cli/pkg/root.go
index 55c1bb4d4..bec666c6c 100644
--- a/cli/pkg/root.go
+++ b/cli/pkg/root.go
@@ -36,10 +36,13 @@ import (
"fmt"
"os"
"runtime"
+ "sort"
"strings"
"time"
- "github.com/charmbracelet/fang"
+ "charm.land/lipgloss/v2"
+ "charm.land/lipgloss/v2/compat"
+ "charm.land/lipgloss/v2/table"
"github.com/fatih/color"
"github.com/getarcaneapp/arcane/cli/internal/config"
"github.com/getarcaneapp/arcane/cli/internal/logger"
@@ -67,6 +70,7 @@ import (
"github.com/getarcaneapp/arcane/cli/pkg/version"
"github.com/getarcaneapp/arcane/cli/pkg/volumes"
"github.com/spf13/cobra"
+ "github.com/spf13/pflag"
)
var (
@@ -82,8 +86,38 @@ var (
globalJSON bool
)
+var (
+ helpPurple = compat.AdaptiveColor{
+ Light: lipgloss.Color("#6d28d9"),
+ Dark: lipgloss.Color("#a78bfa"),
+ }
+ helpTextPrimary = compat.AdaptiveColor{
+ Light: lipgloss.Color("#1f2937"),
+ Dark: lipgloss.Color("#e5e7eb"),
+ }
+ helpTextMuted = compat.AdaptiveColor{
+ Light: lipgloss.Color("#64748b"),
+ Dark: lipgloss.Color("#cbd5e1"),
+ }
+
+ helpTitleStyle = lipgloss.NewStyle().Bold(true).Foreground(helpPurple).Padding(0, 1)
+ helpSubtitleStyle = lipgloss.NewStyle().Foreground(helpTextMuted).PaddingLeft(1)
+ helpVersionStyle = lipgloss.NewStyle().Foreground(helpTextMuted).PaddingLeft(1)
+ helpSectionStyle = lipgloss.NewStyle().Bold(true).Foreground(helpPurple).Padding(0, 1)
+
+ helpCmdHeader = lipgloss.NewStyle().Bold(true).Foreground(helpPurple).Align(lipgloss.Center).Padding(0, 2)
+ helpCmdCell = lipgloss.NewStyle().Padding(0, 2)
+ helpCmdOdd = helpCmdCell.Foreground(helpTextPrimary)
+ helpCmdEven = helpCmdCell.Foreground(helpTextMuted)
+ helpCmdBorder = lipgloss.NewStyle().Foreground(helpPurple)
+
+ helpTableWrap = lipgloss.NewStyle().Padding(0, 1)
+ helpBodyStyle = lipgloss.NewStyle().Foreground(helpTextPrimary).PaddingLeft(2)
+ helpFooterStyle = lipgloss.NewStyle().Foreground(helpTextMuted).Padding(1, 1, 0, 1)
+)
+
var rootCmd = &cobra.Command{
- Use: "arcane",
+ Use: "arcane-cli",
Long: "Arcane CLI - The official command line interface for Arcane",
PersistentPreRunE: func(cmd *cobra.Command, args []string) error {
if configPath != "" {
@@ -160,7 +194,7 @@ var rootCmd = &cobra.Command{
}
func Execute() {
- if err := fang.Execute(context.Background(), rootCmd); err != nil {
+ if err := rootCmd.ExecuteContext(context.Background()); err != nil {
os.Exit(1)
}
}
@@ -172,6 +206,10 @@ func RootCommand() *cobra.Command {
}
func init() {
+ rootCmd.SetHelpFunc(func(cmd *cobra.Command, args []string) {
+ renderCommandHelp(cmd)
+ })
+
rootCmd.PersistentFlags().StringVar(&logLevel, "log-level", "info", "Log level (debug, info, warn, error, fatal, panic)")
rootCmd.PersistentFlags().StringVarP(&configPath, "config", "c", "", "Path to config file (default ~/.config/arcanecli.yml)")
rootCmd.PersistentFlags().StringVar(&outputMode, "output", "text", "Output mode (text, json)")
@@ -204,3 +242,153 @@ func init() {
rootCmd.AddCommand(updater.UpdaterCmd)
rootCmd.AddCommand(admin.AdminCmd)
}
+
+func renderCommandHelp(cmd *cobra.Command) {
+ title := cmd.CommandPath()
+ if cmd == rootCmd {
+ title = "Arcane CLI"
+ }
+ lipgloss.Println(helpTitleStyle.Render(title))
+
+ summary := strings.TrimSpace(cmd.Long)
+ if summary == "" {
+ summary = strings.TrimSpace(cmd.Short)
+ }
+ if summary != "" {
+ lipgloss.Println(helpSubtitleStyle.Render(summary))
+ }
+
+ if cmd == rootCmd {
+ lipgloss.Println(helpVersionStyle.Render(fmt.Sprintf("Version %s (%s)", config.Version, config.Revision)))
+ }
+ lipgloss.Println()
+
+ usageLine := cmd.UseLine()
+ if usageLine != "" {
+ lipgloss.Println(helpSectionStyle.Render("Usage"))
+ lipgloss.Println(helpBodyStyle.Render(usageLine))
+ lipgloss.Println()
+ }
+
+ if len(cmd.Aliases) > 0 {
+ lipgloss.Println(helpSectionStyle.Render("Aliases"))
+ lipgloss.Println(helpBodyStyle.Render(strings.Join(cmd.Aliases, ", ")))
+ lipgloss.Println()
+ }
+
+ commandRows := collectCommandRows(cmd)
+ if len(commandRows) > 0 {
+ lipgloss.Println(helpSectionStyle.Render("Commands"))
+ renderHelpTable([]string{"COMMAND", "DESCRIPTION"}, commandRows)
+ lipgloss.Println()
+ }
+
+ localFlagRows := collectFlagRows(cmd.NonInheritedFlags())
+ if len(localFlagRows) > 0 {
+ lipgloss.Println(helpSectionStyle.Render("Flags"))
+ renderHelpTable([]string{"FLAG", "TYPE", "DEFAULT", "DESCRIPTION"}, localFlagRows)
+ lipgloss.Println()
+ }
+
+ inheritedFlagRows := collectFlagRows(cmd.InheritedFlags())
+ if len(inheritedFlagRows) > 0 {
+ lipgloss.Println(helpSectionStyle.Render("Global Flags"))
+ renderHelpTable([]string{"FLAG", "TYPE", "DEFAULT", "DESCRIPTION"}, inheritedFlagRows)
+ lipgloss.Println()
+ }
+
+ examples := strings.TrimSpace(cmd.Example)
+ if examples != "" {
+ lipgloss.Println(helpSectionStyle.Render("Examples"))
+ for _, line := range strings.Split(examples, "\n") {
+ trimmed := strings.TrimSpace(line)
+ if trimmed == "" {
+ lipgloss.Println()
+ continue
+ }
+ lipgloss.Println(helpBodyStyle.Render(trimmed))
+ }
+ lipgloss.Println()
+ }
+
+ if cmd.HasAvailableSubCommands() {
+ lipgloss.Println(helpFooterStyle.Render(fmt.Sprintf("Run '%s [command] --help' for command-specific help.", cmd.CommandPath())))
+ }
+}
+
+func collectCommandRows(cmd *cobra.Command) [][]string {
+ rows := make([][]string, 0, len(cmd.Commands()))
+ for _, sub := range cmd.Commands() {
+ if !sub.IsAvailableCommand() || sub.Hidden || sub.IsAdditionalHelpTopicCommand() {
+ continue
+ }
+ rows = append(rows, []string{sub.Name(), sub.Short})
+ }
+
+ sort.Slice(rows, func(i, j int) bool {
+ return rows[i][0] < rows[j][0]
+ })
+
+ return rows
+}
+
+func collectFlagRows(flags *pflag.FlagSet) [][]string {
+ if flags == nil {
+ return nil
+ }
+
+ rows := make([][]string, 0)
+ flags.VisitAll(func(f *pflag.Flag) {
+ if f == nil || f.Hidden {
+ return
+ }
+
+ name := "--" + f.Name
+ if f.Shorthand != "" && f.ShorthandDeprecated == "" {
+ name = fmt.Sprintf("-%s, --%s", f.Shorthand, f.Name)
+ }
+
+ defaultValue := strings.TrimSpace(f.DefValue)
+ if defaultValue == "" {
+ defaultValue = "—"
+ }
+
+ flagType := "value"
+ if f.Value != nil {
+ if t := strings.TrimSpace(f.Value.Type()); t != "" {
+ flagType = t
+ }
+ }
+
+ rows = append(rows, []string{name, flagType, defaultValue, f.Usage})
+ })
+
+ sort.Slice(rows, func(i, j int) bool {
+ return rows[i][0] < rows[j][0]
+ })
+
+ return rows
+}
+
+func renderHelpTable(headers []string, rows [][]string) {
+ t := table.New().
+ Border(lipgloss.NormalBorder()).
+ BorderStyle(helpCmdBorder).
+ StyleFunc(func(row, col int) lipgloss.Style {
+ switch {
+ case row == table.HeaderRow:
+ return helpCmdHeader
+ case row%2 == 0:
+ return helpCmdEven
+ default:
+ return helpCmdOdd
+ }
+ }).
+ Headers(headers...)
+
+ if len(rows) > 0 {
+ t = t.Rows(rows...)
+ }
+
+ lipgloss.Println(helpTableWrap.Render(fmt.Sprint(t)))
+}
diff --git a/go.work.sum b/go.work.sum
index 109ea0951..643fb0279 100644
--- a/go.work.sum
+++ b/go.work.sum
@@ -4,6 +4,8 @@ cel.dev/expr v0.24.0 h1:56OvJKSH3hDGL0ml5uSxZmz3/3Pq4tJ+fb1unVLAFcY=
cel.dev/expr v0.24.0/go.mod h1:hLPLo1W4QUmuYdA72RBX06QTs6MXw941piREPl3Yfiw=
cel.dev/expr v0.25.1 h1:1KrZg61W6TWSxuNZ37Xy49ps13NUovb66QLprthtwi4=
cel.dev/expr v0.25.1/go.mod h1:hrXvqGP6G6gyx8UAHSHJ5RGk//1Oj5nXQ2NI02Nrsg4=
+charm.land/bubbles/v2 v2.0.0/go.mod h1:rCHoleP2XhU8um45NTuOWBPNVHxnkXKTiZqcclL/qOI=
+charm.land/bubbletea/v2 v2.0.0/go.mod h1:3LRff2U4WIYXy7MTxfbAQ+AdfM3D8Xuvz2wbsOD9OHQ=
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
cloud.google.com/go v0.121.6 h1:waZiuajrI28iAf40cWgycWNgaXPO06dupuS+sgibK6c=
cloud.google.com/go v0.121.6/go.mod h1:coChdst4Ea5vUpiALcYKXEpR1S9ZgXbhEzzMcMR66vI=
@@ -181,6 +183,7 @@ github.com/aws/smithy-go v1.22.5 h1:P9ATCXPMb2mPjYBgueqJNCA5S9UfktsW0tTxi+a7eqw=
github.com/aws/smithy-go v1.22.5/go.mod h1:t1ufH5HMublsJYulve2RKmHDC15xu1f26kHCp/HgceI=
github.com/aws/smithy-go v1.23.2 h1:Crv0eatJUQhaManss33hS5r40CG3ZFH+21XSkqMrIUM=
github.com/aws/smithy-go v1.23.2/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
+github.com/aymanbagabas/go-udiff v0.4.0/go.mod h1:0L9PGwj20lrtmEMeyw4WKJ/TMyDtvAoK9bf2u/mNo3w=
github.com/bitly/go-hostpool v0.1.0 h1:XKmsF6k5el6xHG3WPJ8U0Ku/ye7njX7W81Ng7O2ioR0=
github.com/bitly/go-simplejson v0.5.0 h1:6IH+V8/tVMab511d5bn4M7EwGXZf9Hj6i2xSwkNEM+Y=
github.com/bits-and-blooms/bitset v1.24.0/go.mod h1:7hO7Gc7Pp1vODcmWvKMRA9BNmbv6a/7QIWpPxHddWR8=
@@ -194,6 +197,7 @@ github.com/bwesterb/go-ristretto v1.2.3/go.mod h1:fUIoIZaG73pV5biE2Blr2xEzDoMj7N
github.com/cenkalti/backoff/v4 v4.3.0 h1:MyRJ/UdXutAwSAT+s3wNd7MfTIcy71VQueUuFK343L8=
github.com/cenkalti/backoff/v4 v4.3.0/go.mod h1:Y3VNntkOUPxTVeUxJ/G5vcM//AlwfmyYozVcomhLiZE=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
+github.com/charmbracelet/ultraviolet v0.0.0-20260205113103-524a6607adb8/go.mod h1:SQpCTRNBtzJkwku5ye4S3HEuthAlGy2n9VXZnWkEW98=
github.com/charmbracelet/x/ansi v0.11.3/go.mod h1:yI7Zslym9tCJcedxz5+WBq+eUGMJT0bM06Fqy1/Y4dI=
github.com/checkpoint-restore/checkpointctl v1.4.0 h1:3kRns56TArwiyHOMakaumUgSZZlB1hZBkjVgR6IeZ3E=
github.com/checkpoint-restore/checkpointctl v1.4.0/go.mod h1:ynQ52zQBazgcTZuxpwTFzRinIcAf0haDTC1X1LA/FKA=
@@ -212,7 +216,10 @@ github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDk
github.com/clipperhouse/displaywidth v0.4.1 h1:uVw9V8UDfnggg3K2U84VWY1YLQ/x2aKSCtkRyYozfoU=
github.com/clipperhouse/displaywidth v0.4.1/go.mod h1:R+kHuzaYWFkTm7xoMmK1lFydbci4X2CicfbGstSGg0o=
github.com/clipperhouse/displaywidth v0.6.1/go.mod h1:R+kHuzaYWFkTm7xoMmK1lFydbci4X2CicfbGstSGg0o=
+github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
+github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
github.com/clipperhouse/uax29/v2 v2.2.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
+github.com/clipperhouse/uax29/v2 v2.5.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
github.com/cloudflare/circl v1.6.0 h1:cr5JKic4HI+LkINy2lg3W2jF8sHCVTBncJr5gIIq7qk=
github.com/cloudflare/circl v1.6.0/go.mod h1:uddAzsPgqdMAYatqJ0lsjX1oECcQLIlRpzZh3pJrofs=
github.com/cloudflare/golz4 v0.0.0-20150217214814-ef862a3cdc58 h1:F1EaeKL/ta07PY/k9Os/UFtwERei2/XzGemhpGnBKNg=
@@ -564,6 +571,7 @@ github.com/markbates/pkger v0.15.1/go.mod h1:0JoVlrol20BSywW79rN3kdFFsE5xYM+rSCQ
github.com/mattn/go-runewidth v0.0.9/go.mod h1:H031xJmbD/WCDINGzjvQ9THkh0rPKHF+m2gUSrubnMI=
github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
github.com/mattn/go-runewidth v0.0.17/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w=
+github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
github.com/matttproud/golang_protobuf_extensions v1.0.1 h1:4hp9jkHxhMHkqkrB3Ix0jegS5sx/RkqARlsWZ6pIwiU=
github.com/mdlayher/socket v0.5.1 h1:VZaqt6RkGkt2OE9l3GcC6nZkqD3xKeQLyfleW/uBcos=
github.com/mdlayher/socket v0.5.1/go.mod h1:TjPLHI1UgwEv5J1B5q0zTZq12A/6H7nKmtTanQE37IQ=
@@ -667,7 +675,6 @@ github.com/rqlite/gorqlite v0.0.0-20230708021416-2acd02b70b79/go.mod h1:xF/KoXmr
github.com/russross/blackfriday v1.6.0 h1:KqfZb0pUVN2lYqZUYRddxF4OR8ZMURnJIG5Y3VRLtww=
github.com/russross/blackfriday v1.6.0/go.mod h1:ti0ldHuxg49ri4ksnFxlkCfN+hvslNlmVHqNRXXJNAY=
github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
-github.com/sagikazarmark/locafero v0.12.0/go.mod h1:sZh36u/YSZ918v0Io+U9ogLYQJ9tLLBmM4eneO6WwsI=
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1 h1:lZUw3E0/J3roVtGQ+SCrUrg3ON6NgVqpn3+iol9aGu4=
github.com/santhosh-tekuri/jsonschema/v5 v5.3.1/go.mod h1:uToXkOrWAZ6/Oc07xWQrPOhJotwFIyu2bBVN41fcDUY=
github.com/santhosh-tekuri/jsonschema/v6 v6.0.1/go.mod h1:JXeL+ps8p7/KNMjDQk3TCwPpBy0wYklyWTfbkIzdIFU=