more theme cleanup

Author: kujtimiihoxha

cspell.json

@@ -1 +1 @@
-{"words":["opencode","charmbracelet","lipgloss","bubbletea","textinput","Focusable","lsps"],"version":"0.2","language":"en","flagWords":[]}
+{"words":["opencode","charmbracelet","lipgloss","bubbletea","textinput","Focusable","lsps","Sourcegraph"],"version":"0.2","language":"en","flagWords":[]}

internal/tui/components/chat/chat.go

@@ -14,7 +14,6 @@ import (
 	"github.com/opencode-ai/opencode/internal/session"
 	"github.com/opencode-ai/opencode/internal/tui/components/chat/messages"
 	"github.com/opencode-ai/opencode/internal/tui/components/core/list"
-	"github.com/opencode-ai/opencode/internal/tui/components/dialog"
 	"github.com/opencode-ai/opencode/internal/tui/layout"
 	"github.com/opencode-ai/opencode/internal/tui/util"
 )
@@ -87,9 +86,6 @@ func (m *messageListCmp) Init() tea.Cmd {
 // Update handles incoming messages and updates the component state.
 func (m *messageListCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	switch msg := msg.(type) {
-	case dialog.ThemeChangedMsg:
-		m.listCmp.ResetView()
-		return m, nil
 	case SessionSelectedMsg:
 		if msg.ID != m.session.ID {
 			cmd := m.SetSession(msg)

internal/tui/components/chat/editor/editor.go

@@ -22,7 +22,6 @@ import (
 	"github.com/opencode-ai/opencode/internal/tui/components/dialog"
 	"github.com/opencode-ai/opencode/internal/tui/layout"
 	"github.com/opencode-ai/opencode/internal/tui/styles"
-	"github.com/opencode-ai/opencode/internal/tui/theme"
 	"github.com/opencode-ai/opencode/internal/tui/util"
 )
 
@@ -138,9 +137,6 @@ func (m *editorCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	var cmd tea.Cmd
 	var cmds []tea.Cmd
 	switch msg := msg.(type) {
-	case dialog.ThemeChangedMsg:
-		m.textarea = CreateTextArea(&m.textarea)
-		return m, cmd
 	case chat.SessionSelectedMsg:
 		if msg.ID != m.session.ID {
 			m.session = msg
@@ -300,11 +296,11 @@ func (m *editorCmp) GetSize() (int, int) {
 
 func (m *editorCmp) attachmentsContent() string {
 	var styledAttachments []string
-	t := theme.CurrentTheme()
-	attachmentStyles := styles.BaseStyle().
+	t := styles.CurrentTheme()
+	attachmentStyles := t.S().Base.
 		MarginLeft(1).
-		Background(t.TextMuted()).
-		Foreground(t.Text())
+		Background(t.FgMuted).
+		Foreground(t.FgBase)
 	for i, attachment := range m.attachments {
 		var filename string
 		if len(attachment.FileName) > 10 {

internal/tui/components/chat/messages/messages.go

@@ -16,7 +16,6 @@ import (
 	"github.com/opencode-ai/opencode/internal/tui/components/anim"
 	"github.com/opencode-ai/opencode/internal/tui/layout"
 	"github.com/opencode-ai/opencode/internal/tui/styles"
-	"github.com/opencode-ai/opencode/internal/tui/theme"
 	"github.com/opencode-ai/opencode/internal/tui/util"
 )
 
@@ -124,7 +123,7 @@ func (m *messageCmp) textWidth() int {
 // style returns the lipgloss style for the message component.
 // Applies different border colors and styles based on message role and focus state.
 func (msg *messageCmp) style() lipgloss.Style {
-	t := theme.CurrentTheme()
+	t := styles.CurrentTheme()
 	var borderColor color.Color
 	borderStyle := lipgloss.NormalBorder()
 	if msg.focused {
@@ -133,17 +132,16 @@ func (msg *messageCmp) style() lipgloss.Style {
 
 	switch msg.message.Role {
 	case message.User:
-		borderColor = t.Secondary()
+		borderColor = t.Secondary
 	case message.Assistant:
-		borderColor = t.Primary()
+		borderColor = t.Primary
 	default:
 		// Tool call
-		borderColor = t.TextMuted()
+		borderColor = t.BgSubtle
 	}
 
-	return styles.BaseStyle().
+	return t.S().Muted.
 		BorderLeft(true).
-		Foreground(t.TextMuted()).
 		BorderForeground(borderColor).
 		BorderStyle(borderStyle)
 }
@@ -182,14 +180,13 @@ func (m *messageCmp) renderAssistantMessage() string {
 // renderUserMessage renders user messages with file attachments.
 // Displays message content and any attached files with appropriate icons.
 func (m *messageCmp) renderUserMessage() string {
-	t := theme.CurrentTheme()
+	t := styles.CurrentTheme()
 	parts := []string{
 		m.markdownContent(),
 	}
-	attachmentStyles := styles.BaseStyle().
+	attachmentStyles := t.S().Text.
 		MarginLeft(1).
-		Background(t.BackgroundSecondary()).
-		Foreground(t.Text())
+		Background(t.BgSubtle)
 	attachments := []string{}
 	for _, attachment := range m.message.BinaryContent() {
 		file := filepath.Base(attachment.Path)

internal/tui/components/chat/messages/renderer.go

@@ -15,7 +15,6 @@ import (
 	"github.com/opencode-ai/opencode/internal/llm/agent"
 	"github.com/opencode-ai/opencode/internal/llm/tools"
 	"github.com/opencode-ai/opencode/internal/tui/styles"
-	"github.com/opencode-ai/opencode/internal/tui/theme"
 )
 
 // responseContextHeight limits the number of lines displayed in tool output
@@ -107,7 +106,7 @@ func (br baseRenderer) renderWithParams(v *toolCallCmp, toolName string, args []
 	return joinHeaderBody(header, body)
 }
 
-// unmarshalParams safely unmarshals JSON parameters
+// unmarshalParams safely unmarshal JSON parameters
 func (br baseRenderer) unmarshalParams(input string, target any) error {
 	return json.Unmarshal([]byte(input), target)
 }
@@ -593,7 +592,7 @@ func joinHeaderBody(header, body string) string {
 }
 
 func renderPlainContent(v *toolCallCmp, content string) string {
-	t := theme.CurrentTheme()
+	t := styles.CurrentTheme()
 	content = strings.TrimSpace(content)
 	lines := strings.Split(content, "\n")
 
@@ -606,58 +605,55 @@ func renderPlainContent(v *toolCallCmp, content string) string {
 		if len(ln) > v.textWidth() {
 			ln = v.fit(ln, v.textWidth())
 		}
-		out = append(out, lipgloss.NewStyle().
+		out = append(out, t.S().Muted.
 			Width(v.textWidth()).
-			Background(t.BackgroundSecondary()).
-			Foreground(t.TextMuted()).
+			Background(t.BgSubtle).
 			Render(ln))
 	}
 
 	if len(lines) > responseContextHeight {
-		out = append(out, lipgloss.NewStyle().
-			Background(t.BackgroundSecondary()).
-			Foreground(t.TextMuted()).
+		out = append(out, t.S().Muted.
+			Background(t.BgSubtle).
 			Render(fmt.Sprintf("... (%d lines)", len(lines)-responseContextHeight)))
 	}
 	return strings.Join(out, "\n")
 }
 
 func renderCodeContent(v *toolCallCmp, path, content string, offset int) string {
-	t := theme.CurrentTheme()
+	t := styles.CurrentTheme()
 	truncated := truncateHeight(content, responseContextHeight)
 
-	highlighted, _ := highlight.SyntaxHighlight(truncated, path, t.BackgroundSecondary())
+	highlighted, _ := highlight.SyntaxHighlight(truncated, path, t.BgSubtle)
 	lines := strings.Split(highlighted, "\n")
 
 	if len(strings.Split(content, "\n")) > responseContextHeight {
-		lines = append(lines, lipgloss.NewStyle().
-			Background(t.BackgroundSecondary()).
-			Foreground(t.TextMuted()).
+		lines = append(lines, t.S().Muted.
+			Background(t.BgSubtle).
 			Render(fmt.Sprintf("... (%d lines)", len(strings.Split(content, "\n"))-responseContextHeight)))
 	}
 
 	for i, ln := range lines {
-		num := lipgloss.NewStyle().
-			PaddingLeft(4).PaddingRight(2).
-			Background(t.BackgroundSecondary()).
-			Foreground(t.TextMuted()).
+		num := t.S().Muted.
+			Background(t.BgSubtle).
+			PaddingLeft(4).
+			PaddingRight(2).
 			Render(fmt.Sprintf("%d", i+1+offset))
 		w := v.textWidth() - lipgloss.Width(num)
 		lines[i] = lipgloss.JoinHorizontal(lipgloss.Left,
 			num,
-			lipgloss.NewStyle().
+			t.S().Base.
 				Width(w).
-				Background(t.BackgroundSecondary()).
+				Background(t.BgSubtle).
 				Render(v.fit(ln, w)))
 	}
 	return lipgloss.JoinVertical(lipgloss.Left, lines...)
 }
 
 func (v *toolCallCmp) renderToolError() string {
-	t := theme.CurrentTheme()
+	t := styles.CurrentTheme()
 	err := strings.ReplaceAll(v.result.Content, "\n", " ")
 	err = fmt.Sprintf("Error: %s", err)
-	return styles.BaseStyle().Foreground(t.Error()).Render(v.fit(err, v.textWidth()))
+	return t.S().Base.Foreground(t.Error).Render(v.fit(err, v.textWidth()))
 }
 
 func removeWorkingDirPrefix(path string) string {

internal/tui/components/chat/messages/tool.go

@@ -11,7 +11,6 @@ import (
 	"github.com/opencode-ai/opencode/internal/tui/components/anim"
 	"github.com/opencode-ai/opencode/internal/tui/layout"
 	"github.com/opencode-ai/opencode/internal/tui/styles"
-	"github.com/opencode-ai/opencode/internal/tui/theme"
 	"github.com/opencode-ai/opencode/internal/tui/util"
 )
 
@@ -216,19 +215,17 @@ func (m *toolCallCmp) renderPending() string {
 // style returns the lipgloss style for the tool call component.
 // Applies muted colors and focus-dependent border styles.
 func (m *toolCallCmp) style() lipgloss.Style {
-	t := theme.CurrentTheme()
+	t := styles.CurrentTheme()
 	if m.isNested {
-		return styles.BaseStyle().
-			Foreground(t.TextMuted())
+		return t.S().Muted
 	}
 	borderStyle := lipgloss.NormalBorder()
 	if m.focused {
 		borderStyle = lipgloss.DoubleBorder()
 	}
-	return styles.BaseStyle().
+	return t.S().Muted.
 		BorderLeft(true).
-		Foreground(t.TextMuted()).
-		BorderForeground(t.TextMuted()).
+		BorderForeground(t.Border).
 		BorderStyle(borderStyle)
 }
 
@@ -240,8 +237,8 @@ func (m *toolCallCmp) textWidth() int {
 
 // fit truncates content to fit within the specified width with ellipsis
 func (m *toolCallCmp) fit(content string, width int) string {
-	t := theme.CurrentTheme()
-	lineStyle := lipgloss.NewStyle().Background(t.BackgroundSecondary()).Foreground(t.TextMuted())
+	t := styles.CurrentTheme()
+	lineStyle := t.S().Muted.Background(t.BgSubtle)
 	dots := lineStyle.Render("...")
 	return ansi.Truncate(content, width, dots)
 }

internal/tui/components/completions/completions.go

@@ -6,7 +6,6 @@ import (
 	"github.com/charmbracelet/lipgloss/v2"
 	"github.com/opencode-ai/opencode/internal/tui/components/core/list"
 	"github.com/opencode-ai/opencode/internal/tui/styles"
-	"github.com/opencode-ai/opencode/internal/tui/theme"
 	"github.com/opencode-ai/opencode/internal/tui/util"
 )
 
@@ -172,11 +171,11 @@ func (c *completionsCmp) View() tea.View {
 }
 
 func (c *completionsCmp) style() lipgloss.Style {
-	t := theme.CurrentTheme()
-	return styles.BaseStyle().
+	t := styles.CurrentTheme()
+	return t.S().Base.
 		Width(c.width).
 		Height(c.height).
-		Background(t.BackgroundSecondary())
+		Background(t.BgSubtle)
 }
 
 func (c *completionsCmp) Open() bool {

internal/tui/components/dialog/filepicker.go

@@ -19,7 +19,6 @@ import (
 	"github.com/opencode-ai/opencode/internal/message"
 	"github.com/opencode-ai/opencode/internal/tui/image"
 	"github.com/opencode-ai/opencode/internal/tui/styles"
-	"github.com/opencode-ai/opencode/internal/tui/theme"
 	"github.com/opencode-ai/opencode/internal/tui/util"
 )
 
@@ -258,7 +257,8 @@ func (f *filepickerCmp) addAttachmentToMessage() (tea.Model, tea.Cmd) {
 }
 
 func (f *filepickerCmp) View() tea.View {
-	t := theme.CurrentTheme()
+	t := styles.CurrentTheme()
+	baseStyle := t.S().Base
 	const maxVisibleDirs = 20
 	const maxWidth = 80
 
@@ -286,12 +286,11 @@ func (f *filepickerCmp) View() tea.View {
 
 	for i := startIdx; i < endIdx; i++ {
 		file := f.dirs[i]
-		itemStyle := styles.BaseStyle().Width(adjustedWidth)
+		itemStyle := t.S().Text.Width(adjustedWidth)
 
 		if i == f.cursor {
 			itemStyle = itemStyle.
-				Background(t.Primary()).
-				Foreground(t.Background()).
+				Background(t.Primary).
 				Bold(true)
 		}
 		filename := file.Name()
@@ -309,20 +308,18 @@ func (f *filepickerCmp) View() tea.View {
 
 	// Pad to always show exactly 21 lines
 	for len(files) < maxVisibleDirs {
-		files = append(files, styles.BaseStyle().Width(adjustedWidth).Render(""))
+		files = append(files, baseStyle.Width(adjustedWidth).Render(""))
 	}
 
-	currentPath := styles.BaseStyle().
+	currentPath := baseStyle.
 		Height(1).
 		Width(adjustedWidth).
 		Render(f.cwd.View())
 
-	viewportstyle := lipgloss.NewStyle().
+	viewportstyle := baseStyle.
 		Width(f.viewport.Width()).
-		Background(t.Background()).
 		Border(lipgloss.RoundedBorder()).
-		BorderForeground(t.TextMuted()).
-		BorderBackground(t.Background()).
+		BorderForeground(t.BorderFocus).
 		Padding(2).
 		Render(f.viewport.View())
 	var insertExitText string
@@ -335,17 +332,16 @@ func (f *filepickerCmp) View() tea.View {
 	content := lipgloss.JoinVertical(
 		lipgloss.Left,
 		currentPath,
-		styles.BaseStyle().Width(adjustedWidth).Render(""),
-		styles.BaseStyle().Width(adjustedWidth).Render(lipgloss.JoinVertical(lipgloss.Left, files...)),
-		styles.BaseStyle().Width(adjustedWidth).Render(""),
-		styles.BaseStyle().Foreground(t.TextMuted()).Width(adjustedWidth).Render(insertExitText),
+		baseStyle.Width(adjustedWidth).Render(""),
+		baseStyle.Width(adjustedWidth).Render(lipgloss.JoinVertical(lipgloss.Left, files...)),
+		baseStyle.Width(adjustedWidth).Render(""),
+		t.S().Muted.Width(adjustedWidth).Render(insertExitText),
 	)
 
 	f.cwd.SetValue(f.cwd.Value())
-	contentStyle := styles.BaseStyle().Padding(1, 2).
+	contentStyle := baseStyle.Padding(1, 2).
 		Border(lipgloss.RoundedBorder()).
-		BorderBackground(t.Background()).
-		BorderForeground(t.TextMuted()).
+		BorderForeground(t.BorderFocus).
 		Width(lipgloss.Width(content) + 4)
 
 	return tea.NewView(