fix(tui): editor styles were off

packages/tui/AGENTS.md

@@ -0,0 +1,26 @@
+# TUI Agent Guidelines
+
+## Build/Test Commands
+
+- **Build**: `go build ./cmd/opencode` (builds main binary)
+- **Test**: `go test ./...` (runs all tests)
+- **Single test**: `go test ./internal/theme -run TestLoadThemesFromJSON` (specific test)
+- **Generate client**: `go generate ./pkg/client/` (after server endpoint changes)
+- **Release build**: Uses `.goreleaser.yml` configuration
+
+## Code Style
+
+- **Language**: Go 1.24+ with standard formatting (`gofmt`)
+- **Imports**: Group standard, third-party, local packages with blank lines
+- **Naming**: Go conventions - PascalCase exports, camelCase private, ALL_CAPS constants
+- **Error handling**: Return errors explicitly, use `fmt.Errorf` for wrapping
+- **Structs**: Define clear interfaces, embed when appropriate
+- **Testing**: Use table-driven tests, `t.TempDir()` for file operations
+
+## Architecture
+
+- **TUI Framework**: Bubble Tea v2 with Lipgloss v2 for styling
+- **Client**: Generated OpenAPI client communicates with TypeScript server
+- **Components**: Reusable UI components in `internal/components/`
+- **Themes**: JSON-based theming system with override hierarchy
+- **State**: Centralized app state with message passing

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

@@ -83,7 +83,7 @@ func (m *editorComponent) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 			return m, tea.Batch(cmds...)
 		} else {
 			existingValue := m.textarea.Value()
-			
+
 			// Replace the current token (after last space)
 			lastSpaceIndex := strings.LastIndex(existingValue, " ")
 			if lastSpaceIndex == -1 {
@@ -124,6 +124,11 @@ func (m *editorComponent) Content() string {
 		Width(m.width).
 		PaddingTop(1).
 		PaddingBottom(1).
+		BorderStyle(lipgloss.ThickBorder()).
+		BorderForeground(t.Border()).
+		BorderBackground(t.Background()).
+		BorderLeft(true).
+		BorderRight(true).
 		Render(textarea)
 
 	hint := base(m.getSubmitKeyText()) + muted(" send   ")
@@ -177,8 +182,6 @@ func (m *editorComponent) GetSize() (width, height int) {
 func (m *editorComponent) SetSize(width, height int) tea.Cmd {
 	m.width = width
 	m.height = height
-	m.textarea.SetWidth(width - 5) // account for the prompt and padding right
-	// m.textarea.SetHeight(height - 4)
 	return nil
 }
 
@@ -324,10 +327,11 @@ func createTextArea(existing *textarea.Model) textarea.Model {
 	ta.Prompt = " "
 	ta.ShowLineNumbers = false
 	ta.CharLimit = -1
+	ta.SetWidth(layout.Current.Container.Width - 6)
 
 	if existing != nil {
 		ta.SetValue(existing.Value())
-		ta.SetWidth(existing.Width())
+		// ta.SetWidth(existing.Width())
 		ta.SetHeight(existing.Height())
 	}
 
@@ -341,7 +345,7 @@ func createSpinner() spinner.Model {
 		spinner.WithSpinner(spinner.Ellipsis),
 		spinner.WithStyle(
 			styles.NewStyle().
-				Foreground(t.Background()).
+				Background(t.Background()).
 				Foreground(t.TextMuted()).
 				Width(3).
 				Lipgloss(),

packages/tui/internal/components/chat/message.go

@@ -397,6 +397,11 @@ func renderToolInvocation(
 					body,
 					styles.WhitespaceStyle(t.Background()),
 				)
+
+				// Add diagnostics at the bottom if they exist
+				if diagnostics := renderDiagnostics(metadata, filename); diagnostics != "" {
+					body += "\n" + renderContentBlock(diagnostics, WithFullWidth(), WithBorderColor(t.Error()))
+				}
 			}
 		}
 	case "write":
@@ -404,6 +409,11 @@ func renderToolInvocation(
 			title = fmt.Sprintf("WRITE %s", relative(filename))
 			if content, ok := toolArgsMap["content"].(string); ok {
 				body = renderFile(filename, content)
+				
+				// Add diagnostics at the bottom if they exist
+				if diagnostics := renderDiagnostics(metadata, filename); diagnostics != "" {
+					body += "\n" + renderContentBlock(diagnostics, WithFullWidth(), WithBorderColor(t.Error()))
+				}
 			}
 		}
 	case "bash":
@@ -685,3 +695,81 @@ func extension(path string) string {
 	}
 	return ext
 }
+
+// Diagnostic represents an LSP diagnostic
+type Diagnostic struct {
+	Range struct {
+		Start struct {
+			Line      int `json:"line"`
+			Character int `json:"character"`
+		} `json:"start"`
+	} `json:"range"`
+	Severity int    `json:"severity"`
+	Message  string `json:"message"`
+}
+
+// renderDiagnostics formats LSP diagnostics for display in the TUI
+func renderDiagnostics(metadata client.MessageMetadata_Tool_AdditionalProperties, filePath string) string {
+	diagnosticsData, ok := metadata.Get("diagnostics")
+	if !ok {
+		return ""
+	}
+
+	// diagnosticsData should be a map[string][]Diagnostic
+	diagnosticsMap, ok := diagnosticsData.(map[string]interface{})
+	if !ok {
+		return ""
+	}
+
+	fileDiagnostics, ok := diagnosticsMap[filePath]
+	if !ok {
+		return ""
+	}
+
+	diagnosticsList, ok := fileDiagnostics.([]interface{})
+	if !ok {
+		return ""
+	}
+
+	var errorDiagnostics []string
+	for _, diagInterface := range diagnosticsList {
+		diagMap, ok := diagInterface.(map[string]interface{})
+		if !ok {
+			continue
+		}
+
+		// Parse the diagnostic
+		var diag Diagnostic
+		diagBytes, err := json.Marshal(diagMap)
+		if err != nil {
+			continue
+		}
+		if err := json.Unmarshal(diagBytes, &diag); err != nil {
+			continue
+		}
+
+		// Only show error diagnostics (severity === 1)
+		if diag.Severity != 1 {
+			continue
+		}
+
+		line := diag.Range.Start.Line + 1      // 1-based
+		column := diag.Range.Start.Character + 1 // 1-based
+		errorDiagnostics = append(errorDiagnostics, fmt.Sprintf("Error [%d:%d] %s", line, column, diag.Message))
+	}
+
+	if len(errorDiagnostics) == 0 {
+		return ""
+	}
+
+	t := theme.CurrentTheme()
+	var result strings.Builder
+	for _, diagnostic := range errorDiagnostics {
+		if result.Len() > 0 {
+			result.WriteString("\n")
+		}
+		result.WriteString(styles.NewStyle().Foreground(t.Error()).Render(diagnostic))
+	}
+
+	return result.String()
+}

packages/tui/internal/components/dialog/complete.go

@@ -6,6 +6,7 @@ import (
 	"github.com/charmbracelet/bubbles/v2/key"
 	"github.com/charmbracelet/bubbles/v2/textarea"
 	tea "github.com/charmbracelet/bubbletea/v2"
+	"github.com/charmbracelet/lipgloss/v2"
 	"github.com/sst/opencode/internal/app"
 	"github.com/sst/opencode/internal/components/list"
 	"github.com/sst/opencode/internal/styles"
@@ -34,8 +35,7 @@ func (ci *CompletionItem) Render(selected bool, width int) string {
 		Padding(0, 1)
 
 	if selected {
-		itemStyle = itemStyle.
-			Foreground(t.Primary())
+		itemStyle = itemStyle.Foreground(t.Primary())
 	}
 
 	title := itemStyle.Render(
@@ -199,8 +199,14 @@ func (c *completionDialogComponent) View() string {
 
 	c.list.SetMaxWidth(maxWidth)
 
-	return baseStyle.Padding(0, 0).
+	return baseStyle.
+		Padding(0, 0).
 		Background(t.BackgroundElement()).
+		BorderStyle(lipgloss.ThickBorder()).
+		BorderLeft(true).
+		BorderRight(true).
+		BorderForeground(t.Border()).
+		BorderBackground(t.Background()).
 		Width(c.width).
 		Render(c.list.View())
 }

packages/tui/internal/components/dialog/session.go

@@ -49,14 +49,14 @@ func (s sessionItem) Render(selected bool, width int) string {
 			// Red background for delete confirmation
 			itemStyle = baseStyle.
 				Background(t.Error()).
-				Foreground(t.Background()).
+				Foreground(t.BackgroundElement()).
 				Width(width).
 				PaddingLeft(1)
 		} else {
 			// Normal selection
 			itemStyle = baseStyle.
 				Background(t.Primary()).
-				Foreground(t.Background()).
+				Foreground(t.BackgroundElement()).
 				Width(width).
 				PaddingLeft(1)
 		}

packages/tui/internal/components/list/list.go

@@ -181,7 +181,7 @@ func (s StringItem) Render(selected bool, width int) string {
 	if selected {
 		itemStyle = baseStyle.
 			Background(t.Primary()).
-			Foreground(t.Background()).
+			Foreground(t.BackgroundElement()).
 			Width(width).
 			PaddingLeft(1)
 	} else {

packages/tui/internal/config/config.go

@@ -18,7 +18,7 @@ type State struct {
 
 func NewState() *State {
 	return &State{
-		Theme: "system",
+		Theme: "opencode",
 	}
 }
 

packages/tui/internal/theme/loader_test.go

@@ -21,7 +21,7 @@ func TestLoadThemesFromJSON(t *testing.T) {
 	}
 
 	// Check for expected themes
-	expectedThemes := []string{"tokyonight", "opencode", "everforest", "ayu", "example"}
+	expectedThemes := []string{"tokyonight", "opencode", "everforest", "ayu"}
 	for _, expected := range expectedThemes {
 		found := slices.Contains(themes, expected)
 		if !found {
@@ -43,22 +43,28 @@ func TestLoadThemesFromJSON(t *testing.T) {
 }
 
 func TestColorReferenceResolution(t *testing.T) {
-	// Test the example theme which uses references
-	example := GetTheme("example")
-	if example == nil {
-		t.Fatal("Failed to get example theme")
+	// Load themes first
+	err := LoadThemesFromJSON()
+	if err != nil {
+		t.Fatalf("Failed to load themes: %v", err)
 	}
 
-	// Check that brandBlue reference was resolved
-	primary := example.Primary()
+	// Test a theme that uses references (e.g., solarized uses color definitions)
+	solarized := GetTheme("solarized")
+	if solarized == nil {
+		t.Fatal("Failed to get solarized theme")
+	}
+
+	// Check that color references were resolved
+	primary := solarized.Primary()
 	if primary.Dark == nil || primary.Light == nil {
-		t.Error("Primary color (brandBlue reference) not resolved")
+		t.Error("Primary color reference not resolved")
 	}
 
-	// Check that nested reference (borderActive -> primary -> brandBlue) works
-	borderActive := example.BorderActive()
-	if borderActive.Dark == nil || borderActive.Light == nil {
-		t.Error("BorderActive color (nested reference) not resolved")
+	// Check that all colors are properly resolved
+	text := solarized.Text()
+	if text.Dark == nil || text.Light == nil {
+		t.Error("Text color reference not resolved")
 	}
 }
 

packages/tui/internal/theme/manager.go

@@ -93,16 +93,16 @@ func AvailableThemes() []string {
 		names = append(names, name)
 	}
 	slices.SortFunc(names, func(a, b string) int {
-		if a == "system" {
-			return -1
-		} else if b == "system" {
-			return 1
-		}
 		if a == "opencode" {
 			return -1
 		} else if b == "opencode" {
 			return 1
 		}
+		if a == "system" {
+			return -1
+		} else if b == "system" {
+			return 1
+		}
 		return strings.Compare(a, b)
 	})
 	return names

packages/tui/internal/theme/themes/cobalt2.json

@@ -0,0 +1,228 @@
+{
+  "$schema": "https://opencode.ai/theme.json",
+  "defs": {
+    "background": "#193549",
+    "backgroundAlt": "#122738",
+    "backgroundPanel": "#1f4662",
+    "foreground": "#ffffff",
+    "foregroundMuted": "#adb7c9",
+    "yellow": "#ffc600",
+    "yellowBright": "#ffe14c",
+    "orange": "#ff9d00",
+    "orangeBright": "#ffb454",
+    "mint": "#2affdf",
+    "mintBright": "#7efff5",
+    "blue": "#0088ff",
+    "blueBright": "#5cb7ff",
+    "pink": "#ff628c",
+    "pinkBright": "#ff86a5",
+    "green": "#9eff80",
+    "greenBright": "#b9ff9f",
+    "purple": "#9a5feb",
+    "purpleBright": "#b88cfd",
+    "red": "#ff0088",
+    "redBright": "#ff5fb3"
+  },
+  "theme": {
+    "primary": {
+      "dark": "blue",
+      "light": "#0066cc"
+    },
+    "secondary": {
+      "dark": "purple",
+      "light": "#7c4dff"
+    },
+    "accent": {
+      "dark": "mint",
+      "light": "#00acc1"
+    },
+    "error": {
+      "dark": "red",
+      "light": "#e91e63"
+    },
+    "warning": {
+      "dark": "yellow",
+      "light": "#ff9800"
+    },
+    "success": {
+      "dark": "green",
+      "light": "#4caf50"
+    },
+    "info": {
+      "dark": "orange",
+      "light": "#ff5722"
+    },
+    "text": {
+      "dark": "foreground",
+      "light": "#193549"
+    },
+    "textMuted": {
+      "dark": "foregroundMuted",
+      "light": "#5c6b7d"
+    },
+    "background": {
+      "dark": "#193549",
+      "light": "#ffffff"
+    },
+    "backgroundPanel": {
+      "dark": "#122738",
+      "light": "#f5f7fa"
+    },
+    "backgroundElement": {
+      "dark": "#1f4662",
+      "light": "#e8ecf1"
+    },
+    "border": {
+      "dark": "#1f4662",
+      "light": "#d3dae3"
+    },
+    "borderActive": {
+      "dark": "blue",
+      "light": "#0066cc"
+    },
+    "borderSubtle": {
+      "dark": "#0e1e2e",
+      "light": "#e8ecf1"
+    },
+    "diffAdded": {
+      "dark": "green",
+      "light": "#4caf50"
+    },
+    "diffRemoved": {
+      "dark": "red",
+      "light": "#e91e63"
+    },
+    "diffContext": {
+      "dark": "foregroundMuted",
+      "light": "#5c6b7d"
+    },
+    "diffHunkHeader": {
+      "dark": "mint",
+      "light": "#00acc1"
+    },
+    "diffHighlightAdded": {
+      "dark": "greenBright",
+      "light": "#4caf50"
+    },
+    "diffHighlightRemoved": {
+      "dark": "redBright",
+      "light": "#e91e63"
+    },
+    "diffAddedBg": {
+      "dark": "#1a3a2a",
+      "light": "#e8f5e9"
+    },
+    "diffRemovedBg": {
+      "dark": "#3a1a2a",
+      "light": "#ffebee"
+    },
+    "diffContextBg": {
+      "dark": "#122738",
+      "light": "#f5f7fa"
+    },
+    "diffLineNumber": {
+      "dark": "#2d5a7b",
+      "light": "#b0bec5"
+    },
+    "diffAddedLineNumberBg": {
+      "dark": "#1a3a2a",
+      "light": "#e8f5e9"
+    },
+    "diffRemovedLineNumberBg": {
+      "dark": "#3a1a2a",
+      "light": "#ffebee"
+    },
+    "markdownText": {
+      "dark": "foreground",
+      "light": "#193549"
+    },
+    "markdownHeading": {
+      "dark": "yellow",
+      "light": "#ff9800"
+    },
+    "markdownLink": {
+      "dark": "blue",
+      "light": "#0066cc"
+    },
+    "markdownLinkText": {
+      "dark": "mint",
+      "light": "#00acc1"
+    },
+    "markdownCode": {
+      "dark": "green",
+      "light": "#4caf50"
+    },
+    "markdownBlockQuote": {
+      "dark": "foregroundMuted",
+      "light": "#5c6b7d"
+    },
+    "markdownEmph": {
+      "dark": "orange",
+      "light": "#ff5722"
+    },
+    "markdownStrong": {
+      "dark": "pink",
+      "light": "#e91e63"
+    },
+    "markdownHorizontalRule": {
+      "dark": "#2d5a7b",
+      "light": "#d3dae3"
+    },
+    "markdownListItem": {
+      "dark": "blue",
+      "light": "#0066cc"
+    },
+    "markdownListEnumeration": {
+      "dark": "mint",
+      "light": "#00acc1"
+    },
+    "markdownImage": {
+      "dark": "blue",
+      "light": "#0066cc"
+    },
+    "markdownImageText": {
+      "dark": "mint",
+      "light": "#00acc1"
+    },
+    "markdownCodeBlock": {
+      "dark": "foreground",
+      "light": "#193549"
+    },
+    "syntaxComment": {
+      "dark": "#0088ff",
+      "light": "#5c6b7d"
+    },
+    "syntaxKeyword": {
+      "dark": "orange",
+      "light": "#ff5722"
+    },
+    "syntaxFunction": {
+      "dark": "yellow",
+      "light": "#ff9800"
+    },
+    "syntaxVariable": {
+      "dark": "foreground",
+      "light": "#193549"
+    },
+    "syntaxString": {
+      "dark": "green",
+      "light": "#4caf50"
+    },
+    "syntaxNumber": {
+      "dark": "pink",
+      "light": "#e91e63"
+    },
+    "syntaxType": {
+      "dark": "mint",
+      "light": "#00acc1"
+    },
+    "syntaxOperator": {
+      "dark": "orange",
+      "light": "#ff5722"
+    },
+    "syntaxPunctuation": {
+      "dark": "foreground",
+      "light": "#193549"
+    }
+  }
+}

packages/tui/internal/theme/themes/dracula.json

@@ -0,0 +1,219 @@
+{
+  "$schema": "https://opencode.ai/theme.json",
+  "defs": {
+    "background": "#282a36",
+    "currentLine": "#44475a",
+    "selection": "#44475a",
+    "foreground": "#f8f8f2",
+    "comment": "#6272a4",
+    "cyan": "#8be9fd",
+    "green": "#50fa7b",
+    "orange": "#ffb86c",
+    "pink": "#ff79c6",
+    "purple": "#bd93f9",
+    "red": "#ff5555",
+    "yellow": "#f1fa8c"
+  },
+  "theme": {
+    "primary": {
+      "dark": "purple",
+      "light": "purple"
+    },
+    "secondary": {
+      "dark": "pink",
+      "light": "pink"
+    },
+    "accent": {
+      "dark": "cyan",
+      "light": "cyan"
+    },
+    "error": {
+      "dark": "red",
+      "light": "red"
+    },
+    "warning": {
+      "dark": "yellow",
+      "light": "yellow"
+    },
+    "success": {
+      "dark": "green",
+      "light": "green"
+    },
+    "info": {
+      "dark": "orange",
+      "light": "orange"
+    },
+    "text": {
+      "dark": "foreground",
+      "light": "#282a36"
+    },
+    "textMuted": {
+      "dark": "comment",
+      "light": "#6272a4"
+    },
+    "background": {
+      "dark": "#282a36",
+      "light": "#f8f8f2"
+    },
+    "backgroundPanel": {
+      "dark": "#21222c",
+      "light": "#e8e8e2"
+    },
+    "backgroundElement": {
+      "dark": "currentLine",
+      "light": "#d8d8d2"
+    },
+    "border": {
+      "dark": "currentLine",
+      "light": "#c8c8c2"
+    },
+    "borderActive": {
+      "dark": "purple",
+      "light": "purple"
+    },
+    "borderSubtle": {
+      "dark": "#191a21",
+      "light": "#e0e0e0"
+    },
+    "diffAdded": {
+      "dark": "green",
+      "light": "green"
+    },
+    "diffRemoved": {
+      "dark": "red",
+      "light": "red"
+    },
+    "diffContext": {
+      "dark": "comment",
+      "light": "#6272a4"
+    },
+    "diffHunkHeader": {
+      "dark": "comment",
+      "light": "#6272a4"
+    },
+    "diffHighlightAdded": {
+      "dark": "green",
+      "light": "green"
+    },
+    "diffHighlightRemoved": {
+      "dark": "red",
+      "light": "red"
+    },
+    "diffAddedBg": {
+      "dark": "#1a3a1a",
+      "light": "#e0ffe0"
+    },
+    "diffRemovedBg": {
+      "dark": "#3a1a1a",
+      "light": "#ffe0e0"
+    },
+    "diffContextBg": {
+      "dark": "#21222c",
+      "light": "#e8e8e2"
+    },
+    "diffLineNumber": {
+      "dark": "currentLine",
+      "light": "#c8c8c2"
+    },
+    "diffAddedLineNumberBg": {
+      "dark": "#1a3a1a",
+      "light": "#e0ffe0"
+    },
+    "diffRemovedLineNumberBg": {
+      "dark": "#3a1a1a",
+      "light": "#ffe0e0"
+    },
+    "markdownText": {
+      "dark": "foreground",
+      "light": "#282a36"
+    },
+    "markdownHeading": {
+      "dark": "purple",
+      "light": "purple"
+    },
+    "markdownLink": {
+      "dark": "cyan",
+      "light": "cyan"
+    },
+    "markdownLinkText": {
+      "dark": "pink",
+      "light": "pink"
+    },
+    "markdownCode": {
+      "dark": "green",
+      "light": "green"
+    },
+    "markdownBlockQuote": {
+      "dark": "comment",
+      "light": "#6272a4"
+    },
+    "markdownEmph": {
+      "dark": "yellow",
+      "light": "yellow"
+    },
+    "markdownStrong": {
+      "dark": "orange",
+      "light": "orange"
+    },
+    "markdownHorizontalRule": {
+      "dark": "comment",
+      "light": "#6272a4"
+    },
+    "markdownListItem": {
+      "dark": "purple",
+      "light": "purple"
+    },
+    "markdownListEnumeration": {
+      "dark": "cyan",
+      "light": "cyan"
+    },
+    "markdownImage": {
+      "dark": "cyan",
+      "light": "cyan"
+    },
+    "markdownImageText": {
+      "dark": "pink",
+      "light": "pink"
+    },
+    "markdownCodeBlock": {
+      "dark": "foreground",
+      "light": "#282a36"
+    },
+    "syntaxComment": {
+      "dark": "comment",
+      "light": "#6272a4"
+    },
+    "syntaxKeyword": {
+      "dark": "pink",
+      "light": "pink"
+    },
+    "syntaxFunction": {
+      "dark": "green",
+      "light": "green"
+    },
+    "syntaxVariable": {
+      "dark": "foreground",
+      "light": "#282a36"
+    },
+    "syntaxString": {
+      "dark": "yellow",
+      "light": "yellow"
+    },
+    "syntaxNumber": {
+      "dark": "purple",
+      "light": "purple"
+    },
+    "syntaxType": {
+      "dark": "cyan",
+      "light": "cyan"
+    },
+    "syntaxOperator": {
+      "dark": "pink",
+      "light": "pink"
+    },
+    "syntaxPunctuation": {
+      "dark": "foreground",
+      "light": "#282a36"
+    }
+  }
+}

packages/tui/internal/theme/themes/github.json

@@ -0,0 +1,233 @@
+{
+  "$schema": "https://opencode.ai/theme.json",
+  "defs": {
+    "darkBg": "#0d1117",
+    "darkBgAlt": "#010409",
+    "darkBgPanel": "#161b22",
+    "darkFg": "#c9d1d9",
+    "darkFgMuted": "#8b949e",
+    "darkBlue": "#58a6ff",
+    "darkGreen": "#3fb950",
+    "darkRed": "#f85149",
+    "darkOrange": "#d29922",
+    "darkPurple": "#bc8cff",
+    "darkPink": "#ff7b72",
+    "darkYellow": "#e3b341",
+    "darkCyan": "#39c5cf",
+    "lightBg": "#ffffff",
+    "lightBgAlt": "#f6f8fa",
+    "lightBgPanel": "#f0f3f6",
+    "lightFg": "#24292f",
+    "lightFgMuted": "#57606a",
+    "lightBlue": "#0969da",
+    "lightGreen": "#1a7f37",
+    "lightRed": "#cf222e",
+    "lightOrange": "#bc4c00",
+    "lightPurple": "#8250df",
+    "lightPink": "#bf3989",
+    "lightYellow": "#9a6700",
+    "lightCyan": "#1b7c83"
+  },
+  "theme": {
+    "primary": {
+      "dark": "darkBlue",
+      "light": "lightBlue"
+    },
+    "secondary": {
+      "dark": "darkPurple",
+      "light": "lightPurple"
+    },
+    "accent": {
+      "dark": "darkCyan",
+      "light": "lightCyan"
+    },
+    "error": {
+      "dark": "darkRed",
+      "light": "lightRed"
+    },
+    "warning": {
+      "dark": "darkYellow",
+      "light": "lightYellow"
+    },
+    "success": {
+      "dark": "darkGreen",
+      "light": "lightGreen"
+    },
+    "info": {
+      "dark": "darkOrange",
+      "light": "lightOrange"
+    },
+    "text": {
+      "dark": "darkFg",
+      "light": "lightFg"
+    },
+    "textMuted": {
+      "dark": "darkFgMuted",
+      "light": "lightFgMuted"
+    },
+    "background": {
+      "dark": "darkBg",
+      "light": "lightBg"
+    },
+    "backgroundPanel": {
+      "dark": "darkBgAlt",
+      "light": "lightBgAlt"
+    },
+    "backgroundElement": {
+      "dark": "darkBgPanel",
+      "light": "lightBgPanel"
+    },
+    "border": {
+      "dark": "#30363d",
+      "light": "#d0d7de"
+    },
+    "borderActive": {
+      "dark": "darkBlue",
+      "light": "lightBlue"
+    },
+    "borderSubtle": {
+      "dark": "#21262d",
+      "light": "#d8dee4"
+    },
+    "diffAdded": {
+      "dark": "darkGreen",
+      "light": "lightGreen"
+    },
+    "diffRemoved": {
+      "dark": "darkRed",
+      "light": "lightRed"
+    },
+    "diffContext": {
+      "dark": "darkFgMuted",
+      "light": "lightFgMuted"
+    },
+    "diffHunkHeader": {
+      "dark": "darkBlue",
+      "light": "lightBlue"
+    },
+    "diffHighlightAdded": {
+      "dark": "#3fb950",
+      "light": "#1a7f37"
+    },
+    "diffHighlightRemoved": {
+      "dark": "#f85149",
+      "light": "#cf222e"
+    },
+    "diffAddedBg": {
+      "dark": "#033a16",
+      "light": "#dafbe1"
+    },
+    "diffRemovedBg": {
+      "dark": "#67060c",
+      "light": "#ffebe9"
+    },
+    "diffContextBg": {
+      "dark": "darkBgAlt",
+      "light": "lightBgAlt"
+    },
+    "diffLineNumber": {
+      "dark": "#484f58",
+      "light": "#afb8c1"
+    },
+    "diffAddedLineNumberBg": {
+      "dark": "#033a16",
+      "light": "#dafbe1"
+    },
+    "diffRemovedLineNumberBg": {
+      "dark": "#67060c",
+      "light": "#ffebe9"
+    },
+    "markdownText": {
+      "dark": "darkFg",
+      "light": "lightFg"
+    },
+    "markdownHeading": {
+      "dark": "darkBlue",
+      "light": "lightBlue"
+    },
+    "markdownLink": {
+      "dark": "darkBlue",
+      "light": "lightBlue"
+    },
+    "markdownLinkText": {
+      "dark": "darkCyan",
+      "light": "lightCyan"
+    },
+    "markdownCode": {
+      "dark": "darkPink",
+      "light": "lightPink"
+    },
+    "markdownBlockQuote": {
+      "dark": "darkFgMuted",
+      "light": "lightFgMuted"
+    },
+    "markdownEmph": {
+      "dark": "darkYellow",
+      "light": "lightYellow"
+    },
+    "markdownStrong": {
+      "dark": "darkOrange",
+      "light": "lightOrange"
+    },
+    "markdownHorizontalRule": {
+      "dark": "#30363d",
+      "light": "#d0d7de"
+    },
+    "markdownListItem": {
+      "dark": "darkBlue",
+      "light": "lightBlue"
+    },
+    "markdownListEnumeration": {
+      "dark": "darkCyan",
+      "light": "lightCyan"
+    },
+    "markdownImage": {
+      "dark": "darkBlue",
+      "light": "lightBlue"
+    },
+    "markdownImageText": {
+      "dark": "darkCyan",
+      "light": "lightCyan"
+    },
+    "markdownCodeBlock": {
+      "dark": "darkFg",
+      "light": "lightFg"
+    },
+    "syntaxComment": {
+      "dark": "darkFgMuted",
+      "light": "lightFgMuted"
+    },
+    "syntaxKeyword": {
+      "dark": "darkPink",
+      "light": "lightRed"
+    },
+    "syntaxFunction": {
+      "dark": "darkPurple",
+      "light": "lightPurple"
+    },
+    "syntaxVariable": {
+      "dark": "darkOrange",
+      "light": "lightOrange"
+    },
+    "syntaxString": {
+      "dark": "darkCyan",
+      "light": "lightBlue"
+    },
+    "syntaxNumber": {
+      "dark": "darkBlue",
+      "light": "lightCyan"
+    },
+    "syntaxType": {
+      "dark": "darkOrange",
+      "light": "lightOrange"
+    },
+    "syntaxOperator": {
+      "dark": "darkPink",
+      "light": "lightRed"
+    },
+    "syntaxPunctuation": {
+      "dark": "darkFg",
+      "light": "lightFg"
+    }
+  }
+}

packages/tui/internal/theme/themes/material.json

@@ -0,0 +1,235 @@
+{
+  "$schema": "https://opencode.ai/theme.json",
+  "defs": {
+    "darkBg": "#263238",
+    "darkBgAlt": "#1e272c",
+    "darkBgPanel": "#37474f",
+    "darkFg": "#eeffff",
+    "darkFgMuted": "#546e7a",
+    "darkRed": "#f07178",
+    "darkPink": "#f78c6c",
+    "darkOrange": "#ffcb6b",
+    "darkYellow": "#ffcb6b",
+    "darkGreen": "#c3e88d",
+    "darkCyan": "#89ddff",
+    "darkBlue": "#82aaff",
+    "darkPurple": "#c792ea",
+    "darkViolet": "#bb80b3",
+    "lightBg": "#fafafa",
+    "lightBgAlt": "#f5f5f5",
+    "lightBgPanel": "#e7e7e8",
+    "lightFg": "#263238",
+    "lightFgMuted": "#90a4ae",
+    "lightRed": "#e53935",
+    "lightPink": "#ec407a",
+    "lightOrange": "#f4511e",
+    "lightYellow": "#ffb300",
+    "lightGreen": "#91b859",
+    "lightCyan": "#39adb5",
+    "lightBlue": "#6182b8",
+    "lightPurple": "#7c4dff",
+    "lightViolet": "#945eb8"
+  },
+  "theme": {
+    "primary": {
+      "dark": "darkBlue",
+      "light": "lightBlue"
+    },
+    "secondary": {
+      "dark": "darkPurple",
+      "light": "lightPurple"
+    },
+    "accent": {
+      "dark": "darkCyan",
+      "light": "lightCyan"
+    },
+    "error": {
+      "dark": "darkRed",
+      "light": "lightRed"
+    },
+    "warning": {
+      "dark": "darkYellow",
+      "light": "lightYellow"
+    },
+    "success": {
+      "dark": "darkGreen",
+      "light": "lightGreen"
+    },
+    "info": {
+      "dark": "darkOrange",
+      "light": "lightOrange"
+    },
+    "text": {
+      "dark": "darkFg",
+      "light": "lightFg"
+    },
+    "textMuted": {
+      "dark": "darkFgMuted",
+      "light": "lightFgMuted"
+    },
+    "background": {
+      "dark": "darkBg",
+      "light": "lightBg"
+    },
+    "backgroundPanel": {
+      "dark": "darkBgAlt",
+      "light": "lightBgAlt"
+    },
+    "backgroundElement": {
+      "dark": "darkBgPanel",
+      "light": "lightBgPanel"
+    },
+    "border": {
+      "dark": "#37474f",
+      "light": "#e0e0e0"
+    },
+    "borderActive": {
+      "dark": "darkBlue",
+      "light": "lightBlue"
+    },
+    "borderSubtle": {
+      "dark": "#1e272c",
+      "light": "#eeeeee"
+    },
+    "diffAdded": {
+      "dark": "darkGreen",
+      "light": "lightGreen"
+    },
+    "diffRemoved": {
+      "dark": "darkRed",
+      "light": "lightRed"
+    },
+    "diffContext": {
+      "dark": "darkFgMuted",
+      "light": "lightFgMuted"
+    },
+    "diffHunkHeader": {
+      "dark": "darkCyan",
+      "light": "lightCyan"
+    },
+    "diffHighlightAdded": {
+      "dark": "darkGreen",
+      "light": "lightGreen"
+    },
+    "diffHighlightRemoved": {
+      "dark": "darkRed",
+      "light": "lightRed"
+    },
+    "diffAddedBg": {
+      "dark": "#2e3c2b",
+      "light": "#e8f5e9"
+    },
+    "diffRemovedBg": {
+      "dark": "#3c2b2b",
+      "light": "#ffebee"
+    },
+    "diffContextBg": {
+      "dark": "darkBgAlt",
+      "light": "lightBgAlt"
+    },
+    "diffLineNumber": {
+      "dark": "#37474f",
+      "light": "#cfd8dc"
+    },
+    "diffAddedLineNumberBg": {
+      "dark": "#2e3c2b",
+      "light": "#e8f5e9"
+    },
+    "diffRemovedLineNumberBg": {
+      "dark": "#3c2b2b",
+      "light": "#ffebee"
+    },
+    "markdownText": {
+      "dark": "darkFg",
+      "light": "lightFg"
+    },
+    "markdownHeading": {
+      "dark": "darkBlue",
+      "light": "lightBlue"
+    },
+    "markdownLink": {
+      "dark": "darkCyan",
+      "light": "lightCyan"
+    },
+    "markdownLinkText": {
+      "dark": "darkPurple",
+      "light": "lightPurple"
+    },
+    "markdownCode": {
+      "dark": "darkGreen",
+      "light": "lightGreen"
+    },
+    "markdownBlockQuote": {
+      "dark": "darkFgMuted",
+      "light": "lightFgMuted"
+    },
+    "markdownEmph": {
+      "dark": "darkYellow",
+      "light": "lightYellow"
+    },
+    "markdownStrong": {
+      "dark": "darkOrange",
+      "light": "lightOrange"
+    },
+    "markdownHorizontalRule": {
+      "dark": "#37474f",
+      "light": "#e0e0e0"
+    },
+    "markdownListItem": {
+      "dark": "darkBlue",
+      "light": "lightBlue"
+    },
+    "markdownListEnumeration": {
+      "dark": "darkCyan",
+      "light": "lightCyan"
+    },
+    "markdownImage": {
+      "dark": "darkCyan",
+      "light": "lightCyan"
+    },
+    "markdownImageText": {
+      "dark": "darkPurple",
+      "light": "lightPurple"
+    },
+    "markdownCodeBlock": {
+      "dark": "darkFg",
+      "light": "lightFg"
+    },
+    "syntaxComment": {
+      "dark": "darkFgMuted",
+      "light": "lightFgMuted"
+    },
+    "syntaxKeyword": {
+      "dark": "darkPurple",
+      "light": "lightPurple"
+    },
+    "syntaxFunction": {
+      "dark": "darkBlue",
+      "light": "lightBlue"
+    },
+    "syntaxVariable": {
+      "dark": "darkFg",
+      "light": "lightFg"
+    },
+    "syntaxString": {
+      "dark": "darkGreen",
+      "light": "lightGreen"
+    },
+    "syntaxNumber": {
+      "dark": "darkOrange",
+      "light": "lightOrange"
+    },
+    "syntaxType": {
+      "dark": "darkYellow",
+      "light": "lightYellow"
+    },
+    "syntaxOperator": {
+      "dark": "darkCyan",
+      "light": "lightCyan"
+    },
+    "syntaxPunctuation": {
+      "dark": "darkFg",
+      "light": "lightFg"
+    }
+  }
+}

packages/tui/internal/theme/themes/monokai.json

@@ -0,0 +1,221 @@
+{
+  "$schema": "https://opencode.ai/theme.json",
+  "defs": {
+    "background": "#272822",
+    "backgroundAlt": "#1e1f1c",
+    "backgroundPanel": "#3e3d32",
+    "foreground": "#f8f8f2",
+    "comment": "#75715e",
+    "red": "#f92672",
+    "orange": "#fd971f",
+    "lightOrange": "#e69f66",
+    "yellow": "#e6db74",
+    "green": "#a6e22e",
+    "cyan": "#66d9ef",
+    "blue": "#66d9ef",
+    "purple": "#ae81ff",
+    "pink": "#f92672"
+  },
+  "theme": {
+    "primary": {
+      "dark": "cyan",
+      "light": "blue"
+    },
+    "secondary": {
+      "dark": "purple",
+      "light": "purple"
+    },
+    "accent": {
+      "dark": "green",
+      "light": "green"
+    },
+    "error": {
+      "dark": "red",
+      "light": "red"
+    },
+    "warning": {
+      "dark": "yellow",
+      "light": "orange"
+    },
+    "success": {
+      "dark": "green",
+      "light": "green"
+    },
+    "info": {
+      "dark": "orange",
+      "light": "orange"
+    },
+    "text": {
+      "dark": "foreground",
+      "light": "#272822"
+    },
+    "textMuted": {
+      "dark": "comment",
+      "light": "#75715e"
+    },
+    "background": {
+      "dark": "#272822",
+      "light": "#fafafa"
+    },
+    "backgroundPanel": {
+      "dark": "#1e1f1c",
+      "light": "#f0f0f0"
+    },
+    "backgroundElement": {
+      "dark": "#3e3d32",
+      "light": "#e0e0e0"
+    },
+    "border": {
+      "dark": "#3e3d32",
+      "light": "#d0d0d0"
+    },
+    "borderActive": {
+      "dark": "cyan",
+      "light": "blue"
+    },
+    "borderSubtle": {
+      "dark": "#1e1f1c",
+      "light": "#e8e8e8"
+    },
+    "diffAdded": {
+      "dark": "green",
+      "light": "green"
+    },
+    "diffRemoved": {
+      "dark": "red",
+      "light": "red"
+    },
+    "diffContext": {
+      "dark": "comment",
+      "light": "#75715e"
+    },
+    "diffHunkHeader": {
+      "dark": "comment",
+      "light": "#75715e"
+    },
+    "diffHighlightAdded": {
+      "dark": "green",
+      "light": "green"
+    },
+    "diffHighlightRemoved": {
+      "dark": "red",
+      "light": "red"
+    },
+    "diffAddedBg": {
+      "dark": "#1a3a1a",
+      "light": "#e0ffe0"
+    },
+    "diffRemovedBg": {
+      "dark": "#3a1a1a",
+      "light": "#ffe0e0"
+    },
+    "diffContextBg": {
+      "dark": "#1e1f1c",
+      "light": "#f0f0f0"
+    },
+    "diffLineNumber": {
+      "dark": "#3e3d32",
+      "light": "#d0d0d0"
+    },
+    "diffAddedLineNumberBg": {
+      "dark": "#1a3a1a",
+      "light": "#e0ffe0"
+    },
+    "diffRemovedLineNumberBg": {
+      "dark": "#3a1a1a",
+      "light": "#ffe0e0"
+    },
+    "markdownText": {
+      "dark": "foreground",
+      "light": "#272822"
+    },
+    "markdownHeading": {
+      "dark": "pink",
+      "light": "pink"
+    },
+    "markdownLink": {
+      "dark": "cyan",
+      "light": "blue"
+    },
+    "markdownLinkText": {
+      "dark": "purple",
+      "light": "purple"
+    },
+    "markdownCode": {
+      "dark": "green",
+      "light": "green"
+    },
+    "markdownBlockQuote": {
+      "dark": "comment",
+      "light": "#75715e"
+    },
+    "markdownEmph": {
+      "dark": "yellow",
+      "light": "orange"
+    },
+    "markdownStrong": {
+      "dark": "orange",
+      "light": "orange"
+    },
+    "markdownHorizontalRule": {
+      "dark": "comment",
+      "light": "#75715e"
+    },
+    "markdownListItem": {
+      "dark": "cyan",
+      "light": "blue"
+    },
+    "markdownListEnumeration": {
+      "dark": "purple",
+      "light": "purple"
+    },
+    "markdownImage": {
+      "dark": "cyan",
+      "light": "blue"
+    },
+    "markdownImageText": {
+      "dark": "purple",
+      "light": "purple"
+    },
+    "markdownCodeBlock": {
+      "dark": "foreground",
+      "light": "#272822"
+    },
+    "syntaxComment": {
+      "dark": "comment",
+      "light": "#75715e"
+    },
+    "syntaxKeyword": {
+      "dark": "pink",
+      "light": "pink"
+    },
+    "syntaxFunction": {
+      "dark": "green",
+      "light": "green"
+    },
+    "syntaxVariable": {
+      "dark": "foreground",
+      "light": "#272822"
+    },
+    "syntaxString": {
+      "dark": "yellow",
+      "light": "orange"
+    },
+    "syntaxNumber": {
+      "dark": "purple",
+      "light": "purple"
+    },
+    "syntaxType": {
+      "dark": "cyan",
+      "light": "blue"
+    },
+    "syntaxOperator": {
+      "dark": "pink",
+      "light": "pink"
+    },
+    "syntaxPunctuation": {
+      "dark": "foreground",
+      "light": "#272822"
+    }
+  }
+}

packages/tui/internal/theme/themes/palenight.json

@@ -0,0 +1,222 @@
+{
+  "$schema": "https://opencode.ai/theme.json",
+  "defs": {
+    "background": "#292d3e",
+    "backgroundAlt": "#1e2132",
+    "backgroundPanel": "#32364a",
+    "foreground": "#a6accd",
+    "foregroundBright": "#bfc7d5",
+    "comment": "#676e95",
+    "red": "#f07178",
+    "orange": "#f78c6c",
+    "yellow": "#ffcb6b",
+    "green": "#c3e88d",
+    "cyan": "#89ddff",
+    "blue": "#82aaff",
+    "purple": "#c792ea",
+    "magenta": "#ff5370",
+    "pink": "#f07178"
+  },
+  "theme": {
+    "primary": {
+      "dark": "blue",
+      "light": "#4976eb"
+    },
+    "secondary": {
+      "dark": "purple",
+      "light": "#a854f2"
+    },
+    "accent": {
+      "dark": "cyan",
+      "light": "#00acc1"
+    },
+    "error": {
+      "dark": "red",
+      "light": "#e53935"
+    },
+    "warning": {
+      "dark": "yellow",
+      "light": "#ffb300"
+    },
+    "success": {
+      "dark": "green",
+      "light": "#91b859"
+    },
+    "info": {
+      "dark": "orange",
+      "light": "#f4511e"
+    },
+    "text": {
+      "dark": "foreground",
+      "light": "#292d3e"
+    },
+    "textMuted": {
+      "dark": "comment",
+      "light": "#8796b0"
+    },
+    "background": {
+      "dark": "#292d3e",
+      "light": "#fafafa"
+    },
+    "backgroundPanel": {
+      "dark": "#1e2132",
+      "light": "#f5f5f5"
+    },
+    "backgroundElement": {
+      "dark": "#32364a",
+      "light": "#e7e7e8"
+    },
+    "border": {
+      "dark": "#32364a",
+      "light": "#e0e0e0"
+    },
+    "borderActive": {
+      "dark": "blue",
+      "light": "#4976eb"
+    },
+    "borderSubtle": {
+      "dark": "#1e2132",
+      "light": "#eeeeee"
+    },
+    "diffAdded": {
+      "dark": "green",
+      "light": "#91b859"
+    },
+    "diffRemoved": {
+      "dark": "red",
+      "light": "#e53935"
+    },
+    "diffContext": {
+      "dark": "comment",
+      "light": "#8796b0"
+    },
+    "diffHunkHeader": {
+      "dark": "cyan",
+      "light": "#00acc1"
+    },
+    "diffHighlightAdded": {
+      "dark": "green",
+      "light": "#91b859"
+    },
+    "diffHighlightRemoved": {
+      "dark": "red",
+      "light": "#e53935"
+    },
+    "diffAddedBg": {
+      "dark": "#2e3c2b",
+      "light": "#e8f5e9"
+    },
+    "diffRemovedBg": {
+      "dark": "#3c2b2b",
+      "light": "#ffebee"
+    },
+    "diffContextBg": {
+      "dark": "#1e2132",
+      "light": "#f5f5f5"
+    },
+    "diffLineNumber": {
+      "dark": "#444760",
+      "light": "#cfd8dc"
+    },
+    "diffAddedLineNumberBg": {
+      "dark": "#2e3c2b",
+      "light": "#e8f5e9"
+    },
+    "diffRemovedLineNumberBg": {
+      "dark": "#3c2b2b",
+      "light": "#ffebee"
+    },
+    "markdownText": {
+      "dark": "foreground",
+      "light": "#292d3e"
+    },
+    "markdownHeading": {
+      "dark": "purple",
+      "light": "#a854f2"
+    },
+    "markdownLink": {
+      "dark": "blue",
+      "light": "#4976eb"
+    },
+    "markdownLinkText": {
+      "dark": "cyan",
+      "light": "#00acc1"
+    },
+    "markdownCode": {
+      "dark": "green",
+      "light": "#91b859"
+    },
+    "markdownBlockQuote": {
+      "dark": "comment",
+      "light": "#8796b0"
+    },
+    "markdownEmph": {
+      "dark": "yellow",
+      "light": "#ffb300"
+    },
+    "markdownStrong": {
+      "dark": "orange",
+      "light": "#f4511e"
+    },
+    "markdownHorizontalRule": {
+      "dark": "comment",
+      "light": "#8796b0"
+    },
+    "markdownListItem": {
+      "dark": "blue",
+      "light": "#4976eb"
+    },
+    "markdownListEnumeration": {
+      "dark": "cyan",
+      "light": "#00acc1"
+    },
+    "markdownImage": {
+      "dark": "blue",
+      "light": "#4976eb"
+    },
+    "markdownImageText": {
+      "dark": "cyan",
+      "light": "#00acc1"
+    },
+    "markdownCodeBlock": {
+      "dark": "foreground",
+      "light": "#292d3e"
+    },
+    "syntaxComment": {
+      "dark": "comment",
+      "light": "#8796b0"
+    },
+    "syntaxKeyword": {
+      "dark": "purple",
+      "light": "#a854f2"
+    },
+    "syntaxFunction": {
+      "dark": "blue",
+      "light": "#4976eb"
+    },
+    "syntaxVariable": {
+      "dark": "foreground",
+      "light": "#292d3e"
+    },
+    "syntaxString": {
+      "dark": "green",
+      "light": "#91b859"
+    },
+    "syntaxNumber": {
+      "dark": "orange",
+      "light": "#f4511e"
+    },
+    "syntaxType": {
+      "dark": "yellow",
+      "light": "#ffb300"
+    },
+    "syntaxOperator": {
+      "dark": "cyan",
+      "light": "#00acc1"
+    },
+    "syntaxPunctuation": {
+      "dark": "foreground",
+      "light": "#292d3e"
+    }
+  }
+}

packages/tui/internal/theme/themes/rosepine.json

@@ -0,0 +1,234 @@
+{
+  "$schema": "https://opencode.ai/theme.json",
+  "defs": {
+    "base": "#191724",
+    "surface": "#1f1d2e",
+    "overlay": "#26233a",
+    "muted": "#6e6a86",
+    "subtle": "#908caa",
+    "text": "#e0def4",
+    "love": "#eb6f92",
+    "gold": "#f6c177",
+    "rose": "#ebbcba",
+    "pine": "#31748f",
+    "foam": "#9ccfd8",
+    "iris": "#c4a7e7",
+    "highlightLow": "#21202e",
+    "highlightMed": "#403d52",
+    "highlightHigh": "#524f67",
+    "moonBase": "#232136",
+    "moonSurface": "#2a273f",
+    "moonOverlay": "#393552",
+    "moonMuted": "#6e6a86",
+    "moonSubtle": "#908caa",
+    "moonText": "#e0def4",
+    "dawnBase": "#faf4ed",
+    "dawnSurface": "#fffaf3",
+    "dawnOverlay": "#f2e9e1",
+    "dawnMuted": "#9893a5",
+    "dawnSubtle": "#797593",
+    "dawnText": "#575279"
+  },
+  "theme": {
+    "primary": {
+      "dark": "foam",
+      "light": "pine"
+    },
+    "secondary": {
+      "dark": "iris",
+      "light": "#907aa9"
+    },
+    "accent": {
+      "dark": "rose",
+      "light": "#d7827e"
+    },
+    "error": {
+      "dark": "love",
+      "light": "#b4637a"
+    },
+    "warning": {
+      "dark": "gold",
+      "light": "#ea9d34"
+    },
+    "success": {
+      "dark": "pine",
+      "light": "#286983"
+    },
+    "info": {
+      "dark": "foam",
+      "light": "#56949f"
+    },
+    "text": {
+      "dark": "#e0def4",
+      "light": "#575279"
+    },
+    "textMuted": {
+      "dark": "muted",
+      "light": "dawnMuted"
+    },
+    "background": {
+      "dark": "base",
+      "light": "dawnBase"
+    },
+    "backgroundPanel": {
+      "dark": "surface",
+      "light": "dawnSurface"
+    },
+    "backgroundElement": {
+      "dark": "overlay",
+      "light": "dawnOverlay"
+    },
+    "border": {
+      "dark": "highlightMed",
+      "light": "#dfdad9"
+    },
+    "borderActive": {
+      "dark": "foam",
+      "light": "pine"
+    },
+    "borderSubtle": {
+      "dark": "highlightLow",
+      "light": "#f4ede8"
+    },
+    "diffAdded": {
+      "dark": "pine",
+      "light": "#286983"
+    },
+    "diffRemoved": {
+      "dark": "love",
+      "light": "#b4637a"
+    },
+    "diffContext": {
+      "dark": "muted",
+      "light": "dawnMuted"
+    },
+    "diffHunkHeader": {
+      "dark": "iris",
+      "light": "#907aa9"
+    },
+    "diffHighlightAdded": {
+      "dark": "pine",
+      "light": "#286983"
+    },
+    "diffHighlightRemoved": {
+      "dark": "love",
+      "light": "#b4637a"
+    },
+    "diffAddedBg": {
+      "dark": "#1f2d3a",
+      "light": "#e5f2f3"
+    },
+    "diffRemovedBg": {
+      "dark": "#3a1f2d",
+      "light": "#fce5e8"
+    },
+    "diffContextBg": {
+      "dark": "surface",
+      "light": "dawnSurface"
+    },
+    "diffLineNumber": {
+      "dark": "muted",
+      "light": "dawnMuted"
+    },
+    "diffAddedLineNumberBg": {
+      "dark": "#1f2d3a",
+      "light": "#e5f2f3"
+    },
+    "diffRemovedLineNumberBg": {
+      "dark": "#3a1f2d",
+      "light": "#fce5e8"
+    },
+    "markdownText": {
+      "dark": "#e0def4",
+      "light": "#575279"
+    },
+    "markdownHeading": {
+      "dark": "iris",
+      "light": "#907aa9"
+    },
+    "markdownLink": {
+      "dark": "foam",
+      "light": "pine"
+    },
+    "markdownLinkText": {
+      "dark": "rose",
+      "light": "#d7827e"
+    },
+    "markdownCode": {
+      "dark": "pine",
+      "light": "#286983"
+    },
+    "markdownBlockQuote": {
+      "dark": "muted",
+      "light": "dawnMuted"
+    },
+    "markdownEmph": {
+      "dark": "gold",
+      "light": "#ea9d34"
+    },
+    "markdownStrong": {
+      "dark": "love",
+      "light": "#b4637a"
+    },
+    "markdownHorizontalRule": {
+      "dark": "highlightMed",
+      "light": "#dfdad9"
+    },
+    "markdownListItem": {
+      "dark": "foam",
+      "light": "pine"
+    },
+    "markdownListEnumeration": {
+      "dark": "rose",
+      "light": "#d7827e"
+    },
+    "markdownImage": {
+      "dark": "foam",
+      "light": "pine"
+    },
+    "markdownImageText": {
+      "dark": "rose",
+      "light": "#d7827e"
+    },
+    "markdownCodeBlock": {
+      "dark": "#e0def4",
+      "light": "#575279"
+    },
+    "syntaxComment": {
+      "dark": "muted",
+      "light": "dawnMuted"
+    },
+    "syntaxKeyword": {
+      "dark": "pine",
+      "light": "#286983"
+    },
+    "syntaxFunction": {
+      "dark": "rose",
+      "light": "#d7827e"
+    },
+    "syntaxVariable": {
+      "dark": "#e0def4",
+      "light": "#575279"
+    },
+    "syntaxString": {
+      "dark": "gold",
+      "light": "#ea9d34"
+    },
+    "syntaxNumber": {
+      "dark": "iris",
+      "light": "#907aa9"
+    },
+    "syntaxType": {
+      "dark": "foam",
+      "light": "#56949f"
+    },
+    "syntaxOperator": {
+      "dark": "subtle",
+      "light": "dawnSubtle"
+    },
+    "syntaxPunctuation": {
+      "dark": "subtle",
+      "light": "dawnSubtle"
+    }
+  }
+}

packages/tui/internal/theme/themes/solarized.json

@@ -0,0 +1,223 @@
+{
+  "$schema": "https://opencode.ai/theme.json",
+  "defs": {
+    "base03": "#002b36",
+    "base02": "#073642",
+    "base01": "#586e75",
+    "base00": "#657b83",
+    "base0": "#839496",
+    "base1": "#93a1a1",
+    "base2": "#eee8d5",
+    "base3": "#fdf6e3",
+    "yellow": "#b58900",
+    "orange": "#cb4b16",
+    "red": "#dc322f",
+    "magenta": "#d33682",
+    "violet": "#6c71c4",
+    "blue": "#268bd2",
+    "cyan": "#2aa198",
+    "green": "#859900"
+  },
+  "theme": {
+    "primary": {
+      "dark": "blue",
+      "light": "blue"
+    },
+    "secondary": {
+      "dark": "violet",
+      "light": "violet"
+    },
+    "accent": {
+      "dark": "cyan",
+      "light": "cyan"
+    },
+    "error": {
+      "dark": "red",
+      "light": "red"
+    },
+    "warning": {
+      "dark": "yellow",
+      "light": "yellow"
+    },
+    "success": {
+      "dark": "green",
+      "light": "green"
+    },
+    "info": {
+      "dark": "orange",
+      "light": "orange"
+    },
+    "text": {
+      "dark": "base0",
+      "light": "base00"
+    },
+    "textMuted": {
+      "dark": "base01",
+      "light": "base1"
+    },
+    "background": {
+      "dark": "base03",
+      "light": "base3"
+    },
+    "backgroundPanel": {
+      "dark": "base02",
+      "light": "base2"
+    },
+    "backgroundElement": {
+      "dark": "#073642",
+      "light": "#eee8d5"
+    },
+    "border": {
+      "dark": "base02",
+      "light": "base2"
+    },
+    "borderActive": {
+      "dark": "base01",
+      "light": "base1"
+    },
+    "borderSubtle": {
+      "dark": "#073642",
+      "light": "#eee8d5"
+    },
+    "diffAdded": {
+      "dark": "green",
+      "light": "green"
+    },
+    "diffRemoved": {
+      "dark": "red",
+      "light": "red"
+    },
+    "diffContext": {
+      "dark": "base01",
+      "light": "base1"
+    },
+    "diffHunkHeader": {
+      "dark": "base01",
+      "light": "base1"
+    },
+    "diffHighlightAdded": {
+      "dark": "green",
+      "light": "green"
+    },
+    "diffHighlightRemoved": {
+      "dark": "red",
+      "light": "red"
+    },
+    "diffAddedBg": {
+      "dark": "#073642",
+      "light": "#eee8d5"
+    },
+    "diffRemovedBg": {
+      "dark": "#073642",
+      "light": "#eee8d5"
+    },
+    "diffContextBg": {
+      "dark": "base02",
+      "light": "base2"
+    },
+    "diffLineNumber": {
+      "dark": "base01",
+      "light": "base1"
+    },
+    "diffAddedLineNumberBg": {
+      "dark": "#073642",
+      "light": "#eee8d5"
+    },
+    "diffRemovedLineNumberBg": {
+      "dark": "#073642",
+      "light": "#eee8d5"
+    },
+    "markdownText": {
+      "dark": "base0",
+      "light": "base00"
+    },
+    "markdownHeading": {
+      "dark": "blue",
+      "light": "blue"
+    },
+    "markdownLink": {
+      "dark": "cyan",
+      "light": "cyan"
+    },
+    "markdownLinkText": {
+      "dark": "violet",
+      "light": "violet"
+    },
+    "markdownCode": {
+      "dark": "green",
+      "light": "green"
+    },
+    "markdownBlockQuote": {
+      "dark": "base01",
+      "light": "base1"
+    },
+    "markdownEmph": {
+      "dark": "yellow",
+      "light": "yellow"
+    },
+    "markdownStrong": {
+      "dark": "orange",
+      "light": "orange"
+    },
+    "markdownHorizontalRule": {
+      "dark": "base01",
+      "light": "base1"
+    },
+    "markdownListItem": {
+      "dark": "blue",
+      "light": "blue"
+    },
+    "markdownListEnumeration": {
+      "dark": "cyan",
+      "light": "cyan"
+    },
+    "markdownImage": {
+      "dark": "cyan",
+      "light": "cyan"
+    },
+    "markdownImageText": {
+      "dark": "violet",
+      "light": "violet"
+    },
+    "markdownCodeBlock": {
+      "dark": "base0",
+      "light": "base00"
+    },
+    "syntaxComment": {
+      "dark": "base01",
+      "light": "base1"
+    },
+    "syntaxKeyword": {
+      "dark": "green",
+      "light": "green"
+    },
+    "syntaxFunction": {
+      "dark": "blue",
+      "light": "blue"
+    },
+    "syntaxVariable": {
+      "dark": "cyan",
+      "light": "cyan"
+    },
+    "syntaxString": {
+      "dark": "cyan",
+      "light": "cyan"
+    },
+    "syntaxNumber": {
+      "dark": "magenta",
+      "light": "magenta"
+    },
+    "syntaxType": {
+      "dark": "yellow",
+      "light": "yellow"
+    },
+    "syntaxOperator": {
+      "dark": "green",
+      "light": "green"
+    },
+    "syntaxPunctuation": {
+      "dark": "base0",
+      "light": "base00"
+    }
+  }
+}

packages/tui/internal/theme/themes/synthwave84.json

@@ -0,0 +1,226 @@
+{
+  "$schema": "https://opencode.ai/theme.json",
+  "defs": {
+    "background": "#262335",
+    "backgroundAlt": "#1e1a29",
+    "backgroundPanel": "#2a2139",
+    "foreground": "#ffffff",
+    "foregroundMuted": "#848bbd",
+    "pink": "#ff7edb",
+    "pinkBright": "#ff92df",
+    "cyan": "#36f9f6",
+    "cyanBright": "#72f1f8",
+    "yellow": "#fede5d",
+    "yellowBright": "#fff95d",
+    "orange": "#ff8b39",
+    "orangeBright": "#ff9f43",
+    "purple": "#b084eb",
+    "purpleBright": "#c792ea",
+    "red": "#fe4450",
+    "redBright": "#ff5e5b",
+    "green": "#72f1b8",
+    "greenBright": "#97f1d8"
+  },
+  "theme": {
+    "primary": {
+      "dark": "cyan",
+      "light": "#00bcd4"
+    },
+    "secondary": {
+      "dark": "pink",
+      "light": "#e91e63"
+    },
+    "accent": {
+      "dark": "purple",
+      "light": "#9c27b0"
+    },
+    "error": {
+      "dark": "red",
+      "light": "#f44336"
+    },
+    "warning": {
+      "dark": "yellow",
+      "light": "#ff9800"
+    },
+    "success": {
+      "dark": "green",
+      "light": "#4caf50"
+    },
+    "info": {
+      "dark": "orange",
+      "light": "#ff5722"
+    },
+    "text": {
+      "dark": "foreground",
+      "light": "#262335"
+    },
+    "textMuted": {
+      "dark": "foregroundMuted",
+      "light": "#5c5c8a"
+    },
+    "background": {
+      "dark": "#262335",
+      "light": "#fafafa"
+    },
+    "backgroundPanel": {
+      "dark": "#1e1a29",
+      "light": "#f5f5f5"
+    },
+    "backgroundElement": {
+      "dark": "#2a2139",
+      "light": "#eeeeee"
+    },
+    "border": {
+      "dark": "#495495",
+      "light": "#e0e0e0"
+    },
+    "borderActive": {
+      "dark": "cyan",
+      "light": "#00bcd4"
+    },
+    "borderSubtle": {
+      "dark": "#241b2f",
+      "light": "#f0f0f0"
+    },
+    "diffAdded": {
+      "dark": "green",
+      "light": "#4caf50"
+    },
+    "diffRemoved": {
+      "dark": "red",
+      "light": "#f44336"
+    },
+    "diffContext": {
+      "dark": "foregroundMuted",
+      "light": "#5c5c8a"
+    },
+    "diffHunkHeader": {
+      "dark": "purple",
+      "light": "#9c27b0"
+    },
+    "diffHighlightAdded": {
+      "dark": "greenBright",
+      "light": "#4caf50"
+    },
+    "diffHighlightRemoved": {
+      "dark": "redBright",
+      "light": "#f44336"
+    },
+    "diffAddedBg": {
+      "dark": "#1a3a2a",
+      "light": "#e8f5e9"
+    },
+    "diffRemovedBg": {
+      "dark": "#3a1a2a",
+      "light": "#ffebee"
+    },
+    "diffContextBg": {
+      "dark": "#1e1a29",
+      "light": "#f5f5f5"
+    },
+    "diffLineNumber": {
+      "dark": "#495495",
+      "light": "#b0b0b0"
+    },
+    "diffAddedLineNumberBg": {
+      "dark": "#1a3a2a",
+      "light": "#e8f5e9"
+    },
+    "diffRemovedLineNumberBg": {
+      "dark": "#3a1a2a",
+      "light": "#ffebee"
+    },
+    "markdownText": {
+      "dark": "foreground",
+      "light": "#262335"
+    },
+    "markdownHeading": {
+      "dark": "pink",
+      "light": "#e91e63"
+    },
+    "markdownLink": {
+      "dark": "cyan",
+      "light": "#00bcd4"
+    },
+    "markdownLinkText": {
+      "dark": "purple",
+      "light": "#9c27b0"
+    },
+    "markdownCode": {
+      "dark": "green",
+      "light": "#4caf50"
+    },
+    "markdownBlockQuote": {
+      "dark": "foregroundMuted",
+      "light": "#5c5c8a"
+    },
+    "markdownEmph": {
+      "dark": "yellow",
+      "light": "#ff9800"
+    },
+    "markdownStrong": {
+      "dark": "orange",
+      "light": "#ff5722"
+    },
+    "markdownHorizontalRule": {
+      "dark": "#495495",
+      "light": "#e0e0e0"
+    },
+    "markdownListItem": {
+      "dark": "cyan",
+      "light": "#00bcd4"
+    },
+    "markdownListEnumeration": {
+      "dark": "purple",
+      "light": "#9c27b0"
+    },
+    "markdownImage": {
+      "dark": "cyan",
+      "light": "#00bcd4"
+    },
+    "markdownImageText": {
+      "dark": "purple",
+      "light": "#9c27b0"
+    },
+    "markdownCodeBlock": {
+      "dark": "foreground",
+      "light": "#262335"
+    },
+    "syntaxComment": {
+      "dark": "foregroundMuted",
+      "light": "#5c5c8a"
+    },
+    "syntaxKeyword": {
+      "dark": "pink",
+      "light": "#e91e63"
+    },
+    "syntaxFunction": {
+      "dark": "orange",
+      "light": "#ff5722"
+    },
+    "syntaxVariable": {
+      "dark": "foreground",
+      "light": "#262335"
+    },
+    "syntaxString": {
+      "dark": "yellow",
+      "light": "#ff9800"
+    },
+    "syntaxNumber": {
+      "dark": "purple",
+      "light": "#9c27b0"
+    },
+    "syntaxType": {
+      "dark": "cyan",
+      "light": "#00bcd4"
+    },
+    "syntaxOperator": {
+      "dark": "pink",
+      "light": "#e91e63"
+    },
+    "syntaxPunctuation": {
+      "dark": "foreground",
+      "light": "#262335"
+    }
+  }
+}

packages/tui/internal/theme/themes/zenburn.json

@@ -0,0 +1,223 @@
+{
+  "$schema": "https://opencode.ai/theme.json",
+  "defs": {
+    "bg": "#3f3f3f",
+    "bgAlt": "#4f4f4f",
+    "bgPanel": "#5f5f5f",
+    "fg": "#dcdccc",
+    "fgMuted": "#9f9f9f",
+    "red": "#cc9393",
+    "redBright": "#dca3a3",
+    "green": "#7f9f7f",
+    "greenBright": "#8fb28f",
+    "yellow": "#f0dfaf",
+    "yellowDim": "#e0cf9f",
+    "blue": "#8cd0d3",
+    "blueDim": "#7cb8bb",
+    "magenta": "#dc8cc3",
+    "cyan": "#93e0e3",
+    "orange": "#dfaf8f"
+  },
+  "theme": {
+    "primary": {
+      "dark": "blue",
+      "light": "#5f7f8f"
+    },
+    "secondary": {
+      "dark": "magenta",
+      "light": "#8f5f8f"
+    },
+    "accent": {
+      "dark": "cyan",
+      "light": "#5f8f8f"
+    },
+    "error": {
+      "dark": "red",
+      "light": "#8f5f5f"
+    },
+    "warning": {
+      "dark": "yellow",
+      "light": "#8f8f5f"
+    },
+    "success": {
+      "dark": "green",
+      "light": "#5f8f5f"
+    },
+    "info": {
+      "dark": "orange",
+      "light": "#8f7f5f"
+    },
+    "text": {
+      "dark": "fg",
+      "light": "#3f3f3f"
+    },
+    "textMuted": {
+      "dark": "fgMuted",
+      "light": "#6f6f6f"
+    },
+    "background": {
+      "dark": "bg",
+      "light": "#ffffef"
+    },
+    "backgroundPanel": {
+      "dark": "bgAlt",
+      "light": "#f5f5e5"
+    },
+    "backgroundElement": {
+      "dark": "bgPanel",
+      "light": "#ebebdb"
+    },
+    "border": {
+      "dark": "#5f5f5f",
+      "light": "#d0d0c0"
+    },
+    "borderActive": {
+      "dark": "blue",
+      "light": "#5f7f8f"
+    },
+    "borderSubtle": {
+      "dark": "#4f4f4f",
+      "light": "#e0e0d0"
+    },
+    "diffAdded": {
+      "dark": "green",
+      "light": "#5f8f5f"
+    },
+    "diffRemoved": {
+      "dark": "red",
+      "light": "#8f5f5f"
+    },
+    "diffContext": {
+      "dark": "fgMuted",
+      "light": "#6f6f6f"
+    },
+    "diffHunkHeader": {
+      "dark": "cyan",
+      "light": "#5f8f8f"
+    },
+    "diffHighlightAdded": {
+      "dark": "greenBright",
+      "light": "#5f8f5f"
+    },
+    "diffHighlightRemoved": {
+      "dark": "redBright",
+      "light": "#8f5f5f"
+    },
+    "diffAddedBg": {
+      "dark": "#4f5f4f",
+      "light": "#efffef"
+    },
+    "diffRemovedBg": {
+      "dark": "#5f4f4f",
+      "light": "#ffefef"
+    },
+    "diffContextBg": {
+      "dark": "bgAlt",
+      "light": "#f5f5e5"
+    },
+    "diffLineNumber": {
+      "dark": "#6f6f6f",
+      "light": "#b0b0a0"
+    },
+    "diffAddedLineNumberBg": {
+      "dark": "#4f5f4f",
+      "light": "#efffef"
+    },
+    "diffRemovedLineNumberBg": {
+      "dark": "#5f4f4f",
+      "light": "#ffefef"
+    },
+    "markdownText": {
+      "dark": "fg",
+      "light": "#3f3f3f"
+    },
+    "markdownHeading": {
+      "dark": "yellow",
+      "light": "#8f8f5f"
+    },
+    "markdownLink": {
+      "dark": "blue",
+      "light": "#5f7f8f"
+    },
+    "markdownLinkText": {
+      "dark": "cyan",
+      "light": "#5f8f8f"
+    },
+    "markdownCode": {
+      "dark": "green",
+      "light": "#5f8f5f"
+    },
+    "markdownBlockQuote": {
+      "dark": "fgMuted",
+      "light": "#6f6f6f"
+    },
+    "markdownEmph": {
+      "dark": "yellowDim",
+      "light": "#8f8f5f"
+    },
+    "markdownStrong": {
+      "dark": "orange",
+      "light": "#8f7f5f"
+    },
+    "markdownHorizontalRule": {
+      "dark": "fgMuted",
+      "light": "#6f6f6f"
+    },
+    "markdownListItem": {
+      "dark": "blue",
+      "light": "#5f7f8f"
+    },
+    "markdownListEnumeration": {
+      "dark": "cyan",
+      "light": "#5f8f8f"
+    },
+    "markdownImage": {
+      "dark": "blue",
+      "light": "#5f7f8f"
+    },
+    "markdownImageText": {
+      "dark": "cyan",
+      "light": "#5f8f8f"
+    },
+    "markdownCodeBlock": {
+      "dark": "fg",
+      "light": "#3f3f3f"
+    },
+    "syntaxComment": {
+      "dark": "#7f9f7f",
+      "light": "#5f7f5f"
+    },
+    "syntaxKeyword": {
+      "dark": "yellow",
+      "light": "#8f8f5f"
+    },
+    "syntaxFunction": {
+      "dark": "blue",
+      "light": "#5f7f8f"
+    },
+    "syntaxVariable": {
+      "dark": "fg",
+      "light": "#3f3f3f"
+    },
+    "syntaxString": {
+      "dark": "red",
+      "light": "#8f5f5f"
+    },
+    "syntaxNumber": {
+      "dark": "greenBright",
+      "light": "#5f8f5f"
+    },
+    "syntaxType": {
+      "dark": "cyan",
+      "light": "#5f8f8f"
+    },
+    "syntaxOperator": {
+      "dark": "yellow",
+      "light": "#8f8f5f"
+    },
+    "syntaxPunctuation": {
+      "dark": "fg",
+      "light": "#3f3f3f"
+    }
+  }
+}

packages/web/astro.config.mjs

@@ -8,14 +8,12 @@ import config from "./config.mjs"
 import { rehypeHeadingIds } from "@astrojs/markdown-remark"
 import rehypeAutolinkHeadings from "rehype-autolink-headings"
 
+const url = "https://opencode.ai"
 const github = "https://github.com/sst/opencode"
-const headerLinks = [
-  { name: "Docs", url: "/docs/" },
-  { name: "GitHub", url: github },
-]
 
 // https://astro.build/config
 export default defineConfig({
+  site: url,
   output: "server",
   adapter: cloudflare({
     imageService: "passthrough",
@@ -37,6 +35,29 @@ export default defineConfig({
       social: [
         { icon: "github", label: "GitHub", href: config.github },
       ],
+      head: [
+        {
+          tag: "link",
+          attrs: {
+            rel: "icon",
+            href: "/favicon.svg",
+          },
+        },
+        {
+          tag: "meta",
+          attrs: {
+            property: "og:image",
+            content: `${url}/social-share.png`,
+          },
+        },
+        {
+          tag: "meta",
+          attrs: {
+            property: "twitter:image",
+            content: `${url}/social-share.png`,
+          },
+        },
+      ],
       editLink: {
         baseUrl: `${github}/edit/master/www/`,
       },

packages/web/src/components/DiffView.tsx

@@ -54,8 +54,8 @@ const DiffView: Component<DiffViewProps> = (props) => {
               // Pair removals with additions
               const maxLength = Math.max(removals.length, additions.length)
               for (let k = 0; k < maxLength; k++) {
-                const hasLeft = !!removals[k]
-                const hasRight = !!additions[k]
+                const hasLeft = k < removals.length
+                const hasRight = k < additions.length
 
                 if (hasLeft && hasRight) {
                   // Replacement - left is removed, right is added
@@ -71,8 +71,8 @@ const DiffView: Component<DiffViewProps> = (props) => {
                     right: "",
                     type: "removed"
                   })
-                } else {
-                  // Pure addition
+                } else if (hasRight) {
+                  // Pure addition - only create if we actually have content
                   diffRows.push({
                     left: "",
                     right: additions[k],
@@ -111,85 +111,136 @@ const DiffView: Component<DiffViewProps> = (props) => {
     return diffRows
   })
 
+  const mobileRows = createMemo(() => {
+    const mobileBlocks: { type: 'removed' | 'added' | 'unchanged', lines: string[] }[] = []
+    const currentRows = rows()
+
+    let i = 0
+    while (i < currentRows.length) {
+      const removedLines: string[] = []
+      const addedLines: string[] = []
+
+      // Collect consecutive modified/removed/added rows
+      while (i < currentRows.length &&
+        (currentRows[i].type === 'modified' ||
+          currentRows[i].type === 'removed' ||
+          currentRows[i].type === 'added')) {
+        const row = currentRows[i]
+        if (row.left && (row.type === 'removed' || row.type === 'modified')) {
+          removedLines.push(row.left)
+        }
+        if (row.right && (row.type === 'added' || row.type === 'modified')) {
+          addedLines.push(row.right)
+        }
+        i++
+      }
+
+      // Add grouped blocks
+      if (removedLines.length > 0) {
+        mobileBlocks.push({ type: 'removed', lines: removedLines })
+      }
+      if (addedLines.length > 0) {
+        mobileBlocks.push({ type: 'added', lines: addedLines })
+      }
+
+      // Add unchanged rows as-is
+      if (i < currentRows.length && currentRows[i].type === 'unchanged') {
+        mobileBlocks.push({
+          type: 'unchanged',
+          lines: [currentRows[i].left]
+        })
+        i++
+      }
+    }
+
+    return mobileBlocks
+  })
+
   return (
     <div class={`${styles.diff} ${props.class ?? ""}`}>
-      {rows().map((r) => (
-        <div class={styles.row}>
-          <div class={styles.beforeColumn}>
-            <CodeBlock
-              code={r.left}
-              lang={props.lang}
-              data-section="cell"
-              data-diff-type={r.type === "removed" || r.type === "modified" ? "removed" : ""}
-              data-display-mobile={r.type === "added" && !r.left ? "false" : undefined}
-            />
-            {(r.type === "added" || r.type === "modified") && r.right !== undefined && (
+      <div class={styles.desktopView}>
+        {rows().map((r) => (
+          <div class={styles.row}>
+            <div class={styles.beforeColumn}>
+              <CodeBlock
+                code={r.left}
+                lang={props.lang}
+                data-section="cell"
+                data-diff-type={r.type === "removed" || r.type === "modified" ? "removed" : ""}
+              />
+            </div>
+            <div class={styles.afterColumn}>
               <CodeBlock
                 code={r.right}
                 lang={props.lang}
                 data-section="cell"
-                data-diff-type="added"
-                data-display-mobile="true"
+                data-diff-type={r.type === "added" || r.type === "modified" ? "added" : ""}
               />
-            )}
+            </div>
           </div>
+        ))}
+      </div>
 
-          <div class={styles.afterColumn}>
-            <CodeBlock
-              code={r.right}
-              lang={props.lang}
-              data-section="cell"
-              data-diff-type={r.type === "added" || r.type === "modified" ? "added" : ""}
-            />
+      <div class={styles.mobileView}>
+        {mobileRows().map((block) => (
+          <div class={styles.mobileBlock}>
+            {block.lines.map((line) => (
+              <CodeBlock
+                code={line}
+                lang={props.lang}
+                data-section="cell"
+                data-diff-type={block.type === 'removed' ? 'removed' :
+                  block.type === 'added' ? 'added' : ''}
+              />
+            ))}
           </div>
-        </div>
-      ))}
+        ))}
+      </div>
     </div>
   )
 }
 
 export default DiffView
 
-// String to test diff viewer with
-const testDiff = `--- combined_before.txt	2025-06-24 16:38:08
-+++ combined_after.txt	2025-06-24 16:38:12
-@@ -1,21 +1,25 @@
- unchanged line
--deleted line
--old content
-+added line
-+new content
- 
--removed empty line below
-+added empty line above
- 
--	tab indented
--trailing spaces   
--very long line that will definitely wrap in most editors and cause potential alignment issues when displayed in a two column diff view
--unicode content: 🚀 ✨ 中文
--mixed	content with	tabs and spaces
-+    space indented
-+no trailing spaces
-+short line
-+very long replacement line that will also wrap and test how the diff viewer handles long line additions after short line removals
-+different unicode: 🎉 💻 日本語
-+normalized content with consistent spacing
-+newline to content
- 
--content to remove
--whitespace only:    	  
--multiple
--consecutive
--deletions
--single deletion
-+    	  
-+single addition
-+first addition
-+second addition
-+third addition
- line before addition
-+first added line
-+
-+third added line
- line after addition
- final unchanged line`
+// const testDiff = `--- combined_before.txt	2025-06-24 16:38:08
+// +++ combined_after.txt	2025-06-24 16:38:12
+// @@ -1,21 +1,25 @@
+//  unchanged line
+// -deleted line
+// -old content
+// +added line
+// +new content
+//  
+// -removed empty line below
+// +added empty line above
+//  
+// -	tab indented
+// -trailing spaces   
+// -very long line that will definitely wrap in most editors and cause potential alignment issues when displayed in a two column diff view
+// -unicode content: 🚀 ✨ 中文
+// -mixed	content with	tabs and spaces
+// +    space indented
+// +no trailing spaces
+// +short line
+// +very long replacement line that will also wrap and test how the diff viewer handles long line additions after short line removals
+// +different unicode: 🎉 💻 日本語
+// +normalized content with consistent spacing
+// +newline to content
+//  
+// -content to remove
+// -whitespace only:    	  
+// -multiple
+// -consecutive
+// -deletions
+// -single deletion
+// +    	  
+// +single addition
+// +first addition
+// +second addition
+// +third addition
+//  line before addition
+// +first added line
+// +
+// +third added line
+//  line after addition
+//  final unchanged line`

packages/web/src/components/diffview.module.css

@@ -6,6 +6,19 @@
   border-radius: 0.25rem;
 }
 
+.desktopView {
+  display: block;
+}
+
+.mobileView {
+  display: none;
+}
+
+.mobileBlock {
+  display: flex;
+  flex-direction: column;
+}
+
 .row {
   display: grid;
   grid-template-columns: 1fr 1fr;
@@ -98,25 +111,11 @@
 }
 
 @media (max-width: 40rem) {
-  .row {
-    grid-template-columns: 1fr;
-  }
-
-  .afterColumn {
+  .desktopView {
     display: none;
   }
 
-  .beforeColumn {
-    border-right: none;
-  }
-
-  [data-section="cell"] {
-    &[data-display-mobile="true"] {
-      display: flex;
-    }
-
-    &[data-display-mobile="false"] {
-      display: none;
-    }
+  .mobileView {
+    display: block;
   }
 }

packages/web/src/components/markdownview.module.css

@@ -30,6 +30,8 @@
   h4,
   h5,
   h6 {
+    font-size: 0.875rem;
+    font-weight: 600;
     margin-bottom: 0.5rem;
   }
 

packages/web/src/content/docs/docs/themes.mdx

@@ -280,7 +280,7 @@ The special value `\"none\"` can be used for any color to inherit the terminal's
 
 ## The System Theme
 
-The `system` theme is opencode's default theme, designed to automatically adapt to your terminal's color scheme. Unlike traditional themes that use fixed colors, the system theme:
+The `system` theme is designed to automatically adapt to your terminal's color scheme. Unlike traditional themes that use fixed colors, the system theme:
 
 - **Generates gray scale**: Creates a custom gray scale based on your terminal's background color, ensuring optimal contrast
 - **Uses ANSI colors**: Leverages standard ANSI colors (0-15) for syntax highlighting and UI elements, which respect your terminal's color palette