d9f7a41 · crush · git.iko.soy

go.mod+1−1

compare with main

unifiedsplit

@@ -13,7 +13,7 @@ require (

13 github.com/bmatcuk/doublestar/v4 v4.8.1

14 github.com/catppuccin/go v0.3.0

15 github.com/charlievieth/fastwalk v1.0.11

16− github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250526131538-b3f0c9e42318

16+ github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250603125125-87aee03b3d4f

17 github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.3.0.20250602154956-43689cfc0174

18 github.com/charmbracelet/glamour/v2 v2.0.0-20250516160903-6f1e2c8f9ebe

19 github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1.0.20250523195325-2d1af06b557c

go.sum+4−6

@@ -72,10 +72,10 @@ github.com/charlievieth/fastwalk v1.0.11 h1:5sLT/q9+d9xMdpKExawLppqvXFZCVKf6JHnr

72github.com/charlievieth/fastwalk v1.0.11/go.mod h1:yGy1zbxog41ZVMcKA/i8ojXLFsuayX5VvwhQVoj9PBI=

73github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250526131538-b3f0c9e42318 h1:f8Q0ybZGxT+St1JfPM7yoz/XFpbmtodcIehaom/9XT8=

74github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250526131538-b3f0c9e42318/go.mod h1:6HamsBKWqEC/FVHuQMHgQL+knPyvHH55HwJDHl/adMw=

75−github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.3.0.20250526132317-434f93986a5c h1:EoW1x1K2EDKYw1D7raqZqWKnwk21IZVpYqLHQVhz1ZU=

75+github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250603122936-f1a3fad2b64e h1:+3I/1v7vbN0Vf8Tjm3Q0zdLQqjOM/TjQBvoRDQtoAss=

76−github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.3.0.20250526132317-434f93986a5c/go.mod h1:sXuGtrlVJo43r1fVGBM06E7PPb16oBl8rDRr6YgQOck=

76+github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250603122936-f1a3fad2b64e/go.mod h1:6HamsBKWqEC/FVHuQMHgQL+knPyvHH55HwJDHl/adMw=

77−github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.3.0.20250602154534-5681225ad367 h1:X+w3YtXyLG3oguOKXvcDT8jQP856YLQsq6SwTE+gqTk=

77+github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250603125125-87aee03b3d4f h1:vvNB+i59Wp3L6gYcpuhfAdNjr4/e6qM/st3ySWfmZnU=

78−github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.3.0.20250602154534-5681225ad367/go.mod h1:oOn1YZGZyJHxJfh4sFAna9vDzxJRNuErLETr/lnlB/I=

78+github.com/charmbracelet/bubbles/v2 v2.0.0-beta.1.0.20250603125125-87aee03b3d4f/go.mod h1:6HamsBKWqEC/FVHuQMHgQL+knPyvHH55HwJDHl/adMw=

79github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.3.0.20250602154956-43689cfc0174 h1:TlVW+df0rdU/osP0O8DIVS9WFOAzXe3nuiMwJR4n+CA=

80github.com/charmbracelet/bubbletea/v2 v2.0.0-beta.3.0.20250602154956-43689cfc0174/go.mod h1:oOn1YZGZyJHxJfh4sFAna9vDzxJRNuErLETr/lnlB/I=

81github.com/charmbracelet/colorprofile v0.3.1 h1:k8dTHMd7fgw4bnFd7jXTLZrSU/CQrKnL3m+AxCzDz40=

@@ -84,8 +84,6 @@ github.com/charmbracelet/glamour/v2 v2.0.0-20250516160903-6f1e2c8f9ebe h1:i6ce4C

84github.com/charmbracelet/glamour/v2 v2.0.0-20250516160903-6f1e2c8f9ebe/go.mod h1:p3Q+aN4eQKeM5jhrmXPMgPrlKbmc59rWSnMsSA3udhk=

85github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1.0.20250523195325-2d1af06b557c h1:177KMz8zHRlEZJsWzafbKYh6OdjgvTspoH+UjaxgIXY=

86github.com/charmbracelet/lipgloss/v2 v2.0.0-beta.1.0.20250523195325-2d1af06b557c/go.mod h1:EJWvaCrhOhNGVZMvcjc0yVryl4qqpMs8tz0r9WyEkdQ=

87−github.com/charmbracelet/x/ansi v0.9.3-0.20250516160309-24eee56f89fa h1:JU05TLAB6nOEL46bxHDV/+e8umBX32ODsGbVkc7o7bk=

88−github.com/charmbracelet/x/ansi v0.9.3-0.20250516160309-24eee56f89fa/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=

89github.com/charmbracelet/x/ansi v0.9.3-0.20250602153603-fb931ed90413 h1:L07QkDqRF274IZ2UJ/mCTL8DR95efU9BNWLYCDXEjvQ=

87github.com/charmbracelet/x/ansi v0.9.3-0.20250602153603-fb931ed90413 h1:L07QkDqRF274IZ2UJ/mCTL8DR95efU9BNWLYCDXEjvQ=

90github.com/charmbracelet/x/ansi v0.9.3-0.20250602153603-fb931ed90413/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=

88github.com/charmbracelet/x/ansi v0.9.3-0.20250602153603-fb931ed90413/go.mod h1:3RQDQ6lDnROptfpWuUVIUG64bD2g2BgntdxH0Ya5TeE=

91github.com/charmbracelet/x/cellbuf v0.0.14-0.20250516160309-24eee56f89fa h1:lphz0Z3rsiOtMYiz8axkT24i9yFiueDhJbzyNUADmME=

89github.com/charmbracelet/x/cellbuf v0.0.14-0.20250516160309-24eee56f89fa h1:lphz0Z3rsiOtMYiz8axkT24i9yFiueDhJbzyNUADmME=

internal/tui/components/chat/editor/editor.go+27−4

@@ -263,8 +263,10 @@ func (m *editorCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

263func (m *editorCmp) View() tea.View {

264 t := styles.CurrentTheme()

265 cursor := m.textarea.Cursor()

266+ if cursor != nil {

266− cursor.X = cursor.X + m.x + 1

267+ cursor.X = cursor.X + m.x + 1

267− cursor.Y = cursor.Y + m.y + 1 // adjust for padding

268+ cursor.Y = cursor.Y + m.y + 1 // adjust for padding

269+ }

268 if len(m.attachments) == 0 {

270 if len(m.attachments) == 0 {

269 content := t.S().Base.Padding(1).Render(

271 content := t.S().Base.Padding(1).Render(

270 m.textarea.View(),

272 m.textarea.View(),

@@ -358,11 +360,15 @@ func CreateTextArea(existing *textarea.Model) textarea.Model {

358 t := styles.CurrentTheme()

360 t := styles.CurrentTheme()

359 ta := textarea.New()

361 ta := textarea.New()

360 ta.SetStyles(t.S().TextArea)

362 ta.SetStyles(t.S().TextArea)

361− ta.SetPromptFunc(4, func(lineIndex int) string {

363+ ta.SetPromptFunc(4, func(lineIndex int, focused bool) string {

362 if lineIndex == 0 {

364 if lineIndex == 0 {

363 return " > "

365 return " > "

364 }

366 }

367+ if focused {

365− return t.S().Base.Foreground(t.Blue).Render("::: ")

368+ return t.S().Base.Foreground(t.Blue).Render("::: ")

369+ } else {

370+ return t.S().Muted.Render("::: ")

371+ }

366 })

372 })

367 ta.ShowLineNumbers = false

373 ta.ShowLineNumbers = false

368 ta.CharLimit = -1

374 ta.CharLimit = -1

@@ -379,6 +385,23 @@ func CreateTextArea(existing *textarea.Model) textarea.Model {

379 return ta

385 return ta

380}

386}

381

387

388+// Blur implements Container.

389+func (c *editorCmp) Blur() tea.Cmd {

390+ c.textarea.Blur()

391+ return nil

392+}

393+

394+// Focus implements Container.

395+func (c *editorCmp) Focus() tea.Cmd {

396+ logging.Info("Focusing editor textarea")

397+ return c.textarea.Focus()

398+}

399+

400+// IsFocused implements Container.

401+func (c *editorCmp) IsFocused() bool {

402+ return c.textarea.Focused()

403+}

404+

382func NewEditorCmp(app *app.App) util.Model {

405func NewEditorCmp(app *app.App) util.Model {

383 ta := CreateTextArea(nil)

406 ta := CreateTextArea(nil)

384 return &editorCmp{

407 return &editorCmp{

internal/tui/components/core/helpers.go+3−2

@@ -26,10 +26,11 @@ func Title(title string, width int) string {

26 char := "╱"

27 length := lipgloss.Width(title) + 1

28 remainingWidth := width - length

29− lineStyle := t.S().Base.Foreground(t.Primary)

30 titleStyle := t.S().Base.Foreground(t.Primary)

29 titleStyle := t.S().Base.Foreground(t.Primary)

31 if remainingWidth > 0 {

30 if remainingWidth > 0 {

32− title = titleStyle.Render(title) + " " + lineStyle.Render(strings.Repeat(char, remainingWidth))

31+ lines := strings.Repeat(char, remainingWidth)

32+ lines = styles.ApplyForegroundGrad(lines, t.Primary, t.Secondary)

33+ title = titleStyle.Render(title) + " " + lines

33 }

34 }

34 return title

35 return title

35}

36}

internal/tui/components/core/status/keys.gonew file+49

@@ -0,0 +1,49 @@

1+package status

2+

3+import (

4+ "github.com/charmbracelet/bubbles/v2/key"

5+ "github.com/opencode-ai/opencode/internal/tui/layout"

6+)

7+

8+type KeyMap struct {

9+ Tab,

10+ Commands,

11+ Help key.Binding

12+}

13+

14+func DefaultKeyMap(tabHelp string) KeyMap {

15+ return KeyMap{

16+ Tab: key.NewBinding(

17+ key.WithKeys("tab"),

18+ key.WithHelp("tab", tabHelp),

19+ ),

20+ Commands: key.NewBinding(

21+ key.WithKeys("ctrl+p"),

22+ key.WithHelp("ctrl+p", "commands"),

23+ ),

24+ Help: key.NewBinding(

25+ key.WithKeys("ctrl+?", "ctrl+_", "ctrl+/"),

26+ key.WithHelp("ctrl+?", "more"),

27+ ),

28+ }

29+}

30+

31+// FullHelp implements help.KeyMap.

32+func (k KeyMap) FullHelp() [][]key.Binding {

33+ m := [][]key.Binding{}

34+ slice := layout.KeyMapToSlice(k)

35+ for i := 0; i < len(slice); i += 4 {

36+ end := min(i+4, len(slice))

37+ m = append(m, slice[i:end])

38+ }

39+ return m

40+}

41+

42+// ShortHelp implements help.KeyMap.

43+func (k KeyMap) ShortHelp() []key.Binding {

44+ return []key.Binding{

45+ k.Tab,

46+ k.Commands,

47+ k.Help,

48+ }

49+}

internal/tui/components/core/status/status.gonew file+113

@@ -0,0 +1,113 @@

1+package status

2+

3+import (

4+ "time"

5+

6+ "github.com/charmbracelet/bubbles/v2/help"

7+ tea "github.com/charmbracelet/bubbletea/v2"

8+ "github.com/opencode-ai/opencode/internal/logging"

9+ "github.com/opencode-ai/opencode/internal/pubsub"

10+ "github.com/opencode-ai/opencode/internal/session"

11+ "github.com/opencode-ai/opencode/internal/tui/styles"

12+ "github.com/opencode-ai/opencode/internal/tui/util"

13+)

14+

15+type StatusCmp interface {

16+ util.Model

17+}

18+

19+type statusCmp struct {

20+ info util.InfoMsg

21+ width int

22+ messageTTL time.Duration

23+ session session.Session

24+ help help.Model

25+}

26+

27+// clearMessageCmd is a command that clears status messages after a timeout

28+func (m statusCmp) clearMessageCmd(ttl time.Duration) tea.Cmd {

29+ return tea.Tick(ttl, func(time.Time) tea.Msg {

30+ return util.ClearStatusMsg{}

31+ })

32+}

33+

34+func (m statusCmp) Init() tea.Cmd {

35+ return nil

36+}

37+

38+func (m statusCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

39+ switch msg := msg.(type) {

40+ case tea.WindowSizeMsg:

41+ m.width = msg.Width

42+ return m, nil

43+

44+ // Handle status info

45+ case util.InfoMsg:

46+ m.info = msg

47+ ttl := msg.TTL

48+ if ttl == 0 {

49+ ttl = m.messageTTL

50+ }

51+ return m, m.clearMessageCmd(ttl)

52+ case util.ClearStatusMsg:

53+ m.info = util.InfoMsg{}

54+

55+ // Handle persistent logs

56+ case pubsub.Event[logging.LogMessage]:

57+ if msg.Payload.Persist {

58+ switch msg.Payload.Level {

59+ case "error":

60+ m.info = util.InfoMsg{

61+ Type: util.InfoTypeError,

62+ Msg: msg.Payload.Message,

63+ TTL: msg.Payload.PersistTime,

64+ }

65+ case "info":

66+ m.info = util.InfoMsg{

67+ Type: util.InfoTypeInfo,

68+ Msg: msg.Payload.Message,

69+ TTL: msg.Payload.PersistTime,

70+ }

71+ case "warn":

72+ m.info = util.InfoMsg{

73+ Type: util.InfoTypeWarn,

74+ Msg: msg.Payload.Message,

75+ TTL: msg.Payload.PersistTime,

76+ }

77+ default:

78+ m.info = util.InfoMsg{

79+ Type: util.InfoTypeInfo,

80+ Msg: msg.Payload.Message,

81+ TTL: msg.Payload.PersistTime,

82+ }

83+ }

84+ }

85+ }

86+ return m, nil

87+}

88+

89+func (m statusCmp) View() tea.View {

90+ t := styles.CurrentTheme()

91+ status := t.S().Base.Padding(0, 1).Render(m.help.View(DefaultKeyMap("focus chat")))

92+ if m.info.Msg != "" {

93+ switch m.info.Type {

94+ case util.InfoTypeError:

95+ status = t.S().Base.Background(t.Error).Padding(0, 1).Width(m.width).Render(m.info.Msg)

96+ case util.InfoTypeWarn:

97+ status = t.S().Base.Background(t.Warning).Padding(0, 1).Width(m.width).Render(m.info.Msg)

98+ default:

99+ status = t.S().Base.Background(t.Info).Padding(0, 1).Width(m.width).Render(m.info.Msg)

100+ }

101+ }

102+ return tea.NewView(status)

103+}

104+

105+func NewStatusCmp() StatusCmp {

106+ t := styles.CurrentTheme()

107+ help := help.New()

108+ help.Styles = t.S().Help

109+ return &statusCmp{

110+ messageTTL: 10 * time.Second,

111+ help: help,

112+ }

113+}

internal/tui/components/dialogs/commands/commands.go+2−2

@@ -160,9 +160,9 @@ func (c *commandDialogCmp) commandTypeRadio() string {

160 iconSelected := "◉"

161 iconUnselected := "○"

162 if c.commandType == SystemCommands {

163− return t.S().Text.Render(iconSelected + " " + choices[0] + " " + iconUnselected + " " + choices[1])

163+ return t.S().Base.Foreground(t.FgHalfMuted).Render(iconSelected + " " + choices[0] + " " + iconUnselected + " " + choices[1])

164 }

165− return t.S().Text.Render(iconUnselected + " " + choices[0] + " " + iconSelected + " " + choices[1])

165+ return t.S().Base.Foreground(t.FgHalfMuted).Render(iconUnselected + " " + choices[0] + " " + iconSelected + " " + choices[1])

166}

167

168func (c *commandDialogCmp) listWidth() int {

internal/tui/components/logo/logo.go+2−76

@@ -10,8 +10,7 @@ import (

10 "github.com/charmbracelet/lipgloss/v2"

11 "github.com/charmbracelet/x/ansi"

12 "github.com/charmbracelet/x/exp/slice"

13− "github.com/lucasb-eyer/go-colorful"

13+ "github.com/opencode-ai/opencode/internal/tui/styles"

14− "github.com/rivo/uniseg"

15)

14)

16

15

17// letterform represents a letterform. It can be stretched horizontally by

16// letterform represents a letterform. It can be stretched horizontally by

@@ -46,7 +45,7 @@ func Render(version string, compact bool, o Opts) string {

46 crushWidth := lipgloss.Width(crush)

45 crushWidth := lipgloss.Width(crush)

47 b := new(strings.Builder)

46 b := new(strings.Builder)

48 for r := range strings.SplitSeq(crush, "\n") {

47 for r := range strings.SplitSeq(crush, "\n") {

49− fmt.Fprintln(b, applyForegroundGrad(r, o.TitleColorA, o.TitleColorB))

48+ fmt.Fprintln(b, styles.ApplyForegroundGrad(r, o.TitleColorA, o.TitleColorB))

50 }

49 }

51 crush = b.String()

50 crush = b.String()

52

51

@@ -312,76 +311,3 @@ func stretchLetterformPart(s string, p letterformProps) string {

312 }

311 }

313 return lipgloss.JoinHorizontal(lipgloss.Top, parts...)

312 return lipgloss.JoinHorizontal(lipgloss.Top, parts...)

314}

313}

315−

316−// applyForegroundGrad renders a given string with a horizontal gradient

317−// foreground.

318−func applyForegroundGrad(input string, color1, color2 color.Color) string {

319− if input == "" {

320− return ""

321− }

322−

323− var o strings.Builder

324− if len(input) == 1 {

325− return lipgloss.NewStyle().Foreground(color1).Render(input)

326− }

327−

328− var clusters []string

329− gr := uniseg.NewGraphemes(input)

330− for gr.Next() {

331− clusters = append(clusters, string(gr.Runes()))

332− }

333−

334− ramp := blendColors(len(clusters), color1, color2)

335− for i, c := range ramp {

336− fmt.Fprint(&o, lipgloss.NewStyle().Foreground(c).Render(clusters[i]))

337− }

338−

339− return o.String()

340−}

341−

342−// blendColors returns a slice of colors blended between the given keys.

343−// Blending is done in Hcl to stay in gamut.

344−func blendColors(size int, stops ...color.Color) []color.Color {

345− if len(stops) < 2 {

346− return nil

347− }

348−

349− stopsPrime := make([]colorful.Color, len(stops))

350− for i, k := range stops {

351− stopsPrime[i], _ = colorful.MakeColor(k)

352− }

353−

354− numSegments := len(stopsPrime) - 1

355− blended := make([]color.Color, 0, size)

356−

357− // Calculate how many colors each segment should have.

358− segmentSizes := make([]int, numSegments)

359− baseSize := size / numSegments

360− remainder := size % numSegments

361−

362− // Distribute the remainder across segments.

363− for i := range numSegments {

364− segmentSizes[i] = baseSize

365− if i < remainder {

366− segmentSizes[i]++

367− }

368− }

369−

370− // Generate colors for each segment.

371− for i := range numSegments {

372− c1 := stopsPrime[i]

373− c2 := stopsPrime[i+1]

374− segmentSize := segmentSizes[i]

375−

376− for j := range segmentSize {

377− var t float64

378− if segmentSize > 1 {

379− t = float64(j) / float64(segmentSize-1)

380− }

381− c := c1.BlendHcl(c2, t)

382− blended = append(blended, c)

383− }

384− }

385−

386− return blended

387−}

internal/tui/keys.go+7−20

@@ -6,13 +6,11 @@ import (

6)

7

8type KeyMap struct {

9− Logs key.Binding

9+ Logs key.Binding

10− Quit key.Binding

10+ Quit key.Binding

11− Help key.Binding

11+ Help key.Binding

12− Commands key.Binding

12+ Commands key.Binding

13− FilePicker key.Binding

13+ FilePicker key.Binding

14− Models key.Binding

15− SwitchTheme key.Binding

16}

14}

17

15

18func DefaultKeyMap() KeyMap {

16func DefaultKeyMap() KeyMap {

@@ -21,7 +19,6 @@ func DefaultKeyMap() KeyMap {

21 key.WithKeys("ctrl+l"),

19 key.WithKeys("ctrl+l"),

22 key.WithHelp("ctrl+l", "logs"),

20 key.WithHelp("ctrl+l", "logs"),

23 ),

21 ),

24−

25 Quit: key.NewBinding(

22 Quit: key.NewBinding(

26 key.WithKeys("ctrl+c"),

23 key.WithKeys("ctrl+c"),

27 key.WithHelp("ctrl+c", "quit"),

24 key.WithHelp("ctrl+c", "quit"),

@@ -31,24 +28,14 @@ func DefaultKeyMap() KeyMap {

31 key.WithKeys("ctrl+_"),

28 key.WithKeys("ctrl+_"),

32 key.WithHelp("ctrl+?", "toggle help"),

29 key.WithHelp("ctrl+?", "toggle help"),

33 ),

30 ),

34−

35 Commands: key.NewBinding(

31 Commands: key.NewBinding(

36− key.WithKeys("ctrl+k"),

32+ key.WithKeys("ctrl+p"),

37− key.WithHelp("ctrl+k", "commands"),

33+ key.WithHelp("ctrl+p", "commands"),

38 ),

34 ),

39 FilePicker: key.NewBinding(

35 FilePicker: key.NewBinding(

40 key.WithKeys("ctrl+f"),

36 key.WithKeys("ctrl+f"),

41 key.WithHelp("ctrl+f", "select files to upload"),

37 key.WithHelp("ctrl+f", "select files to upload"),

42 ),

38 ),

43− Models: key.NewBinding(

44− key.WithKeys("ctrl+o"),

45− key.WithHelp("ctrl+o", "model selection"),

46− ),

47−

48− SwitchTheme: key.NewBinding(

49− key.WithKeys("ctrl+t"),

50− key.WithHelp("ctrl+t", "switch theme"),

51− ),

52 }

39 }

53}

40}

54

41

internal/tui/layout/container.go+55−15

@@ -13,10 +13,12 @@ type Container interface {

13 Sizeable

14 Bindings

15 Positionable

16+ Focusable

16}

17}

17type container struct {

18type container struct {

18− width int

19+ width int

19− height int

20+ height int

21+ isFocused bool

20

22

21 x, y int

23 x, y int

22

24

@@ -35,14 +37,39 @@ type container struct {

35 borderStyle lipgloss.Border

37 borderStyle lipgloss.Border

36}

38}

37

39

40+type ContainerOption func(*container)

41+

42+func NewContainer(content util.Model, options ...ContainerOption) Container {

43+ c := &container{

44+ content: content,

45+ borderStyle: lipgloss.NormalBorder(),

46+ }

47+

48+ for _, option := range options {

49+ option(c)

50+ }

51+

52+ return c

53+}

54+

38func (c *container) Init() tea.Cmd {

55func (c *container) Init() tea.Cmd {

39 return c.content.Init()

56 return c.content.Init()

40}

57}

41

58

42func (c *container) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

59func (c *container) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

60+ switch msg := msg.(type) {

61+ case tea.KeyPressMsg:

62+ if c.IsFocused() {

43− u, cmd := c.content.Update(msg)

63+ u, cmd := c.content.Update(msg)

64+ c.content = u.(util.Model)

65+ return c, cmd

66+ }

67+ return c, nil

68+ default:

69+ u, cmd := c.content.Update(msg)

44− c.content = u.(util.Model)

70+ c.content = u.(util.Model)

45− return c, cmd

71+ return c, cmd

72+ }

46}

73}

47

74

48func (c *container) View() tea.View {

75func (c *container) View() tea.View {

@@ -80,7 +107,8 @@ func (c *container) View() tea.View {

80

107

81 contentView := c.content.View()

108 contentView := c.content.View()

82 view := tea.NewView(style.Render(contentView.String()))

109 view := tea.NewView(style.Render(contentView.String()))

83− view.SetCursor(contentView.Cursor())

110+ cursor := contentView.Cursor()

111+ view.SetCursor(cursor)

84 return view

112 return view

85}

113}

86

114

@@ -136,19 +164,31 @@ func (c *container) BindingKeys() []key.Binding {

136 return []key.Binding{}

164 return []key.Binding{}

137}

165}

138

166

167+// Blur implements Container.

139−type ContainerOption func(*container)

168+func (c *container) Blur() tea.Cmd {

140−

169+ c.isFocused = false

141−func NewContainer(content util.Model, options ...ContainerOption) Container {

170+ if focusable, ok := c.content.(Focusable); ok {

142− c := &container{

171+ return focusable.Blur()

143− content: content,

144− borderStyle: lipgloss.NormalBorder(),

145 }

172 }

173+ return nil

174+}

146

175

147− for _, option := range options {

176+// Focus implements Container.

148− option(c)

177+func (c *container) Focus() tea.Cmd {

178+ c.isFocused = true

179+ if focusable, ok := c.content.(Focusable); ok {

180+ return focusable.Focus()

149 }

181 }

182+ return nil

183+}

150

184

185+// IsFocused implements Container.

186+func (c *container) IsFocused() bool {

187+ isFocused := c.isFocused

188+ if focusable, ok := c.content.(Focusable); ok {

189+ isFocused = isFocused || focusable.IsFocused()

190+ }

151− return c

191+ return isFocused

152}

192}

153

193

154// Padding options

194// Padding options

internal/tui/layout/split.go+30

@@ -8,6 +8,14 @@ import (

8 "github.com/opencode-ai/opencode/internal/tui/util"

9)

10

11+type LayoutPanel string

12+

13+const (

14+ LeftPanel LayoutPanel = "left"

15+ RightPanel LayoutPanel = "right"

16+ BottomPanel LayoutPanel = "bottom"

17+)

18+

11type SplitPaneLayout interface {

19type SplitPaneLayout interface {

12 util.Model

20 util.Model

13 Sizeable

21 Sizeable

@@ -19,6 +27,8 @@ type SplitPaneLayout interface {

19 ClearLeftPanel() tea.Cmd

27 ClearLeftPanel() tea.Cmd

20 ClearRightPanel() tea.Cmd

28 ClearRightPanel() tea.Cmd

21 ClearBottomPanel() tea.Cmd

29 ClearBottomPanel() tea.Cmd

30+

31+ FocusPanel(panel LayoutPanel) tea.Cmd

22}

32}

23

33

24type splitPaneLayout struct {

34type splitPaneLayout struct {

@@ -279,6 +289,26 @@ func (s *splitPaneLayout) BindingKeys() []key.Binding {

279 return keys

289 return keys

280}

290}

281

291

292+func (s *splitPaneLayout) FocusPanel(panel LayoutPanel) tea.Cmd {

293+ panels := map[LayoutPanel]Container{

294+ LeftPanel: s.leftPanel,

295+ RightPanel: s.rightPanel,

296+ BottomPanel: s.bottomPanel,

297+ }

298+ var cmds []tea.Cmd

299+ for p, container := range panels {

300+ if container == nil {

301+ continue

302+ }

303+ if p == panel {

304+ cmds = append(cmds, container.Focus())

305+ } else {

306+ cmds = append(cmds, container.Blur())

307+ }

308+ }

309+ return tea.Batch(cmds...)

310+}

311+

282func NewSplitPane(options ...SplitPaneOption) SplitPaneLayout {

312func NewSplitPane(options ...SplitPaneOption) SplitPaneLayout {

283 layout := &splitPaneLayout{

313 layout := &splitPaneLayout{

284 ratio: 0.8,

314 ratio: 0.8,

internal/tui/page/chat/chat.go+30−22

@@ -6,6 +6,7 @@ import (

6 "github.com/charmbracelet/bubbles/v2/key"

7 tea "github.com/charmbracelet/bubbletea/v2"

8 "github.com/opencode-ai/opencode/internal/app"

9+ "github.com/opencode-ai/opencode/internal/logging"

9 "github.com/opencode-ai/opencode/internal/message"

10 "github.com/opencode-ai/opencode/internal/message"

10 "github.com/opencode-ai/opencode/internal/session"

11 "github.com/opencode-ai/opencode/internal/session"

11 "github.com/opencode-ai/opencode/internal/tui/components/chat"

12 "github.com/opencode-ai/opencode/internal/tui/components/chat"

@@ -19,32 +20,28 @@ import (

19

20

20var ChatPage page.PageID = "chat"

21var ChatPage page.PageID = "chat"

21

22

23+type ChatFocusedMsg struct {

24+ Focused bool // True if the chat input is focused, false otherwise

25+}

26+

22type chatPage struct {

27type chatPage struct {

23 app *app.App

28 app *app.App

24

29

25 layout layout.SplitPaneLayout

30 layout layout.SplitPaneLayout

26

31

27 session session.Session

32 session session.Session

28−}

29

33

30−type ChatKeyMap struct {

34+ keyMap KeyMap

31− NewSession key.Binding

32− Cancel key.Binding

33−}

34

35

35−var keyMap = ChatKeyMap{

36+ chatFocused bool

36− NewSession: key.NewBinding(

37− key.WithKeys("ctrl+n"),

38− key.WithHelp("ctrl+n", "new session"),

39− ),

40− Cancel: key.NewBinding(

41− key.WithKeys("esc"),

42− key.WithHelp("esc", "cancel"),

43− ),

44}

37}

45

38

46func (p *chatPage) Init() tea.Cmd {

39func (p *chatPage) Init() tea.Cmd {

47− return p.layout.Init()

40+ cmd := p.layout.Init()

41+ return tea.Batch(

42+ cmd,

43+ p.layout.FocusPanel(layout.BottomPanel), // Focus on the bottom panel (editor)

44+ )

48}

45}

49

46

50func (p *chatPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

47func (p *chatPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

@@ -79,13 +76,28 @@ func (p *chatPage) Update(msg tea.Msg) (tea.Model, tea.Cmd) {

79 p.session = msg

76 p.session = msg

80 case tea.KeyPressMsg:

77 case tea.KeyPressMsg:

81 switch {

78 switch {

82− case key.Matches(msg, keyMap.NewSession):

79+ case key.Matches(msg, p.keyMap.NewSession):

83 p.session = session.Session{}

80 p.session = session.Session{}

84 return p, tea.Batch(

81 return p, tea.Batch(

85 p.clearMessages(),

82 p.clearMessages(),

86 util.CmdHandler(chat.SessionClearedMsg{}),

83 util.CmdHandler(chat.SessionClearedMsg{}),

87 )

84 )

85+

86+ case key.Matches(msg, p.keyMap.Tab):

87+ logging.Info("Tab key pressed, toggling chat focus")

88+ if p.session.ID == "" {

89+ return p, nil

90+ }

91+ p.chatFocused = !p.chatFocused

92+ if p.chatFocused {

93+ cmds = append(cmds, p.layout.FocusPanel(layout.LeftPanel))

94+ cmds = append(cmds, util.CmdHandler(ChatFocusedMsg{Focused: true}))

95+ } else {

96+ cmds = append(cmds, p.layout.FocusPanel(layout.BottomPanel))

97+ cmds = append(cmds, util.CmdHandler(ChatFocusedMsg{Focused: false}))

98+ }

99+ return p, tea.Batch(cmds...)

88− case key.Matches(msg, keyMap.Cancel):

100+ case key.Matches(msg, p.keyMap.Cancel):

89 if p.session.ID != "" {

101 if p.session.ID != "" {

90 // Cancel the current session's generation process

102 // Cancel the current session's generation process

91 // This allows users to interrupt long-running operations

103 // This allows users to interrupt long-running operations

@@ -148,11 +160,6 @@ func (p *chatPage) View() tea.View {

148 return p.layout.View()

160 return p.layout.View()

149}

161}

150

162

151−func (p *chatPage) BindingKeys() []key.Binding {

152− bindings := layout.KeyMapToSlice(keyMap)

153− return bindings

154−}

155−

156func NewChatPage(app *app.App) util.Model {

163func NewChatPage(app *app.App) util.Model {

157 sidebarContainer := layout.NewContainer(

164 sidebarContainer := layout.NewContainer(

158 sidebar.NewSidebarCmp(),

165 sidebar.NewSidebarCmp(),

@@ -169,5 +176,6 @@ func NewChatPage(app *app.App) util.Model {

169 layout.WithFixedBottomHeight(5),

176 layout.WithFixedBottomHeight(5),

170 layout.WithFixedRightWidth(31),

177 layout.WithFixedRightWidth(31),

171 ),

178 ),

179+ keyMap: DefaultKeyMap(),

172 }

180 }

173}

181}

internal/tui/page/chat/keys.go+46

@@ -1 +1,47 @@

1package chat

2+

3+import (

4+ "github.com/charmbracelet/bubbles/v2/key"

5+ "github.com/opencode-ai/opencode/internal/tui/layout"

6+)

7+

8+type KeyMap struct {

9+ NewSession key.Binding

10+ Cancel key.Binding

11+ Tab key.Binding

12+}

13+

14+func DefaultKeyMap() KeyMap {

15+ return KeyMap{

16+ NewSession: key.NewBinding(

17+ key.WithKeys("ctrl+n"),

18+ key.WithHelp("ctrl+n", "new session"),

19+ ),

20+ Cancel: key.NewBinding(

21+ key.WithKeys("esc"),

22+ key.WithHelp("esc", "cancel"),

23+ ),

24+ Tab: key.NewBinding(

25+ key.WithKeys("tab"),

26+ key.WithHelp("tab", "change focus"),

27+ ),

28+ }

29+}

30+

31+// FullHelp implements help.KeyMap.

32+func (k KeyMap) FullHelp() [][]key.Binding {

33+ m := [][]key.Binding{}

34+ slice := layout.KeyMapToSlice(k)

35+ for i := 0; i < len(slice); i += 4 {

36+ end := min(i+4, len(slice))

37+ m = append(m, slice[i:end])

38+ }

39+ return m

40+}

41+

42+// ShortHelp implements help.KeyMap.

43+func (k KeyMap) ShortHelp() []key.Binding {

44+ return []key.Binding{

45+ k.Tab,

46+ }

47+}

internal/tui/styles/crush.go+5−4

@@ -24,10 +24,11 @@ func NewCrushTheme() *Theme {

24 BgOverlay: charmtone.Iron,

25

26 // Foregrounds

27− FgBase: charmtone.Ash,

27+ FgBase: charmtone.Ash,

28− FgMuted: charmtone.Squid,

28+ FgMuted: charmtone.Squid,

29+ FgHalfMuted: charmtone.Smoke,

29− FgSubtle: charmtone.Oyster,

30+ FgSubtle: charmtone.Oyster,

30− FgSelected: charmtone.Salt,

31+ FgSelected: charmtone.Salt,

31

32

32 // Borders

33 // Borders

33 Border: charmtone.Charcoal,

34 Border: charmtone.Charcoal,

internal/tui/styles/theme.go+81−4

@@ -3,6 +3,7 @@ package styles

3import (

4 "fmt"

5 "image/color"

6+ "strings"

6

7

7 "github.com/charmbracelet/bubbles/v2/help"

8 "github.com/charmbracelet/bubbles/v2/help"

8 "github.com/charmbracelet/bubbles/v2/textarea"

9 "github.com/charmbracelet/bubbles/v2/textarea"

@@ -10,6 +11,8 @@ import (

10 tea "github.com/charmbracelet/bubbletea/v2"

11 tea "github.com/charmbracelet/bubbletea/v2"

11 "github.com/charmbracelet/glamour/v2/ansi"

12 "github.com/charmbracelet/glamour/v2/ansi"

12 "github.com/charmbracelet/lipgloss/v2"

13 "github.com/charmbracelet/lipgloss/v2"

14+ "github.com/lucasb-eyer/go-colorful"

15+ "github.com/rivo/uniseg"

13)

16)

14

17

15const (

18const (

@@ -35,10 +38,11 @@ type Theme struct {

35 BgSubtle color.Color

38 BgSubtle color.Color

36 BgOverlay color.Color

39 BgOverlay color.Color

37

40

41+ FgBase color.Color

38− FgBase color.Color

42+ FgMuted color.Color

39− FgMuted color.Color

43+ FgHalfMuted color.Color

40− FgSubtle color.Color

44+ FgSubtle color.Color

41− FgSelected color.Color

45+ FgSelected color.Color

42

46

43 Border color.Color

47 Border color.Color

44 BorderFocus color.Color

48 BorderFocus color.Color

@@ -491,3 +495,76 @@ func Lighten(c color.Color, percent float64) color.Color {

491 A: uint8(a >> 8),

495 A: uint8(a >> 8),

492 }

496 }

493}

497}

498+

499+// ApplyForegroundGrad renders a given string with a horizontal gradient

500+// foreground.

501+func ApplyForegroundGrad(input string, color1, color2 color.Color) string {

502+ if input == "" {

503+ return ""

504+ }

505+

506+ var o strings.Builder

507+ if len(input) == 1 {

508+ return lipgloss.NewStyle().Foreground(color1).Render(input)

509+ }

510+

511+ var clusters []string

512+ gr := uniseg.NewGraphemes(input)

513+ for gr.Next() {

514+ clusters = append(clusters, string(gr.Runes()))

515+ }

516+

517+ ramp := blendColors(len(clusters), color1, color2)

518+ for i, c := range ramp {

519+ fmt.Fprint(&o, CurrentTheme().S().Base.Foreground(c).Render(clusters[i]))

520+ }

521+

522+ return o.String()

523+}

524+

525+// blendColors returns a slice of colors blended between the given keys.

526+// Blending is done in Hcl to stay in gamut.

527+func blendColors(size int, stops ...color.Color) []color.Color {

528+ if len(stops) < 2 {

529+ return nil

530+ }

531+

532+ stopsPrime := make([]colorful.Color, len(stops))

533+ for i, k := range stops {

534+ stopsPrime[i], _ = colorful.MakeColor(k)

535+ }

536+

537+ numSegments := len(stopsPrime) - 1

538+ blended := make([]color.Color, 0, size)

539+

540+ // Calculate how many colors each segment should have.

541+ segmentSizes := make([]int, numSegments)

542+ baseSize := size / numSegments

543+ remainder := size % numSegments

544+

545+ // Distribute the remainder across segments.

546+ for i := range numSegments {

547+ segmentSizes[i] = baseSize

548+ if i < remainder {

549+ segmentSizes[i]++

550+ }

551+ }

552+

553+ // Generate colors for each segment.

554+ for i := range numSegments {

555+ c1 := stopsPrime[i]

556+ c2 := stopsPrime[i+1]

557+ segmentSize := segmentSizes[i]

558+

559+ for j := range segmentSize {

560+ var t float64

561+ if segmentSize > 1 {

562+ t = float64(j) / float64(segmentSize-1)

563+ }

564+ c := c1.BlendHcl(c2, t)

565+ blended = append(blended, c)

566+ }

567+ }

568+

569+ return blended

570+}

internal/tui/tui.go+3−2

@@ -12,6 +12,7 @@ import (

12 cmpChat "github.com/opencode-ai/opencode/internal/tui/components/chat"

13 "github.com/opencode-ai/opencode/internal/tui/components/completions"

14 "github.com/opencode-ai/opencode/internal/tui/components/core"

15+ "github.com/opencode-ai/opencode/internal/tui/components/core/status"

15 "github.com/opencode-ai/opencode/internal/tui/components/dialogs"

16 "github.com/opencode-ai/opencode/internal/tui/components/dialogs"

16 "github.com/opencode-ai/opencode/internal/tui/components/dialogs/commands"

17 "github.com/opencode-ai/opencode/internal/tui/components/dialogs/commands"

17 "github.com/opencode-ai/opencode/internal/tui/components/dialogs/models"

18 "github.com/opencode-ai/opencode/internal/tui/components/dialogs/models"

@@ -34,7 +35,7 @@ type appModel struct {

34 pages map[page.PageID]util.Model

35 pages map[page.PageID]util.Model

35 loadedPages map[page.PageID]bool

36 loadedPages map[page.PageID]bool

36

37

37− status core.StatusCmp

38+ status status.StatusCmp

38

39

39 app *app.App

40 app *app.App

40

41

@@ -288,7 +289,7 @@ func New(app *app.App) tea.Model {

288 model := &appModel{

289 model := &appModel{

289 currentPage: startPage,

290 currentPage: startPage,

290 app: app,

291 app: app,

291− status: core.NewStatusCmp(app.LSPClients),

292+ status: status.NewStatusCmp(),

292 loadedPages: make(map[page.PageID]bool),

293 loadedPages: make(map[page.PageID]bool),

293 keyMap: DefaultKeyMap(),

294 keyMap: DefaultKeyMap(),

294

295

todos.md+5

@@ -13,3 +13,8 @@

13- [x] Sessions dialog

14- [ ] Models

15- [~] Move sessions and model dialog to the commands

16+

17+## Investigate

18+

19+- [ ] Events when tool error

20+- [ ] Fancy Spinner