diff --git a/go.mod b/go.mod index 32a4a8fdf1442a7913530f3dbb0c27d445bff50b..6aa3f8d15fa52f302897ecaf63c7c767f3ad4c43 100644 --- a/go.mod +++ b/go.mod @@ -3,7 +3,10 @@ module github.com/charmbracelet/crush go 1.25.0 require ( + charm.land/bubbles/v2 v2.0.0-beta.1.0.20251104200223-da0b892d1759 + charm.land/bubbletea/v2 v2.0.0-rc.1.0.20251105182244-3138f1cd1bf8 charm.land/fantasy v0.1.6 + charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251104200114-3aae28661422 github.com/JohannesKaufmann/html-to-markdown v1.6.0 github.com/MakeNowJust/heredoc v1.0.0 github.com/PuerkitoBio/goquery v1.10.3 @@ -12,18 +15,15 @@ require ( github.com/aymanbagabas/go-udiff v0.3.1 github.com/bmatcuk/doublestar/v4 v4.9.1 github.com/charlievieth/fastwalk v1.0.14 - github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250820203609-601216f68ee2 - github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.6 github.com/charmbracelet/catwalk v0.8.2 - github.com/charmbracelet/colorprofile v0.3.2 + github.com/charmbracelet/colorprofile v0.3.3 github.com/charmbracelet/fang v0.4.3 github.com/charmbracelet/glamour/v2 v2.0.0-20250811143442-a27abb32f018 - github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3.0.20250917201909-41ff0bf215ea github.com/charmbracelet/log/v2 v2.0.0-20250226163916-c379e29ff706 - github.com/charmbracelet/ultraviolet v0.0.0-20251017140847-d4ace4d6e731 - github.com/charmbracelet/x/ansi v0.10.2 + github.com/charmbracelet/ultraviolet v0.0.0-20251105181648-75d1e37ff1bb + github.com/charmbracelet/x/ansi v0.10.3 github.com/charmbracelet/x/exp/charmtone v0.0.0-20250708181618-a60a724ba6c3 - github.com/charmbracelet/x/exp/golden v0.0.0-20250207160936-21c02780d27a + github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f github.com/charmbracelet/x/exp/ordered v0.1.0 github.com/charmbracelet/x/exp/slice v0.0.0-20250904123553-b4e2667e5ad5 github.com/charmbracelet/x/powernap v0.0.0-20251015113943-25f979b54ad4 @@ -88,10 +88,14 @@ require ( github.com/bahlo/generic-list-go v0.2.0 // indirect github.com/buger/jsonparser v1.1.1 // indirect github.com/charmbracelet/anthropic-sdk-go v0.0.0-20251024181547-21d6f3d9a904 // indirect + github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3.0.20251103214348-d3032608aa74 // indirect github.com/charmbracelet/x/cellbuf v0.0.14-0.20250811133356-e0c5dbe5ea4a // indirect github.com/charmbracelet/x/json v0.2.0 // indirect github.com/charmbracelet/x/termios v0.1.1 // indirect github.com/charmbracelet/x/windows v0.2.2 // indirect + github.com/clipperhouse/displaywidth v0.4.1 // indirect + github.com/clipperhouse/stringish v0.1.1 // indirect + github.com/clipperhouse/uax29/v2 v2.3.0 // indirect github.com/davecgh/go-spew v1.1.1 // indirect github.com/disintegration/gift v1.1.2 // indirect github.com/dlclark/regexp2 v1.11.5 // indirect @@ -116,7 +120,7 @@ require ( github.com/klauspost/pgzip v1.2.6 // indirect github.com/mailru/easyjson v0.7.7 // indirect github.com/mattn/go-isatty v0.0.20 // indirect - github.com/mattn/go-runewidth v0.0.17 // indirect + github.com/mattn/go-runewidth v0.0.19 // indirect github.com/mfridman/interpolate v0.0.2 // indirect github.com/microcosm-cc/bluemonday v1.0.27 // indirect github.com/mitchellh/mapstructure v1.5.0 // indirect diff --git a/go.sum b/go.sum index e86f2eee43b708f606ad9bf4a83ce2b00a3f0631..412b67925f1696e747f56ac4ad109eefa08c1922 100644 --- a/go.sum +++ b/go.sum @@ -1,5 +1,11 @@ +charm.land/bubbles/v2 v2.0.0-beta.1.0.20251104200223-da0b892d1759 h1:P1MxkVl8ZeI9tHmmrn9UzV/5Mz7heoiTgqECHRFsUcs= +charm.land/bubbles/v2 v2.0.0-beta.1.0.20251104200223-da0b892d1759/go.mod h1:G7JWaj3kDT0BDB+h5BLDUhhBLpDoRLKrpOp5QrA2SQs= +charm.land/bubbletea/v2 v2.0.0-rc.1.0.20251105182244-3138f1cd1bf8 h1:A1y0nyy7ykH1judtnD36sgpepLBrU4y7mN6QlZEVhZk= +charm.land/bubbletea/v2 v2.0.0-rc.1.0.20251105182244-3138f1cd1bf8/go.mod h1:oR2A+f83vzDY0hALwW4eh90fKXdranRWnH/vfwJL1lU= charm.land/fantasy v0.1.6 h1:laomMUqUaniQoLx7UOb+MLUpIGJPoNwsXvw1PbzgnB8= charm.land/fantasy v0.1.6/go.mod h1:JpFcJ5zs/1CjmYYGAZ7GaFmeBv0mPaTzEPRG6Eic5pc= +charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251104200114-3aae28661422 h1:LcW3SSv1EZvlb9pfaVZIZyHrPVRJdb0adgX+tWPYl0k= +charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251104200114-3aae28661422/go.mod h1:0EJAlA1PDGb+2RyyC02yDSPDwvpegDefu74HC9Blg5o= cloud.google.com/go v0.116.0 h1:B3fRrSDkLRt5qSHWe40ERJvhvnQwdZiHu0bJOpldweE= cloud.google.com/go v0.116.0/go.mod h1:cEPSRWPzZEswwdr9BxE6ChEn01dWlTaF05LiC2Xs70U= cloud.google.com/go/auth v0.17.0 h1:74yCm7hCj2rUyyAocqnFzsAYXgJhrG26XCFimrc/Kz4= @@ -78,32 +84,28 @@ github.com/charlievieth/fastwalk v1.0.14 h1:3Eh5uaFGwHZd8EGwTjJnSpBkfwfsak9h6ICg github.com/charlievieth/fastwalk v1.0.14/go.mod h1:diVcUreiU1aQ4/Wu3NbxxH4/KYdKpLDojrQ1Bb2KgNY= github.com/charmbracelet/anthropic-sdk-go v0.0.0-20251024181547-21d6f3d9a904 h1:rwLdEpG9wE6kL69KkEKDiWprO8pQOZHZXeod6+9K+mw= github.com/charmbracelet/anthropic-sdk-go v0.0.0-20251024181547-21d6f3d9a904/go.mod h1:8TIYxZxsuCqqeJ0lga/b91tBwrbjoHDC66Sq5t8N2R4= -github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250820203609-601216f68ee2 h1:973OHYuq2Jx9deyuPwe/6lsuQrDCatOsjP8uCd02URE= -github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250820203609-601216f68ee2/go.mod h1:6HamsBKWqEC/FVHuQMHgQL+knPyvHH55HwJDHl/adMw= -github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.6 h1:nXNg4TmtfoQXFdF2BSSjTxFp9bSHQCILkIKK3FXMW/E= -github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.6/go.mod h1:SUTLq+/pGQ5qntHgt0JswfVJFfgJgWDqyvyiSLVlmbo= github.com/charmbracelet/catwalk v0.8.2 h1:J7xq/ft/ZByJCHl3JpgvxlCd59bzZPugy66XuoL4vAs= github.com/charmbracelet/catwalk v0.8.2/go.mod h1:ReU4SdrLfe63jkEjWMdX2wlZMV3k9r11oQAmzN0m+KY= -github.com/charmbracelet/colorprofile v0.3.2 h1:9J27WdztfJQVAQKX2WOlSSRB+5gaKqqITmrvb1uTIiI= -github.com/charmbracelet/colorprofile v0.3.2/go.mod h1:mTD5XzNeWHj8oqHb+S1bssQb7vIHbepiebQ2kPKVKbI= +github.com/charmbracelet/colorprofile v0.3.3 h1:DjJzJtLP6/NZ8p7Cgjno0CKGr7wwRJGxWUwh2IyhfAI= +github.com/charmbracelet/colorprofile v0.3.3/go.mod h1:nB1FugsAbzq284eJcjfah2nhdSLppN2NqvfotkfRYP4= github.com/charmbracelet/fang v0.4.3 h1:qXeMxnL4H6mSKBUhDefHu8NfikFbP/MBNTfqTrXvzmY= github.com/charmbracelet/fang v0.4.3/go.mod h1:wHJKQYO5ReYsxx+yZl+skDtrlKO/4LLEQ6EXsdHhRhg= github.com/charmbracelet/glamour/v2 v2.0.0-20250811143442-a27abb32f018 h1:PU4Zvpagsk5sgaDxn5W4sxHuLp9QRMBZB3bFSk40A4w= github.com/charmbracelet/glamour/v2 v2.0.0-20250811143442-a27abb32f018/go.mod h1:Z/GLmp9fzaqX4ze3nXG7StgWez5uBM5XtlLHK8V/qSk= -github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3.0.20250917201909-41ff0bf215ea h1:g1HfUgSMvye8mgecMD1mPscpt+pzJoDEiSA+p2QXzdQ= -github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3.0.20250917201909-41ff0bf215ea/go.mod h1:ngHerf1JLJXBrDXdphn5gFrBPriCL437uwukd5c93pM= +github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3.0.20251103214348-d3032608aa74 h1:2N+CxpUFM6Rrx+xT7XaqM9pp/psOFlxKWa5R7rP/lck= +github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.3.0.20251103214348-d3032608aa74/go.mod h1:RfXmCdNs2F4MVJjBVQp5RZYXR05MiRAHN4GHwWmsNIA= github.com/charmbracelet/log/v2 v2.0.0-20250226163916-c379e29ff706 h1:WkwO6Ks3mSIGnGuSdKl9qDSyfbYK50z2wc2gGMggegE= github.com/charmbracelet/log/v2 v2.0.0-20250226163916-c379e29ff706/go.mod h1:mjJGp00cxcfvD5xdCa+bso251Jt4owrQvuimJtVmEmM= -github.com/charmbracelet/ultraviolet v0.0.0-20251017140847-d4ace4d6e731 h1:Lr+igmzKpLPdb8yUZBP9noYWwCZP042z2nWPrJZTc+8= -github.com/charmbracelet/ultraviolet v0.0.0-20251017140847-d4ace4d6e731/go.mod h1:KfWwUa0Oe//D72YlhbOq/g40L7UiGtATrvsGI3cciG8= -github.com/charmbracelet/x/ansi v0.10.2 h1:ith2ArZS0CJG30cIUfID1LXN7ZFXRCww6RUvAPA+Pzw= -github.com/charmbracelet/x/ansi v0.10.2/go.mod h1:HbLdJjQH4UH4AqA2HpRWuWNluRE6zxJH/yteYEYCFa8= +github.com/charmbracelet/ultraviolet v0.0.0-20251105181648-75d1e37ff1bb h1:KZnKSrGjarKScpekDuPAVnlMSMtA7mdzmoUD0AhAZC0= +github.com/charmbracelet/ultraviolet v0.0.0-20251105181648-75d1e37ff1bb/go.mod h1:G7cNuWgmuugx6ApJv4kDGfnFanoDAz8AWazH9lSoWdw= +github.com/charmbracelet/x/ansi v0.10.3 h1:3WoV9XN8uMEnFRZZ+vBPRy59TaIWa+gJodS4Vg5Fut0= +github.com/charmbracelet/x/ansi v0.10.3/go.mod h1:uQt8bOrq/xgXjlGcFMc8U2WYbnxyjrKhnvTQluvfCaE= github.com/charmbracelet/x/cellbuf v0.0.14-0.20250811133356-e0c5dbe5ea4a h1:zYSNtEJM9jwHbJts2k+Hroj+xQwsW1yxc4Wopdv7KaI= github.com/charmbracelet/x/cellbuf v0.0.14-0.20250811133356-e0c5dbe5ea4a/go.mod h1:rc2bsPC6MWae3LdOxNO1mOb443NlMrrDL0xEya48NNc= github.com/charmbracelet/x/exp/charmtone v0.0.0-20250708181618-a60a724ba6c3 h1:1xwHZg6eMZ9Wv5TE1UGub6ARubyOd1Lo5kPUI/6VL50= github.com/charmbracelet/x/exp/charmtone v0.0.0-20250708181618-a60a724ba6c3/go.mod h1:T9jr8CzFpjhFVHjNjKwbAD7KwBNyFnj2pntAO7F2zw0= -github.com/charmbracelet/x/exp/golden v0.0.0-20250207160936-21c02780d27a h1:FsHEJ52OC4VuTzU8t+n5frMjLvpYWEznSr/u8tnkCYw= -github.com/charmbracelet/x/exp/golden v0.0.0-20250207160936-21c02780d27a/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/slice v0.0.0-20250904123553-b4e2667e5ad5 h1:DTSZxdV9qQagD4iGcAt9RgaRBZtJl01bfKgdLzUzUPI= @@ -118,6 +120,12 @@ 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.4.1 h1:uVw9V8UDfnggg3K2U84VWY1YLQ/x2aKSCtkRyYozfoU= +github.com/clipperhouse/displaywidth v0.4.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.3.0 h1:SNdx9DVUqMoBuBoW3iLOj4FQv3dN5mDtuqwuhIGpJy4= +github.com/clipperhouse/uax29/v2 v2.3.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g= 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= @@ -204,8 +212,8 @@ github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc= 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-runewidth v0.0.17 h1:78v8ZlW0bP43XfmAfPsdXcoNCelfMHsDmd/pkENfrjQ= -github.com/mattn/go-runewidth v0.0.17/go.mod h1:Jdepj2loyihRzMpdS35Xk/zdY8IAYHsh153qUoGf23w= +github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw= +github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs= github.com/mfridman/interpolate v0.0.2 h1:pnuTK7MQIxxFz1Gr+rjSIx9u7qVjf5VOoM/u6BbAxPY= github.com/mfridman/interpolate v0.0.2/go.mod h1:p+7uk6oE07mpE/Ik1b8EckO0O4ZXiGAfshKBWLUM9Xg= github.com/microcosm-cc/bluemonday v1.0.27 h1:MpEUotklkwCSLeH+Qdx1VJgNqLlpY2KXwXFM08ygZfk= @@ -253,7 +261,6 @@ github.com/qjebbs/go-jsons v1.0.0-alpha.4 h1:Qsb4ohRUHQODIUAsJKdKJ/SIDbsO7oGOzsf github.com/qjebbs/go-jsons v1.0.0-alpha.4/go.mod h1:wNJrtinHyC3YSf6giEh4FJN8+yZV7nXBjvmfjhBIcw4= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec h1:W09IVJc94icq4NjY3clb7Lk8O1qJ8BdBEF8z0ibU0rE= github.com/remyoudompheng/bigfft v0.0.0-20230129092748-24d4a6f8daec/go.mod h1:qqbHyh8v60DhA7CoWK5oRCqLrMHRGoxYCSS9EjAz6Eo= -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/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ= diff --git a/internal/app/app.go b/internal/app/app.go index dc0d26a83a1d20aa8dac220a2b8451089a1a0e25..1169e402670bdd683458fd87b8053c4bfc196df7 100644 --- a/internal/app/app.go +++ b/internal/app/app.go @@ -13,8 +13,9 @@ import ( "sync" "time" + tea "charm.land/bubbletea/v2" "charm.land/fantasy" - tea "github.com/charmbracelet/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/agent" "github.com/charmbracelet/crush/internal/agent/tools/mcp" "github.com/charmbracelet/crush/internal/config" @@ -31,7 +32,6 @@ import ( "github.com/charmbracelet/crush/internal/term" "github.com/charmbracelet/crush/internal/tui/components/anim" "github.com/charmbracelet/crush/internal/tui/styles" - "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" "github.com/charmbracelet/x/exp/charmtone" ) diff --git a/internal/cmd/dirs.go b/internal/cmd/dirs.go index d3bc0bd4fb1482e2657eedaab9ce4cee30a09373..334a7742a1f2a72f31de964913727b68964d3b89 100644 --- a/internal/cmd/dirs.go +++ b/internal/cmd/dirs.go @@ -4,9 +4,9 @@ import ( "os" "path/filepath" + "charm.land/lipgloss/v2" + "charm.land/lipgloss/v2/table" "github.com/charmbracelet/crush/internal/config" - "github.com/charmbracelet/lipgloss/v2" - "github.com/charmbracelet/lipgloss/v2/table" "github.com/charmbracelet/x/term" "github.com/spf13/cobra" ) diff --git a/internal/cmd/root.go b/internal/cmd/root.go index 0a1f10837b5e73ddbb51de08839a094fba5e0768..e98fd9d3b6bc7fcb59d1db739fd550f31e017b48 100644 --- a/internal/cmd/root.go +++ b/internal/cmd/root.go @@ -12,7 +12,8 @@ import ( "strconv" "strings" - tea "github.com/charmbracelet/bubbletea/v2" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/colorprofile" "github.com/charmbracelet/crush/internal/app" "github.com/charmbracelet/crush/internal/config" @@ -22,7 +23,6 @@ import ( "github.com/charmbracelet/crush/internal/tui" "github.com/charmbracelet/crush/internal/version" "github.com/charmbracelet/fang" - "github.com/charmbracelet/lipgloss/v2" uv "github.com/charmbracelet/ultraviolet" "github.com/charmbracelet/x/ansi" "github.com/charmbracelet/x/exp/charmtone" diff --git a/internal/cmd/update_providers.go b/internal/cmd/update_providers.go index 1e771642db785794a5abca24a14b33376cdc0724..4949c31e2e8b87f212d8ac0ed94e2416f363a53b 100644 --- a/internal/cmd/update_providers.go +++ b/internal/cmd/update_providers.go @@ -4,8 +4,8 @@ import ( "fmt" "log/slog" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/config" - "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/exp/charmtone" "github.com/spf13/cobra" ) diff --git a/internal/format/spinner.go b/internal/format/spinner.go index c557f203f8deb835501260233246942b07cff4ba..53d48dbb2831df8b6145f762884ee506c2f4ce0a 100644 --- a/internal/format/spinner.go +++ b/internal/format/spinner.go @@ -6,7 +6,7 @@ import ( "fmt" "os" - tea "github.com/charmbracelet/bubbletea/v2" + tea "charm.land/bubbletea/v2" "github.com/charmbracelet/crush/internal/tui/components/anim" "github.com/charmbracelet/x/ansi" ) diff --git a/internal/tui/components/anim/anim.go b/internal/tui/components/anim/anim.go index d04176ba9e07c2ce15427e9496cf0896222ba930..1ffa8074b09afb201a4238c848f3d289450173ce 100644 --- a/internal/tui/components/anim/anim.go +++ b/internal/tui/components/anim/anim.go @@ -11,8 +11,8 @@ import ( "github.com/zeebo/xxh3" - tea "github.com/charmbracelet/bubbletea/v2" - "github.com/charmbracelet/lipgloss/v2" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/lucasb-eyer/go-colorful" "github.com/charmbracelet/crush/internal/csync" diff --git a/internal/tui/components/chat/chat.go b/internal/tui/components/chat/chat.go index 7647a9080aced65ae5b1ca47be60a2d15a16c3d7..6d7660dc6be9ed3e10d2cab9cabf2c9960326a3a 100644 --- a/internal/tui/components/chat/chat.go +++ b/internal/tui/components/chat/chat.go @@ -5,9 +5,9 @@ import ( "strings" "time" + "charm.land/bubbles/v2/key" + tea "charm.land/bubbletea/v2" "github.com/atotto/clipboard" - "github.com/charmbracelet/bubbles/v2/key" - tea "github.com/charmbracelet/bubbletea/v2" "github.com/charmbracelet/crush/internal/agent" "github.com/charmbracelet/crush/internal/agent/tools" "github.com/charmbracelet/crush/internal/app" diff --git a/internal/tui/components/chat/editor/editor.go b/internal/tui/components/chat/editor/editor.go index f954ced345095548508c7223f86c7a87e59c314a..1ce0a6349c01560d2d3a81d91408a25a7e4dbc83 100644 --- a/internal/tui/components/chat/editor/editor.go +++ b/internal/tui/components/chat/editor/editor.go @@ -13,9 +13,10 @@ import ( "strings" "unicode" - "github.com/charmbracelet/bubbles/v2/key" - "github.com/charmbracelet/bubbles/v2/textarea" - tea "github.com/charmbracelet/bubbletea/v2" + "charm.land/bubbles/v2/key" + "charm.land/bubbles/v2/textarea" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/app" "github.com/charmbracelet/crush/internal/fsext" "github.com/charmbracelet/crush/internal/message" @@ -29,7 +30,6 @@ import ( "github.com/charmbracelet/crush/internal/tui/components/dialogs/quit" "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/crush/internal/tui/util" - "github.com/charmbracelet/lipgloss/v2" ) type Editor interface { @@ -220,7 +220,7 @@ func (m *editorCmp) Update(msg tea.Msg) (util.Model, tea.Cmd) { m.textarea.SetValue(msg.Text) m.textarea.MoveToEnd() case tea.PasteMsg: - path := strings.ReplaceAll(string(msg), "\\ ", " ") + path := strings.ReplaceAll(msg.Content, "\\ ", " ") // try to get an image path, err := filepath.Abs(strings.TrimSpace(path)) if err != nil { diff --git a/internal/tui/components/chat/editor/keys.go b/internal/tui/components/chat/editor/keys.go index 8bc8b2354dfb72120d9e6173256635e903d012fd..0ba4571888e547b1c4a85e7ee9dd73ff07ce13d2 100644 --- a/internal/tui/components/chat/editor/keys.go +++ b/internal/tui/components/chat/editor/keys.go @@ -1,7 +1,7 @@ package editor import ( - "github.com/charmbracelet/bubbles/v2/key" + "charm.land/bubbles/v2/key" ) type EditorKeyMap struct { diff --git a/internal/tui/components/chat/header/header.go b/internal/tui/components/chat/header/header.go index 96afabdd33ed993c249510639c8540fc0b1beeea..59389815ac63ac127ac000abf872b000eb8f2347 100644 --- a/internal/tui/components/chat/header/header.go +++ b/internal/tui/components/chat/header/header.go @@ -4,7 +4,8 @@ import ( "fmt" "strings" - tea "github.com/charmbracelet/bubbletea/v2" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/config" "github.com/charmbracelet/crush/internal/csync" "github.com/charmbracelet/crush/internal/fsext" @@ -13,7 +14,6 @@ import ( "github.com/charmbracelet/crush/internal/session" "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/crush/internal/tui/util" - "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" "github.com/charmbracelet/x/powernap/pkg/lsp/protocol" ) diff --git a/internal/tui/components/chat/messages/messages.go b/internal/tui/components/chat/messages/messages.go index e67b713100e01e70040911d01e7f4b98c50ae805..54f36fbb0bb71bc4d88de141eaf36bca9bc538ab 100644 --- a/internal/tui/components/chat/messages/messages.go +++ b/internal/tui/components/chat/messages/messages.go @@ -6,11 +6,11 @@ import ( "strings" "time" - "github.com/charmbracelet/bubbles/v2/key" - "github.com/charmbracelet/bubbles/v2/viewport" - tea "github.com/charmbracelet/bubbletea/v2" + "charm.land/bubbles/v2/key" + "charm.land/bubbles/v2/viewport" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/catwalk/pkg/catwalk" - "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" "github.com/charmbracelet/x/exp/ordered" "github.com/google/uuid" diff --git a/internal/tui/components/chat/messages/renderer.go b/internal/tui/components/chat/messages/renderer.go index 24dcaee3838c3ee924c75f66514414db236731db..a13be29fff885acbd81df2628a8a5849577c5dad 100644 --- a/internal/tui/components/chat/messages/renderer.go +++ b/internal/tui/components/chat/messages/renderer.go @@ -6,6 +6,8 @@ import ( "strings" "time" + "charm.land/lipgloss/v2" + "charm.land/lipgloss/v2/tree" "github.com/charmbracelet/crush/internal/agent" "github.com/charmbracelet/crush/internal/agent/tools" "github.com/charmbracelet/crush/internal/ansiext" @@ -13,8 +15,6 @@ import ( "github.com/charmbracelet/crush/internal/tui/components/core" "github.com/charmbracelet/crush/internal/tui/highlight" "github.com/charmbracelet/crush/internal/tui/styles" - "github.com/charmbracelet/lipgloss/v2" - "github.com/charmbracelet/lipgloss/v2/tree" "github.com/charmbracelet/x/ansi" ) diff --git a/internal/tui/components/chat/messages/tool.go b/internal/tui/components/chat/messages/tool.go index 991a79cfc2e2322fc23b406be931d435c2d3b892..123d02e63c76687d4a722957a5b363082c9a3670 100644 --- a/internal/tui/components/chat/messages/tool.go +++ b/internal/tui/components/chat/messages/tool.go @@ -7,9 +7,10 @@ import ( "strings" "time" + "charm.land/bubbles/v2/key" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/atotto/clipboard" - "github.com/charmbracelet/bubbles/v2/key" - tea "github.com/charmbracelet/bubbletea/v2" "github.com/charmbracelet/crush/internal/agent" "github.com/charmbracelet/crush/internal/agent/tools" "github.com/charmbracelet/crush/internal/diff" @@ -20,7 +21,6 @@ import ( "github.com/charmbracelet/crush/internal/tui/components/core/layout" "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/crush/internal/tui/util" - "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" ) diff --git a/internal/tui/components/chat/queue.go b/internal/tui/components/chat/queue.go index 7bbb2c6f9cb3e532c3a710c810e742777f2a074c..f35700e212006bff7032252fa6516fe605a4c8c6 100644 --- a/internal/tui/components/chat/queue.go +++ b/internal/tui/components/chat/queue.go @@ -4,8 +4,8 @@ import ( "fmt" "strings" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/tui/styles" - "github.com/charmbracelet/lipgloss/v2" ) func queuePill(queue int, t *styles.Theme) string { diff --git a/internal/tui/components/chat/sidebar/sidebar.go b/internal/tui/components/chat/sidebar/sidebar.go index ddabf8eadf194abb27ede0897782be39ca08ae6c..9b3d52dadb9a7677bdb5db4b3a8360e7385775ba 100644 --- a/internal/tui/components/chat/sidebar/sidebar.go +++ b/internal/tui/components/chat/sidebar/sidebar.go @@ -6,7 +6,8 @@ import ( "slices" "strings" - tea "github.com/charmbracelet/bubbletea/v2" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/catwalk/pkg/catwalk" "github.com/charmbracelet/crush/internal/config" "github.com/charmbracelet/crush/internal/csync" @@ -27,7 +28,6 @@ import ( "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/crush/internal/version" - "github.com/charmbracelet/lipgloss/v2" "golang.org/x/text/cases" "golang.org/x/text/language" ) diff --git a/internal/tui/components/chat/splash/keys.go b/internal/tui/components/chat/splash/keys.go index d36c8d8e7ee2231ef8bc27eb053a5745a0bd3885..5bd9e333395ae6e379c95e997f5eb12860b280a8 100644 --- a/internal/tui/components/chat/splash/keys.go +++ b/internal/tui/components/chat/splash/keys.go @@ -1,7 +1,7 @@ package splash import ( - "github.com/charmbracelet/bubbles/v2/key" + "charm.land/bubbles/v2/key" ) type KeyMap struct { diff --git a/internal/tui/components/chat/splash/splash.go b/internal/tui/components/chat/splash/splash.go index e08af49f8bdbb1dc117c01a6ada4ae341b6b65ba..3b995ab22ded328c49bda36714438c7d4c7b39eb 100644 --- a/internal/tui/components/chat/splash/splash.go +++ b/internal/tui/components/chat/splash/splash.go @@ -5,9 +5,10 @@ import ( "strings" "time" - "github.com/charmbracelet/bubbles/v2/key" - "github.com/charmbracelet/bubbles/v2/spinner" - tea "github.com/charmbracelet/bubbletea/v2" + "charm.land/bubbles/v2/key" + "charm.land/bubbles/v2/spinner" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/catwalk/pkg/catwalk" "github.com/charmbracelet/crush/internal/agent" "github.com/charmbracelet/crush/internal/config" @@ -23,7 +24,6 @@ import ( "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/crush/internal/version" - "github.com/charmbracelet/lipgloss/v2" ) type Splash interface { diff --git a/internal/tui/components/completions/completions.go b/internal/tui/components/completions/completions.go index 93c1b6498f418c23a17ef0738d5748e25d04a685..31532952f6243a466c18d55230875346448c151a 100644 --- a/internal/tui/components/completions/completions.go +++ b/internal/tui/components/completions/completions.go @@ -3,12 +3,12 @@ package completions import ( "strings" - "github.com/charmbracelet/bubbles/v2/key" - tea "github.com/charmbracelet/bubbletea/v2" + "charm.land/bubbles/v2/key" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/tui/exp/list" "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/crush/internal/tui/util" - "github.com/charmbracelet/lipgloss/v2" ) const maxCompletionsHeight = 10 diff --git a/internal/tui/components/completions/keys.go b/internal/tui/components/completions/keys.go index dec1059f8cde34b7a65faad279ebe551a2108a3a..7adaaa02195e5266df0ecb3823fa15d918adb4ab 100644 --- a/internal/tui/components/completions/keys.go +++ b/internal/tui/components/completions/keys.go @@ -1,7 +1,7 @@ package completions import ( - "github.com/charmbracelet/bubbles/v2/key" + "charm.land/bubbles/v2/key" ) type KeyMap struct { diff --git a/internal/tui/components/core/core.go b/internal/tui/components/core/core.go index 80c28ba1e11c4ddeb7e6da1f4802577d23e8b4dc..2b60664c26a6082fafd28626d471575b706c9890 100644 --- a/internal/tui/components/core/core.go +++ b/internal/tui/components/core/core.go @@ -4,12 +4,12 @@ import ( "image/color" "strings" + "charm.land/bubbles/v2/help" + "charm.land/bubbles/v2/key" + "charm.land/lipgloss/v2" "github.com/alecthomas/chroma/v2" - "github.com/charmbracelet/bubbles/v2/help" - "github.com/charmbracelet/bubbles/v2/key" "github.com/charmbracelet/crush/internal/tui/exp/diffview" "github.com/charmbracelet/crush/internal/tui/styles" - "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" ) diff --git a/internal/tui/components/core/layout/layout.go b/internal/tui/components/core/layout/layout.go index 6ceb30adf45595f5d44d4b4b48d6ac0feb87a028..99358755d6070286aab00ac13aeb3d3da2b91e3d 100644 --- a/internal/tui/components/core/layout/layout.go +++ b/internal/tui/components/core/layout/layout.go @@ -1,8 +1,8 @@ package layout import ( - "github.com/charmbracelet/bubbles/v2/key" - tea "github.com/charmbracelet/bubbletea/v2" + "charm.land/bubbles/v2/key" + tea "charm.land/bubbletea/v2" ) // TODO: move this to core diff --git a/internal/tui/components/core/status/status.go b/internal/tui/components/core/status/status.go index effbaac9d48c8600c2b9b0e7dce94b9bbf5b429b..db51c8f00bc9a1038f4d66d76f119d9a11825def 100644 --- a/internal/tui/components/core/status/status.go +++ b/internal/tui/components/core/status/status.go @@ -3,11 +3,11 @@ package status import ( "time" - "github.com/charmbracelet/bubbles/v2/help" - tea "github.com/charmbracelet/bubbletea/v2" + "charm.land/bubbles/v2/help" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/crush/internal/tui/util" - "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" ) diff --git a/internal/tui/components/dialogs/commands/arguments.go b/internal/tui/components/dialogs/commands/arguments.go index 997c1c3056b68fed5451298e30b33cd610980a9d..a4c852cd6fb85b2e8fb3e83e607c5b9a87652dd3 100644 --- a/internal/tui/components/dialogs/commands/arguments.go +++ b/internal/tui/components/dialogs/commands/arguments.go @@ -3,14 +3,14 @@ package commands import ( "cmp" - "github.com/charmbracelet/bubbles/v2/help" - "github.com/charmbracelet/bubbles/v2/key" - "github.com/charmbracelet/bubbles/v2/textinput" - tea "github.com/charmbracelet/bubbletea/v2" + "charm.land/bubbles/v2/help" + "charm.land/bubbles/v2/key" + "charm.land/bubbles/v2/textinput" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/tui/components/dialogs" "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/crush/internal/tui/util" - "github.com/charmbracelet/lipgloss/v2" ) const ( diff --git a/internal/tui/components/dialogs/commands/commands.go b/internal/tui/components/dialogs/commands/commands.go index 9d98005798aabd4879a8cb9a843b776869b3f326..137b20a87e9313281a36d679b09794458b898591 100644 --- a/internal/tui/components/dialogs/commands/commands.go +++ b/internal/tui/components/dialogs/commands/commands.go @@ -5,11 +5,11 @@ import ( "slices" "strings" - "github.com/charmbracelet/bubbles/v2/help" - "github.com/charmbracelet/bubbles/v2/key" - tea "github.com/charmbracelet/bubbletea/v2" + "charm.land/bubbles/v2/help" + "charm.land/bubbles/v2/key" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/catwalk/pkg/catwalk" - "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/crush/internal/agent" "github.com/charmbracelet/crush/internal/agent/tools/mcp" diff --git a/internal/tui/components/dialogs/commands/keys.go b/internal/tui/components/dialogs/commands/keys.go index 65d4af84c22c87117bf5a08427027da5ee0e244f..f07f1c5f4a6db353d6d53888a3bf869702bfb24c 100644 --- a/internal/tui/components/dialogs/commands/keys.go +++ b/internal/tui/components/dialogs/commands/keys.go @@ -1,7 +1,7 @@ package commands import ( - "github.com/charmbracelet/bubbles/v2/key" + "charm.land/bubbles/v2/key" ) type CommandsDialogKeyMap struct { diff --git a/internal/tui/components/dialogs/commands/loader.go b/internal/tui/components/dialogs/commands/loader.go index 3b51604818a77ca12540fa7adcced0726689f884..95875a6810febde86d011e681e8d89cf5483f934 100644 --- a/internal/tui/components/dialogs/commands/loader.go +++ b/internal/tui/components/dialogs/commands/loader.go @@ -10,7 +10,7 @@ import ( "regexp" "strings" - tea "github.com/charmbracelet/bubbletea/v2" + tea "charm.land/bubbletea/v2" "github.com/charmbracelet/crush/internal/agent/tools/mcp" "github.com/charmbracelet/crush/internal/config" "github.com/charmbracelet/crush/internal/home" diff --git a/internal/tui/components/dialogs/dialogs.go b/internal/tui/components/dialogs/dialogs.go index d5ad83c160e0e618e637dabe2b5e297ff0c1cd65..4dacd56daa8008b42ebe7ede8bdb6c955b27dbe5 100644 --- a/internal/tui/components/dialogs/dialogs.go +++ b/internal/tui/components/dialogs/dialogs.go @@ -3,9 +3,9 @@ package dialogs import ( "slices" - tea "github.com/charmbracelet/bubbletea/v2" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/tui/util" - "github.com/charmbracelet/lipgloss/v2" ) type DialogID string diff --git a/internal/tui/components/dialogs/filepicker/filepicker.go b/internal/tui/components/dialogs/filepicker/filepicker.go index 85a391ce5ceba7689148fbdcd016b73c1e100f54..fd9f85e70d1a100ec33d89219dd4d276459bb6ee 100644 --- a/internal/tui/components/dialogs/filepicker/filepicker.go +++ b/internal/tui/components/dialogs/filepicker/filepicker.go @@ -7,10 +7,11 @@ import ( "path/filepath" "strings" - "github.com/charmbracelet/bubbles/v2/filepicker" - "github.com/charmbracelet/bubbles/v2/help" - "github.com/charmbracelet/bubbles/v2/key" - tea "github.com/charmbracelet/bubbletea/v2" + "charm.land/bubbles/v2/filepicker" + "charm.land/bubbles/v2/help" + "charm.land/bubbles/v2/key" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/home" "github.com/charmbracelet/crush/internal/message" "github.com/charmbracelet/crush/internal/tui/components/core" @@ -18,7 +19,6 @@ import ( "github.com/charmbracelet/crush/internal/tui/components/image" "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/crush/internal/tui/util" - "github.com/charmbracelet/lipgloss/v2" ) const ( diff --git a/internal/tui/components/dialogs/filepicker/keys.go b/internal/tui/components/dialogs/filepicker/keys.go index 72e32f2ab9dd07d8b7165aee74744e8be5fd78e8..1fc493ba148e9d48f0348b3f3d49a132ffe60da2 100644 --- a/internal/tui/components/dialogs/filepicker/keys.go +++ b/internal/tui/components/dialogs/filepicker/keys.go @@ -1,7 +1,7 @@ package filepicker import ( - "github.com/charmbracelet/bubbles/v2/key" + "charm.land/bubbles/v2/key" ) // KeyMap defines keyboard bindings for dialog management. diff --git a/internal/tui/components/dialogs/keys.go b/internal/tui/components/dialogs/keys.go index 264ce3d42f6a99f441f961128f109e6baebf4c1b..178ea65612a0db8072f21c0a17335d7c627afae4 100644 --- a/internal/tui/components/dialogs/keys.go +++ b/internal/tui/components/dialogs/keys.go @@ -1,7 +1,7 @@ package dialogs import ( - "github.com/charmbracelet/bubbles/v2/key" + "charm.land/bubbles/v2/key" ) // KeyMap defines keyboard bindings for dialog management. diff --git a/internal/tui/components/dialogs/models/apikey.go b/internal/tui/components/dialogs/models/apikey.go index 1c4ee0c14a77e2006d2bd43e40947b6852fa1736..6ab890ca83bdcce55cc3441683c9b2c6e6acf542 100644 --- a/internal/tui/components/dialogs/models/apikey.go +++ b/internal/tui/components/dialogs/models/apikey.go @@ -3,14 +3,14 @@ package models import ( "fmt" - "github.com/charmbracelet/bubbles/v2/spinner" - "github.com/charmbracelet/bubbles/v2/textinput" - tea "github.com/charmbracelet/bubbletea/v2" + "charm.land/bubbles/v2/spinner" + "charm.land/bubbles/v2/textinput" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/config" "github.com/charmbracelet/crush/internal/home" "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/crush/internal/tui/util" - "github.com/charmbracelet/lipgloss/v2" ) type APIKeyInputState int diff --git a/internal/tui/components/dialogs/models/keys.go b/internal/tui/components/dialogs/models/keys.go index 4ec1a487e865981edc0be5852bb6c044ddf04c1f..e36a18d7299a172486423749464f898954dcb1f2 100644 --- a/internal/tui/components/dialogs/models/keys.go +++ b/internal/tui/components/dialogs/models/keys.go @@ -1,7 +1,7 @@ package models import ( - "github.com/charmbracelet/bubbles/v2/key" + "charm.land/bubbles/v2/key" ) type KeyMap struct { diff --git a/internal/tui/components/dialogs/models/list.go b/internal/tui/components/dialogs/models/list.go index c584881480257dd873bc6c64062255d2641f058d..87d333c4bd7e349b77cd2eff7e753743acde4296 100644 --- a/internal/tui/components/dialogs/models/list.go +++ b/internal/tui/components/dialogs/models/list.go @@ -6,7 +6,7 @@ import ( "slices" "strings" - tea "github.com/charmbracelet/bubbletea/v2" + tea "charm.land/bubbletea/v2" "github.com/charmbracelet/catwalk/pkg/catwalk" "github.com/charmbracelet/crush/internal/config" "github.com/charmbracelet/crush/internal/tui/exp/list" diff --git a/internal/tui/components/dialogs/models/models.go b/internal/tui/components/dialogs/models/models.go index 2e0b68cc3640c9ee5ed411eb10a07e9dc3bc0635..46b4df644c7ff6619369c03f9e68aec7cc950e71 100644 --- a/internal/tui/components/dialogs/models/models.go +++ b/internal/tui/components/dialogs/models/models.go @@ -4,10 +4,11 @@ import ( "fmt" "time" - "github.com/charmbracelet/bubbles/v2/help" - "github.com/charmbracelet/bubbles/v2/key" - "github.com/charmbracelet/bubbles/v2/spinner" - tea "github.com/charmbracelet/bubbletea/v2" + "charm.land/bubbles/v2/help" + "charm.land/bubbles/v2/key" + "charm.land/bubbles/v2/spinner" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/catwalk/pkg/catwalk" "github.com/charmbracelet/crush/internal/config" "github.com/charmbracelet/crush/internal/tui/components/core" @@ -15,7 +16,6 @@ import ( "github.com/charmbracelet/crush/internal/tui/exp/list" "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/crush/internal/tui/util" - "github.com/charmbracelet/lipgloss/v2" ) const ( diff --git a/internal/tui/components/dialogs/permissions/keys.go b/internal/tui/components/dialogs/permissions/keys.go index fc1810fc582dc4c25cada280b00b3f9515e43008..5e7786ec1eddf1f3491f3a961c087f72911f1c33 100644 --- a/internal/tui/components/dialogs/permissions/keys.go +++ b/internal/tui/components/dialogs/permissions/keys.go @@ -1,7 +1,7 @@ package permissions import ( - "github.com/charmbracelet/bubbles/v2/key" + "charm.land/bubbles/v2/key" ) type KeyMap struct { diff --git a/internal/tui/components/dialogs/permissions/permissions.go b/internal/tui/components/dialogs/permissions/permissions.go index b674018c701cd8622b44e6753aab6940439615bf..b2e52c204d21634d3fd92cfc2b8ed25d01489988 100644 --- a/internal/tui/components/dialogs/permissions/permissions.go +++ b/internal/tui/components/dialogs/permissions/permissions.go @@ -5,10 +5,11 @@ import ( "fmt" "strings" - "github.com/charmbracelet/bubbles/v2/help" - "github.com/charmbracelet/bubbles/v2/key" - "github.com/charmbracelet/bubbles/v2/viewport" - tea "github.com/charmbracelet/bubbletea/v2" + "charm.land/bubbles/v2/help" + "charm.land/bubbles/v2/key" + "charm.land/bubbles/v2/viewport" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/agent/tools" "github.com/charmbracelet/crush/internal/fsext" "github.com/charmbracelet/crush/internal/permission" @@ -16,7 +17,6 @@ import ( "github.com/charmbracelet/crush/internal/tui/components/dialogs" "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/crush/internal/tui/util" - "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" ) diff --git a/internal/tui/components/dialogs/quit/keys.go b/internal/tui/components/dialogs/quit/keys.go index 2e8dbc199264eb9221544319f81ef859d71e58b5..15b3e85e0da960a9a63562427f2f2e2f624ab627 100644 --- a/internal/tui/components/dialogs/quit/keys.go +++ b/internal/tui/components/dialogs/quit/keys.go @@ -1,7 +1,7 @@ package quit import ( - "github.com/charmbracelet/bubbles/v2/key" + "charm.land/bubbles/v2/key" ) // KeyMap defines the keyboard bindings for the quit dialog. diff --git a/internal/tui/components/dialogs/quit/quit.go b/internal/tui/components/dialogs/quit/quit.go index a8857104550886abc5f70956bf384ab2df6ec302..4ffc04a0d1bf2397e2c00c7b321c360d9566d623 100644 --- a/internal/tui/components/dialogs/quit/quit.go +++ b/internal/tui/components/dialogs/quit/quit.go @@ -1,12 +1,12 @@ package quit import ( - "github.com/charmbracelet/bubbles/v2/key" - tea "github.com/charmbracelet/bubbletea/v2" + "charm.land/bubbles/v2/key" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/tui/components/dialogs" "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/crush/internal/tui/util" - "github.com/charmbracelet/lipgloss/v2" ) const ( diff --git a/internal/tui/components/dialogs/reasoning/reasoning.go b/internal/tui/components/dialogs/reasoning/reasoning.go index 995c46606ffc4b91317643e46eece3f835ad6883..dfe6898b90b516903dc3b6b490641899c8cc6ca2 100644 --- a/internal/tui/components/dialogs/reasoning/reasoning.go +++ b/internal/tui/components/dialogs/reasoning/reasoning.go @@ -1,10 +1,10 @@ package reasoning import ( - "github.com/charmbracelet/bubbles/v2/help" - "github.com/charmbracelet/bubbles/v2/key" - tea "github.com/charmbracelet/bubbletea/v2" - "github.com/charmbracelet/lipgloss/v2" + "charm.land/bubbles/v2/help" + "charm.land/bubbles/v2/key" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "golang.org/x/text/cases" "golang.org/x/text/language" diff --git a/internal/tui/components/dialogs/sessions/keys.go b/internal/tui/components/dialogs/sessions/keys.go index 73c50899f7ae7da3655fc8a3e3a3dd34c4c22f95..94b260bd71261699413151836c672b2498e03abe 100644 --- a/internal/tui/components/dialogs/sessions/keys.go +++ b/internal/tui/components/dialogs/sessions/keys.go @@ -1,7 +1,7 @@ package sessions import ( - "github.com/charmbracelet/bubbles/v2/key" + "charm.land/bubbles/v2/key" ) type KeyMap struct { diff --git a/internal/tui/components/dialogs/sessions/sessions.go b/internal/tui/components/dialogs/sessions/sessions.go index 7f01f3ba4dacfe408fed0e8f5a2f34b39d8b2edd..11515eeedf8347b8eba5c94b7e0d35715d1380cc 100644 --- a/internal/tui/components/dialogs/sessions/sessions.go +++ b/internal/tui/components/dialogs/sessions/sessions.go @@ -1,9 +1,10 @@ package sessions import ( - "github.com/charmbracelet/bubbles/v2/help" - "github.com/charmbracelet/bubbles/v2/key" - tea "github.com/charmbracelet/bubbletea/v2" + "charm.land/bubbles/v2/help" + "charm.land/bubbles/v2/key" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/event" "github.com/charmbracelet/crush/internal/session" "github.com/charmbracelet/crush/internal/tui/components/chat" @@ -12,7 +13,6 @@ import ( "github.com/charmbracelet/crush/internal/tui/exp/list" "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/crush/internal/tui/util" - "github.com/charmbracelet/lipgloss/v2" ) const SessionsDialogID dialogs.DialogID = "sessions" diff --git a/internal/tui/components/files/files.go b/internal/tui/components/files/files.go index 3e99f222f96e26ef2bec6943d0bfeb3156b25777..c7898d472452fd8465394ccea1131a15224712b2 100644 --- a/internal/tui/components/files/files.go +++ b/internal/tui/components/files/files.go @@ -7,7 +7,7 @@ import ( "sort" "strings" - "github.com/charmbracelet/lipgloss/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/x/ansi" "github.com/charmbracelet/crush/internal/config" diff --git a/internal/tui/components/image/image.go b/internal/tui/components/image/image.go index 5d84c18e984c0e252064f2973263f9390118e244..b526b1bb0a4b1eaf186a55475980bd81f5704ff6 100644 --- a/internal/tui/components/image/image.go +++ b/internal/tui/components/image/image.go @@ -7,7 +7,7 @@ import ( _ "image/jpeg" _ "image/png" - tea "github.com/charmbracelet/bubbletea/v2" + tea "charm.land/bubbletea/v2" ) type Model struct { diff --git a/internal/tui/components/image/load.go b/internal/tui/components/image/load.go index 25fb4bc82908b4d818efab199356d8a5b9bfe87d..1a31bd3d2251119d51f990398c324e1971c3f33f 100644 --- a/internal/tui/components/image/load.go +++ b/internal/tui/components/image/load.go @@ -11,7 +11,7 @@ import ( "os" "strings" - tea "github.com/charmbracelet/bubbletea/v2" + tea "charm.land/bubbletea/v2" "github.com/disintegration/imageorient" "github.com/lucasb-eyer/go-colorful" "github.com/muesli/termenv" diff --git a/internal/tui/components/logo/logo.go b/internal/tui/components/logo/logo.go index 6d1fbe5c69b908c27f3819011a02054d9b940452..9f4cdfef36723cc69dd13f4a60dcd76f0c8f9904 100644 --- a/internal/tui/components/logo/logo.go +++ b/internal/tui/components/logo/logo.go @@ -6,9 +6,9 @@ import ( "image/color" "strings" + "charm.land/lipgloss/v2" "github.com/MakeNowJust/heredoc" "github.com/charmbracelet/crush/internal/tui/styles" - "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" "github.com/charmbracelet/x/exp/slice" ) diff --git a/internal/tui/components/lsp/lsp.go b/internal/tui/components/lsp/lsp.go index 0c0384e91c36744b8f318f9bbc71e5e076a26abf..18c3f74b71768b88d068093759245615d2f7a284 100644 --- a/internal/tui/components/lsp/lsp.go +++ b/internal/tui/components/lsp/lsp.go @@ -4,13 +4,13 @@ import ( "fmt" "strings" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/app" "github.com/charmbracelet/crush/internal/config" "github.com/charmbracelet/crush/internal/csync" "github.com/charmbracelet/crush/internal/lsp" "github.com/charmbracelet/crush/internal/tui/components/core" "github.com/charmbracelet/crush/internal/tui/styles" - "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/powernap/pkg/lsp/protocol" ) diff --git a/internal/tui/components/mcp/mcp.go b/internal/tui/components/mcp/mcp.go index 355341c9d9a08e70422c1c6c464c5fddb7cb1213..782a776c5eefb946e0b858f6711bc5ec0ac705fd 100644 --- a/internal/tui/components/mcp/mcp.go +++ b/internal/tui/components/mcp/mcp.go @@ -4,7 +4,7 @@ import ( "fmt" "strings" - "github.com/charmbracelet/lipgloss/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/agent/tools/mcp" "github.com/charmbracelet/crush/internal/config" diff --git a/internal/tui/exp/diffview/chroma.go b/internal/tui/exp/diffview/chroma.go index 72e286c6cbab0a2080bcb54043083bf253171158..d66cf39712a5e9a42a6021bec96ad155e0ffbd76 100644 --- a/internal/tui/exp/diffview/chroma.go +++ b/internal/tui/exp/diffview/chroma.go @@ -6,9 +6,9 @@ import ( "io" "strings" + "charm.land/lipgloss/v2" "github.com/alecthomas/chroma/v2" "github.com/charmbracelet/crush/internal/ansiext" - "github.com/charmbracelet/lipgloss/v2" ) var _ chroma.Formatter = chromaFormatter{} diff --git a/internal/tui/exp/diffview/diffview.go b/internal/tui/exp/diffview/diffview.go index 555e3bc821e064576bcc1af520030ba6d57270b8..f1b69bc173fc63f1e5241d7bb46610c1802c98b8 100644 --- a/internal/tui/exp/diffview/diffview.go +++ b/internal/tui/exp/diffview/diffview.go @@ -6,10 +6,10 @@ import ( "strconv" "strings" + "charm.land/lipgloss/v2" "github.com/alecthomas/chroma/v2" "github.com/alecthomas/chroma/v2/lexers" "github.com/aymanbagabas/go-udiff" - "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" "github.com/zeebo/xxh3" ) diff --git a/internal/tui/exp/diffview/style.go b/internal/tui/exp/diffview/style.go index e24f67ec7f1aee809cb058ca11268562ff00d74e..25fd08ac68c7b160bbdcfa61df737b48f12cb625 100644 --- a/internal/tui/exp/diffview/style.go +++ b/internal/tui/exp/diffview/style.go @@ -1,7 +1,7 @@ package diffview import ( - "github.com/charmbracelet/lipgloss/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/x/exp/charmtone" ) diff --git a/internal/tui/exp/list/filterable.go b/internal/tui/exp/list/filterable.go index 6f57931bb4334fbbf27ad887852b696b3d9cbe95..f7ded77b9370794fee68d7ea82f961aceca0edf6 100644 --- a/internal/tui/exp/list/filterable.go +++ b/internal/tui/exp/list/filterable.go @@ -4,13 +4,13 @@ import ( "regexp" "slices" - "github.com/charmbracelet/bubbles/v2/key" - "github.com/charmbracelet/bubbles/v2/textinput" - tea "github.com/charmbracelet/bubbletea/v2" + "charm.land/bubbles/v2/key" + "charm.land/bubbles/v2/textinput" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/tui/components/core/layout" "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/crush/internal/tui/util" - "github.com/charmbracelet/lipgloss/v2" "github.com/sahilm/fuzzy" ) diff --git a/internal/tui/exp/list/filterable_group.go b/internal/tui/exp/list/filterable_group.go index 572181d705882e9a3062fcc3aecd8cf043b0750a..8597050cbc3820a53efe467182c8625f608616c2 100644 --- a/internal/tui/exp/list/filterable_group.go +++ b/internal/tui/exp/list/filterable_group.go @@ -5,13 +5,13 @@ import ( "sort" "strings" - "github.com/charmbracelet/bubbles/v2/key" - "github.com/charmbracelet/bubbles/v2/textinput" - tea "github.com/charmbracelet/bubbletea/v2" + "charm.land/bubbles/v2/key" + "charm.land/bubbles/v2/textinput" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/tui/components/core/layout" "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/crush/internal/tui/util" - "github.com/charmbracelet/lipgloss/v2" "github.com/sahilm/fuzzy" ) diff --git a/internal/tui/exp/list/grouped.go b/internal/tui/exp/list/grouped.go index 9e9eabd27e940688db3c8c58c4aa91db0ebcbf81..b1408aa663a4847ad4acaaf89d8b2282cf2b3aab 100644 --- a/internal/tui/exp/list/grouped.go +++ b/internal/tui/exp/list/grouped.go @@ -1,7 +1,7 @@ package list import ( - tea "github.com/charmbracelet/bubbletea/v2" + tea "charm.land/bubbletea/v2" "github.com/charmbracelet/crush/internal/tui/components/core/layout" "github.com/charmbracelet/crush/internal/tui/util" ) diff --git a/internal/tui/exp/list/items.go b/internal/tui/exp/list/items.go index 143908d5416be744424cc30965b8d663ca2a2c68..fa89fb6e7a58a5fc0d9e6bcab36a979130c482e9 100644 --- a/internal/tui/exp/list/items.go +++ b/internal/tui/exp/list/items.go @@ -3,12 +3,12 @@ package list import ( "image/color" - tea "github.com/charmbracelet/bubbletea/v2" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/tui/components/core" "github.com/charmbracelet/crush/internal/tui/components/core/layout" "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/crush/internal/tui/util" - "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/ansi" "github.com/google/uuid" "github.com/rivo/uniseg" diff --git a/internal/tui/exp/list/keys.go b/internal/tui/exp/list/keys.go index ba0f6cec97ed1d0cdc91ff70f69a8f2e1cd386d7..e470fbfbea2ea9f958949ebdfabe5fd679192f9c 100644 --- a/internal/tui/exp/list/keys.go +++ b/internal/tui/exp/list/keys.go @@ -1,7 +1,7 @@ package list import ( - "github.com/charmbracelet/bubbles/v2/key" + "charm.land/bubbles/v2/key" ) type KeyMap struct { diff --git a/internal/tui/exp/list/list.go b/internal/tui/exp/list/list.go index 240176ea6a3a0492d3c1bdff4f774b512dd1e738..19848719b284e9982752fa450441d4011d92d551 100644 --- a/internal/tui/exp/list/list.go +++ b/internal/tui/exp/list/list.go @@ -4,13 +4,13 @@ import ( "strings" "sync" - "github.com/charmbracelet/bubbles/v2/key" - tea "github.com/charmbracelet/bubbletea/v2" + "charm.land/bubbles/v2/key" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/tui/components/anim" "github.com/charmbracelet/crush/internal/tui/components/core/layout" "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/crush/internal/tui/util" - "github.com/charmbracelet/lipgloss/v2" uv "github.com/charmbracelet/ultraviolet" "github.com/charmbracelet/x/ansi" "github.com/charmbracelet/x/exp/ordered" diff --git a/internal/tui/exp/list/list_test.go b/internal/tui/exp/list/list_test.go index 234f2a32cbec813355db040df37c87d166409d62..57ca7883f87e9facf82b46f60f66f2101a08428a 100644 --- a/internal/tui/exp/list/list_test.go +++ b/internal/tui/exp/list/list_test.go @@ -5,10 +5,10 @@ import ( "strings" "testing" - tea "github.com/charmbracelet/bubbletea/v2" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/tui/components/core/layout" "github.com/charmbracelet/crush/internal/tui/util" - "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/exp/golden" "github.com/google/uuid" "github.com/stretchr/testify/assert" diff --git a/internal/tui/keys.go b/internal/tui/keys.go index d618063e1ec0d51a1a9f8a15a1b83216f7d251e8..1d3d93cea77e91635bbeb1629bc8bce008496611 100644 --- a/internal/tui/keys.go +++ b/internal/tui/keys.go @@ -1,7 +1,7 @@ package tui import ( - "github.com/charmbracelet/bubbles/v2/key" + "charm.land/bubbles/v2/key" ) type KeyMap struct { diff --git a/internal/tui/page/chat/chat.go b/internal/tui/page/chat/chat.go index 0664b65261fa61f491b624cd15e043d8c9791563..c478701e5ce702703a008e2cf18c0e20fdc36cc4 100644 --- a/internal/tui/page/chat/chat.go +++ b/internal/tui/page/chat/chat.go @@ -6,10 +6,11 @@ import ( "fmt" "time" - "github.com/charmbracelet/bubbles/v2/help" - "github.com/charmbracelet/bubbles/v2/key" - "github.com/charmbracelet/bubbles/v2/spinner" - tea "github.com/charmbracelet/bubbletea/v2" + "charm.land/bubbles/v2/help" + "charm.land/bubbles/v2/key" + "charm.land/bubbles/v2/spinner" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/app" "github.com/charmbracelet/crush/internal/config" "github.com/charmbracelet/crush/internal/history" @@ -36,7 +37,6 @@ import ( "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/crush/internal/tui/util" "github.com/charmbracelet/crush/internal/version" - "github.com/charmbracelet/lipgloss/v2" ) var ChatPageID page.PageID = "chat" @@ -1025,7 +1025,8 @@ func (p *chatPage) Help() help.KeyMap { // to reflect that. key.WithHelp("ctrl+j", "newline"), ) - if p.keyboardEnhancements.SupportsKeyDisambiguation() { + if p.keyboardEnhancements.Flags > 0 { + // Non-zero flags mean we have at least key disambiguation. newLineBinding.SetHelp("shift+enter", newLineBinding.Help().Desc) } shortList = append(shortList, newLineBinding) diff --git a/internal/tui/page/chat/keys.go b/internal/tui/page/chat/keys.go index 679a97c69522c0e831e59bddc7b0c1ddcc55fbb9..b175b4bf99a522fb8e9ea041e24105e3a0fad7ba 100644 --- a/internal/tui/page/chat/keys.go +++ b/internal/tui/page/chat/keys.go @@ -1,7 +1,7 @@ package chat import ( - "github.com/charmbracelet/bubbles/v2/key" + "charm.land/bubbles/v2/key" ) type KeyMap struct { diff --git a/internal/tui/styles/charmtone.go b/internal/tui/styles/charmtone.go index 1d9a194273457f143216e1bfa472207d7b593fe1..5f2f58b76bb6bbc9b92ad96eaf5ff6a8675863b5 100644 --- a/internal/tui/styles/charmtone.go +++ b/internal/tui/styles/charmtone.go @@ -1,7 +1,7 @@ package styles import ( - "github.com/charmbracelet/lipgloss/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/x/exp/charmtone" ) diff --git a/internal/tui/styles/theme.go b/internal/tui/styles/theme.go index e8da5d04e9b8120668edf8f0197588cacf73883b..4060cf493af3c3c5d94fd4bfc014d25f27f79d65 100644 --- a/internal/tui/styles/theme.go +++ b/internal/tui/styles/theme.go @@ -5,14 +5,14 @@ import ( "image/color" "strings" - "github.com/charmbracelet/bubbles/v2/filepicker" - "github.com/charmbracelet/bubbles/v2/help" - "github.com/charmbracelet/bubbles/v2/textarea" - "github.com/charmbracelet/bubbles/v2/textinput" - tea "github.com/charmbracelet/bubbletea/v2" + "charm.land/bubbles/v2/filepicker" + "charm.land/bubbles/v2/help" + "charm.land/bubbles/v2/textarea" + "charm.land/bubbles/v2/textinput" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/tui/exp/diffview" "github.com/charmbracelet/glamour/v2/ansi" - "github.com/charmbracelet/lipgloss/v2" "github.com/charmbracelet/x/exp/charmtone" "github.com/lucasb-eyer/go-colorful" "github.com/rivo/uniseg" diff --git a/internal/tui/tui.go b/internal/tui/tui.go index 3efc581a88167493d520cc4a9d37f00e2296ac1b..25636206b0b147a20e896e8ca8c75935a7e0f265 100644 --- a/internal/tui/tui.go +++ b/internal/tui/tui.go @@ -8,8 +8,9 @@ import ( "strings" "time" - "github.com/charmbracelet/bubbles/v2/key" - tea "github.com/charmbracelet/bubbletea/v2" + "charm.land/bubbles/v2/key" + tea "charm.land/bubbletea/v2" + "charm.land/lipgloss/v2" "github.com/charmbracelet/crush/internal/agent/tools/mcp" "github.com/charmbracelet/crush/internal/app" "github.com/charmbracelet/crush/internal/config" @@ -33,7 +34,6 @@ import ( "github.com/charmbracelet/crush/internal/tui/page/chat" "github.com/charmbracelet/crush/internal/tui/styles" "github.com/charmbracelet/crush/internal/tui/util" - "github.com/charmbracelet/lipgloss/v2" "golang.org/x/text/cases" "golang.org/x/text/language" ) @@ -120,7 +120,7 @@ func (a *appModel) Update(msg tea.Msg) (tea.Model, tea.Cmd) { a.sendProgressBar = slices.Contains(msg, "WT_SESSION") } case tea.TerminalVersionMsg: - termVersion := strings.ToLower(string(msg)) + termVersion := strings.ToLower(msg.Name) // Only enable progress bar for the following terminals. if !a.sendProgressBar { a.sendProgressBar = strings.Contains(termVersion, "ghostty") diff --git a/internal/tui/util/util.go b/internal/tui/util/util.go index c3ce1dbf7ad94cc89def5e6a11da94b540f7b38e..46af5beb8181968bae35356f6d2124561d9f51e7 100644 --- a/internal/tui/util/util.go +++ b/internal/tui/util/util.go @@ -4,7 +4,7 @@ import ( "log/slog" "time" - tea "github.com/charmbracelet/bubbletea/v2" + tea "charm.land/bubbletea/v2" ) type Cursor interface {