Kujtim Hoxha created
.github/cla-signatures.json | 8 ++++++++
go.mod | 8 ++++----
go.sum | 16 ++++++++--------
internal/cmd/logs.go | 2 +-
internal/history/file.go | 2 +-
internal/message/message.go | 2 +-
internal/permission/permission.go | 2 +-
internal/pubsub/events.go | 2 +-
internal/session/session.go | 2 +-
internal/tui/styles/chroma.go | 2 +-
internal/tui/styles/markdown.go | 4 ++--
internal/tui/styles/theme.go | 2 +-
12 files changed, 30 insertions(+), 22 deletions(-)
@@ -951,6 +951,14 @@
"created_at": "2025-12-11T23:09:21Z",
"repoId": 987670088,
"pullRequestNo": 1611
+ },
+ {
+ "name": "strawberry-code",
+ "id": 18684103,
+ "comment_id": 3650628850,
+ "created_at": "2025-12-14T09:41:12Z",
+ "repoId": 987670088,
+ "pullRequestNo": 1628
}
]
}
@@ -4,9 +4,11 @@ go 1.25.5
require (
charm.land/bubbles/v2 v2.0.0-rc.1
- charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251212022530-7adbf082fd25
+ charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251212194116-6348bd4b7475
charm.land/fantasy v0.5.2
+ charm.land/glamour/v2 v2.0.0-20251110203732-69649f93d3b1
charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251205162909-7869489d8971
+ charm.land/log/v2 v2.0.0-20251110204020-529bb77f35da
charm.land/x/vcr v0.1.1
github.com/JohannesKaufmann/html-to-markdown v1.6.0
github.com/MakeNowJust/heredoc v1.0.0
@@ -19,9 +21,7 @@ require (
github.com/charmbracelet/catwalk v0.10.1
github.com/charmbracelet/colorprofile v0.4.1
github.com/charmbracelet/fang v0.4.4
- github.com/charmbracelet/glamour/v2 v2.0.0-20251106195642-800eb8175930
- github.com/charmbracelet/log/v2 v2.0.0-20251106192421-eb64aaa963a0
- github.com/charmbracelet/ultraviolet v0.0.0-20251211195649-3a51f4048cae
+ github.com/charmbracelet/ultraviolet v0.0.0-20251212194010-b927aa605560
github.com/charmbracelet/x/ansi v0.11.3
github.com/charmbracelet/x/exp/charmtone v0.0.0-20250708181618-a60a724ba6c3
github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f
@@ -1,11 +1,15 @@
charm.land/bubbles/v2 v2.0.0-rc.1 h1:EiIFVAc3Zi/yY86td+79mPhHR7AqZ1OxF+6ztpOCRaM=
charm.land/bubbles/v2 v2.0.0-rc.1/go.mod h1:5AbN6cEd/47gkEf8TgiQ2O3RZ5QxMS14l9W+7F9fPC4=
-charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251212022530-7adbf082fd25 h1:qmVU/kDsds1L+caeJ2LghFyFOn/1iEx9RRbQ6YQkxb4=
-charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251212022530-7adbf082fd25/go.mod h1:C1MMjbspGDebEITrYpuJd6gB42cSTqWgR4/vQPjD224=
+charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251212194116-6348bd4b7475 h1:73ohAau8fvq3d54i1bQxVKhBf/vmPYDtV3JZgb+SIQk=
+charm.land/bubbletea/v2 v2.0.0-rc.2.0.20251212194116-6348bd4b7475/go.mod h1:pDM18flq3Z4njKZPA3zCvyVSSIJbMcoqlE82BdGUtL8=
charm.land/fantasy v0.5.2 h1:4zlNsIcsyF3Jr+1onEuhHqZRzuH1LlxBle/gInS00QY=
charm.land/fantasy v0.5.2/go.mod h1:SPOsnIlkBKnhw2Wnasv+wZ82EmCMIGesx0je3tgR6+M=
+charm.land/glamour/v2 v2.0.0-20251110203732-69649f93d3b1 h1:9q4+yyU7105T3OrOx0csMyKnw89yMSijJ+rVld/Z2ek=
+charm.land/glamour/v2 v2.0.0-20251110203732-69649f93d3b1/go.mod h1:J3kVhY6oHXZq5f+8vC3hmDO95fEvbqj3z7xDwxrfzU8=
charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251205162909-7869489d8971 h1:xZFcNsJMiIDbFtWRyDmkKNk1sjojfaom4Zoe0cyH/8c=
charm.land/lipgloss/v2 v2.0.0-beta.3.0.20251205162909-7869489d8971/go.mod h1:i61Y3FmdbcBNSKa+pKB3DaE4uVQmBLMs/xlvRyHcXAE=
+charm.land/log/v2 v2.0.0-20251110204020-529bb77f35da h1:vZa/Ow0uLclpfaDY0ubjzE+B0eLQqi2zanmpeALanow=
+charm.land/log/v2 v2.0.0-20251110204020-529bb77f35da/go.mod h1:Tj12StbPc4GwksDF6XwhC9wdXouinIVxRGKKmmmzdSU=
charm.land/x/vcr v0.1.1 h1:PXCFMUG0rPtyk35rhfzYCJEduOzWXCIbrXTFq4OF/9Q=
charm.land/x/vcr v0.1.1/go.mod h1:eByq2gqzWvcct/8XE2XO5KznoWEBiXH56+y2gphbltM=
cloud.google.com/go v0.116.0 h1:B3fRrSDkLRt5qSHWe40ERJvhvnQwdZiHu0bJOpldweE=
@@ -94,12 +98,8 @@ github.com/charmbracelet/colorprofile v0.4.1 h1:a1lO03qTrSIRaK8c3JRxJDZOvhvIeSco
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/charmbracelet/glamour/v2 v2.0.0-20251106195642-800eb8175930 h1:+47Z2jVAWPSLGjPRbfZizW3OpcAYsu7EUk2DR+66FyM=
-github.com/charmbracelet/glamour/v2 v2.0.0-20251106195642-800eb8175930/go.mod h1:izs11tnkYaT3DTEH2E0V/lCb18VGZ7k9HLYEGuvgXGA=
-github.com/charmbracelet/log/v2 v2.0.0-20251106192421-eb64aaa963a0 h1:lxHzxsHd4P7o7+5D5OcEItYkQ1xY3ovNg8Dc5ftd3rI=
-github.com/charmbracelet/log/v2 v2.0.0-20251106192421-eb64aaa963a0/go.mod h1:Q7oMtlboDPnnrYiJDXNwdWmJblOmuOnycPKczlVju6I=
-github.com/charmbracelet/ultraviolet v0.0.0-20251211195649-3a51f4048cae h1:njFQJDtNiWgKXHmYruigCG+9q5Ptq6rWW400UvG/Tpc=
-github.com/charmbracelet/ultraviolet v0.0.0-20251211195649-3a51f4048cae/go.mod h1:VWATWLRwYP06VYCEur7FsNR2B1xAo7Y+xl1PTbd1ePc=
+github.com/charmbracelet/ultraviolet v0.0.0-20251212194010-b927aa605560 h1:j3PW2hypGoPKBy3ooKzW0TFxaxhyHK3NbkLLn4KeRFc=
+github.com/charmbracelet/ultraviolet v0.0.0-20251212194010-b927aa605560/go.mod h1:VWATWLRwYP06VYCEur7FsNR2B1xAo7Y+xl1PTbd1ePc=
github.com/charmbracelet/x/ansi v0.11.3 h1:6DcVaqWI82BBVM/atTyq6yBoRLZFBsnoDoX9GCu2YOI=
github.com/charmbracelet/x/ansi v0.11.3/go.mod h1:yI7Zslym9tCJcedxz5+WBq+eUGMJT0bM06Fqy1/Y4dI=
github.com/charmbracelet/x/etag v0.2.0 h1:Euj1VkheoHfTYA9y+TCwkeXF/hN8Fb9l4LqZl79pt04=
@@ -10,9 +10,9 @@ import (
"slices"
"time"
+ "charm.land/log/v2"
"github.com/charmbracelet/colorprofile"
"github.com/charmbracelet/crush/internal/config"
- "github.com/charmbracelet/log/v2"
"github.com/charmbracelet/x/term"
"github.com/nxadm/tail"
"github.com/spf13/cobra"
@@ -26,7 +26,7 @@ type File struct {
}
type Service interface {
- pubsub.Suscriber[File]
+ pubsub.Subscriber[File]
Create(ctx context.Context, sessionID, path, content string) (File, error)
CreateVersion(ctx context.Context, sessionID, path, content string) (File, error)
Get(ctx context.Context, id string) (File, error)
@@ -21,7 +21,7 @@ type CreateMessageParams struct {
}
type Service interface {
- pubsub.Suscriber[Message]
+ pubsub.Subscriber[Message]
Create(ctx context.Context, sessionID string, params CreateMessageParams) (Message, error)
Update(ctx context.Context, message Message) error
Get(ctx context.Context, id string) (Message, error)
@@ -43,7 +43,7 @@ type PermissionRequest struct {
}
type Service interface {
- pubsub.Suscriber[PermissionRequest]
+ pubsub.Subscriber[PermissionRequest]
GrantPersistent(permission PermissionRequest)
Grant(permission PermissionRequest)
Deny(permission PermissionRequest)
@@ -8,7 +8,7 @@ const (
DeletedEvent EventType = "deleted"
)
-type Suscriber[T any] interface {
+type Subscriber[T any] interface {
Subscribe(context.Context) <-chan Event[T]
}
@@ -43,7 +43,7 @@ type Session struct {
}
type Service interface {
- pubsub.Suscriber[Session]
+ pubsub.Subscriber[Session]
Create(ctx context.Context, title string) (Session, error)
CreateTitleSession(ctx context.Context, parentSessionID string) (Session, error)
CreateTaskSession(ctx context.Context, toolCallID, parentSessionID, title string) (Session, error)
@@ -1,8 +1,8 @@
package styles
import (
+ "charm.land/glamour/v2/ansi"
"github.com/alecthomas/chroma/v2"
- "github.com/charmbracelet/glamour/v2/ansi"
)
func chromaStyle(style ansi.StylePrimitive) string {
@@ -4,8 +4,8 @@ import (
"fmt"
"image/color"
- "github.com/charmbracelet/glamour/v2"
- "github.com/charmbracelet/glamour/v2/ansi"
+ "charm.land/glamour/v2"
+ "charm.land/glamour/v2/ansi"
)
// lipglossColorToHex converts a color.Color to hex string
@@ -10,9 +10,9 @@ import (
"charm.land/bubbles/v2/textarea"
"charm.land/bubbles/v2/textinput"
tea "charm.land/bubbletea/v2"
+ "charm.land/glamour/v2/ansi"
"charm.land/lipgloss/v2"
"github.com/charmbracelet/crush/internal/tui/exp/diffview"
- "github.com/charmbracelet/glamour/v2/ansi"
"github.com/charmbracelet/x/exp/charmtone"
"github.com/lucasb-eyer/go-colorful"
"github.com/rivo/uniseg"