From 4659bbf812e2df74c0fd188b344370f09396be45 Mon Sep 17 00:00:00 2001 From: saeid-rez Date: Sun, 28 Jun 2026 16:50:52 +0200 Subject: [PATCH] Add Bubbletea --- cmd/add.go | 11 ++- cmd/init.go | 17 ++++ go.mod | 39 ++++---- go.sum | 86 +++++++++--------- pkg/ui/agent_wizard.go | 2 +- pkg/ui/multiselect.go | 176 +++++++++++++++++++++++++++++++++++++ pkg/ui/multiselect_test.go | 83 +++++++++++++++++ pkg/ui/ui.go | 92 ++++--------------- 8 files changed, 364 insertions(+), 142 deletions(-) create mode 100644 pkg/ui/multiselect.go create mode 100644 pkg/ui/multiselect_test.go diff --git a/cmd/add.go b/cmd/add.go index 3ac1e8b..1394596 100644 --- a/cmd/add.go +++ b/cmd/add.go @@ -1,10 +1,11 @@ package cmd import ( + "errors" "fmt" "strings" - "github.com/charmbracelet/huh" + "charm.land/huh/v2" "github.com/saeid-rez/crewup/internal/agentdefs" "github.com/saeid-rez/crewup/internal/config" "github.com/saeid-rez/crewup/internal/mcp" @@ -51,6 +52,10 @@ var addMCPCmd = &cobra.Command{ } selected, err := ui.SelectMCPPresets() if err != nil { + if errors.Is(err, ui.ErrUserCancelled) { + fmt.Println("Setup cancelled.") + return nil + } return err } if len(selected) == 0 { @@ -83,6 +88,10 @@ var addMCPCmd = &cobra.Command{ targetTools, err := ui.SelectTargetTools(cfg.Tools, preset.Name) if err != nil { + if errors.Is(err, ui.ErrUserCancelled) { + fmt.Println("Setup cancelled.") + return nil + } fmt.Printf(" ⚠️ %s: skipping tool selection (%v)\n", preset.Name, err) continue } diff --git a/cmd/init.go b/cmd/init.go index 50ab040..454d2bd 100644 --- a/cmd/init.go +++ b/cmd/init.go @@ -1,6 +1,7 @@ package cmd import ( + "errors" "fmt" "github.com/saeid-rez/crewup/internal/config" @@ -43,12 +44,20 @@ func runInit() error { // Step 2: Let user pick which tools to configure selectedTools, err := ui.SelectTools(detected) if err != nil { + if errors.Is(err, ui.ErrUserCancelled) { + fmt.Println("Setup cancelled.") + return nil + } return err } // Step 3: Let user pick which agent roles to set up selectedRoles, err := ui.SelectAgentRoles() if err != nil { + if errors.Is(err, ui.ErrUserCancelled) { + fmt.Println("Setup cancelled.") + return nil + } return err } @@ -87,6 +96,10 @@ func runInit() error { // Step 5: MCP preset selection and install selectedPresets, err := ui.SelectMCPPresets() if err != nil { + if errors.Is(err, ui.ErrUserCancelled) { + fmt.Println("Setup cancelled.") + return nil + } return err } @@ -100,6 +113,10 @@ func runInit() error { targetTools, err := ui.SelectTargetTools(toolInfos, preset.Name) if err != nil { + if errors.Is(err, ui.ErrUserCancelled) { + fmt.Println("Setup cancelled.") + return nil + } fmt.Printf(" ⚠️ %s: skipping tool selection (%v)\n", preset.Name, err) continue } diff --git a/go.mod b/go.mod index 81891dd..c028415 100644 --- a/go.mod +++ b/go.mod @@ -1,40 +1,39 @@ module github.com/saeid-rez/crewup -go 1.24.1 +go 1.25.8 require ( - github.com/charmbracelet/huh v1.0.0 - github.com/charmbracelet/lipgloss v1.1.0 + charm.land/bubbletea/v2 v2.0.7 + charm.land/huh/v2 v2.0.3 + charm.land/lipgloss/v2 v2.0.4 github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf + github.com/mattn/go-isatty v0.0.20 github.com/spf13/cobra v1.10.2 ) require ( + charm.land/bubbles/v2 v2.0.0 // indirect github.com/atotto/clipboard v0.1.4 // indirect - github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect github.com/catppuccin/go v0.3.0 // indirect - github.com/charmbracelet/bubbles v0.21.1-0.20250623103423-23b8fd6302d7 // indirect - github.com/charmbracelet/bubbletea v1.3.6 // indirect - github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc // indirect - github.com/charmbracelet/x/ansi v0.9.3 // indirect - github.com/charmbracelet/x/cellbuf v0.0.13 // indirect + github.com/charmbracelet/colorprofile v0.4.3 // indirect + github.com/charmbracelet/ultraviolet v0.0.0-20260525132238-948f4557a654 // indirect + github.com/charmbracelet/x/ansi v0.11.7 // indirect + github.com/charmbracelet/x/exp/ordered v0.1.0 // indirect github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 // indirect - github.com/charmbracelet/x/term v0.2.1 // indirect + github.com/charmbracelet/x/term v0.2.2 // indirect + github.com/charmbracelet/x/termios v0.1.1 // indirect + github.com/charmbracelet/x/windows v0.2.2 // indirect + github.com/clipperhouse/displaywidth v0.11.0 // indirect + github.com/clipperhouse/uax29/v2 v2.7.0 // indirect github.com/dustin/go-humanize v1.0.1 // indirect - github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect github.com/inconshreveable/mousetrap v1.1.0 // indirect - github.com/lucasb-eyer/go-colorful v1.2.0 // 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.16 // indirect + github.com/lucasb-eyer/go-colorful v1.4.0 // indirect + github.com/mattn/go-runewidth v0.0.23 // indirect github.com/mitchellh/hashstructure/v2 v2.0.2 // indirect - github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect github.com/muesli/cancelreader v0.2.2 // indirect - github.com/muesli/termenv v0.16.0 // indirect github.com/rivo/uniseg v0.4.7 // indirect github.com/spf13/pflag v1.0.10 // indirect github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect - golang.org/x/sync v0.16.0 // indirect - golang.org/x/sys v0.33.0 // indirect - golang.org/x/text v0.28.0 // indirect + golang.org/x/sync v0.20.0 // indirect + golang.org/x/sys v0.45.0 // indirect ) diff --git a/go.sum b/go.sum index ff3254b..43e10b4 100644 --- a/go.sum +++ b/go.sum @@ -1,69 +1,66 @@ +charm.land/bubbles/v2 v2.0.0 h1:tE3eK/pHjmtrDiRdoC9uGNLgpopOd8fjhEe31B/ai5s= +charm.land/bubbles/v2 v2.0.0/go.mod h1:rCHoleP2XhU8um45NTuOWBPNVHxnkXKTiZqcclL/qOI= +charm.land/bubbletea/v2 v2.0.7 h1:7qw2tTAVar7m7klOPBYfTB0mniv/RuexsYwMRNxSeL0= +charm.land/bubbletea/v2 v2.0.7/go.mod h1:DGW2q8gvzHnOpMpZTORs0aySVHCox5C+2Svk0fci1qs= +charm.land/huh/v2 v2.0.3 h1:2cJsMqEPwSywGHvdlKsJyQKPtSJLVnFKyFbsYZTlLkU= +charm.land/huh/v2 v2.0.3/go.mod h1:93eEveeeqn47MwiC3tf+2atZ2l7Is88rAtmZNZ8x9Wc= +charm.land/lipgloss/v2 v2.0.4 h1:lcPeVtcp23SNra7lHy8iYE4UC2aIipVQ47sbGyyxR5Q= +charm.land/lipgloss/v2 v2.0.4/go.mod h1:0653x8epbZSzdDfO/XPS1a/uYPOBeSsCssOpJOqDzik= github.com/MakeNowJust/heredoc v1.0.0 h1:cXCdzVdstXyiTqTvfqk9SDHpKNjxuom+DOlyEeQ4pzQ= github.com/MakeNowJust/heredoc v1.0.0/go.mod h1:mG5amYoWBHf8vpLOuehzbGGw0EHxpZZ6lCpQ4fNJ8LE= 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/aymanbagabas/go-udiff v0.4.1 h1:OEIrQ8maEeDBXQDoGCbbTTXYJMYRCRO1fnodZ12Gv5o= +github.com/aymanbagabas/go-udiff v0.4.1/go.mod h1:0L9PGwj20lrtmEMeyw4WKJ/TMyDtvAoK9bf2u/mNo3w= github.com/catppuccin/go v0.3.0 h1:d+0/YicIq+hSTo5oPuRi5kOpqkVA5tAsU6dNhvRu+aY= github.com/catppuccin/go v0.3.0/go.mod h1:8IHJuMGaUUjQM82qBrGNBv7LFq6JI3NnQCF6MOlZjpc= -github.com/charmbracelet/bubbles v0.21.1-0.20250623103423-23b8fd6302d7 h1:JFgG/xnwFfbezlUnFMJy0nusZvytYysV4SCS2cYbvws= -github.com/charmbracelet/bubbles v0.21.1-0.20250623103423-23b8fd6302d7/go.mod h1:ISC1gtLcVilLOf23wvTfoQuYbW2q0JevFxPfUzZ9Ybw= -github.com/charmbracelet/bubbletea v1.3.6 h1:VkHIxPJQeDt0aFJIsVxw8BQdh/F/L2KKZGsK6et5taU= -github.com/charmbracelet/bubbletea v1.3.6/go.mod h1:oQD9VCRQFF8KplacJLo28/jofOI2ToOfGYeFgBBxHOc= -github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc h1:4pZI35227imm7yK2bGPcfpFEmuY1gc2YSTShr4iJBfs= -github.com/charmbracelet/colorprofile v0.2.3-0.20250311203215-f60798e515dc/go.mod h1:X4/0JoqgTIPSFcRA/P6INZzIuyqdFY5rm8tb41s9okk= -github.com/charmbracelet/huh v1.0.0 h1:wOnedH8G4qzJbmhftTqrpppyqHakl/zbbNdXIWJyIxw= -github.com/charmbracelet/huh v1.0.0/go.mod h1:5YVc+SlZ1IhQALxRPpkGwwEKftN/+OlJlnJYlDRFqN4= -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/x/ansi v0.9.3 h1:BXt5DHS/MKF+LjuK4huWrC6NCvHtexww7dMayh6GXd0= -github.com/charmbracelet/x/ansi v0.9.3/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE= -github.com/charmbracelet/x/cellbuf v0.0.13 h1:/KBBKHuVRbq1lYx5BzEHBAFBP8VcQzJejZ/IA3iR28k= -github.com/charmbracelet/x/cellbuf v0.0.13/go.mod h1:xe0nKWGd3eJgtqZRaN9RjMtK7xUYchjzPr7q6kcvCCs= -github.com/charmbracelet/x/conpty v0.1.0 h1:4zc8KaIcbiL4mghEON8D72agYtSeIgq8FSThSPQIb+U= -github.com/charmbracelet/x/conpty v0.1.0/go.mod h1:rMFsDJoDwVmiYM10aD4bH2XiRgwI7NYJtQgl5yskjEQ= +github.com/charmbracelet/colorprofile v0.4.3 h1:QPa1IWkYI+AOB+fE+mg/5/4HRMZcaXex9t5KX76i20Q= +github.com/charmbracelet/colorprofile v0.4.3/go.mod h1:/zT4BhpD5aGFpqQQqw7a+VtHCzu+zrQtt1zhMt9mR4Q= +github.com/charmbracelet/ultraviolet v0.0.0-20260525132238-948f4557a654 h1:FpSYhY28ucg9ZRr+2wj67FAQ0Ey5yiK0072PmRDJNek= +github.com/charmbracelet/ultraviolet v0.0.0-20260525132238-948f4557a654/go.mod h1:hFpumms29Smx3LStRfku8vcCTBe1Kq8aCXtHUJa3mjY= +github.com/charmbracelet/x/ansi v0.11.7 h1:kzv1kJvjg2S3r9KHo8hDdHFQLEqn4RBCb39dAYC84jI= +github.com/charmbracelet/x/ansi v0.11.7/go.mod h1:9qGpnAVYz+8ACONkZBUWPtL7lulP9No6p1epAihUZwQ= +github.com/charmbracelet/x/conpty v0.1.1 h1:s1bUxjoi7EpqiXysVtC+a8RrvPPNcNvAjfi4jxsAuEs= +github.com/charmbracelet/x/conpty v0.1.1/go.mod h1:OmtR77VODEFbiTzGE9G1XiRJAga6011PIm4u5fTNZpk= github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86 h1:JSt3B+U9iqk37QUU2Rvb6DSBYRLtWqFqfxf8l5hOZUA= github.com/charmbracelet/x/errors v0.0.0-20240508181413-e8d8b6e2de86/go.mod h1:2P0UgXMEa6TsToMSuFqKFQR+fZTO9CNGUNokkPatT/0= -github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91 h1:payRxjMjKgx2PaCWLZ4p3ro9y97+TVLZNaRZgJwSVDQ= -github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U= +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/exp/ordered v0.1.0 h1:55/qLwjIh0gL0Vni+QAWk7T/qRVP6sBf+2agPBgnOFE= +github.com/charmbracelet/x/exp/ordered v0.1.0/go.mod h1:5UHwmG+is5THxMyCJHNPCn2/ecI07aKNrW+LcResjJ8= github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0 h1:qko3AQ4gK1MTS/de7F5hPGx6/k1u0w4TeYmBFwzYVP4= github.com/charmbracelet/x/exp/strings v0.0.0-20240722160745-212f7b056ed0/go.mod h1:pBhA0ybfXv6hDjQUZ7hk1lVxBiUbupdw5R31yPUViVQ= -github.com/charmbracelet/x/term v0.2.1 h1:AQeHeLZ1OqSXhrAWpYUtZyX1T3zVxfpZuEQMIQaGIAQ= -github.com/charmbracelet/x/term v0.2.1/go.mod h1:oQ4enTYFV7QN4m0i9mzHrViD7TQKvNEEkHUMCmsxdUg= +github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk= +github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI= github.com/charmbracelet/x/termios v0.1.1 h1:o3Q2bT8eqzGnGPOYheoYS8eEleT5ZVNYNy8JawjaNZY= github.com/charmbracelet/x/termios v0.1.1/go.mod h1:rB7fnv1TgOPOyyKRJ9o+AsTU/vK5WHJ2ivHeut/Pcwo= -github.com/charmbracelet/x/xpty v0.1.2 h1:Pqmu4TEJ8KeA9uSkISKMU3f+C1F6OGBn8ABuGlqCbtI= -github.com/charmbracelet/x/xpty v0.1.2/go.mod h1:XK2Z0id5rtLWcpeNiMYBccNNBrP2IJnzHI0Lq13Xzq4= +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/charmbracelet/x/xpty v0.1.3 h1:eGSitii4suhzrISYH50ZfufV3v085BXQwIytcOdFSsw= +github.com/charmbracelet/x/xpty v0.1.3/go.mod h1:poPYpWuLDBFCKmKLDnhBp51ATa0ooD8FhypRwEFtH3Y= +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/cpuguy83/go-md2man/v2 v2.0.6/go.mod h1:oOW0eioCTA6cOiMLiUPZOpcVxMig6NIQQ7OS05n1F4g= github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s= github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE= github.com/dustin/go-humanize v1.0.1 h1:GzkhY7T5VNhEkwH0PVJgjz+fX1rhBrR7pRT3mDkpeCY= github.com/dustin/go-humanize v1.0.1/go.mod h1:Mu1zIs6XwVuF/gI1OepvI0qD18qycQx+mFykh5fBlto= -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/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf h1:WfD7VjIE6z8dIvMsI4/s+1qr5EL+zoIGev1BQj1eoJ8= github.com/inconshreveable/go-update v0.0.0-20160112193335-8152e7eb6ccf/go.mod h1:hyb9oH7vZsitZCiBt0ZvifOrB+qc8PS5IiilCIb87rg= github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8= github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw= -github.com/lucasb-eyer/go-colorful v1.2.0 h1:1nnpGOrhyZZuNyfu1QjKiUICQ74+3FNCN69Aj6K7nkY= -github.com/lucasb-eyer/go-colorful v1.2.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= +github.com/lucasb-eyer/go-colorful v1.4.0 h1:UtrWVfLdarDgc44HcS7pYloGHJUjHV/4FwW4TvVgFr4= +github.com/lucasb-eyer/go-colorful v1.4.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0= 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.16 h1:E5ScNMtiwvlvB5paMFdw9p4kSQzbXFikJ5SQO6TULQc= -github.com/mattn/go-runewidth v0.0.16/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/mattn/go-runewidth v0.0.23 h1:7ykA0T0jkPpzSvMS5i9uoNn2Xy3R383f9HDx3RybWcw= +github.com/mattn/go-runewidth v0.0.23/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs= github.com/mitchellh/hashstructure/v2 v2.0.2 h1:vGKWl0YJqUNxE8d+h8f6NJLcCJrgbhC4NcD46KavDd4= github.com/mitchellh/hashstructure/v2 v2.0.2/go.mod h1:MG3aRVU/N29oo/V/IhBX8GR/zz4kQkprJgF2EVszyDE= -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/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc= -github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk= -github.com/rivo/uniseg v0.2.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc= github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ= github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88= github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM= @@ -77,12 +74,9 @@ github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJu go.yaml.in/yaml/v3 v3.0.4/go.mod h1:DhzuOOF2ATzADvBadXxruRBLzYTpT36CKvDb3+aBEFg= golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI= golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo= -golang.org/x/sync v0.16.0 h1:ycBJEhp9p4vXvUZNszeOq0kGTPghopOL8q0fq3vstxw= -golang.org/x/sync v0.16.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA= -golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= +golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4= +golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0= golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= -golang.org/x/sys v0.33.0 h1:q3i8TbbEz+JRD9ywIRlyRAQbM0qF7hu24q3teo2hbuw= -golang.org/x/sys v0.33.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k= -golang.org/x/text v0.28.0 h1:rhazDwis8INMIwQ4tpjLDzUhx6RlXqZNPEM0huQojng= -golang.org/x/text v0.28.0/go.mod h1:U8nCwOR8jO/marOQ0QbDiOngZVEBB7MAiitBuMjXiNU= +golang.org/x/sys v0.45.0 h1:dO4czNzziLiiXplLQgBCEpCvXQ3dnkn0SdaZSYdQ+FY= +golang.org/x/sys v0.45.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= diff --git a/pkg/ui/agent_wizard.go b/pkg/ui/agent_wizard.go index 7b1cf1a..c0b4517 100644 --- a/pkg/ui/agent_wizard.go +++ b/pkg/ui/agent_wizard.go @@ -5,7 +5,7 @@ import ( "fmt" "os" - "github.com/charmbracelet/huh" + "charm.land/huh/v2" "github.com/saeid-rez/crewup/internal/config" "github.com/saeid-rez/crewup/internal/models" ) diff --git a/pkg/ui/multiselect.go b/pkg/ui/multiselect.go new file mode 100644 index 0000000..676a9c2 --- /dev/null +++ b/pkg/ui/multiselect.go @@ -0,0 +1,176 @@ +package ui + +import ( + "errors" + "fmt" + "strings" + + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" +) + +// ErrUserCancelled indicates the user aborted an interactive selection. +var ErrUserCancelled = errors.New("user cancelled setup") + +type item struct { + id string + title string + desc string + selected bool +} + +type multiSelectModel struct { + title string + items []item + cursor int + done bool + quitting bool +} + +var ( + multiSelectTitleStyle = lipgloss.NewStyle().Bold(true).Foreground(lipgloss.Color("205")) + multiSelectCursorStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("212")) + multiSelectSelectedStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("10")) + multiSelectDescStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("240")) + multiSelectHelpStyle = lipgloss.NewStyle().Foreground(lipgloss.Color("241")) +) + +func newMultiSelectModel(title string, items []item) *multiSelectModel { + cloned := make([]item, len(items)) + copy(cloned, items) + return &multiSelectModel{title: title, items: cloned} +} + +func (m *multiSelectModel) Init() tea.Cmd { return nil } + +func (m *multiSelectModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) { + switch msg := msg.(type) { + case tea.KeyPressMsg: + switch msg.String() { + case "ctrl+c", "q": + m.quitting = true + return m, tea.Quit + case "up", "k": + if m.cursor > 0 { + m.cursor-- + } + case "down", "j": + if m.cursor < len(m.items)-1 { + m.cursor++ + } + case "space": + m.toggleCursor() + case "a": + m.toggleAll() + case "enter": + m.done = true + return m, tea.Quit + } + } + + return m, nil +} + +func (m *multiSelectModel) View() tea.View { + var sb strings.Builder + sb.WriteString(multiSelectTitleStyle.Render(m.title)) + sb.WriteString("\n\n") + + for i, it := range m.items { + cursor := " " + if m.cursor == i { + cursor = multiSelectCursorStyle.Render("> ") + } + + marker := "○" + lineStyle := lipgloss.NewStyle() + if it.selected { + marker = multiSelectSelectedStyle.Render("●") + lineStyle = multiSelectSelectedStyle + } + + sb.WriteString(cursor) + sb.WriteString(marker) + sb.WriteString(" ") + sb.WriteString(lineStyle.Render(it.title)) + sb.WriteString("\n") + + if it.desc != "" { + sb.WriteString(" ") + sb.WriteString(multiSelectDescStyle.Render(it.desc)) + sb.WriteString("\n") + } + } + + sb.WriteString("\n") + sb.WriteString(multiSelectHelpStyle.Render("up/down or j/k: move • space: toggle • a: all • enter: confirm • q: cancel")) + sb.WriteString("\n") + return tea.NewView(sb.String()) +} + +func (m *multiSelectModel) toggleCursor() { + if len(m.items) == 0 { + return + } + m.items[m.cursor].selected = !m.items[m.cursor].selected +} + +func (m *multiSelectModel) toggleAll() { + if len(m.items) == 0 { + return + } + + selectAll := !m.allSelected() + for i := range m.items { + m.items[i].selected = selectAll + } +} + +func (m *multiSelectModel) allSelected() bool { + if len(m.items) == 0 { + return false + } + for _, it := range m.items { + if !it.selected { + return false + } + } + return true +} + +func (m *multiSelectModel) selectedIDs() []string { + ids := make([]string, 0, len(m.items)) + for _, it := range m.items { + if it.selected { + ids = append(ids, it.id) + } + } + return ids +} + +func (m *multiSelectModel) result() ([]string, error) { + if m.quitting && !m.done { + return nil, ErrUserCancelled + } + return m.selectedIDs(), nil +} + +// RunMultiSelect runs a Bubble Tea multi-select prompt and returns selected IDs. +func RunMultiSelect(title string, items []item) ([]string, error) { + if len(items) == 0 { + return []string{}, nil + } + + model := newMultiSelectModel(title, items) + finalModel, err := tea.NewProgram(model).Run() + if err != nil { + return nil, err + } + + resultModel, ok := finalModel.(*multiSelectModel) + if !ok { + return nil, fmt.Errorf("unexpected Bubble Tea model type %T", finalModel) + } + + return resultModel.result() +} diff --git a/pkg/ui/multiselect_test.go b/pkg/ui/multiselect_test.go new file mode 100644 index 0000000..b79707e --- /dev/null +++ b/pkg/ui/multiselect_test.go @@ -0,0 +1,83 @@ +package ui + +import ( + "errors" + "testing" + + tea "charm.land/bubbletea/v2" +) + +func TestMultiSelectModelToggleCursor(t *testing.T) { + m := newMultiSelectModel("Pick tools", []item{{id: "copilot", title: "Copilot"}}) + + if m.items[0].selected { + t.Fatal("expected item to start deselected") + } + + m.Update(tea.KeyPressMsg{Code: ' ', Text: " "}) + if !m.items[0].selected { + t.Fatal("expected space to select the current item") + } + + m.Update(tea.KeyPressMsg{Code: ' ', Text: " "}) + if m.items[0].selected { + t.Fatal("expected second space to deselect the current item") + } +} + +func TestMultiSelectModelToggleAll(t *testing.T) { + m := newMultiSelectModel("Pick roles", []item{{id: "planner", title: "Planner"}, {id: "reviewer", title: "Reviewer"}}) + + m.Update(tea.KeyPressMsg{Code: 'a', Text: "a"}) + if !m.items[0].selected || !m.items[1].selected { + t.Fatal("expected a to select all items") + } + + m.Update(tea.KeyPressMsg{Code: 'a', Text: "a"}) + if m.items[0].selected || m.items[1].selected { + t.Fatal("expected second a to deselect all items") + } +} + +func TestMultiSelectModelCursorMovement(t *testing.T) { + m := newMultiSelectModel("Pick MCPs", []item{{id: "one", title: "One"}, {id: "two", title: "Two"}}) + + m.Update(tea.KeyPressMsg{Code: tea.KeyDown}) + if m.cursor != 1 { + t.Fatalf("expected cursor at 1, got %d", m.cursor) + } + + m.Update(tea.KeyPressMsg{Code: tea.KeyDown}) + if m.cursor != 1 { + t.Fatalf("expected cursor to stay at lower bound, got %d", m.cursor) + } + + m.Update(tea.KeyPressMsg{Code: tea.KeyUp}) + if m.cursor != 0 { + t.Fatalf("expected cursor at 0, got %d", m.cursor) + } +} + +func TestMultiSelectModelResultReturnsSelectedIDsInOrder(t *testing.T) { + m := newMultiSelectModel("Pick tools", []item{{id: "copilot", title: "Copilot", selected: true}, {id: "opencode", title: "OpenCode"}, {id: "claude", title: "Claude", selected: true}}) + m.done = true + + ids, err := m.result() + if err != nil { + t.Fatalf("result error: %v", err) + } + + if len(ids) != 2 || ids[0] != "copilot" || ids[1] != "claude" { + t.Fatalf("unexpected selected IDs: %#v", ids) + } +} + +func TestMultiSelectModelResultReturnsCancellationError(t *testing.T) { + m := newMultiSelectModel("Pick tools", []item{{id: "copilot", title: "Copilot"}}) + m.quitting = true + + _, err := m.result() + if !errors.Is(err, ErrUserCancelled) { + t.Fatalf("expected ErrUserCancelled, got %v", err) + } +} diff --git a/pkg/ui/ui.go b/pkg/ui/ui.go index 1cad67b..d08ccdc 100644 --- a/pkg/ui/ui.go +++ b/pkg/ui/ui.go @@ -6,8 +6,8 @@ import ( "os" "strings" - "github.com/charmbracelet/huh" - "github.com/charmbracelet/lipgloss" + "charm.land/huh/v2" + "charm.land/lipgloss/v2" "github.com/mattn/go-isatty" "github.com/saeid-rez/crewup/internal/config" "github.com/saeid-rez/crewup/internal/mcp" @@ -50,27 +50,13 @@ func SelectTools(detected []tools.AITool) ([]tools.AITool, error) { return detected, nil } - opts := make([]huh.Option[string], len(detected)) + items := make([]item, len(detected)) for i, t := range detected { - opts[i] = huh.NewOption(t.Name+" ("+t.ConfigPath+")", t.ID).Selected(true) + items[i] = item{id: t.ID, title: t.Name, desc: t.ConfigPath, selected: true} } - var selectedIDs []string - form := huh.NewForm( - huh.NewGroup( - huh.NewMultiSelect[string](). - Title("🔍 Select AI tools to configure"). - Description("Space to toggle, Enter to confirm"). - Options(opts...). - Value(&selectedIDs), - ), - ) - - if err := form.Run(); err != nil { - if errors.Is(err, huh.ErrUserAborted) { - fmt.Println("Setup cancelled.") - os.Exit(0) - } + selectedIDs, err := RunMultiSelect("🔍 Select AI tools to configure", items) + if err != nil { return nil, err } @@ -96,27 +82,13 @@ func SelectAgentRoles() ([]config.AgentRole, error) { return config.DefaultRoles, nil } - opts := make([]huh.Option[string], len(config.DefaultRoles)) + items := make([]item, len(config.DefaultRoles)) for i, r := range config.DefaultRoles { - opts[i] = huh.NewOption(r.Name+" — "+r.Description, r.ID).Selected(true) + items[i] = item{id: r.ID, title: r.Name, desc: r.Description, selected: true} } - var selectedIDs []string - form := huh.NewForm( - huh.NewGroup( - huh.NewMultiSelect[string](). - Title("🤖 Select agent roles for your crew"). - Description("Space to toggle, Enter to confirm"). - Options(opts...). - Value(&selectedIDs), - ), - ) - - if err := form.Run(); err != nil { - if errors.Is(err, huh.ErrUserAborted) { - fmt.Println("Setup cancelled.") - os.Exit(0) - } + selectedIDs, err := RunMultiSelect("🤖 Select agent roles for your crew", items) + if err != nil { return nil, err } @@ -143,27 +115,13 @@ func SelectMCPPresets() ([]mcp.MCPPreset, error) { return []mcp.MCPPreset{}, nil } - opts := make([]huh.Option[string], len(mcp.Presets)) + items := make([]item, len(mcp.Presets)) for i, p := range mcp.Presets { - opts[i] = huh.NewOption(p.Name+" — "+p.Description, p.ID) + items[i] = item{id: p.ID, title: p.Name, desc: p.Description} } - var selectedIDs []string - form := huh.NewForm( - huh.NewGroup( - huh.NewMultiSelect[string](). - Title("🔌 Popular MCP servers (optional)"). - Description("Space to toggle, Enter to confirm (or skip)"). - Options(opts...). - Value(&selectedIDs), - ), - ) - - if err := form.Run(); err != nil { - if errors.Is(err, huh.ErrUserAborted) { - fmt.Println("Setup cancelled.") - os.Exit(0) - } + selectedIDs, err := RunMultiSelect("🔌 Popular MCP servers (optional)", items) + if err != nil { return nil, err } @@ -243,27 +201,13 @@ func SelectTargetTools(configured []config.ToolInfo, presetName string) ([]confi return configured, nil } - opts := make([]huh.Option[string], len(configured)) + items := make([]item, len(configured)) for i, t := range configured { - opts[i] = huh.NewOption(t.Name, t.ID).Selected(true) + items[i] = item{id: t.ID, title: t.Name, selected: true} } - var selectedIDs []string - form := huh.NewForm( - huh.NewGroup( - huh.NewMultiSelect[string](). - Title(fmt.Sprintf("🛠 Install %s for which tools?", presetName)). - Description("Space to toggle, Enter to confirm"). - Options(opts...). - Value(&selectedIDs), - ), - ) - - if err := form.Run(); err != nil { - if errors.Is(err, huh.ErrUserAborted) { - fmt.Println("Setup cancelled.") - os.Exit(0) - } + selectedIDs, err := RunMultiSelect(fmt.Sprintf("🛠 Install %s for which tools?", presetName), items) + if err != nil { return nil, err }