2
0
adamdottv 10 сар өмнө
parent
commit
1ae3f1830b

+ 1 - 1
cmd/schema/main.go

@@ -106,7 +106,7 @@ func generateSchema() map[string]any {
 				"type":        "string",
 				"description": "TUI theme name",
 				"default":     "opencode",
-				"enum":        []string{"opencode", "catppuccin", "flexoki", "gruvbox", "monokai", "onedark"},
+				"enum":        []string{"opencode", "catppuccin", "dracula", "flexoki", "gruvbox", "monokai", "onedark"},
 			},
 		},
 	}

+ 274 - 0
internal/tui/theme/dracula.go

@@ -0,0 +1,274 @@
+package theme
+
+import (
+	"github.com/charmbracelet/lipgloss"
+)
+
+// DraculaTheme implements the Theme interface with Dracula colors.
+// It provides both dark and light variants, though Dracula is primarily a dark theme.
+type DraculaTheme struct {
+	BaseTheme
+}
+
+// NewDraculaTheme creates a new instance of the Dracula theme.
+func NewDraculaTheme() *DraculaTheme {
+	// Dracula color palette
+	// Official colors from https://draculatheme.com/
+	darkBackground := "#282a36"
+	darkCurrentLine := "#44475a"
+	darkSelection := "#44475a"
+	darkForeground := "#f8f8f2"
+	darkComment := "#6272a4"
+	darkCyan := "#8be9fd"
+	darkGreen := "#50fa7b"
+	darkOrange := "#ffb86c"
+	darkPink := "#ff79c6"
+	darkPurple := "#bd93f9"
+	darkRed := "#ff5555"
+	darkYellow := "#f1fa8c"
+	darkBorder := "#44475a"
+
+	// Light mode approximation (Dracula is primarily a dark theme)
+	lightBackground := "#f8f8f2"
+	lightCurrentLine := "#e6e6e6"
+	lightSelection := "#d8d8d8"
+	lightForeground := "#282a36"
+	lightComment := "#6272a4"
+	lightCyan := "#0097a7"
+	lightGreen := "#388e3c"
+	lightOrange := "#f57c00"
+	lightPink := "#d81b60"
+	lightPurple := "#7e57c2"
+	lightRed := "#e53935"
+	lightYellow := "#fbc02d"
+	lightBorder := "#d8d8d8"
+
+	theme := &DraculaTheme{}
+
+	// Base colors
+	theme.PrimaryColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.SecondaryColor = lipgloss.AdaptiveColor{
+		Dark:  darkPink,
+		Light: lightPink,
+	}
+	theme.AccentColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+
+	// Status colors
+	theme.ErrorColor = lipgloss.AdaptiveColor{
+		Dark:  darkRed,
+		Light: lightRed,
+	}
+	theme.WarningColor = lipgloss.AdaptiveColor{
+		Dark:  darkOrange,
+		Light: lightOrange,
+	}
+	theme.SuccessColor = lipgloss.AdaptiveColor{
+		Dark:  darkGreen,
+		Light: lightGreen,
+	}
+	theme.InfoColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+
+	// Text colors
+	theme.TextColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+	theme.TextMutedColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.TextEmphasizedColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+
+	// Background colors
+	theme.BackgroundColor = lipgloss.AdaptiveColor{
+		Dark:  darkBackground,
+		Light: lightBackground,
+	}
+	theme.BackgroundSecondaryColor = lipgloss.AdaptiveColor{
+		Dark:  darkCurrentLine,
+		Light: lightCurrentLine,
+	}
+	theme.BackgroundDarkerColor = lipgloss.AdaptiveColor{
+		Dark:  "#21222c", // Slightly darker than background
+		Light: "#ffffff", // Slightly lighter than background
+	}
+
+	// Border colors
+	theme.BorderNormalColor = lipgloss.AdaptiveColor{
+		Dark:  darkBorder,
+		Light: lightBorder,
+	}
+	theme.BorderFocusedColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.BorderDimColor = lipgloss.AdaptiveColor{
+		Dark:  darkSelection,
+		Light: lightSelection,
+	}
+
+	// Diff view colors
+	theme.DiffAddedColor = lipgloss.AdaptiveColor{
+		Dark:  darkGreen,
+		Light: lightGreen,
+	}
+	theme.DiffRemovedColor = lipgloss.AdaptiveColor{
+		Dark:  darkRed,
+		Light: lightRed,
+	}
+	theme.DiffContextColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.DiffHunkHeaderColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.DiffHighlightAddedColor = lipgloss.AdaptiveColor{
+		Dark:  "#50fa7b",
+		Light: "#a5d6a7",
+	}
+	theme.DiffHighlightRemovedColor = lipgloss.AdaptiveColor{
+		Dark:  "#ff5555",
+		Light: "#ef9a9a",
+	}
+	theme.DiffAddedBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#2c3b2c",
+		Light: "#e8f5e9",
+	}
+	theme.DiffRemovedBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#3b2c2c",
+		Light: "#ffebee",
+	}
+	theme.DiffContextBgColor = lipgloss.AdaptiveColor{
+		Dark:  darkBackground,
+		Light: lightBackground,
+	}
+	theme.DiffLineNumberColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.DiffAddedLineNumberBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#253025",
+		Light: "#c8e6c9",
+	}
+	theme.DiffRemovedLineNumberBgColor = lipgloss.AdaptiveColor{
+		Dark:  "#302525",
+		Light: "#ffcdd2",
+	}
+
+	// Markdown colors
+	theme.MarkdownTextColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+	theme.MarkdownHeadingColor = lipgloss.AdaptiveColor{
+		Dark:  darkPink,
+		Light: lightPink,
+	}
+	theme.MarkdownLinkColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.MarkdownLinkTextColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.MarkdownCodeColor = lipgloss.AdaptiveColor{
+		Dark:  darkGreen,
+		Light: lightGreen,
+	}
+	theme.MarkdownBlockQuoteColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+	theme.MarkdownEmphColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+	theme.MarkdownStrongColor = lipgloss.AdaptiveColor{
+		Dark:  darkOrange,
+		Light: lightOrange,
+	}
+	theme.MarkdownHorizontalRuleColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.MarkdownListItemColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.MarkdownListEnumerationColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.MarkdownImageColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.MarkdownImageTextColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.MarkdownCodeBlockColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+
+	// Syntax highlighting colors
+	theme.SyntaxCommentColor = lipgloss.AdaptiveColor{
+		Dark:  darkComment,
+		Light: lightComment,
+	}
+	theme.SyntaxKeywordColor = lipgloss.AdaptiveColor{
+		Dark:  darkPink,
+		Light: lightPink,
+	}
+	theme.SyntaxFunctionColor = lipgloss.AdaptiveColor{
+		Dark:  darkGreen,
+		Light: lightGreen,
+	}
+	theme.SyntaxVariableColor = lipgloss.AdaptiveColor{
+		Dark:  darkOrange,
+		Light: lightOrange,
+	}
+	theme.SyntaxStringColor = lipgloss.AdaptiveColor{
+		Dark:  darkYellow,
+		Light: lightYellow,
+	}
+	theme.SyntaxNumberColor = lipgloss.AdaptiveColor{
+		Dark:  darkPurple,
+		Light: lightPurple,
+	}
+	theme.SyntaxTypeColor = lipgloss.AdaptiveColor{
+		Dark:  darkCyan,
+		Light: lightCyan,
+	}
+	theme.SyntaxOperatorColor = lipgloss.AdaptiveColor{
+		Dark:  darkPink,
+		Light: lightPink,
+	}
+	theme.SyntaxPunctuationColor = lipgloss.AdaptiveColor{
+		Dark:  darkForeground,
+		Light: lightForeground,
+	}
+
+	return theme
+}
+
+func init() {
+	// Register the Dracula theme with the theme manager
+	RegisterTheme("dracula", NewDraculaTheme())
+}

+ 89 - 88
opencode-schema.json

@@ -12,63 +12,63 @@
         "model": {
           "description": "Model ID for the agent",
           "enum": [
-            "azure.o1",
-            "azure.o4-mini",
+            "openrouter.gpt-4.5-preview",
+            "gemini-2.5",
+            "qwen-qwq",
             "openrouter.gpt-4.1-mini",
-            "openrouter.claude-3.7-sonnet",
-            "claude-3-haiku",
-            "o3-mini",
+            "openrouter.o1-mini",
             "gpt-4.1",
-            "gpt-4o",
-            "openrouter.gemini-2.5",
-            "o3",
+            "deepseek-r1-distill-llama-70b",
+            "meta-llama/llama-4-scout-17b-16e-instruct",
+            "bedrock.claude-3.7-sonnet",
+            "gpt-4o-mini",
+            "o1-pro",
+            "claude-3-haiku",
             "gemini-2.5-flash",
-            "gemini-2.0-flash-lite",
-            "openrouter.gpt-4.5-preview",
-            "openrouter.o3-mini",
-            "openrouter.claude-3-opus",
-            "openrouter.o4-mini",
-            "llama-3.3-70b-versatile",
-            "azure.gpt-4.1",
-            "azure.o3-mini",
             "azure.o3",
-            "gpt-4o-mini",
+            "openrouter.gpt-4.1",
+            "openrouter.o1-pro",
+            "openrouter.o4-mini",
+            "o1-mini",
+            "o3",
+            "gpt-4.1-nano",
+            "azure.gpt-4o",
+            "openrouter.claude-3.5-sonnet",
+            "o4-mini",
             "openrouter.gpt-4o",
-            "claude-3.7-sonnet",
             "gemini-2.0-flash",
-            "azure.o1-mini",
-            "openrouter.gpt-4o-mini",
-            "openrouter.o1-mini",
-            "o4-mini",
-            "gemini-2.5",
-            "qwen-qwq",
             "azure.gpt-4o-mini",
-            "azure.gpt-4.1-nano",
-            "bedrock.claude-3.7-sonnet",
-            "o1-pro",
-            "gpt-4.5-preview",
+            "o3-mini",
+            "azure.gpt-4.1",
             "gpt-4.1-mini",
-            "openrouter.o1-pro",
-            "claude-3.5-haiku",
-            "o1",
-            "openrouter.gpt-4.1-nano",
-            "openrouter.claude-3-haiku",
-            "openrouter.claude-3.5-haiku",
-            "openrouter.o3",
-            "claude-3-opus",
+            "azure.o1-mini",
             "openrouter.gemini-2.5-flash",
-            "o1-mini",
-            "deepseek-r1-distill-llama-70b",
+            "gemini-2.0-flash-lite",
             "azure.gpt-4.5-preview",
-            "openrouter.gpt-4.1",
-            "meta-llama/llama-4-maverick-17b-128e-instruct",
-            "openrouter.claude-3.5-sonnet",
+            "azure.o3-mini",
+            "openrouter.claude-3.7-sonnet",
+            "o1",
             "claude-3.5-sonnet",
-            "azure.gpt-4o",
+            "claude-3.5-haiku",
+            "llama-3.3-70b-versatile",
             "azure.gpt-4.1-mini",
+            "openrouter.gemini-2.5",
+            "openrouter.o3-mini",
+            "openrouter.claude-3-opus",
+            "openrouter.gpt-4.1-nano",
+            "openrouter.gpt-4o-mini",
+            "claude-3.7-sonnet",
+            "claude-3-opus",
             "openrouter.o1",
-            "gpt-4.1-nano",
-            "meta-llama/llama-4-scout-17b-16e-instruct"
+            "gpt-4.5-preview",
+            "azure.gpt-4.1-nano",
+            "azure.o1",
+            "openrouter.o3",
+            "openrouter.claude-3-haiku",
+            "gpt-4o",
+            "meta-llama/llama-4-maverick-17b-128e-instruct",
+            "azure.o4-mini",
+            "openrouter.claude-3.5-haiku"
           ],
           "type": "string"
         },
@@ -102,63 +102,63 @@
           "model": {
             "description": "Model ID for the agent",
             "enum": [
-              "azure.o1",
-              "azure.o4-mini",
+              "openrouter.gpt-4.5-preview",
+              "gemini-2.5",
+              "qwen-qwq",
               "openrouter.gpt-4.1-mini",
-              "openrouter.claude-3.7-sonnet",
-              "claude-3-haiku",
-              "o3-mini",
+              "openrouter.o1-mini",
               "gpt-4.1",
-              "gpt-4o",
-              "openrouter.gemini-2.5",
-              "o3",
+              "deepseek-r1-distill-llama-70b",
+              "meta-llama/llama-4-scout-17b-16e-instruct",
+              "bedrock.claude-3.7-sonnet",
+              "gpt-4o-mini",
+              "o1-pro",
+              "claude-3-haiku",
               "gemini-2.5-flash",
-              "gemini-2.0-flash-lite",
-              "openrouter.gpt-4.5-preview",
-              "openrouter.o3-mini",
-              "openrouter.claude-3-opus",
-              "openrouter.o4-mini",
-              "llama-3.3-70b-versatile",
-              "azure.gpt-4.1",
-              "azure.o3-mini",
               "azure.o3",
-              "gpt-4o-mini",
+              "openrouter.gpt-4.1",
+              "openrouter.o1-pro",
+              "openrouter.o4-mini",
+              "o1-mini",
+              "o3",
+              "gpt-4.1-nano",
+              "azure.gpt-4o",
+              "openrouter.claude-3.5-sonnet",
+              "o4-mini",
               "openrouter.gpt-4o",
-              "claude-3.7-sonnet",
               "gemini-2.0-flash",
-              "azure.o1-mini",
-              "openrouter.gpt-4o-mini",
-              "openrouter.o1-mini",
-              "o4-mini",
-              "gemini-2.5",
-              "qwen-qwq",
               "azure.gpt-4o-mini",
-              "azure.gpt-4.1-nano",
-              "bedrock.claude-3.7-sonnet",
-              "o1-pro",
-              "gpt-4.5-preview",
+              "o3-mini",
+              "azure.gpt-4.1",
               "gpt-4.1-mini",
-              "openrouter.o1-pro",
-              "claude-3.5-haiku",
-              "o1",
-              "openrouter.gpt-4.1-nano",
-              "openrouter.claude-3-haiku",
-              "openrouter.claude-3.5-haiku",
-              "openrouter.o3",
-              "claude-3-opus",
+              "azure.o1-mini",
               "openrouter.gemini-2.5-flash",
-              "o1-mini",
-              "deepseek-r1-distill-llama-70b",
+              "gemini-2.0-flash-lite",
               "azure.gpt-4.5-preview",
-              "openrouter.gpt-4.1",
-              "meta-llama/llama-4-maverick-17b-128e-instruct",
-              "openrouter.claude-3.5-sonnet",
+              "azure.o3-mini",
+              "openrouter.claude-3.7-sonnet",
+              "o1",
               "claude-3.5-sonnet",
-              "azure.gpt-4o",
+              "claude-3.5-haiku",
+              "llama-3.3-70b-versatile",
               "azure.gpt-4.1-mini",
+              "openrouter.gemini-2.5",
+              "openrouter.o3-mini",
+              "openrouter.claude-3-opus",
+              "openrouter.gpt-4.1-nano",
+              "openrouter.gpt-4o-mini",
+              "claude-3.7-sonnet",
+              "claude-3-opus",
               "openrouter.o1",
-              "gpt-4.1-nano",
-              "meta-llama/llama-4-scout-17b-16e-instruct"
+              "gpt-4.5-preview",
+              "azure.gpt-4.1-nano",
+              "azure.o1",
+              "openrouter.o3",
+              "openrouter.claude-3-haiku",
+              "gpt-4o",
+              "meta-llama/llama-4-maverick-17b-128e-instruct",
+              "azure.o4-mini",
+              "openrouter.claude-3.5-haiku"
             ],
             "type": "string"
           },
@@ -360,6 +360,7 @@
           "enum": [
             "opencode",
             "catppuccin",
+            "dracula",
             "flexoki",
             "gruvbox",
             "monokai",