wip: refactoring tui

internal/config/config.go

@@ -11,62 +11,13 @@ import (
 	"strings"
 
 	"github.com/spf13/viper"
-	"github.com/sst/opencode/internal/llm/models"
 )
 
-// MCPType defines the type of MCP (Model Control Protocol) server.
-type MCPType string
-
-// Supported MCP types
-const (
-	MCPStdio MCPType = "stdio"
-	MCPSse   MCPType = "sse"
-)
-
-// MCPServer defines the configuration for a Model Control Protocol server.
-type MCPServer struct {
-	Command string            `json:"command"`
-	Env     []string          `json:"env"`
-	Args    []string          `json:"args"`
-	Type    MCPType           `json:"type"`
-	URL     string            `json:"url"`
-	Headers map[string]string `json:"headers"`
-}
-
-type AgentName string
-
-const (
-	AgentPrimary AgentName = "primary"
-	AgentTask    AgentName = "task"
-	AgentTitle   AgentName = "title"
-)
-
-// Agent defines configuration for different LLM models and their token limits.
-type Agent struct {
-	Model           models.ModelID `json:"model"`
-	MaxTokens       int64          `json:"maxTokens"`
-	ReasoningEffort string         `json:"reasoningEffort"` // For openai models low,medium,heigh
-}
-
-// Provider defines configuration for an LLM provider.
-type Provider struct {
-	APIKey   string `json:"apiKey"`
-	Disabled bool   `json:"disabled"`
-}
-
 // Data defines storage configuration.
 type Data struct {
 	Directory string `json:"directory,omitempty"`
 }
 
-// LSPConfig defines configuration for Language Server Protocol integration.
-type LSPConfig struct {
-	Disabled bool     `json:"enabled"`
-	Command  string   `json:"command"`
-	Args     []string `json:"args"`
-	Options  any      `json:"options"`
-}
-
 // TUIConfig defines the configuration for the Terminal User Interface.
 type TUIConfig struct {
 	Theme       string         `json:"theme,omitempty"`
@@ -81,17 +32,13 @@ type ShellConfig struct {
 
 // Config is the main configuration structure for the application.
 type Config struct {
-	Data         Data                              `json:"data"`
-	WorkingDir   string                            `json:"wd,omitempty"`
-	MCPServers   map[string]MCPServer              `json:"mcpServers,omitempty"`
-	Providers    map[models.ModelProvider]Provider `json:"providers,omitempty"`
-	LSP          map[string]LSPConfig              `json:"lsp,omitempty"`
-	Agents       map[AgentName]Agent               `json:"agents,omitempty"`
-	Debug        bool                              `json:"debug,omitempty"`
-	DebugLSP     bool                              `json:"debugLSP,omitempty"`
-	ContextPaths []string                          `json:"contextPaths,omitempty"`
-	TUI          TUIConfig                         `json:"tui"`
-	Shell        ShellConfig                       `json:"shell,omitempty"`
+	Data         Data        `json:"data"`
+	WorkingDir   string      `json:"wd,omitempty"`
+	Debug        bool        `json:"debug,omitempty"`
+	DebugLSP     bool        `json:"debugLSP,omitempty"`
+	ContextPaths []string    `json:"contextPaths,omitempty"`
+	TUI          TUIConfig   `json:"tui"`
+	Shell        ShellConfig `json:"shell,omitempty"`
 }
 
 // Application constants
@@ -132,9 +79,6 @@ func Load(workingDir string, debug bool) (*Config, error) {
 
 	cfg = &Config{
 		WorkingDir: workingDir,
-		MCPServers: make(map[string]MCPServer),
-		Providers:  make(map[models.ModelProvider]Provider),
-		LSP:        make(map[string]LSPConfig),
 	}
 
 	configureViper()
@@ -148,15 +92,11 @@ func Load(workingDir string, debug bool) (*Config, error) {
 	// Load and merge local config
 	mergeLocalConfig(workingDir)
 
-	setProviderDefaults()
-
 	// Apply configuration to the struct
 	if err := viper.Unmarshal(cfg); err != nil {
 		return cfg, fmt.Errorf("failed to unmarshal config: %w", err)
 	}
 
-	applyDefaultValues()
-
 	defaultLevel := slog.LevelInfo
 	if cfg.Debug {
 		defaultLevel = slog.LevelDebug
@@ -167,16 +107,6 @@ func Load(workingDir string, debug bool) (*Config, error) {
 	if err := Validate(); err != nil {
 		return cfg, fmt.Errorf("config validation failed: %w", err)
 	}
-
-	if cfg.Agents == nil {
-		cfg.Agents = make(map[AgentName]Agent)
-	}
-
-	// Override the max tokens for title agent
-	cfg.Agents[AgentTitle] = Agent{
-		Model:     cfg.Agents[AgentTitle].Model,
-		MaxTokens: 80,
-	}
 	return cfg, nil
 }
 
@@ -206,156 +136,6 @@ func setDefaults(debug bool) {
 	}
 }
 
-// setProviderDefaults configures LLM provider defaults based on provider provided by
-// environment variables and configuration file.
-func setProviderDefaults() {
-	// Set all API keys we can find in the environment
-	if apiKey := os.Getenv("ANTHROPIC_API_KEY"); apiKey != "" {
-		viper.SetDefault("providers.anthropic.apiKey", apiKey)
-	}
-	if apiKey := os.Getenv("OPENAI_API_KEY"); apiKey != "" {
-		viper.SetDefault("providers.openai.apiKey", apiKey)
-	}
-	if apiKey := os.Getenv("GEMINI_API_KEY"); apiKey != "" {
-		viper.SetDefault("providers.gemini.apiKey", apiKey)
-	}
-	if apiKey := os.Getenv("GROQ_API_KEY"); apiKey != "" {
-		viper.SetDefault("providers.groq.apiKey", apiKey)
-	}
-	if apiKey := os.Getenv("OPENROUTER_API_KEY"); apiKey != "" {
-		viper.SetDefault("providers.openrouter.apiKey", apiKey)
-	}
-	if apiKey := os.Getenv("XAI_API_KEY"); apiKey != "" {
-		viper.SetDefault("providers.xai.apiKey", apiKey)
-	}
-	if apiKey := os.Getenv("AZURE_OPENAI_ENDPOINT"); apiKey != "" {
-		// api-key may be empty when using Entra ID credentials – that's okay
-		viper.SetDefault("providers.azure.apiKey", os.Getenv("AZURE_OPENAI_API_KEY"))
-	}
-
-	// Use this order to set the default models
-	// 1. Anthropic
-	// 2. OpenAI
-	// 3. Google Gemini
-	// 4. Groq
-	// 5. OpenRouter
-	// 6. AWS Bedrock
-	// 7. Azure
-	// 8. Google Cloud VertexAI
-
-	// Anthropic configuration
-	if key := viper.GetString("providers.anthropic.apiKey"); strings.TrimSpace(key) != "" {
-		viper.SetDefault("agents.primary.model", models.Claude4Sonnet)
-		viper.SetDefault("agents.task.model", models.Claude4Sonnet)
-		viper.SetDefault("agents.title.model", models.Claude4Sonnet)
-		return
-	}
-
-	// OpenAI configuration
-	if key := viper.GetString("providers.openai.apiKey"); strings.TrimSpace(key) != "" {
-		viper.SetDefault("agents.primary.model", models.GPT41)
-		viper.SetDefault("agents.task.model", models.GPT41Mini)
-		viper.SetDefault("agents.title.model", models.GPT41Mini)
-		return
-	}
-
-	// Google Gemini configuration
-	if key := viper.GetString("providers.gemini.apiKey"); strings.TrimSpace(key) != "" {
-		viper.SetDefault("agents.primary.model", models.Gemini25)
-		viper.SetDefault("agents.task.model", models.Gemini25Flash)
-		viper.SetDefault("agents.title.model", models.Gemini25Flash)
-		return
-	}
-
-	// Groq configuration
-	if key := viper.GetString("providers.groq.apiKey"); strings.TrimSpace(key) != "" {
-		viper.SetDefault("agents.primary.model", models.QWENQwq)
-		viper.SetDefault("agents.task.model", models.QWENQwq)
-		viper.SetDefault("agents.title.model", models.QWENQwq)
-		return
-	}
-
-	// OpenRouter configuration
-	if key := viper.GetString("providers.openrouter.apiKey"); strings.TrimSpace(key) != "" {
-		viper.SetDefault("agents.primary.model", models.OpenRouterClaude37Sonnet)
-		viper.SetDefault("agents.task.model", models.OpenRouterClaude37Sonnet)
-		viper.SetDefault("agents.title.model", models.OpenRouterClaude35Haiku)
-		return
-	}
-
-	// XAI configuration
-	if key := viper.GetString("providers.xai.apiKey"); strings.TrimSpace(key) != "" {
-		viper.SetDefault("agents.primary.model", models.XAIGrok3Beta)
-		viper.SetDefault("agents.task.model", models.XAIGrok3Beta)
-		viper.SetDefault("agents.title.model", models.XAiGrok3MiniFastBeta)
-		return
-	}
-
-	// AWS Bedrock configuration
-	if hasAWSCredentials() {
-		viper.SetDefault("agents.primary.model", models.BedrockClaude37Sonnet)
-		viper.SetDefault("agents.task.model", models.BedrockClaude37Sonnet)
-		viper.SetDefault("agents.title.model", models.BedrockClaude37Sonnet)
-		return
-	}
-
-	// Azure OpenAI configuration
-	if os.Getenv("AZURE_OPENAI_ENDPOINT") != "" {
-		viper.SetDefault("agents.primary.model", models.AzureGPT41)
-		viper.SetDefault("agents.task.model", models.AzureGPT41Mini)
-		viper.SetDefault("agents.title.model", models.AzureGPT41Mini)
-		return
-	}
-
-	// Google Cloud VertexAI configuration
-	if hasVertexAICredentials() {
-		viper.SetDefault("agents.coder.model", models.VertexAIGemini25)
-		viper.SetDefault("agents.summarizer.model", models.VertexAIGemini25)
-		viper.SetDefault("agents.task.model", models.VertexAIGemini25Flash)
-		viper.SetDefault("agents.title.model", models.VertexAIGemini25Flash)
-		return
-	}
-}
-
-// hasAWSCredentials checks if AWS credentials are available in the environment.
-func hasAWSCredentials() bool {
-	// Check for explicit AWS credentials
-	if os.Getenv("AWS_ACCESS_KEY_ID") != "" && os.Getenv("AWS_SECRET_ACCESS_KEY") != "" {
-		return true
-	}
-
-	// Check for AWS profile
-	if os.Getenv("AWS_PROFILE") != "" || os.Getenv("AWS_DEFAULT_PROFILE") != "" {
-		return true
-	}
-
-	// Check for AWS region
-	if os.Getenv("AWS_REGION") != "" || os.Getenv("AWS_DEFAULT_REGION") != "" {
-		return true
-	}
-
-	// Check if running on EC2 with instance profile
-	if os.Getenv("AWS_CONTAINER_CREDENTIALS_RELATIVE_URI") != "" ||
-		os.Getenv("AWS_CONTAINER_CREDENTIALS_FULL_URI") != "" {
-		return true
-	}
-
-	return false
-}
-
-// hasVertexAICredentials checks if VertexAI credentials are available in the environment.
-func hasVertexAICredentials() bool {
-	// Check for explicit VertexAI parameters
-	if os.Getenv("VERTEXAI_PROJECT") != "" && os.Getenv("VERTEXAI_LOCATION") != "" {
-		return true
-	}
-	// Check for Google Cloud project and location
-	if os.Getenv("GOOGLE_CLOUD_PROJECT") != "" && (os.Getenv("GOOGLE_CLOUD_REGION") != "" || os.Getenv("GOOGLE_CLOUD_LOCATION") != "") {
-		return true
-	}
-	return false
-}
-
 // readConfig handles the result of reading a configuration file.
 func readConfig(err error) error {
 	if err == nil {
@@ -383,346 +163,15 @@ func mergeLocalConfig(workingDir string) {
 	}
 }
 
-// applyDefaultValues sets default values for configuration fields that need processing.
-func applyDefaultValues() {
-	// Set default MCP type if not specified
-	for k, v := range cfg.MCPServers {
-		if v.Type == "" {
-			v.Type = MCPStdio
-			cfg.MCPServers[k] = v
-		}
-	}
-}
-
-// It validates model IDs and providers, ensuring they are supported.
-func validateAgent(cfg *Config, name AgentName, agent Agent) error {
-	// Check if model exists
-	model, modelExists := models.SupportedModels[agent.Model]
-	if !modelExists {
-		slog.Warn("unsupported model configured, reverting to default",
-			"agent", name,
-			"configured_model", agent.Model)
-
-		// Set default model based on available providers
-		if setDefaultModelForAgent(name) {
-			slog.Info("set default model for agent", "agent", name, "model", cfg.Agents[name].Model)
-		} else {
-			return fmt.Errorf("no valid provider available for agent %s", name)
-		}
-		return nil
-	}
-
-	// Check if provider for the model is configured
-	provider := model.Provider
-	providerCfg, providerExists := cfg.Providers[provider]
-
-	if !providerExists {
-		// Provider not configured, check if we have environment variables
-		apiKey := getProviderAPIKey(provider)
-		if apiKey == "" {
-			slog.Warn("provider not configured for model, reverting to default",
-				"agent", name,
-				"model", agent.Model,
-				"provider", provider)
-
-			// Set default model based on available providers
-			if setDefaultModelForAgent(name) {
-				slog.Info("set default model for agent", "agent", name, "model", cfg.Agents[name].Model)
-			} else {
-				return fmt.Errorf("no valid provider available for agent %s", name)
-			}
-		} else {
-			// Add provider with API key from environment
-			cfg.Providers[provider] = Provider{
-				APIKey: apiKey,
-			}
-			slog.Info("added provider from environment", "provider", provider)
-		}
-	} else if providerCfg.Disabled || providerCfg.APIKey == "" {
-		// Provider is disabled or has no API key
-		slog.Warn("provider is disabled or has no API key, reverting to default",
-			"agent", name,
-			"model", agent.Model,
-			"provider", provider)
-
-		// Set default model based on available providers
-		if setDefaultModelForAgent(name) {
-			slog.Info("set default model for agent", "agent", name, "model", cfg.Agents[name].Model)
-		} else {
-			return fmt.Errorf("no valid provider available for agent %s", name)
-		}
-	}
-
-	// Validate max tokens
-	if agent.MaxTokens <= 0 {
-		slog.Warn("invalid max tokens, setting to default",
-			"agent", name,
-			"model", agent.Model,
-			"max_tokens", agent.MaxTokens)
-
-		// Update the agent with default max tokens
-		updatedAgent := cfg.Agents[name]
-		if model.DefaultMaxTokens > 0 {
-			updatedAgent.MaxTokens = model.DefaultMaxTokens
-		} else {
-			updatedAgent.MaxTokens = MaxTokensFallbackDefault
-		}
-		cfg.Agents[name] = updatedAgent
-	} else if model.ContextWindow > 0 && agent.MaxTokens > model.ContextWindow/2 {
-		// Ensure max tokens doesn't exceed half the context window (reasonable limit)
-		slog.Warn("max tokens exceeds half the context window, adjusting",
-			"agent", name,
-			"model", agent.Model,
-			"max_tokens", agent.MaxTokens,
-			"context_window", model.ContextWindow)
-
-		// Update the agent with adjusted max tokens
-		updatedAgent := cfg.Agents[name]
-		updatedAgent.MaxTokens = model.ContextWindow / 2
-		cfg.Agents[name] = updatedAgent
-	}
-
-	// Validate reasoning effort for models that support reasoning
-	if model.CanReason && provider == models.ProviderOpenAI {
-		if agent.ReasoningEffort == "" {
-			// Set default reasoning effort for models that support it
-			slog.Info("setting default reasoning effort for model that supports reasoning",
-				"agent", name,
-				"model", agent.Model)
-
-			// Update the agent with default reasoning effort
-			updatedAgent := cfg.Agents[name]
-			updatedAgent.ReasoningEffort = "medium"
-			cfg.Agents[name] = updatedAgent
-		} else {
-			// Check if reasoning effort is valid (low, medium, high)
-			effort := strings.ToLower(agent.ReasoningEffort)
-			if effort != "low" && effort != "medium" && effort != "high" {
-				slog.Warn("invalid reasoning effort, setting to medium",
-					"agent", name,
-					"model", agent.Model,
-					"reasoning_effort", agent.ReasoningEffort)
-
-				// Update the agent with valid reasoning effort
-				updatedAgent := cfg.Agents[name]
-				updatedAgent.ReasoningEffort = "medium"
-				cfg.Agents[name] = updatedAgent
-			}
-		}
-	} else if !model.CanReason && agent.ReasoningEffort != "" {
-		// Model doesn't support reasoning but reasoning effort is set
-		slog.Warn("model doesn't support reasoning but reasoning effort is set, ignoring",
-			"agent", name,
-			"model", agent.Model,
-			"reasoning_effort", agent.ReasoningEffort)
-
-		// Update the agent to remove reasoning effort
-		updatedAgent := cfg.Agents[name]
-		updatedAgent.ReasoningEffort = ""
-		cfg.Agents[name] = updatedAgent
-	}
-
-	return nil
-}
-
 // Validate checks if the configuration is valid and applies defaults where needed.
 func Validate() error {
 	if cfg == nil {
 		return fmt.Errorf("config not loaded")
 	}
 
-	// Validate agent models
-	for name, agent := range cfg.Agents {
-		if err := validateAgent(cfg, name, agent); err != nil {
-			return err
-		}
-	}
-
-	// Validate providers
-	for provider, providerCfg := range cfg.Providers {
-		if providerCfg.APIKey == "" && !providerCfg.Disabled {
-			slog.Warn("provider has no API key, marking as disabled", "provider", provider)
-			providerCfg.Disabled = true
-			cfg.Providers[provider] = providerCfg
-		}
-	}
-
-	// Validate LSP configurations
-	for language, lspConfig := range cfg.LSP {
-		if lspConfig.Command == "" && !lspConfig.Disabled {
-			slog.Warn("LSP configuration has no command, marking as disabled", "language", language)
-			lspConfig.Disabled = true
-			cfg.LSP[language] = lspConfig
-		}
-	}
-
 	return nil
 }
 
-// getProviderAPIKey gets the API key for a provider from environment variables
-func getProviderAPIKey(provider models.ModelProvider) string {
-	switch provider {
-	case models.ProviderAnthropic:
-		return os.Getenv("ANTHROPIC_API_KEY")
-	case models.ProviderOpenAI:
-		return os.Getenv("OPENAI_API_KEY")
-	case models.ProviderGemini:
-		return os.Getenv("GEMINI_API_KEY")
-	case models.ProviderGROQ:
-		return os.Getenv("GROQ_API_KEY")
-	case models.ProviderAzure:
-		return os.Getenv("AZURE_OPENAI_API_KEY")
-	case models.ProviderOpenRouter:
-		return os.Getenv("OPENROUTER_API_KEY")
-	case models.ProviderBedrock:
-		if hasAWSCredentials() {
-			return "aws-credentials-available"
-		}
-	case models.ProviderVertexAI:
-		if hasVertexAICredentials() {
-			return "vertex-ai-credentials-available"
-		}
-	}
-	return ""
-}
-
-// setDefaultModelForAgent sets a default model for an agent based on available providers
-func setDefaultModelForAgent(agent AgentName) bool {
-	// Check providers in order of preference
-	if apiKey := os.Getenv("ANTHROPIC_API_KEY"); apiKey != "" {
-		maxTokens := int64(5000)
-		if agent == AgentTitle {
-			maxTokens = 80
-		}
-		cfg.Agents[agent] = Agent{
-			Model:     models.Claude4Sonnet,
-			MaxTokens: maxTokens,
-		}
-		return true
-	}
-
-	if apiKey := os.Getenv("OPENAI_API_KEY"); apiKey != "" {
-		var model models.ModelID
-		maxTokens := int64(5000)
-		reasoningEffort := ""
-
-		switch agent {
-		case AgentTitle:
-			model = models.GPT41Mini
-			maxTokens = 80
-		case AgentTask:
-			model = models.GPT41Mini
-		default:
-			model = models.GPT41
-		}
-
-		// Check if model supports reasoning
-		if modelInfo, ok := models.SupportedModels[model]; ok && modelInfo.CanReason {
-			reasoningEffort = "medium"
-		}
-
-		cfg.Agents[agent] = Agent{
-			Model:           model,
-			MaxTokens:       maxTokens,
-			ReasoningEffort: reasoningEffort,
-		}
-		return true
-	}
-
-	if apiKey := os.Getenv("OPENROUTER_API_KEY"); apiKey != "" {
-		var model models.ModelID
-		maxTokens := int64(5000)
-		reasoningEffort := ""
-
-		switch agent {
-		case AgentTitle:
-			model = models.OpenRouterClaude35Haiku
-			maxTokens = 80
-		case AgentTask:
-			model = models.OpenRouterClaude37Sonnet
-		default:
-			model = models.OpenRouterClaude37Sonnet
-		}
-
-		// Check if model supports reasoning
-		if modelInfo, ok := models.SupportedModels[model]; ok && modelInfo.CanReason {
-			reasoningEffort = "medium"
-		}
-
-		cfg.Agents[agent] = Agent{
-			Model:           model,
-			MaxTokens:       maxTokens,
-			ReasoningEffort: reasoningEffort,
-		}
-		return true
-	}
-
-	if apiKey := os.Getenv("GEMINI_API_KEY"); apiKey != "" {
-		var model models.ModelID
-		maxTokens := int64(5000)
-
-		if agent == AgentTitle {
-			model = models.Gemini25Flash
-			maxTokens = 80
-		} else {
-			model = models.Gemini25
-		}
-
-		cfg.Agents[agent] = Agent{
-			Model:     model,
-			MaxTokens: maxTokens,
-		}
-		return true
-	}
-
-	if apiKey := os.Getenv("GROQ_API_KEY"); apiKey != "" {
-		maxTokens := int64(5000)
-		if agent == AgentTitle {
-			maxTokens = 80
-		}
-
-		cfg.Agents[agent] = Agent{
-			Model:     models.QWENQwq,
-			MaxTokens: maxTokens,
-		}
-		return true
-	}
-
-	if hasAWSCredentials() {
-		maxTokens := int64(5000)
-		if agent == AgentTitle {
-			maxTokens = 80
-		}
-
-		cfg.Agents[agent] = Agent{
-			Model:           models.BedrockClaude37Sonnet,
-			MaxTokens:       maxTokens,
-			ReasoningEffort: "medium", // Claude models support reasoning
-		}
-		return true
-	}
-
-	if hasVertexAICredentials() {
-		var model models.ModelID
-		maxTokens := int64(5000)
-
-		if agent == AgentTitle {
-			model = models.VertexAIGemini25Flash
-			maxTokens = 80
-		} else {
-			model = models.VertexAIGemini25
-		}
-
-		cfg.Agents[agent] = Agent{
-			Model:     model,
-			MaxTokens: maxTokens,
-		}
-		return true
-	}
-
-	return false
-}
-
 // Get returns the current configuration.
 // It's safe to call this function multiple times.
 func Get() *Config {
@@ -801,44 +250,6 @@ func updateCfgFile(updateCfg func(config *Config)) error {
 	return nil
 }
 
-func UpdateAgentModel(agentName AgentName, modelID models.ModelID) error {
-	if cfg == nil {
-		panic("config not loaded")
-	}
-
-	existingAgentCfg := cfg.Agents[agentName]
-
-	model, ok := models.SupportedModels[modelID]
-	if !ok {
-		return fmt.Errorf("model %s not supported", modelID)
-	}
-
-	maxTokens := existingAgentCfg.MaxTokens
-	if model.DefaultMaxTokens > 0 {
-		maxTokens = model.DefaultMaxTokens
-	}
-
-	newAgentCfg := Agent{
-		Model:           modelID,
-		MaxTokens:       maxTokens,
-		ReasoningEffort: existingAgentCfg.ReasoningEffort,
-	}
-	cfg.Agents[agentName] = newAgentCfg
-
-	if err := validateAgent(cfg, agentName, newAgentCfg); err != nil {
-		// revert config update on failure
-		cfg.Agents[agentName] = existingAgentCfg
-		return fmt.Errorf("failed to update agent model: %w", err)
-	}
-
-	return updateCfgFile(func(config *Config) {
-		if config.Agents == nil {
-			config.Agents = make(map[AgentName]Agent)
-		}
-		config.Agents[agentName] = newAgentCfg
-	})
-}
-
 // UpdateTheme updates the theme in the configuration and writes it to the config file.
 func UpdateTheme(themeName string) error {
 	if cfg == nil {

internal/llm/models/anthropic.go

@@ -1,97 +0,0 @@
-package models
-
-const (
-	ProviderAnthropic ModelProvider = "anthropic"
-
-	// Models
-	Claude35Sonnet ModelID = "claude-3.5-sonnet"
-	Claude3Haiku   ModelID = "claude-3-haiku"
-	Claude37Sonnet ModelID = "claude-3.7-sonnet"
-	Claude35Haiku  ModelID = "claude-3.5-haiku"
-	Claude3Opus    ModelID = "claude-3-opus"
-	Claude4Sonnet  ModelID = "claude-4-sonnet"
-)
-
-// https://docs.anthropic.com/en/docs/about-claude/models/all-models
-var AnthropicModels = map[ModelID]Model{
-	Claude35Sonnet: {
-		ID:                  Claude35Sonnet,
-		Name:                "Claude 3.5 Sonnet",
-		Provider:            ProviderAnthropic,
-		APIModel:            "claude-3-5-sonnet-latest",
-		CostPer1MIn:         3.0,
-		CostPer1MInCached:   3.75,
-		CostPer1MOutCached:  0.30,
-		CostPer1MOut:        15.0,
-		ContextWindow:       200000,
-		DefaultMaxTokens:    5000,
-		SupportsAttachments: true,
-	},
-	Claude3Haiku: {
-		ID:                  Claude3Haiku,
-		Name:                "Claude 3 Haiku",
-		Provider:            ProviderAnthropic,
-		APIModel:            "claude-3-haiku-20240307", // doesn't support "-latest"
-		CostPer1MIn:         0.25,
-		CostPer1MInCached:   0.30,
-		CostPer1MOutCached:  0.03,
-		CostPer1MOut:        1.25,
-		ContextWindow:       200000,
-		DefaultMaxTokens:    4096,
-		SupportsAttachments: true,
-	},
-	Claude37Sonnet: {
-		ID:                  Claude37Sonnet,
-		Name:                "Claude 3.7 Sonnet",
-		Provider:            ProviderAnthropic,
-		APIModel:            "claude-3-7-sonnet-latest",
-		CostPer1MIn:         3.0,
-		CostPer1MInCached:   3.75,
-		CostPer1MOutCached:  0.30,
-		CostPer1MOut:        15.0,
-		ContextWindow:       200000,
-		DefaultMaxTokens:    50000,
-		CanReason:           true,
-		SupportsAttachments: true,
-	},
-	Claude4Sonnet: {
-		ID:                  Claude4Sonnet,
-		Name:                "Claude 4 Sonnet",
-		Provider:            ProviderAnthropic,
-		APIModel:            "claude-sonnet-4-20250514",
-		CostPer1MIn:         3.0,
-		CostPer1MInCached:   3.75,
-		CostPer1MOutCached:  0.30,
-		CostPer1MOut:        15.0,
-		ContextWindow:       200000,
-		DefaultMaxTokens:    50000,
-		CanReason:           true,
-		SupportsAttachments: true,
-	},
-	Claude35Haiku: {
-		ID:                  Claude35Haiku,
-		Name:                "Claude 3.5 Haiku",
-		Provider:            ProviderAnthropic,
-		APIModel:            "claude-3-5-haiku-latest",
-		CostPer1MIn:         0.80,
-		CostPer1MInCached:   1.0,
-		CostPer1MOutCached:  0.08,
-		CostPer1MOut:        4.0,
-		ContextWindow:       200000,
-		DefaultMaxTokens:    4096,
-		SupportsAttachments: true,
-	},
-	Claude3Opus: {
-		ID:                  Claude3Opus,
-		Name:                "Claude 3 Opus",
-		Provider:            ProviderAnthropic,
-		APIModel:            "claude-3-opus-latest",
-		CostPer1MIn:         15.0,
-		CostPer1MInCached:   18.75,
-		CostPer1MOutCached:  1.50,
-		CostPer1MOut:        75.0,
-		ContextWindow:       200000,
-		DefaultMaxTokens:    4096,
-		SupportsAttachments: true,
-	},
-}

internal/llm/models/azure.go

@@ -1,168 +0,0 @@
-package models
-
-const ProviderAzure ModelProvider = "azure"
-
-const (
-	AzureGPT41        ModelID = "azure.gpt-4.1"
-	AzureGPT41Mini    ModelID = "azure.gpt-4.1-mini"
-	AzureGPT41Nano    ModelID = "azure.gpt-4.1-nano"
-	AzureGPT45Preview ModelID = "azure.gpt-4.5-preview"
-	AzureGPT4o        ModelID = "azure.gpt-4o"
-	AzureGPT4oMini    ModelID = "azure.gpt-4o-mini"
-	AzureO1           ModelID = "azure.o1"
-	AzureO1Mini       ModelID = "azure.o1-mini"
-	AzureO3           ModelID = "azure.o3"
-	AzureO3Mini       ModelID = "azure.o3-mini"
-	AzureO4Mini       ModelID = "azure.o4-mini"
-)
-
-var AzureModels = map[ModelID]Model{
-	AzureGPT41: {
-		ID:                  AzureGPT41,
-		Name:                "Azure OpenAI – GPT 4.1",
-		Provider:            ProviderAzure,
-		APIModel:            "gpt-4.1",
-		CostPer1MIn:         OpenAIModels[GPT41].CostPer1MIn,
-		CostPer1MInCached:   OpenAIModels[GPT41].CostPer1MInCached,
-		CostPer1MOut:        OpenAIModels[GPT41].CostPer1MOut,
-		CostPer1MOutCached:  OpenAIModels[GPT41].CostPer1MOutCached,
-		ContextWindow:       OpenAIModels[GPT41].ContextWindow,
-		DefaultMaxTokens:    OpenAIModels[GPT41].DefaultMaxTokens,
-		SupportsAttachments: true,
-	},
-	AzureGPT41Mini: {
-		ID:                  AzureGPT41Mini,
-		Name:                "Azure OpenAI – GPT 4.1 mini",
-		Provider:            ProviderAzure,
-		APIModel:            "gpt-4.1-mini",
-		CostPer1MIn:         OpenAIModels[GPT41Mini].CostPer1MIn,
-		CostPer1MInCached:   OpenAIModels[GPT41Mini].CostPer1MInCached,
-		CostPer1MOut:        OpenAIModels[GPT41Mini].CostPer1MOut,
-		CostPer1MOutCached:  OpenAIModels[GPT41Mini].CostPer1MOutCached,
-		ContextWindow:       OpenAIModels[GPT41Mini].ContextWindow,
-		DefaultMaxTokens:    OpenAIModels[GPT41Mini].DefaultMaxTokens,
-		SupportsAttachments: true,
-	},
-	AzureGPT41Nano: {
-		ID:                  AzureGPT41Nano,
-		Name:                "Azure OpenAI – GPT 4.1 nano",
-		Provider:            ProviderAzure,
-		APIModel:            "gpt-4.1-nano",
-		CostPer1MIn:         OpenAIModels[GPT41Nano].CostPer1MIn,
-		CostPer1MInCached:   OpenAIModels[GPT41Nano].CostPer1MInCached,
-		CostPer1MOut:        OpenAIModels[GPT41Nano].CostPer1MOut,
-		CostPer1MOutCached:  OpenAIModels[GPT41Nano].CostPer1MOutCached,
-		ContextWindow:       OpenAIModels[GPT41Nano].ContextWindow,
-		DefaultMaxTokens:    OpenAIModels[GPT41Nano].DefaultMaxTokens,
-		SupportsAttachments: true,
-	},
-	AzureGPT45Preview: {
-		ID:                  AzureGPT45Preview,
-		Name:                "Azure OpenAI – GPT 4.5 preview",
-		Provider:            ProviderAzure,
-		APIModel:            "gpt-4.5-preview",
-		CostPer1MIn:         OpenAIModels[GPT45Preview].CostPer1MIn,
-		CostPer1MInCached:   OpenAIModels[GPT45Preview].CostPer1MInCached,
-		CostPer1MOut:        OpenAIModels[GPT45Preview].CostPer1MOut,
-		CostPer1MOutCached:  OpenAIModels[GPT45Preview].CostPer1MOutCached,
-		ContextWindow:       OpenAIModels[GPT45Preview].ContextWindow,
-		DefaultMaxTokens:    OpenAIModels[GPT45Preview].DefaultMaxTokens,
-		SupportsAttachments: true,
-	},
-	AzureGPT4o: {
-		ID:                  AzureGPT4o,
-		Name:                "Azure OpenAI – GPT-4o",
-		Provider:            ProviderAzure,
-		APIModel:            "gpt-4o",
-		CostPer1MIn:         OpenAIModels[GPT4o].CostPer1MIn,
-		CostPer1MInCached:   OpenAIModels[GPT4o].CostPer1MInCached,
-		CostPer1MOut:        OpenAIModels[GPT4o].CostPer1MOut,
-		CostPer1MOutCached:  OpenAIModels[GPT4o].CostPer1MOutCached,
-		ContextWindow:       OpenAIModels[GPT4o].ContextWindow,
-		DefaultMaxTokens:    OpenAIModels[GPT4o].DefaultMaxTokens,
-		SupportsAttachments: true,
-	},
-	AzureGPT4oMini: {
-		ID:                  AzureGPT4oMini,
-		Name:                "Azure OpenAI – GPT-4o mini",
-		Provider:            ProviderAzure,
-		APIModel:            "gpt-4o-mini",
-		CostPer1MIn:         OpenAIModels[GPT4oMini].CostPer1MIn,
-		CostPer1MInCached:   OpenAIModels[GPT4oMini].CostPer1MInCached,
-		CostPer1MOut:        OpenAIModels[GPT4oMini].CostPer1MOut,
-		CostPer1MOutCached:  OpenAIModels[GPT4oMini].CostPer1MOutCached,
-		ContextWindow:       OpenAIModels[GPT4oMini].ContextWindow,
-		DefaultMaxTokens:    OpenAIModels[GPT4oMini].DefaultMaxTokens,
-		SupportsAttachments: true,
-	},
-	AzureO1: {
-		ID:                  AzureO1,
-		Name:                "Azure OpenAI – O1",
-		Provider:            ProviderAzure,
-		APIModel:            "o1",
-		CostPer1MIn:         OpenAIModels[O1].CostPer1MIn,
-		CostPer1MInCached:   OpenAIModels[O1].CostPer1MInCached,
-		CostPer1MOut:        OpenAIModels[O1].CostPer1MOut,
-		CostPer1MOutCached:  OpenAIModels[O1].CostPer1MOutCached,
-		ContextWindow:       OpenAIModels[O1].ContextWindow,
-		DefaultMaxTokens:    OpenAIModels[O1].DefaultMaxTokens,
-		CanReason:           OpenAIModels[O1].CanReason,
-		SupportsAttachments: true,
-	},
-	AzureO1Mini: {
-		ID:                  AzureO1Mini,
-		Name:                "Azure OpenAI – O1 mini",
-		Provider:            ProviderAzure,
-		APIModel:            "o1-mini",
-		CostPer1MIn:         OpenAIModels[O1Mini].CostPer1MIn,
-		CostPer1MInCached:   OpenAIModels[O1Mini].CostPer1MInCached,
-		CostPer1MOut:        OpenAIModels[O1Mini].CostPer1MOut,
-		CostPer1MOutCached:  OpenAIModels[O1Mini].CostPer1MOutCached,
-		ContextWindow:       OpenAIModels[O1Mini].ContextWindow,
-		DefaultMaxTokens:    OpenAIModels[O1Mini].DefaultMaxTokens,
-		CanReason:           OpenAIModels[O1Mini].CanReason,
-		SupportsAttachments: true,
-	},
-	AzureO3: {
-		ID:                  AzureO3,
-		Name:                "Azure OpenAI – O3",
-		Provider:            ProviderAzure,
-		APIModel:            "o3",
-		CostPer1MIn:         OpenAIModels[O3].CostPer1MIn,
-		CostPer1MInCached:   OpenAIModels[O3].CostPer1MInCached,
-		CostPer1MOut:        OpenAIModels[O3].CostPer1MOut,
-		CostPer1MOutCached:  OpenAIModels[O3].CostPer1MOutCached,
-		ContextWindow:       OpenAIModels[O3].ContextWindow,
-		DefaultMaxTokens:    OpenAIModels[O3].DefaultMaxTokens,
-		CanReason:           OpenAIModels[O3].CanReason,
-		SupportsAttachments: true,
-	},
-	AzureO3Mini: {
-		ID:                  AzureO3Mini,
-		Name:                "Azure OpenAI – O3 mini",
-		Provider:            ProviderAzure,
-		APIModel:            "o3-mini",
-		CostPer1MIn:         OpenAIModels[O3Mini].CostPer1MIn,
-		CostPer1MInCached:   OpenAIModels[O3Mini].CostPer1MInCached,
-		CostPer1MOut:        OpenAIModels[O3Mini].CostPer1MOut,
-		CostPer1MOutCached:  OpenAIModels[O3Mini].CostPer1MOutCached,
-		ContextWindow:       OpenAIModels[O3Mini].ContextWindow,
-		DefaultMaxTokens:    OpenAIModels[O3Mini].DefaultMaxTokens,
-		CanReason:           OpenAIModels[O3Mini].CanReason,
-		SupportsAttachments: false,
-	},
-	AzureO4Mini: {
-		ID:                  AzureO4Mini,
-		Name:                "Azure OpenAI – O4 mini",
-		Provider:            ProviderAzure,
-		APIModel:            "o4-mini",
-		CostPer1MIn:         OpenAIModels[O4Mini].CostPer1MIn,
-		CostPer1MInCached:   OpenAIModels[O4Mini].CostPer1MInCached,
-		CostPer1MOut:        OpenAIModels[O4Mini].CostPer1MOut,
-		CostPer1MOutCached:  OpenAIModels[O4Mini].CostPer1MOutCached,
-		ContextWindow:       OpenAIModels[O4Mini].ContextWindow,
-		DefaultMaxTokens:    OpenAIModels[O4Mini].DefaultMaxTokens,
-		CanReason:           OpenAIModels[O4Mini].CanReason,
-		SupportsAttachments: true,
-	},
-}

internal/llm/models/bedrock.go

@@ -1,25 +0,0 @@
-package models
-
-const (
-	ProviderBedrock ModelProvider = "bedrock"
-
-	// Models
-	BedrockClaude37Sonnet ModelID = "bedrock.claude-3.7-sonnet"
-)
-
-var BedrockModels = map[ModelID]Model{
-	BedrockClaude37Sonnet: {
-		ID:                  BedrockClaude37Sonnet,
-		Name:                "Bedrock: Claude 3.7 Sonnet",
-		Provider:            ProviderBedrock,
-		APIModel:            "anthropic.claude-3-7-sonnet-20250219-v1:0",
-		CostPer1MIn:         3.0,
-		CostPer1MInCached:   3.75,
-		CostPer1MOutCached:  0.30,
-		CostPer1MOut:        15.0,
-		ContextWindow:       200_000,
-		DefaultMaxTokens:    50_000,
-		CanReason:           true,
-		SupportsAttachments: true,
-	},
-}

internal/llm/models/gemini.go

@@ -1,67 +0,0 @@
-package models
-
-const (
-	ProviderGemini ModelProvider = "gemini"
-
-	// Models
-	Gemini25Flash     ModelID = "gemini-2.5-flash"
-	Gemini25          ModelID = "gemini-2.5"
-	Gemini20Flash     ModelID = "gemini-2.0-flash"
-	Gemini20FlashLite ModelID = "gemini-2.0-flash-lite"
-)
-
-var GeminiModels = map[ModelID]Model{
-	Gemini25Flash: {
-		ID:                  Gemini25Flash,
-		Name:                "Gemini 2.5 Flash",
-		Provider:            ProviderGemini,
-		APIModel:            "gemini-2.5-flash-preview-04-17",
-		CostPer1MIn:         0.15,
-		CostPer1MInCached:   0,
-		CostPer1MOutCached:  0,
-		CostPer1MOut:        0.60,
-		ContextWindow:       1000000,
-		DefaultMaxTokens:    50000,
-		SupportsAttachments: true,
-	},
-	Gemini25: {
-		ID:                  Gemini25,
-		Name:                "Gemini 2.5 Pro",
-		Provider:            ProviderGemini,
-		APIModel:            "gemini-2.5-pro-preview-03-25",
-		CostPer1MIn:         1.25,
-		CostPer1MInCached:   0,
-		CostPer1MOutCached:  0,
-		CostPer1MOut:        10,
-		ContextWindow:       1000000,
-		DefaultMaxTokens:    50000,
-		SupportsAttachments: true,
-	},
-
-	Gemini20Flash: {
-		ID:                  Gemini20Flash,
-		Name:                "Gemini 2.0 Flash",
-		Provider:            ProviderGemini,
-		APIModel:            "gemini-2.0-flash",
-		CostPer1MIn:         0.10,
-		CostPer1MInCached:   0,
-		CostPer1MOutCached:  0,
-		CostPer1MOut:        0.40,
-		ContextWindow:       1000000,
-		DefaultMaxTokens:    6000,
-		SupportsAttachments: true,
-	},
-	Gemini20FlashLite: {
-		ID:                  Gemini20FlashLite,
-		Name:                "Gemini 2.0 Flash Lite",
-		Provider:            ProviderGemini,
-		APIModel:            "gemini-2.0-flash-lite",
-		CostPer1MIn:         0.05,
-		CostPer1MInCached:   0,
-		CostPer1MOutCached:  0,
-		CostPer1MOut:        0.30,
-		ContextWindow:       1000000,
-		DefaultMaxTokens:    6000,
-		SupportsAttachments: true,
-	},
-}

internal/llm/models/groq.go

@@ -1,89 +0,0 @@
-package models
-
-const (
-	ProviderGROQ ModelProvider = "groq"
-
-	// GROQ
-	QWENQwq ModelID = "qwen-qwq"
-
-	// GROQ preview models
-	Llama4Scout               ModelID = "meta-llama/llama-4-scout-17b-16e-instruct"
-	Llama4Maverick            ModelID = "meta-llama/llama-4-maverick-17b-128e-instruct"
-	Llama3_3_70BVersatile     ModelID = "llama-3.3-70b-versatile"
-	DeepseekR1DistillLlama70b ModelID = "deepseek-r1-distill-llama-70b"
-)
-
-var GroqModels = map[ModelID]Model{
-	//
-	// GROQ
-	QWENQwq: {
-		ID:                 QWENQwq,
-		Name:               "Qwen Qwq",
-		Provider:           ProviderGROQ,
-		APIModel:           "qwen-qwq-32b",
-		CostPer1MIn:        0.29,
-		CostPer1MInCached:  0.275,
-		CostPer1MOutCached: 0.0,
-		CostPer1MOut:       0.39,
-		ContextWindow:      128_000,
-		DefaultMaxTokens:   50000,
-		// for some reason, the groq api doesn't like the reasoningEffort parameter
-		CanReason:           false,
-		SupportsAttachments: false,
-	},
-
-	Llama4Scout: {
-		ID:                  Llama4Scout,
-		Name:                "Llama4Scout",
-		Provider:            ProviderGROQ,
-		APIModel:            "meta-llama/llama-4-scout-17b-16e-instruct",
-		CostPer1MIn:         0.11,
-		CostPer1MInCached:   0,
-		CostPer1MOutCached:  0,
-		CostPer1MOut:        0.34,
-		DefaultMaxTokens:    8192,
-		ContextWindow:       128_000, // 10M when?
-		SupportsAttachments: true,
-	},
-
-	Llama4Maverick: {
-		ID:                  Llama4Maverick,
-		Name:                "Llama4Maverick",
-		Provider:            ProviderGROQ,
-		APIModel:            "meta-llama/llama-4-maverick-17b-128e-instruct",
-		CostPer1MIn:         0.20,
-		CostPer1MInCached:   0,
-		CostPer1MOutCached:  0,
-		CostPer1MOut:        0.20,
-		DefaultMaxTokens:    8192,
-		ContextWindow:       128_000,
-		SupportsAttachments: true,
-	},
-
-	Llama3_3_70BVersatile: {
-		ID:                  Llama3_3_70BVersatile,
-		Name:                "Llama3_3_70BVersatile",
-		Provider:            ProviderGROQ,
-		APIModel:            "llama-3.3-70b-versatile",
-		CostPer1MIn:         0.59,
-		CostPer1MInCached:   0,
-		CostPer1MOutCached:  0,
-		CostPer1MOut:        0.79,
-		ContextWindow:       128_000,
-		SupportsAttachments: false,
-	},
-
-	DeepseekR1DistillLlama70b: {
-		ID:                  DeepseekR1DistillLlama70b,
-		Name:                "DeepseekR1DistillLlama70b",
-		Provider:            ProviderGROQ,
-		APIModel:            "deepseek-r1-distill-llama-70b",
-		CostPer1MIn:         0.75,
-		CostPer1MInCached:   0,
-		CostPer1MOutCached:  0,
-		CostPer1MOut:        0.99,
-		ContextWindow:       128_000,
-		CanReason:           true,
-		SupportsAttachments: false,
-	},
-}

internal/llm/models/models.go

@@ -1,54 +0,0 @@
-package models
-
-import "maps"
-
-type (
-	ModelID       string
-	ModelProvider string
-)
-
-type Model struct {
-	ID                  ModelID       `json:"id"`
-	Name                string        `json:"name"`
-	Provider            ModelProvider `json:"provider"`
-	APIModel            string        `json:"api_model"`
-	CostPer1MIn         float64       `json:"cost_per_1m_in"`
-	CostPer1MOut        float64       `json:"cost_per_1m_out"`
-	CostPer1MInCached   float64       `json:"cost_per_1m_in_cached"`
-	CostPer1MOutCached  float64       `json:"cost_per_1m_out_cached"`
-	ContextWindow       int64         `json:"context_window"`
-	DefaultMaxTokens    int64         `json:"default_max_tokens"`
-	CanReason           bool          `json:"can_reason"`
-	SupportsAttachments bool          `json:"supports_attachments"`
-}
-
-const (
-	// ForTests
-	ProviderMock ModelProvider = "__mock"
-)
-
-// Providers in order of popularity
-var ProviderPopularity = map[ModelProvider]int{
-	ProviderAnthropic:  1,
-	ProviderOpenAI:     2,
-	ProviderGemini:     3,
-	ProviderGROQ:       4,
-	ProviderOpenRouter: 5,
-	ProviderBedrock:    6,
-	ProviderAzure:      7,
-	ProviderVertexAI:   8,
-}
-
-var SupportedModels = map[ModelID]Model{}
-
-func init() {
-	maps.Copy(SupportedModels, AnthropicModels)
-	maps.Copy(SupportedModels, BedrockModels)
-	maps.Copy(SupportedModels, OpenAIModels)
-	maps.Copy(SupportedModels, GeminiModels)
-	maps.Copy(SupportedModels, GroqModels)
-	maps.Copy(SupportedModels, AzureModels)
-	maps.Copy(SupportedModels, OpenRouterModels)
-	maps.Copy(SupportedModels, XAIModels)
-	maps.Copy(SupportedModels, VertexAIGeminiModels)
-}

internal/llm/models/openai.go

@@ -1,196 +0,0 @@
-package models
-
-const (
-	ProviderOpenAI ModelProvider = "openai"
-
-	CodexMini    ModelID = "codex-mini"
-	GPT41        ModelID = "gpt-4.1"
-	GPT41Mini    ModelID = "gpt-4.1-mini"
-	GPT41Nano    ModelID = "gpt-4.1-nano"
-	GPT45Preview ModelID = "gpt-4.5-preview"
-	GPT4o        ModelID = "gpt-4o"
-	GPT4oMini    ModelID = "gpt-4o-mini"
-	O1           ModelID = "o1"
-	O1Pro        ModelID = "o1-pro"
-	O1Mini       ModelID = "o1-mini"
-	O3           ModelID = "o3"
-	O3Mini       ModelID = "o3-mini"
-	O4Mini       ModelID = "o4-mini"
-)
-
-var OpenAIModels = map[ModelID]Model{
-	CodexMini: {
-		ID:                  CodexMini,
-		Name:                "Codex Mini",
-		Provider:            ProviderOpenAI,
-		APIModel:            "codex-mini-latest",
-		CostPer1MIn:         1.50,
-		CostPer1MInCached:   0.375,
-		CostPer1MOutCached:  0.0,
-		CostPer1MOut:        6.00,
-		ContextWindow:       200_000,
-		DefaultMaxTokens:    100_000,
-		CanReason:           true,
-		SupportsAttachments: true,
-	},
-	GPT41: {
-		ID:                  GPT41,
-		Name:                "GPT 4.1",
-		Provider:            ProviderOpenAI,
-		APIModel:            "gpt-4.1",
-		CostPer1MIn:         2.00,
-		CostPer1MInCached:   0.50,
-		CostPer1MOutCached:  0.0,
-		CostPer1MOut:        8.00,
-		ContextWindow:       1_047_576,
-		DefaultMaxTokens:    20000,
-		SupportsAttachments: true,
-	},
-	GPT41Mini: {
-		ID:                  GPT41Mini,
-		Name:                "GPT 4.1 mini",
-		Provider:            ProviderOpenAI,
-		APIModel:            "gpt-4.1",
-		CostPer1MIn:         0.40,
-		CostPer1MInCached:   0.10,
-		CostPer1MOutCached:  0.0,
-		CostPer1MOut:        1.60,
-		ContextWindow:       200_000,
-		DefaultMaxTokens:    20000,
-		SupportsAttachments: true,
-	},
-	GPT41Nano: {
-		ID:                  GPT41Nano,
-		Name:                "GPT 4.1 nano",
-		Provider:            ProviderOpenAI,
-		APIModel:            "gpt-4.1-nano",
-		CostPer1MIn:         0.10,
-		CostPer1MInCached:   0.025,
-		CostPer1MOutCached:  0.0,
-		CostPer1MOut:        0.40,
-		ContextWindow:       1_047_576,
-		DefaultMaxTokens:    20000,
-		SupportsAttachments: true,
-	},
-	GPT45Preview: {
-		ID:                  GPT45Preview,
-		Name:                "GPT 4.5 preview",
-		Provider:            ProviderOpenAI,
-		APIModel:            "gpt-4.5-preview",
-		CostPer1MIn:         75.00,
-		CostPer1MInCached:   37.50,
-		CostPer1MOutCached:  0.0,
-		CostPer1MOut:        150.00,
-		ContextWindow:       128_000,
-		DefaultMaxTokens:    15000,
-		SupportsAttachments: true,
-	},
-	GPT4o: {
-		ID:                  GPT4o,
-		Name:                "GPT 4o",
-		Provider:            ProviderOpenAI,
-		APIModel:            "gpt-4o",
-		CostPer1MIn:         2.50,
-		CostPer1MInCached:   1.25,
-		CostPer1MOutCached:  0.0,
-		CostPer1MOut:        10.00,
-		ContextWindow:       128_000,
-		DefaultMaxTokens:    4096,
-		SupportsAttachments: true,
-	},
-	GPT4oMini: {
-		ID:                  GPT4oMini,
-		Name:                "GPT 4o mini",
-		Provider:            ProviderOpenAI,
-		APIModel:            "gpt-4o-mini",
-		CostPer1MIn:         0.15,
-		CostPer1MInCached:   0.075,
-		CostPer1MOutCached:  0.0,
-		CostPer1MOut:        0.60,
-		ContextWindow:       128_000,
-		SupportsAttachments: true,
-	},
-	O1: {
-		ID:                  O1,
-		Name:                "O1",
-		Provider:            ProviderOpenAI,
-		APIModel:            "o1",
-		CostPer1MIn:         15.00,
-		CostPer1MInCached:   7.50,
-		CostPer1MOutCached:  0.0,
-		CostPer1MOut:        60.00,
-		ContextWindow:       200_000,
-		DefaultMaxTokens:    50000,
-		CanReason:           true,
-		SupportsAttachments: true,
-	},
-	O1Pro: {
-		ID:                  O1Pro,
-		Name:                "o1 pro",
-		Provider:            ProviderOpenAI,
-		APIModel:            "o1-pro",
-		CostPer1MIn:         150.00,
-		CostPer1MInCached:   0.0,
-		CostPer1MOutCached:  0.0,
-		CostPer1MOut:        600.00,
-		ContextWindow:       200_000,
-		DefaultMaxTokens:    50000,
-		CanReason:           true,
-		SupportsAttachments: true,
-	},
-	O1Mini: {
-		ID:                  O1Mini,
-		Name:                "o1 mini",
-		Provider:            ProviderOpenAI,
-		APIModel:            "o1-mini",
-		CostPer1MIn:         1.10,
-		CostPer1MInCached:   0.55,
-		CostPer1MOutCached:  0.0,
-		CostPer1MOut:        4.40,
-		ContextWindow:       128_000,
-		DefaultMaxTokens:    50000,
-		CanReason:           true,
-		SupportsAttachments: true,
-	},
-	O3: {
-		ID:                  O3,
-		Name:                "o3",
-		Provider:            ProviderOpenAI,
-		APIModel:            "o3",
-		CostPer1MIn:         10.00,
-		CostPer1MInCached:   2.50,
-		CostPer1MOutCached:  0.0,
-		CostPer1MOut:        40.00,
-		ContextWindow:       200_000,
-		CanReason:           true,
-		SupportsAttachments: true,
-	},
-	O3Mini: {
-		ID:                  O3Mini,
-		Name:                "o3 mini",
-		Provider:            ProviderOpenAI,
-		APIModel:            "o3-mini",
-		CostPer1MIn:         1.10,
-		CostPer1MInCached:   0.55,
-		CostPer1MOutCached:  0.0,
-		CostPer1MOut:        4.40,
-		ContextWindow:       200_000,
-		DefaultMaxTokens:    50000,
-		CanReason:           true,
-		SupportsAttachments: false,
-	},
-	O4Mini: {
-		ID:                  O4Mini,
-		Name:                "o4 mini",
-		Provider:            ProviderOpenAI,
-		APIModel:            "o4-mini",
-		CostPer1MIn:         1.10,
-		CostPer1MInCached:   0.275,
-		CostPer1MOutCached:  0.0,
-		CostPer1MOut:        4.40,
-		ContextWindow:       128_000,
-		DefaultMaxTokens:    50000,
-		CanReason:           true,
-		SupportsAttachments: true,
-	},
-}

internal/llm/models/openrouter.go

@@ -1,327 +0,0 @@
-package models
-
-const (
-	ProviderOpenRouter ModelProvider = "openrouter"
-
-	OpenRouterGPT41          ModelID = "openrouter.gpt-4.1"
-	OpenRouterGPT41Mini      ModelID = "openrouter.gpt-4.1-mini"
-	OpenRouterGPT41Nano      ModelID = "openrouter.gpt-4.1-nano"
-	OpenRouterGPT45Preview   ModelID = "openrouter.gpt-4.5-preview"
-	OpenRouterGPT4o          ModelID = "openrouter.gpt-4o"
-	OpenRouterGPT4oMini      ModelID = "openrouter.gpt-4o-mini"
-	OpenRouterO1             ModelID = "openrouter.o1"
-	OpenRouterO1Pro          ModelID = "openrouter.o1-pro"
-	OpenRouterO1Mini         ModelID = "openrouter.o1-mini"
-	OpenRouterO3             ModelID = "openrouter.o3"
-	OpenRouterO3Mini         ModelID = "openrouter.o3-mini"
-	OpenRouterO4Mini         ModelID = "openrouter.o4-mini"
-	OpenRouterGemini25Flash  ModelID = "openrouter.gemini-2.5-flash"
-	OpenRouterGemini25       ModelID = "openrouter.gemini-2.5"
-	OpenRouterClaude35Sonnet ModelID = "openrouter.claude-3.5-sonnet"
-	OpenRouterClaude3Haiku   ModelID = "openrouter.claude-3-haiku"
-	OpenRouterClaude37Sonnet ModelID = "openrouter.claude-3.7-sonnet"
-	OpenRouterClaude35Haiku  ModelID = "openrouter.claude-3.5-haiku"
-	OpenRouterClaude3Opus    ModelID = "openrouter.claude-3-opus"
-	OpenRouterQwen235B       ModelID = "openrouter.qwen-3-235b"
-	OpenRouterQwen32B        ModelID = "openrouter.qwen-3-32b"
-	OpenRouterQwen30B        ModelID = "openrouter.qwen-3-30b"
-	OpenRouterQwen14B        ModelID = "openrouter.qwen-3-14b"
-	OpenRouterQwen8B         ModelID = "openrouter.qwen-3-8b"
-)
-
-var OpenRouterModels = map[ModelID]Model{
-	OpenRouterGPT41: {
-		ID:                 OpenRouterGPT41,
-		Name:               "OpenRouter: GPT 4.1",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "openai/gpt-4.1",
-		CostPer1MIn:        OpenAIModels[GPT41].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[GPT41].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[GPT41].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[GPT41].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[GPT41].ContextWindow,
-		DefaultMaxTokens:   OpenAIModels[GPT41].DefaultMaxTokens,
-	},
-	OpenRouterGPT41Mini: {
-		ID:                 OpenRouterGPT41Mini,
-		Name:               "OpenRouter: GPT 4.1 mini",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "openai/gpt-4.1-mini",
-		CostPer1MIn:        OpenAIModels[GPT41Mini].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[GPT41Mini].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[GPT41Mini].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[GPT41Mini].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[GPT41Mini].ContextWindow,
-		DefaultMaxTokens:   OpenAIModels[GPT41Mini].DefaultMaxTokens,
-	},
-	OpenRouterGPT41Nano: {
-		ID:                 OpenRouterGPT41Nano,
-		Name:               "OpenRouter: GPT 4.1 nano",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "openai/gpt-4.1-nano",
-		CostPer1MIn:        OpenAIModels[GPT41Nano].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[GPT41Nano].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[GPT41Nano].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[GPT41Nano].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[GPT41Nano].ContextWindow,
-		DefaultMaxTokens:   OpenAIModels[GPT41Nano].DefaultMaxTokens,
-	},
-	OpenRouterGPT45Preview: {
-		ID:                 OpenRouterGPT45Preview,
-		Name:               "OpenRouter: GPT 4.5 preview",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "openai/gpt-4.5-preview",
-		CostPer1MIn:        OpenAIModels[GPT45Preview].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[GPT45Preview].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[GPT45Preview].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[GPT45Preview].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[GPT45Preview].ContextWindow,
-		DefaultMaxTokens:   OpenAIModels[GPT45Preview].DefaultMaxTokens,
-	},
-	OpenRouterGPT4o: {
-		ID:                 OpenRouterGPT4o,
-		Name:               "OpenRouter: GPT 4o",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "openai/gpt-4o",
-		CostPer1MIn:        OpenAIModels[GPT4o].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[GPT4o].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[GPT4o].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[GPT4o].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[GPT4o].ContextWindow,
-		DefaultMaxTokens:   OpenAIModels[GPT4o].DefaultMaxTokens,
-	},
-	OpenRouterGPT4oMini: {
-		ID:                 OpenRouterGPT4oMini,
-		Name:               "OpenRouter: GPT 4o mini",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "openai/gpt-4o-mini",
-		CostPer1MIn:        OpenAIModels[GPT4oMini].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[GPT4oMini].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[GPT4oMini].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[GPT4oMini].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[GPT4oMini].ContextWindow,
-	},
-	OpenRouterO1: {
-		ID:                 OpenRouterO1,
-		Name:               "OpenRouter: O1",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "openai/o1",
-		CostPer1MIn:        OpenAIModels[O1].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[O1].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[O1].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[O1].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[O1].ContextWindow,
-		DefaultMaxTokens:   OpenAIModels[O1].DefaultMaxTokens,
-		CanReason:          OpenAIModels[O1].CanReason,
-	},
-	OpenRouterO1Pro: {
-		ID:                 OpenRouterO1Pro,
-		Name:               "OpenRouter: o1 pro",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "openai/o1-pro",
-		CostPer1MIn:        OpenAIModels[O1Pro].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[O1Pro].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[O1Pro].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[O1Pro].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[O1Pro].ContextWindow,
-		DefaultMaxTokens:   OpenAIModels[O1Pro].DefaultMaxTokens,
-		CanReason:          OpenAIModels[O1Pro].CanReason,
-	},
-	OpenRouterO1Mini: {
-		ID:                 OpenRouterO1Mini,
-		Name:               "OpenRouter: o1 mini",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "openai/o1-mini",
-		CostPer1MIn:        OpenAIModels[O1Mini].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[O1Mini].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[O1Mini].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[O1Mini].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[O1Mini].ContextWindow,
-		DefaultMaxTokens:   OpenAIModels[O1Mini].DefaultMaxTokens,
-		CanReason:          OpenAIModels[O1Mini].CanReason,
-	},
-	OpenRouterO3: {
-		ID:                 OpenRouterO3,
-		Name:               "OpenRouter: o3",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "openai/o3",
-		CostPer1MIn:        OpenAIModels[O3].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[O3].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[O3].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[O3].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[O3].ContextWindow,
-		DefaultMaxTokens:   OpenAIModels[O3].DefaultMaxTokens,
-		CanReason:          OpenAIModels[O3].CanReason,
-	},
-	OpenRouterO3Mini: {
-		ID:                 OpenRouterO3Mini,
-		Name:               "OpenRouter: o3 mini",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "openai/o3-mini-high",
-		CostPer1MIn:        OpenAIModels[O3Mini].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[O3Mini].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[O3Mini].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[O3Mini].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[O3Mini].ContextWindow,
-		DefaultMaxTokens:   OpenAIModels[O3Mini].DefaultMaxTokens,
-		CanReason:          OpenAIModels[O3Mini].CanReason,
-	},
-	OpenRouterO4Mini: {
-		ID:                 OpenRouterO4Mini,
-		Name:               "OpenRouter: o4 mini",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "openai/o4-mini-high",
-		CostPer1MIn:        OpenAIModels[O4Mini].CostPer1MIn,
-		CostPer1MInCached:  OpenAIModels[O4Mini].CostPer1MInCached,
-		CostPer1MOut:       OpenAIModels[O4Mini].CostPer1MOut,
-		CostPer1MOutCached: OpenAIModels[O4Mini].CostPer1MOutCached,
-		ContextWindow:      OpenAIModels[O4Mini].ContextWindow,
-		DefaultMaxTokens:   OpenAIModels[O4Mini].DefaultMaxTokens,
-		CanReason:          OpenAIModels[O4Mini].CanReason,
-	},
-	OpenRouterGemini25Flash: {
-		ID:                 OpenRouterGemini25Flash,
-		Name:               "OpenRouter: Gemini 2.5 Flash",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "google/gemini-2.5-flash-preview:thinking",
-		CostPer1MIn:        GeminiModels[Gemini25Flash].CostPer1MIn,
-		CostPer1MInCached:  GeminiModels[Gemini25Flash].CostPer1MInCached,
-		CostPer1MOut:       GeminiModels[Gemini25Flash].CostPer1MOut,
-		CostPer1MOutCached: GeminiModels[Gemini25Flash].CostPer1MOutCached,
-		ContextWindow:      GeminiModels[Gemini25Flash].ContextWindow,
-		DefaultMaxTokens:   GeminiModels[Gemini25Flash].DefaultMaxTokens,
-	},
-	OpenRouterGemini25: {
-		ID:                 OpenRouterGemini25,
-		Name:               "OpenRouter: Gemini 2.5 Pro",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "google/gemini-2.5-pro-preview-03-25",
-		CostPer1MIn:        GeminiModels[Gemini25].CostPer1MIn,
-		CostPer1MInCached:  GeminiModels[Gemini25].CostPer1MInCached,
-		CostPer1MOut:       GeminiModels[Gemini25].CostPer1MOut,
-		CostPer1MOutCached: GeminiModels[Gemini25].CostPer1MOutCached,
-		ContextWindow:      GeminiModels[Gemini25].ContextWindow,
-		DefaultMaxTokens:   GeminiModels[Gemini25].DefaultMaxTokens,
-	},
-	OpenRouterClaude35Sonnet: {
-		ID:                 OpenRouterClaude35Sonnet,
-		Name:               "OpenRouter: Claude 3.5 Sonnet",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "anthropic/claude-3.5-sonnet",
-		CostPer1MIn:        AnthropicModels[Claude35Sonnet].CostPer1MIn,
-		CostPer1MInCached:  AnthropicModels[Claude35Sonnet].CostPer1MInCached,
-		CostPer1MOut:       AnthropicModels[Claude35Sonnet].CostPer1MOut,
-		CostPer1MOutCached: AnthropicModels[Claude35Sonnet].CostPer1MOutCached,
-		ContextWindow:      AnthropicModels[Claude35Sonnet].ContextWindow,
-		DefaultMaxTokens:   AnthropicModels[Claude35Sonnet].DefaultMaxTokens,
-	},
-	OpenRouterClaude3Haiku: {
-		ID:                 OpenRouterClaude3Haiku,
-		Name:               "OpenRouter: Claude 3 Haiku",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "anthropic/claude-3-haiku",
-		CostPer1MIn:        AnthropicModels[Claude3Haiku].CostPer1MIn,
-		CostPer1MInCached:  AnthropicModels[Claude3Haiku].CostPer1MInCached,
-		CostPer1MOut:       AnthropicModels[Claude3Haiku].CostPer1MOut,
-		CostPer1MOutCached: AnthropicModels[Claude3Haiku].CostPer1MOutCached,
-		ContextWindow:      AnthropicModels[Claude3Haiku].ContextWindow,
-		DefaultMaxTokens:   AnthropicModels[Claude3Haiku].DefaultMaxTokens,
-	},
-	OpenRouterClaude37Sonnet: {
-		ID:                 OpenRouterClaude37Sonnet,
-		Name:               "OpenRouter: Claude 3.7 Sonnet",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "anthropic/claude-3.7-sonnet",
-		CostPer1MIn:        AnthropicModels[Claude37Sonnet].CostPer1MIn,
-		CostPer1MInCached:  AnthropicModels[Claude37Sonnet].CostPer1MInCached,
-		CostPer1MOut:       AnthropicModels[Claude37Sonnet].CostPer1MOut,
-		CostPer1MOutCached: AnthropicModels[Claude37Sonnet].CostPer1MOutCached,
-		ContextWindow:      AnthropicModels[Claude37Sonnet].ContextWindow,
-		DefaultMaxTokens:   AnthropicModels[Claude37Sonnet].DefaultMaxTokens,
-		CanReason:          AnthropicModels[Claude37Sonnet].CanReason,
-	},
-	OpenRouterClaude35Haiku: {
-		ID:                 OpenRouterClaude35Haiku,
-		Name:               "OpenRouter: Claude 3.5 Haiku",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "anthropic/claude-3.5-haiku",
-		CostPer1MIn:        AnthropicModels[Claude35Haiku].CostPer1MIn,
-		CostPer1MInCached:  AnthropicModels[Claude35Haiku].CostPer1MInCached,
-		CostPer1MOut:       AnthropicModels[Claude35Haiku].CostPer1MOut,
-		CostPer1MOutCached: AnthropicModels[Claude35Haiku].CostPer1MOutCached,
-		ContextWindow:      AnthropicModels[Claude35Haiku].ContextWindow,
-		DefaultMaxTokens:   AnthropicModels[Claude35Haiku].DefaultMaxTokens,
-	},
-	OpenRouterClaude3Opus: {
-		ID:                 OpenRouterClaude3Opus,
-		Name:               "OpenRouter: Claude 3 Opus",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "anthropic/claude-3-opus",
-		CostPer1MIn:        AnthropicModels[Claude3Opus].CostPer1MIn,
-		CostPer1MInCached:  AnthropicModels[Claude3Opus].CostPer1MInCached,
-		CostPer1MOut:       AnthropicModels[Claude3Opus].CostPer1MOut,
-		CostPer1MOutCached: AnthropicModels[Claude3Opus].CostPer1MOutCached,
-		ContextWindow:      AnthropicModels[Claude3Opus].ContextWindow,
-		DefaultMaxTokens:   AnthropicModels[Claude3Opus].DefaultMaxTokens,
-	},
-	OpenRouterQwen235B: {
-		ID:                 OpenRouterQwen235B,
-		Name:               "OpenRouter: Qwen3 235B A22B",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "qwen/qwen3-235b-a22b",
-		CostPer1MIn:        0.1,
-		CostPer1MInCached:  0.1,
-		CostPer1MOut:       0.1,
-		CostPer1MOutCached: 0.1,
-		ContextWindow:      40960,
-		DefaultMaxTokens:   4096,
-	},
-	OpenRouterQwen32B: {
-		ID:                 OpenRouterQwen32B,
-		Name:               "OpenRouter: Qwen3 32B",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "qwen/qwen3-32b",
-		CostPer1MIn:        0.1,
-		CostPer1MInCached:  0.1,
-		CostPer1MOut:       0.3,
-		CostPer1MOutCached: 0.3,
-		ContextWindow:      40960,
-		DefaultMaxTokens:   4096,
-	},
-	OpenRouterQwen30B: {
-		ID:                 OpenRouterQwen30B,
-		Name:               "OpenRouter: Qwen3 30B A3B",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "qwen/qwen3-30b-a3b",
-		CostPer1MIn:        0.1,
-		CostPer1MInCached:  0.1,
-		CostPer1MOut:       0.3,
-		CostPer1MOutCached: 0.3,
-		ContextWindow:      40960,
-		DefaultMaxTokens:   4096,
-	},
-	OpenRouterQwen14B: {
-		ID:                 OpenRouterQwen14B,
-		Name:               "OpenRouter: Qwen3 14B",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "qwen/qwen3-14b",
-		CostPer1MIn:        0.7,
-		CostPer1MInCached:  0.7,
-		CostPer1MOut:       0.24,
-		CostPer1MOutCached: 0.24,
-		ContextWindow:      40960,
-		DefaultMaxTokens:   4096,
-	},
-	OpenRouterQwen8B: {
-		ID:                 OpenRouterQwen8B,
-		Name:               "OpenRouter: Qwen3 8B",
-		Provider:           ProviderOpenRouter,
-		APIModel:           "qwen/qwen3-8b",
-		CostPer1MIn:        0.35,
-		CostPer1MInCached:  0.35,
-		CostPer1MOut:       0.138,
-		CostPer1MOutCached: 0.138,
-		ContextWindow:      128000,
-		DefaultMaxTokens:   4096,
-	},
-}

internal/llm/models/vertexai.go

@@ -1,38 +0,0 @@
-package models
-
-const (
-	ProviderVertexAI ModelProvider = "vertexai"
-
-	// Models
-	VertexAIGemini25Flash ModelID = "vertexai.gemini-2.5-flash"
-	VertexAIGemini25      ModelID = "vertexai.gemini-2.5"
-)
-
-var VertexAIGeminiModels = map[ModelID]Model{
-	VertexAIGemini25Flash: {
-		ID:                  VertexAIGemini25Flash,
-		Name:                "VertexAI: Gemini 2.5 Flash",
-		Provider:            ProviderVertexAI,
-		APIModel:            "gemini-2.5-flash-preview-04-17",
-		CostPer1MIn:         GeminiModels[Gemini25Flash].CostPer1MIn,
-		CostPer1MInCached:   GeminiModels[Gemini25Flash].CostPer1MInCached,
-		CostPer1MOut:        GeminiModels[Gemini25Flash].CostPer1MOut,
-		CostPer1MOutCached:  GeminiModels[Gemini25Flash].CostPer1MOutCached,
-		ContextWindow:       GeminiModels[Gemini25Flash].ContextWindow,
-		DefaultMaxTokens:    GeminiModels[Gemini25Flash].DefaultMaxTokens,
-		SupportsAttachments: true,
-	},
-	VertexAIGemini25: {
-		ID:                  VertexAIGemini25,
-		Name:                "VertexAI: Gemini 2.5 Pro",
-		Provider:            ProviderVertexAI,
-		APIModel:            "gemini-2.5-pro-preview-03-25",
-		CostPer1MIn:         GeminiModels[Gemini25].CostPer1MIn,
-		CostPer1MInCached:   GeminiModels[Gemini25].CostPer1MInCached,
-		CostPer1MOut:        GeminiModels[Gemini25].CostPer1MOut,
-		CostPer1MOutCached:  GeminiModels[Gemini25].CostPer1MOutCached,
-		ContextWindow:       GeminiModels[Gemini25].ContextWindow,
-		DefaultMaxTokens:    GeminiModels[Gemini25].DefaultMaxTokens,
-		SupportsAttachments: true,
-	},
-}

internal/llm/models/xai.go

@@ -1,61 +0,0 @@
-package models
-
-const (
-	ProviderXAI ModelProvider = "xai"
-
-	XAIGrok3Beta         ModelID = "grok-3-beta"
-	XAIGrok3MiniBeta     ModelID = "grok-3-mini-beta"
-	XAIGrok3FastBeta     ModelID = "grok-3-fast-beta"
-	XAiGrok3MiniFastBeta ModelID = "grok-3-mini-fast-beta"
-)
-
-var XAIModels = map[ModelID]Model{
-	XAIGrok3Beta: {
-		ID:                 XAIGrok3Beta,
-		Name:               "Grok3 Beta",
-		Provider:           ProviderXAI,
-		APIModel:           "grok-3-beta",
-		CostPer1MIn:        3.0,
-		CostPer1MInCached:  0,
-		CostPer1MOut:       15,
-		CostPer1MOutCached: 0,
-		ContextWindow:      131_072,
-		DefaultMaxTokens:   20_000,
-	},
-	XAIGrok3MiniBeta: {
-		ID:                 XAIGrok3MiniBeta,
-		Name:               "Grok3 Mini Beta",
-		Provider:           ProviderXAI,
-		APIModel:           "grok-3-mini-beta",
-		CostPer1MIn:        0.3,
-		CostPer1MInCached:  0,
-		CostPer1MOut:       0.5,
-		CostPer1MOutCached: 0,
-		ContextWindow:      131_072,
-		DefaultMaxTokens:   20_000,
-	},
-	XAIGrok3FastBeta: {
-		ID:                 XAIGrok3FastBeta,
-		Name:               "Grok3 Fast Beta",
-		Provider:           ProviderXAI,
-		APIModel:           "grok-3-fast-beta",
-		CostPer1MIn:        5,
-		CostPer1MInCached:  0,
-		CostPer1MOut:       25,
-		CostPer1MOutCached: 0,
-		ContextWindow:      131_072,
-		DefaultMaxTokens:   20_000,
-	},
-	XAiGrok3MiniFastBeta: {
-		ID:                 XAiGrok3MiniFastBeta,
-		Name:               "Grok3 Mini Fast Beta",
-		Provider:           ProviderXAI,
-		APIModel:           "grok-3-mini-fast-beta",
-		CostPer1MIn:        0.6,
-		CostPer1MInCached:  0,
-		CostPer1MOut:       4.0,
-		CostPer1MOutCached: 0,
-		ContextWindow:      131_072,
-		DefaultMaxTokens:   20_000,
-	},
-}

internal/llm/prompt/primary.go

@@ -1,222 +0,0 @@
-package prompt
-
-import (
-	"context"
-	"fmt"
-	"os"
-	"path/filepath"
-	"runtime"
-	"time"
-
-	"github.com/sst/opencode/internal/config"
-	"github.com/sst/opencode/internal/llm/models"
-	"github.com/sst/opencode/internal/llm/tools"
-)
-
-func PrimaryPrompt(provider models.ModelProvider) string {
-	basePrompt := baseAnthropicPrimaryPrompt
-	switch provider {
-	case models.ProviderOpenAI:
-		basePrompt = baseOpenAIPrimaryPrompt
-	}
-	envInfo := getEnvironmentInfo()
-
-	return fmt.Sprintf("%s\n\n%s\n%s", basePrompt, envInfo, lspInformation())
-}
-
-const baseOpenAIPrimaryPrompt = `
-You are operating as and within the OpenCode CLI, a terminal-based agentic coding assistant built by OpenAI. It wraps OpenAI models to enable natural language interaction with a local codebase. You are expected to be precise, safe, and helpful.
-
-You can:
-- Receive user prompts, project context, and files.
-- Stream responses and emit function calls (e.g., shell commands, code edits).
-- Apply patches, run commands, and manage user approvals based on policy.
-- Work inside a sandboxed, git-backed workspace with rollback support.
-- Log telemetry so sessions can be replayed or inspected later.
-- More details on your functionality are available at "opencode --help"
-
-
-You are an agent - please keep going until the user's query is completely resolved, before ending your turn and yielding back to the user. Only terminate your turn when you are sure that the problem is solved. If you are not sure about file content or codebase structure pertaining to the user's request, use your tools to read files and gather the relevant information: do NOT guess or make up an answer.
-
-Please resolve the user's task by editing and testing the code files in your current code execution session. You are a deployed coding agent. Your session allows for you to modify and run code. The repo(s) are already cloned in your working directory, and you must fully solve the problem for your answer to be considered correct.
-
-You MUST adhere to the following criteria when executing the task:
-- Working on the repo(s) in the current environment is allowed, even if they are proprietary.
-- Analyzing code for vulnerabilities is allowed.
-- Showing user code and tool call details is allowed.
-- User instructions may overwrite the *CODING GUIDELINES* section in this developer message.
-- If completing the user's task requires writing or modifying files:
-    - Your code and final answer should follow these *CODING GUIDELINES*:
-        - Fix the problem at the root cause rather than applying surface-level patches, when possible.
-        - Avoid unneeded complexity in your solution.
-            - Ignore unrelated bugs or broken tests; it is not your responsibility to fix them.
-        - Update documentation as necessary.
-        - Keep changes consistent with the style of the existing codebase. Changes should be minimal and focused on the task.
-            - Use "git log" and "git blame" to search the history of the codebase if additional context is required; internet access is disabled.
-        - NEVER add copyright or license headers unless specifically requested.
-        - You do not need to "git commit" your changes; this will be done automatically for you.
-        - Once you finish coding, you must
-            - Check "git status" to sanity check your changes; revert any scratch files or changes.
-            - Remove all inline comments you added as much as possible, even if they look normal. Check using "git diff". Inline comments must be generally avoided, unless active maintainers of the repo, after long careful study of the code and the issue, will still misinterpret the code without the comments.
-            - Check if you accidentally add copyright or license headers. If so, remove them.
-            - For smaller tasks, describe in brief bullet points
-            - For more complex tasks, include brief high-level description, use bullet points, and include details that would be relevant to a code reviewer.
-- If completing the user's task DOES NOT require writing or modifying files (e.g., the user asks a question about the code base):
-    - Respond in a friendly tune as a remote teammate, who is knowledgeable, capable and eager to help with coding.
-- When your task involves writing or modifying files:
-    - Do NOT tell the user to "save the file" or "copy the code into a file" if you already created or modified the file using "apply_patch". Instead, reference the file as already saved.
-    - Do NOT show the full contents of large files you have already written, unless the user explicitly asks for them.
-- When doing things with paths, always use use the full path, if the working directory is /abc/xyz  and you want to edit the file abc.go in the working dir refer to it as /abc/xyz/abc.go.
-- If you send a path not including the working dir, the working dir will be prepended to it.
-- Remember the user does not see the full output of tools
-`
-
-const baseAnthropicPrimaryPrompt = `You are OpenCode, an interactive CLI tool that helps users with software engineering tasks. Use the instructions below and the tools available to you to assist the user.
-
-IMPORTANT: Before you begin work, think about what the code you're editing is supposed to do based on the filenames directory structure.
-
-# Memory
-If the current working directory contains a file called OpenCode.md, it will be automatically added to your context. This file serves multiple purposes:
-1. Storing frequently used bash commands (build, test, lint, etc.) so you can use them without searching each time
-2. Recording the user's code style preferences (naming conventions, preferred libraries, etc.)
-3. Maintaining useful information about the codebase structure and organization
-
-When you spend time searching for commands to typecheck, lint, build, or test, you should ask the user if it's okay to add those commands to CONTEXT.md. Similarly, when learning about code style preferences or important codebase information, ask if it's okay to add that to CONTEXT.md so you can remember it for next time.
-
-# Tone and style
-You should be concise, direct, and to the point. When you run a non-trivial bash command, you should explain what the command does and why you are running it, to make sure the user understands what you are doing (this is especially important when you are running a command that will make changes to the user's system).
-Remember that your output will be displayed on a command line interface. Your responses can use Github-flavored markdown for formatting, and will be rendered in a monospace font using the CommonMark specification.
-Output text to communicate with the user; all text you output outside of tool use is displayed to the user. Only use tools to complete tasks. Never use tools like Bash or code comments as means to communicate with the user during the session.
-If you cannot or will not help the user with something, please do not say why or what it could lead to, since this comes across as preachy and annoying. Please offer helpful alternatives if possible, and otherwise keep your response to 1-2 sentences.
-IMPORTANT: You should minimize output tokens as much as possible while maintaining helpfulness, quality, and accuracy. Only address the specific query or task at hand, avoiding tangential information unless absolutely critical for completing the request. If you can answer in 1-3 sentences or a short paragraph, please do.
-IMPORTANT: You should NOT answer with unnecessary preamble or postamble (such as explaining your code or summarizing your action), unless the user asks you to.
-IMPORTANT: Keep your responses short, since they will be displayed on a command line interface. You MUST answer concisely with fewer than 4 lines (not including tool use or code generation), unless user asks for detail. Answer the user's question directly, without elaboration, explanation, or details. One word answers are best. Avoid introductions, conclusions, and explanations. You MUST avoid text before/after your response, such as "The answer is <answer>.", "Here is the content of the file..." or "Based on the information provided, the answer is..." or "Here is what I will do next...". Here are some examples to demonstrate appropriate verbosity:
-<example>
-user: 2 + 2
-assistant: 4
-</example>
-
-<example>
-user: what is 2+2?
-assistant: 4
-</example>
-
-<example>
-user: is 11 a prime number?
-assistant: yes
-</example>
-
-<example>
-user: what command should I run to list files in the current directory?
-assistant: ls
-</example>
-
-<example>
-user: what command should I run to watch files in the current directory?
-assistant: [use the ls tool to list the files in the current directory, then read docs/commands in the relevant file to find out how to watch files]
-npm run dev
-</example>
-
-<example>
-user: How many golf balls fit inside a jetta?
-assistant: 150000
-</example>
-
-<example>
-user: what files are in the directory src/?
-assistant: [runs ls and sees foo.c, bar.c, baz.c]
-user: which file contains the implementation of foo?
-assistant: src/foo.c
-</example>
-
-<example>
-user: write tests for new feature
-assistant: [uses grep and glob search tools to find where similar tests are defined, uses concurrent read file tool use blocks in one tool call to read relevant files at the same time, uses edit/patch file tool to write new tests]
-</example>
-
-# Proactiveness
-You are allowed to be proactive, but only when the user asks you to do something. You should strive to strike a balance between:
-1. Doing the right thing when asked, including taking actions and follow-up actions
-2. Not surprising the user with actions you take without asking
-For example, if the user asks you how to approach something, you should do your best to answer their question first, and not immediately jump into taking actions.
-3. Do not add additional code explanation summary unless requested by the user. After working on a file, just stop, rather than providing an explanation of what you did.
-
-# Following conventions
-When making changes to files, first understand the file's code conventions. Mimic code style, use existing libraries and utilities, and follow existing patterns.
-- NEVER assume that a given library is available, even if it is well known. Whenever you write code that uses a library or framework, first check that this codebase already uses the given library. For example, you might look at neighboring files, or check the package.json (or cargo.toml, and so on depending on the language).
-- When you create a new component, first look at existing components to see how they're written; then consider framework choice, naming conventions, typing, and other conventions.
-- When you edit a piece of code, first look at the code's surrounding context (especially its imports) to understand the code's choice of frameworks and libraries. Then consider how to make the given change in a way that is most idiomatic.
-- Always follow security best practices. Never introduce code that exposes or logs secrets and keys. Never commit secrets or keys to the repository.
-
-# Code style
-- Do not add comments to the code you write, unless the user asks you to, or the code is complex and requires additional context.
-
-# Doing tasks
-The user will primarily request you perform software engineering tasks. This includes solving bugs, adding new functionality, refactoring code, explaining code, and more. For these tasks the following steps are recommended:
-1. Use the available search tools to understand the codebase and the user's query. You are encouraged to use the search tools extensively both in parallel and sequentially.
-2. Implement the solution using all tools available to you
-3. Verify the solution if possible with tests. NEVER assume specific test framework or test script. Check the README or search codebase to determine the testing approach.
-4. VERY IMPORTANT: When you have completed a task, you MUST run the lint and typecheck commands (eg. npm run lint, npm run typecheck, ruff, etc.) if they were provided to you to ensure your code is correct. If you are unable to find the correct command, ask the user for the command to run and if they supply it, proactively suggest writing it to opencode.md so that you will know to run it next time.
-
-NEVER commit changes unless the user explicitly asks you to. It is VERY IMPORTANT to only commit when explicitly asked, otherwise the user will feel that you are being too proactive.
-
-# Tool usage policy
-- When doing file search, prefer to use the Agent tool in order to reduce context usage.
-- If you intend to call multiple tools and there are no dependencies between the calls, make all of the independent calls in the same function_calls block.
-- IMPORTANT: The user does not see the full output of the tool responses, so if you need the output of the tool for the response make sure to summarize it for the user.
-
-You MUST answer concisely with fewer than 4 lines of text (not including tool use or code generation), unless user asks for detail.`
-
-func getEnvironmentInfo() string {
-	cwd := config.WorkingDirectory()
-	isGit := isGitRepo(cwd)
-	platform := runtime.GOOS
-	date := time.Now().Format("1/2/2006")
-	ls := tools.NewLsTool()
-	r, _ := ls.Run(context.Background(), tools.ToolCall{
-		Input: `{"path":"."}`,
-	})
-	return fmt.Sprintf(`Here is useful information about the environment you are running in:
-<env>
-Working directory: %s
-Is directory a git repo: %s
-Platform: %s
-Today's date: %s
-</env>
-<project>
-%s
-</project>
-		`, cwd, boolToYesNo(isGit), platform, date, r.Content)
-}
-
-func isGitRepo(dir string) bool {
-	_, err := os.Stat(filepath.Join(dir, ".git"))
-	return err == nil
-}
-
-func lspInformation() string {
-	cfg := config.Get()
-	hasLSP := false
-	for _, v := range cfg.LSP {
-		if !v.Disabled {
-			hasLSP = true
-			break
-		}
-	}
-	if !hasLSP {
-		return ""
-	}
-	return `# LSP Information
-Tools that support it will also include useful diagnostics such as linting and typechecking.
-- These diagnostics will be automatically enabled when you run the tool, and will be displayed in the output at the bottom within the <file_diagnostics></file_diagnostics> and <project_diagnostics></project_diagnostics> tags.
-- Take necessary actions to fix the issues.
-- You should ignore diagnostics of files that you did not change or are not related or caused by your changes unless the user explicitly asks you to fix them.
-`
-}
-
-func boolToYesNo(b bool) string {
-	if b {
-		return "Yes"
-	}
-	return "No"
-}

internal/llm/prompt/prompt.go

@@ -1,135 +0,0 @@
-package prompt
-
-import (
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-	"sync"
-
-	"github.com/sst/opencode/internal/config"
-	"github.com/sst/opencode/internal/llm/models"
-	"log/slog"
-)
-
-func GetAgentPrompt(agentName config.AgentName, provider models.ModelProvider) string {
-	basePrompt := ""
-	switch agentName {
-	case config.AgentPrimary:
-		basePrompt = PrimaryPrompt(provider)
-	case config.AgentTitle:
-		basePrompt = TitlePrompt(provider)
-	case config.AgentTask:
-		basePrompt = TaskPrompt(provider)
-	default:
-		basePrompt = "You are a helpful assistant"
-	}
-
-	if agentName == config.AgentPrimary || agentName == config.AgentTask {
-		// Add context from project-specific instruction files if they exist
-		contextContent := getContextFromPaths()
-		slog.Debug("Context content", "Context", contextContent)
-		if contextContent != "" {
-			return fmt.Sprintf("%s\n\n# Project-Specific Context\n Make sure to follow the instructions in the context below\n%s", basePrompt, contextContent)
-		}
-	}
-	return basePrompt
-}
-
-var (
-	onceContext    sync.Once
-	contextContent string
-)
-
-func getContextFromPaths() string {
-	onceContext.Do(func() {
-		var (
-			cfg          = config.Get()
-			workDir      = cfg.WorkingDir
-			contextPaths = cfg.ContextPaths
-		)
-
-		contextContent = processContextPaths(workDir, contextPaths)
-	})
-
-	return contextContent
-}
-
-func processContextPaths(workDir string, paths []string) string {
-	var (
-		wg       sync.WaitGroup
-		resultCh = make(chan string)
-	)
-
-	// Track processed files to avoid duplicates
-	processedFiles := make(map[string]bool)
-	var processedMutex sync.Mutex
-
-	for _, path := range paths {
-		wg.Add(1)
-		go func(p string) {
-			defer wg.Done()
-
-			if strings.HasSuffix(p, "/") {
-				filepath.WalkDir(filepath.Join(workDir, p), func(path string, d os.DirEntry, err error) error {
-					if err != nil {
-						return err
-					}
-					if !d.IsDir() {
-						// Check if we've already processed this file (case-insensitive)
-						processedMutex.Lock()
-						lowerPath := strings.ToLower(path)
-						if !processedFiles[lowerPath] {
-							processedFiles[lowerPath] = true
-							processedMutex.Unlock()
-
-							if result := processFile(path); result != "" {
-								resultCh <- result
-							}
-						} else {
-							processedMutex.Unlock()
-						}
-					}
-					return nil
-				})
-			} else {
-				fullPath := filepath.Join(workDir, p)
-
-				// Check if we've already processed this file (case-insensitive)
-				processedMutex.Lock()
-				lowerPath := strings.ToLower(fullPath)
-				if !processedFiles[lowerPath] {
-					processedFiles[lowerPath] = true
-					processedMutex.Unlock()
-
-					result := processFile(fullPath)
-					if result != "" {
-						resultCh <- result
-					}
-				} else {
-					processedMutex.Unlock()
-				}
-			}
-		}(path)
-	}
-
-	go func() {
-		wg.Wait()
-		close(resultCh)
-	}()
-
-	results := make([]string, 0)
-	for result := range resultCh {
-		results = append(results, result)
-	}
-
-	return strings.Join(results, "\n")
-}
-
-func processFile(filePath string) string {
-	content, err := os.ReadFile(filePath)
-	if err != nil {
-		return ""
-	}
-	return "# From:" + filePath + "\n" + string(content)
-}

internal/llm/prompt/prompt_test.go

@@ -1,61 +0,0 @@
-package prompt
-
-import (
-	"fmt"
-	"log/slog"
-	"os"
-	"path/filepath"
-	"testing"
-
-	"github.com/sst/opencode/internal/config"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestGetContextFromPaths(t *testing.T) {
-	t.Parallel()
-
-	lvl := new(slog.LevelVar)
-	lvl.Set(slog.LevelDebug)
-
-	tmpDir := t.TempDir()
-	_, err := config.Load(tmpDir, false, lvl)
-	if err != nil {
-		t.Fatalf("Failed to load config: %v", err)
-	}
-	cfg := config.Get()
-	cfg.WorkingDir = tmpDir
-	cfg.ContextPaths = []string{
-		"file.txt",
-		"directory/",
-	}
-	testFiles := []string{
-		"file.txt",
-		"directory/file_a.txt",
-		"directory/file_b.txt",
-		"directory/file_c.txt",
-	}
-
-	createTestFiles(t, tmpDir, testFiles)
-
-	context := getContextFromPaths()
-	expectedContext := fmt.Sprintf("# From:%s/file.txt\nfile.txt: test content\n# From:%s/directory/file_a.txt\ndirectory/file_a.txt: test content\n# From:%s/directory/file_b.txt\ndirectory/file_b.txt: test content\n# From:%s/directory/file_c.txt\ndirectory/file_c.txt: test content", tmpDir, tmpDir, tmpDir, tmpDir)
-	assert.Equal(t, expectedContext, context)
-}
-
-func createTestFiles(t *testing.T, tmpDir string, testFiles []string) {
-	t.Helper()
-	for _, path := range testFiles {
-		fullPath := filepath.Join(tmpDir, path)
-		if path[len(path)-1] == '/' {
-			err := os.MkdirAll(fullPath, 0755)
-			require.NoError(t, err)
-		} else {
-			dir := filepath.Dir(fullPath)
-			err := os.MkdirAll(dir, 0755)
-			require.NoError(t, err)
-			err = os.WriteFile(fullPath, []byte(path+": test content"), 0644)
-			require.NoError(t, err)
-		}
-	}
-}

internal/llm/prompt/task.go

@@ -1,17 +0,0 @@
-package prompt
-
-import (
-	"fmt"
-
-	"github.com/sst/opencode/internal/llm/models"
-)
-
-func TaskPrompt(_ models.ModelProvider) string {
-	agentPrompt := `You are an agent for OpenCode. Given the user's prompt, you should use the tools available to you to answer the user's question.
-Notes:
-1. IMPORTANT: You should be concise, direct, and to the point, since your responses will be displayed on a command line interface. Answer the user's question directly, without elaboration, explanation, or details. One word answers are best. Avoid introductions, conclusions, and explanations. You MUST avoid text before/after your response, such as "The answer is <answer>.", "Here is the content of the file..." or "Based on the information provided, the answer is..." or "Here is what I will do next...".
-2. When relevant, share file names and code snippets relevant to the query
-3. Any file paths you return in your final response MUST be absolute. DO NOT use relative paths.`
-
-	return fmt.Sprintf("%s\n%s\n", agentPrompt, getEnvironmentInfo())
-}

internal/llm/prompt/title.go

@@ -1,13 +0,0 @@
-package prompt
-
-import "github.com/sst/opencode/internal/llm/models"
-
-func TitlePrompt(_ models.ModelProvider) string {
-	return `you will generate a short title based on the first message a user begins a conversation with
-- ensure it is not more than 50 characters long
-- the title should be a summary of the user's message
-- it should be one line long
-- do not use quotes or colons
-- the entire text you return will be used as the title
-- never return anything that is more than one sentence (one line) long`
-}

internal/llm/provider/anthropic.go

@@ -1,472 +0,0 @@
-package provider
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"strings"
-	"time"
-
-	"github.com/anthropics/anthropic-sdk-go"
-	"github.com/anthropics/anthropic-sdk-go/bedrock"
-	"github.com/anthropics/anthropic-sdk-go/option"
-	"github.com/sst/opencode/internal/config"
-	"github.com/sst/opencode/internal/llm/models"
-	"github.com/sst/opencode/internal/llm/tools"
-	"github.com/sst/opencode/internal/message"
-	"github.com/sst/opencode/internal/status"
-	"log/slog"
-)
-
-type anthropicOptions struct {
-	useBedrock   bool
-	disableCache bool
-	shouldThink  func(userMessage string) bool
-}
-
-type AnthropicOption func(*anthropicOptions)
-
-type anthropicClient struct {
-	providerOptions providerClientOptions
-	options         anthropicOptions
-	client          anthropic.Client
-}
-
-type AnthropicClient ProviderClient
-
-func newAnthropicClient(opts providerClientOptions) AnthropicClient {
-	anthropicOpts := anthropicOptions{}
-	for _, o := range opts.anthropicOptions {
-		o(&anthropicOpts)
-	}
-
-	anthropicClientOptions := []option.RequestOption{}
-	if opts.apiKey != "" {
-		anthropicClientOptions = append(anthropicClientOptions, option.WithAPIKey(opts.apiKey))
-	}
-	if anthropicOpts.useBedrock {
-		anthropicClientOptions = append(anthropicClientOptions, bedrock.WithLoadDefaultConfig(context.Background()))
-	}
-
-	client := anthropic.NewClient(anthropicClientOptions...)
-	return &anthropicClient{
-		providerOptions: opts,
-		options:         anthropicOpts,
-		client:          client,
-	}
-}
-
-func (a *anthropicClient) convertMessages(messages []message.Message) (anthropicMessages []anthropic.MessageParam) {
-	for i, msg := range messages {
-		cache := false
-		if i > len(messages)-3 {
-			cache = true
-		}
-		switch msg.Role {
-		case message.User:
-			content := anthropic.NewTextBlock(msg.Content().String())
-			if cache && !a.options.disableCache {
-				content.OfRequestTextBlock.CacheControl = anthropic.CacheControlEphemeralParam{
-					Type: "ephemeral",
-				}
-			}
-			var contentBlocks []anthropic.ContentBlockParamUnion
-			contentBlocks = append(contentBlocks, content)
-			for _, binaryContent := range msg.BinaryContent() {
-				base64Image := binaryContent.String(models.ProviderAnthropic)
-				imageBlock := anthropic.NewImageBlockBase64(binaryContent.MIMEType, base64Image)
-				contentBlocks = append(contentBlocks, imageBlock)
-			}
-			anthropicMessages = append(anthropicMessages, anthropic.NewUserMessage(contentBlocks...))
-
-		case message.Assistant:
-			blocks := []anthropic.ContentBlockParamUnion{}
-
-			if msg.Content() != nil {
-				content := msg.Content().String()
-				if strings.TrimSpace(content) != "" {
-					block := anthropic.NewTextBlock(content)
-					if cache && !a.options.disableCache {
-						block.OfRequestTextBlock.CacheControl = anthropic.CacheControlEphemeralParam{
-							Type: "ephemeral",
-						}
-					}
-					blocks = append(blocks, block)
-				}
-			}
-
-			for _, toolCall := range msg.ToolCalls() {
-				var inputMap map[string]any
-				err := json.Unmarshal([]byte(toolCall.Input), &inputMap)
-				if err != nil {
-					continue
-				}
-				blocks = append(blocks, anthropic.ContentBlockParamOfRequestToolUseBlock(toolCall.ID, inputMap, toolCall.Name))
-			}
-
-			if len(blocks) == 0 {
-				slog.Warn("There is a message without content, investigate, this should not happen")
-				continue
-			}
-			anthropicMessages = append(anthropicMessages, anthropic.NewAssistantMessage(blocks...))
-
-		case message.Tool:
-			results := make([]anthropic.ContentBlockParamUnion, len(msg.ToolResults()))
-			for i, toolResult := range msg.ToolResults() {
-				results[i] = anthropic.NewToolResultBlock(toolResult.ToolCallID, toolResult.Content, toolResult.IsError)
-			}
-			anthropicMessages = append(anthropicMessages, anthropic.NewUserMessage(results...))
-		}
-	}
-	return
-}
-
-func (a *anthropicClient) convertTools(tools []tools.BaseTool) []anthropic.ToolUnionParam {
-	anthropicTools := make([]anthropic.ToolUnionParam, len(tools))
-
-	for i, tool := range tools {
-		info := tool.Info()
-		toolParam := anthropic.ToolParam{
-			Name:        info.Name,
-			Description: anthropic.String(info.Description),
-			InputSchema: anthropic.ToolInputSchemaParam{
-				Properties: info.Parameters,
-				// TODO: figure out how we can tell claude the required fields?
-			},
-		}
-
-		if i == len(tools)-1 && !a.options.disableCache {
-			toolParam.CacheControl = anthropic.CacheControlEphemeralParam{
-				Type: "ephemeral",
-			}
-		}
-
-		anthropicTools[i] = anthropic.ToolUnionParam{OfTool: &toolParam}
-	}
-
-	return anthropicTools
-}
-
-func (a *anthropicClient) finishReason(reason string) message.FinishReason {
-	switch reason {
-	case "end_turn":
-		return message.FinishReasonEndTurn
-	case "max_tokens":
-		return message.FinishReasonMaxTokens
-	case "tool_use":
-		return message.FinishReasonToolUse
-	case "stop_sequence":
-		return message.FinishReasonEndTurn
-	default:
-		return message.FinishReasonUnknown
-	}
-}
-
-func (a *anthropicClient) preparedMessages(messages []anthropic.MessageParam, tools []anthropic.ToolUnionParam) anthropic.MessageNewParams {
-	var thinkingParam anthropic.ThinkingConfigParamUnion
-	lastMessage := messages[len(messages)-1]
-	isUser := lastMessage.Role == anthropic.MessageParamRoleUser
-	messageContent := ""
-	temperature := anthropic.Float(0)
-	if isUser {
-		for _, m := range lastMessage.Content {
-			if m.OfRequestTextBlock != nil && m.OfRequestTextBlock.Text != "" {
-				messageContent = m.OfRequestTextBlock.Text
-			}
-		}
-		if messageContent != "" && a.options.shouldThink != nil && a.options.shouldThink(messageContent) {
-			thinkingParam = anthropic.ThinkingConfigParamUnion{
-				OfThinkingConfigEnabled: &anthropic.ThinkingConfigEnabledParam{
-					BudgetTokens: int64(float64(a.providerOptions.maxTokens) * 0.8),
-					Type:         "enabled",
-				},
-			}
-			temperature = anthropic.Float(1)
-		}
-	}
-
-	return anthropic.MessageNewParams{
-		Model:       anthropic.Model(a.providerOptions.model.APIModel),
-		MaxTokens:   a.providerOptions.maxTokens,
-		Temperature: temperature,
-		Messages:    messages,
-		Tools:       tools,
-		Thinking:    thinkingParam,
-		System: []anthropic.TextBlockParam{
-			{
-				Text: a.providerOptions.systemMessage,
-				CacheControl: anthropic.CacheControlEphemeralParam{
-					Type: "ephemeral",
-				},
-			},
-		},
-	}
-}
-
-func (a *anthropicClient) send(ctx context.Context, messages []message.Message, tools []tools.BaseTool) (resposne *ProviderResponse, err error) {
-	preparedMessages := a.preparedMessages(a.convertMessages(messages), a.convertTools(tools))
-	cfg := config.Get()
-	if cfg.Debug {
-		jsonData, _ := json.Marshal(preparedMessages)
-		slog.Debug("Prepared messages", "messages", string(jsonData))
-	}
-
-	attempts := 0
-	for {
-		attempts++
-		anthropicResponse, err := a.client.Messages.New(
-			ctx,
-			preparedMessages,
-		)
-		// If there is an error we are going to see if we can retry the call
-		if err != nil {
-			slog.Error("Error in Anthropic API call", "error", err)
-			retry, after, retryErr := a.shouldRetry(attempts, err)
-			duration := time.Duration(after) * time.Millisecond
-			if retryErr != nil {
-				return nil, retryErr
-			}
-			if retry {
-				status.Warn(fmt.Sprintf("Retrying due to rate limit... attempt %d of %d", attempts, maxRetries), status.WithDuration(duration))
-				select {
-				case <-ctx.Done():
-					return nil, ctx.Err()
-				case <-time.After(duration):
-					continue
-				}
-			}
-			return nil, retryErr
-		}
-
-		content := ""
-		for _, block := range anthropicResponse.Content {
-			if text, ok := block.AsAny().(anthropic.TextBlock); ok {
-				content += text.Text
-			}
-		}
-
-		return &ProviderResponse{
-			Content:   content,
-			ToolCalls: a.toolCalls(*anthropicResponse),
-			Usage:     a.usage(*anthropicResponse),
-		}, nil
-	}
-}
-
-func (a *anthropicClient) stream(ctx context.Context, messages []message.Message, tools []tools.BaseTool) <-chan ProviderEvent {
-	preparedMessages := a.preparedMessages(a.convertMessages(messages), a.convertTools(tools))
-	cfg := config.Get()
-	if cfg.Debug {
-		jsonData, _ := json.Marshal(preparedMessages)
-		slog.Debug("Prepared messages", "messages", string(jsonData))
-	}
-	attempts := 0
-	eventChan := make(chan ProviderEvent)
-	go func() {
-		for {
-			attempts++
-			anthropicStream := a.client.Messages.NewStreaming(
-				ctx,
-				preparedMessages,
-			)
-			accumulatedMessage := anthropic.Message{}
-
-			currentToolCallID := ""
-			for anthropicStream.Next() {
-				event := anthropicStream.Current()
-				err := accumulatedMessage.Accumulate(event)
-				if err != nil {
-					slog.Warn("Error accumulating message", "error", err)
-					continue
-				}
-
-				switch event := event.AsAny().(type) {
-				case anthropic.ContentBlockStartEvent:
-					if event.ContentBlock.Type == "text" {
-						eventChan <- ProviderEvent{Type: EventContentStart}
-					} else if event.ContentBlock.Type == "tool_use" {
-						currentToolCallID = event.ContentBlock.ID
-						eventChan <- ProviderEvent{
-							Type: EventToolUseStart,
-							ToolCall: &message.ToolCall{
-								ID:       event.ContentBlock.ID,
-								Name:     event.ContentBlock.Name,
-								Finished: false,
-							},
-						}
-					}
-
-				case anthropic.ContentBlockDeltaEvent:
-					if event.Delta.Type == "thinking_delta" && event.Delta.Thinking != "" {
-						eventChan <- ProviderEvent{
-							Type:     EventThinkingDelta,
-							Thinking: event.Delta.Thinking,
-						}
-					} else if event.Delta.Type == "text_delta" && event.Delta.Text != "" {
-						eventChan <- ProviderEvent{
-							Type:    EventContentDelta,
-							Content: event.Delta.Text,
-						}
-					} else if event.Delta.Type == "input_json_delta" {
-						if currentToolCallID != "" {
-							eventChan <- ProviderEvent{
-								Type: EventToolUseDelta,
-								ToolCall: &message.ToolCall{
-									ID:       currentToolCallID,
-									Finished: false,
-									Input:    event.Delta.JSON.PartialJSON.Raw(),
-								},
-							}
-						}
-					}
-				case anthropic.ContentBlockStopEvent:
-					if currentToolCallID != "" {
-						eventChan <- ProviderEvent{
-							Type: EventToolUseStop,
-							ToolCall: &message.ToolCall{
-								ID: currentToolCallID,
-							},
-						}
-						currentToolCallID = ""
-					} else {
-						eventChan <- ProviderEvent{Type: EventContentStop}
-					}
-
-				case anthropic.MessageStopEvent:
-					content := ""
-					for _, block := range accumulatedMessage.Content {
-						if text, ok := block.AsAny().(anthropic.TextBlock); ok {
-							content += text.Text
-						}
-					}
-
-					eventChan <- ProviderEvent{
-						Type: EventComplete,
-						Response: &ProviderResponse{
-							Content:      content,
-							ToolCalls:    a.toolCalls(accumulatedMessage),
-							Usage:        a.usage(accumulatedMessage),
-							FinishReason: a.finishReason(string(accumulatedMessage.StopReason)),
-						},
-					}
-				}
-			}
-
-			err := anthropicStream.Err()
-			if err == nil || errors.Is(err, io.EOF) {
-				close(eventChan)
-				return
-			}
-			// If there is an error we are going to see if we can retry the call
-			retry, after, retryErr := a.shouldRetry(attempts, err)
-			duration := time.Duration(after) * time.Millisecond
-			if retryErr != nil {
-				eventChan <- ProviderEvent{Type: EventError, Error: retryErr}
-				close(eventChan)
-				return
-			}
-			if retry {
-				status.Warn(fmt.Sprintf("Retrying due to rate limit... attempt %d of %d", attempts, maxRetries), status.WithDuration(duration))
-				select {
-				case <-ctx.Done():
-					// context cancelled
-					if ctx.Err() != nil {
-						eventChan <- ProviderEvent{Type: EventError, Error: ctx.Err()}
-					}
-					close(eventChan)
-					return
-				case <-time.After(duration):
-					continue
-				}
-			}
-			if ctx.Err() != nil {
-				eventChan <- ProviderEvent{Type: EventError, Error: ctx.Err()}
-			}
-
-			close(eventChan)
-			return
-		}
-	}()
-	return eventChan
-}
-
-func (a *anthropicClient) shouldRetry(attempts int, err error) (bool, int64, error) {
-	var apierr *anthropic.Error
-	if !errors.As(err, &apierr) {
-		return false, 0, err
-	}
-
-	if apierr.StatusCode != 429 && apierr.StatusCode != 529 {
-		return false, 0, err
-	}
-
-	if attempts > maxRetries {
-		return false, 0, fmt.Errorf("maximum retry attempts reached for rate limit: %d retries", maxRetries)
-	}
-
-	retryMs := 0
-	retryAfterValues := apierr.Response.Header.Values("Retry-After")
-
-	backoffMs := 2000 * (1 << (attempts - 1))
-	jitterMs := int(float64(backoffMs) * 0.2)
-	retryMs = backoffMs + jitterMs
-	if len(retryAfterValues) > 0 {
-		if _, err := fmt.Sscanf(retryAfterValues[0], "%d", &retryMs); err == nil {
-			retryMs = retryMs * 1000
-		}
-	}
-	return true, int64(retryMs), nil
-}
-
-func (a *anthropicClient) toolCalls(msg anthropic.Message) []message.ToolCall {
-	var toolCalls []message.ToolCall
-
-	for _, block := range msg.Content {
-		switch variant := block.AsAny().(type) {
-		case anthropic.ToolUseBlock:
-			toolCall := message.ToolCall{
-				ID:       variant.ID,
-				Name:     variant.Name,
-				Input:    string(variant.Input),
-				Type:     string(variant.Type),
-				Finished: true,
-			}
-			toolCalls = append(toolCalls, toolCall)
-		}
-	}
-
-	return toolCalls
-}
-
-func (a *anthropicClient) usage(msg anthropic.Message) TokenUsage {
-	return TokenUsage{
-		InputTokens:         msg.Usage.InputTokens,
-		OutputTokens:        msg.Usage.OutputTokens,
-		CacheCreationTokens: msg.Usage.CacheCreationInputTokens,
-		CacheReadTokens:     msg.Usage.CacheReadInputTokens,
-	}
-}
-
-func WithAnthropicBedrock(useBedrock bool) AnthropicOption {
-	return func(options *anthropicOptions) {
-		options.useBedrock = useBedrock
-	}
-}
-
-func WithAnthropicDisableCache() AnthropicOption {
-	return func(options *anthropicOptions) {
-		options.disableCache = true
-	}
-}
-
-func DefaultShouldThinkFn(s string) bool {
-	return strings.Contains(strings.ToLower(s), "think")
-}
-
-func WithAnthropicShouldThinkFn(fn func(string) bool) AnthropicOption {
-	return func(options *anthropicOptions) {
-		options.shouldThink = fn
-	}
-}

internal/llm/provider/azure.go

@@ -1,47 +0,0 @@
-package provider
-
-import (
-	"os"
-
-	"github.com/Azure/azure-sdk-for-go/sdk/azidentity"
-	"github.com/openai/openai-go"
-	"github.com/openai/openai-go/azure"
-	"github.com/openai/openai-go/option"
-)
-
-type azureClient struct {
-	*openaiClient
-}
-
-type AzureClient ProviderClient
-
-func newAzureClient(opts providerClientOptions) AzureClient {
-
-	endpoint := os.Getenv("AZURE_OPENAI_ENDPOINT")      // ex: https://foo.openai.azure.com
-	apiVersion := os.Getenv("AZURE_OPENAI_API_VERSION") // ex: 2025-04-01-preview
-
-	if endpoint == "" || apiVersion == "" {
-		return &azureClient{openaiClient: newOpenAIClient(opts).(*openaiClient)}
-	}
-
-	reqOpts := []option.RequestOption{
-		azure.WithEndpoint(endpoint, apiVersion),
-	}
-
-	if opts.apiKey != "" || os.Getenv("AZURE_OPENAI_API_KEY") != "" {
-		key := opts.apiKey
-		if key == "" {
-			key = os.Getenv("AZURE_OPENAI_API_KEY")
-		}
-		reqOpts = append(reqOpts, azure.WithAPIKey(key))
-	} else if cred, err := azidentity.NewDefaultAzureCredential(nil); err == nil {
-		reqOpts = append(reqOpts, azure.WithTokenCredential(cred))
-	}
-
-	base := &openaiClient{
-		providerOptions: opts,
-		client:          openai.NewClient(reqOpts...),
-	}
-
-	return &azureClient{openaiClient: base}
-}

internal/llm/provider/bedrock.go

@@ -1,100 +0,0 @@
-package provider
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"os"
-	"strings"
-
-	"github.com/sst/opencode/internal/llm/tools"
-	"github.com/sst/opencode/internal/message"
-)
-
-type bedrockOptions struct {
-	// Bedrock specific options can be added here
-}
-
-type BedrockOption func(*bedrockOptions)
-
-type bedrockClient struct {
-	providerOptions providerClientOptions
-	options         bedrockOptions
-	childProvider   ProviderClient
-}
-
-type BedrockClient ProviderClient
-
-func newBedrockClient(opts providerClientOptions) BedrockClient {
-	bedrockOpts := bedrockOptions{}
-	// Apply bedrock specific options if they are added in the future
-
-	// Get AWS region from environment
-	region := os.Getenv("AWS_REGION")
-	if region == "" {
-		region = os.Getenv("AWS_DEFAULT_REGION")
-	}
-
-	if region == "" {
-		region = "us-east-1" // default region
-	}
-	if len(region) < 2 {
-		return &bedrockClient{
-			providerOptions: opts,
-			options:         bedrockOpts,
-			childProvider:   nil, // Will cause an error when used
-		}
-	}
-
-	// Prefix the model name with region
-	regionPrefix := region[:2]
-	modelName := opts.model.APIModel
-	opts.model.APIModel = fmt.Sprintf("%s.%s", regionPrefix, modelName)
-
-	// Determine which provider to use based on the model
-	if strings.Contains(string(opts.model.APIModel), "anthropic") {
-		// Create Anthropic client with Bedrock configuration
-		anthropicOpts := opts
-		anthropicOpts.anthropicOptions = append(anthropicOpts.anthropicOptions,
-			WithAnthropicBedrock(true),
-			WithAnthropicDisableCache(),
-		)
-		return &bedrockClient{
-			providerOptions: opts,
-			options:         bedrockOpts,
-			childProvider:   newAnthropicClient(anthropicOpts),
-		}
-	}
-
-	// Return client with nil childProvider if model is not supported
-	// This will cause an error when used
-	return &bedrockClient{
-		providerOptions: opts,
-		options:         bedrockOpts,
-		childProvider:   nil,
-	}
-}
-
-func (b *bedrockClient) send(ctx context.Context, messages []message.Message, tools []tools.BaseTool) (*ProviderResponse, error) {
-	if b.childProvider == nil {
-		return nil, errors.New("unsupported model for bedrock provider")
-	}
-	return b.childProvider.send(ctx, messages, tools)
-}
-
-func (b *bedrockClient) stream(ctx context.Context, messages []message.Message, tools []tools.BaseTool) <-chan ProviderEvent {
-	eventChan := make(chan ProviderEvent)
-
-	if b.childProvider == nil {
-		go func() {
-			eventChan <- ProviderEvent{
-				Type:  EventError,
-				Error: errors.New("unsupported model for bedrock provider"),
-			}
-			close(eventChan)
-		}()
-		return eventChan
-	}
-
-	return b.childProvider.stream(ctx, messages, tools)
-}

internal/llm/provider/gemini.go

@@ -1,555 +0,0 @@
-package provider
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"strings"
-	"time"
-
-	"github.com/google/uuid"
-	"github.com/sst/opencode/internal/config"
-	"github.com/sst/opencode/internal/llm/tools"
-	"github.com/sst/opencode/internal/message"
-	"github.com/sst/opencode/internal/status"
-	"google.golang.org/genai"
-	"log/slog"
-)
-
-type geminiOptions struct {
-	disableCache bool
-}
-
-type GeminiOption func(*geminiOptions)
-
-type geminiClient struct {
-	providerOptions providerClientOptions
-	options         geminiOptions
-	client          *genai.Client
-}
-
-type GeminiClient ProviderClient
-
-func newGeminiClient(opts providerClientOptions) GeminiClient {
-	geminiOpts := geminiOptions{}
-	for _, o := range opts.geminiOptions {
-		o(&geminiOpts)
-	}
-
-	client, err := genai.NewClient(context.Background(), &genai.ClientConfig{APIKey: opts.apiKey, Backend: genai.BackendGeminiAPI})
-	if err != nil {
-		slog.Error("Failed to create Gemini client", "error", err)
-		return nil
-	}
-
-	return &geminiClient{
-		providerOptions: opts,
-		options:         geminiOpts,
-		client:          client,
-	}
-}
-
-func (g *geminiClient) convertMessages(messages []message.Message) []*genai.Content {
-	var history []*genai.Content
-	for _, msg := range messages {
-		switch msg.Role {
-		case message.User:
-			var parts []*genai.Part
-			parts = append(parts, &genai.Part{Text: msg.Content().String()})
-			for _, binaryContent := range msg.BinaryContent() {
-				imageFormat := strings.Split(binaryContent.MIMEType, "/")
-				parts = append(parts, &genai.Part{InlineData: &genai.Blob{
-					MIMEType: imageFormat[1],
-					Data:     binaryContent.Data,
-				}})
-			}
-			history = append(history, &genai.Content{
-				Parts: parts,
-				Role:  "user",
-			})
-		case message.Assistant:
-			content := &genai.Content{
-				Role:  "model",
-				Parts: []*genai.Part{},
-			}
-
-			if msg.Content().String() != "" {
-				content.Parts = append(content.Parts, &genai.Part{Text: msg.Content().String()})
-			}
-
-			if len(msg.ToolCalls()) > 0 {
-				for _, call := range msg.ToolCalls() {
-					args, _ := parseJsonToMap(call.Input)
-					content.Parts = append(content.Parts, &genai.Part{
-						FunctionCall: &genai.FunctionCall{
-							Name: call.Name,
-							Args: args,
-						},
-					})
-				}
-			}
-
-			history = append(history, content)
-
-		case message.Tool:
-			for _, result := range msg.ToolResults() {
-				response := map[string]interface{}{"result": result.Content}
-				parsed, err := parseJsonToMap(result.Content)
-				if err == nil {
-					response = parsed
-				}
-
-				var toolCall message.ToolCall
-				for _, m := range messages {
-					if m.Role == message.Assistant {
-						for _, call := range m.ToolCalls() {
-							if call.ID == result.ToolCallID {
-								toolCall = call
-								break
-							}
-						}
-					}
-				}
-
-				history = append(history, &genai.Content{
-					Parts: []*genai.Part{
-						{
-							FunctionResponse: &genai.FunctionResponse{
-								Name:     toolCall.Name,
-								Response: response,
-							},
-						},
-					},
-					Role: "function",
-				})
-			}
-		}
-	}
-
-	return history
-}
-
-func (g *geminiClient) convertTools(tools []tools.BaseTool) []*genai.Tool {
-	geminiTool := &genai.Tool{}
-	geminiTool.FunctionDeclarations = make([]*genai.FunctionDeclaration, 0, len(tools))
-
-	for _, tool := range tools {
-		info := tool.Info()
-		declaration := &genai.FunctionDeclaration{
-			Name:        info.Name,
-			Description: info.Description,
-			Parameters: &genai.Schema{
-				Type:       genai.TypeObject,
-				Properties: convertSchemaProperties(info.Parameters),
-				Required:   info.Required,
-			},
-		}
-
-		geminiTool.FunctionDeclarations = append(geminiTool.FunctionDeclarations, declaration)
-	}
-
-	return []*genai.Tool{geminiTool}
-}
-
-func (g *geminiClient) finishReason(reason genai.FinishReason) message.FinishReason {
-	switch {
-	case reason == genai.FinishReasonStop:
-		return message.FinishReasonEndTurn
-	case reason == genai.FinishReasonMaxTokens:
-		return message.FinishReasonMaxTokens
-	default:
-		return message.FinishReasonUnknown
-	}
-}
-
-func (g *geminiClient) send(ctx context.Context, messages []message.Message, tools []tools.BaseTool) (*ProviderResponse, error) {
-	// Convert messages
-	geminiMessages := g.convertMessages(messages)
-
-	cfg := config.Get()
-	if cfg.Debug {
-		jsonData, _ := json.Marshal(geminiMessages)
-		slog.Debug("Prepared messages", "messages", string(jsonData))
-	}
-
-	history := geminiMessages[:len(geminiMessages)-1] // All but last message
-	lastMsg := geminiMessages[len(geminiMessages)-1]
-	config := &genai.GenerateContentConfig{
-		MaxOutputTokens: int32(g.providerOptions.maxTokens),
-		SystemInstruction: &genai.Content{
-			Parts: []*genai.Part{{Text: g.providerOptions.systemMessage}},
-		},
-	}
-	if len(tools) > 0 {
-		config.Tools = g.convertTools(tools)
-	}
-	chat, _ := g.client.Chats.Create(ctx, g.providerOptions.model.APIModel, config, history)
-
-	attempts := 0
-	for {
-		attempts++
-		var toolCalls []message.ToolCall
-
-		var lastMsgParts []genai.Part
-		for _, part := range lastMsg.Parts {
-			lastMsgParts = append(lastMsgParts, *part)
-		}
-		resp, err := chat.SendMessage(ctx, lastMsgParts...)
-		// If there is an error we are going to see if we can retry the call
-		if err != nil {
-			retry, after, retryErr := g.shouldRetry(attempts, err)
-			duration := time.Duration(after) * time.Millisecond
-			if retryErr != nil {
-				return nil, retryErr
-			}
-			if retry {
-				status.Warn(fmt.Sprintf("Retrying due to rate limit... attempt %d of %d", attempts, maxRetries), status.WithDuration(duration))
-				select {
-				case <-ctx.Done():
-					return nil, ctx.Err()
-				case <-time.After(duration):
-					continue
-				}
-			}
-			return nil, retryErr
-		}
-
-		content := ""
-
-		if len(resp.Candidates) > 0 && resp.Candidates[0].Content != nil {
-			for _, part := range resp.Candidates[0].Content.Parts {
-				switch {
-				case part.Text != "":
-					content = string(part.Text)
-				case part.FunctionCall != nil:
-					id := "call_" + uuid.New().String()
-					args, _ := json.Marshal(part.FunctionCall.Args)
-					toolCalls = append(toolCalls, message.ToolCall{
-						ID:       id,
-						Name:     part.FunctionCall.Name,
-						Input:    string(args),
-						Type:     "function",
-						Finished: true,
-					})
-				}
-			}
-		}
-		finishReason := message.FinishReasonEndTurn
-		if len(resp.Candidates) > 0 {
-			finishReason = g.finishReason(resp.Candidates[0].FinishReason)
-		}
-		if len(toolCalls) > 0 {
-			finishReason = message.FinishReasonToolUse
-		}
-
-		return &ProviderResponse{
-			Content:      content,
-			ToolCalls:    toolCalls,
-			Usage:        g.usage(resp),
-			FinishReason: finishReason,
-		}, nil
-	}
-}
-
-func (g *geminiClient) stream(ctx context.Context, messages []message.Message, tools []tools.BaseTool) <-chan ProviderEvent {
-	// Convert messages
-	geminiMessages := g.convertMessages(messages)
-
-	cfg := config.Get()
-	if cfg.Debug {
-		jsonData, _ := json.Marshal(geminiMessages)
-		slog.Debug("Prepared messages", "messages", string(jsonData))
-	}
-
-	history := geminiMessages[:len(geminiMessages)-1] // All but last message
-	lastMsg := geminiMessages[len(geminiMessages)-1]
-	config := &genai.GenerateContentConfig{
-		MaxOutputTokens: int32(g.providerOptions.maxTokens),
-		SystemInstruction: &genai.Content{
-			Parts: []*genai.Part{{Text: g.providerOptions.systemMessage}},
-		},
-	}
-	if len(tools) > 0 {
-		config.Tools = g.convertTools(tools)
-	}
-	chat, _ := g.client.Chats.Create(ctx, g.providerOptions.model.APIModel, config, history)
-
-	attempts := 0
-	eventChan := make(chan ProviderEvent)
-
-	go func() {
-		defer close(eventChan)
-
-		for {
-			attempts++
-
-			currentContent := ""
-			toolCalls := []message.ToolCall{}
-			var finalResp *genai.GenerateContentResponse
-
-			eventChan <- ProviderEvent{Type: EventContentStart}
-
-			var lastMsgParts []genai.Part
-
-			for _, part := range lastMsg.Parts {
-				lastMsgParts = append(lastMsgParts, *part)
-			}
-			for resp, err := range chat.SendMessageStream(ctx, lastMsgParts...) {
-				if err != nil {
-					retry, after, retryErr := g.shouldRetry(attempts, err)
-					duration := time.Duration(after) * time.Millisecond
-					if retryErr != nil {
-						eventChan <- ProviderEvent{Type: EventError, Error: retryErr}
-						return
-					}
-					if retry {
-						status.Warn(fmt.Sprintf("Retrying due to rate limit... attempt %d of %d", attempts, maxRetries), status.WithDuration(duration))
-						select {
-						case <-ctx.Done():
-							if ctx.Err() != nil {
-								eventChan <- ProviderEvent{Type: EventError, Error: ctx.Err()}
-							}
-
-							return
-						case <-time.After(duration):
-							break
-						}
-					} else {
-						eventChan <- ProviderEvent{Type: EventError, Error: err}
-						return
-					}
-				}
-
-				finalResp = resp
-
-				if len(resp.Candidates) > 0 && resp.Candidates[0].Content != nil {
-					for _, part := range resp.Candidates[0].Content.Parts {
-						switch {
-						case part.Text != "":
-							delta := string(part.Text)
-							if delta != "" {
-								eventChan <- ProviderEvent{
-									Type:    EventContentDelta,
-									Content: delta,
-								}
-								currentContent += delta
-							}
-						case part.FunctionCall != nil:
-							id := "call_" + uuid.New().String()
-							args, _ := json.Marshal(part.FunctionCall.Args)
-							newCall := message.ToolCall{
-								ID:       id,
-								Name:     part.FunctionCall.Name,
-								Input:    string(args),
-								Type:     "function",
-								Finished: true,
-							}
-
-							isNew := true
-							for _, existing := range toolCalls {
-								if existing.Name == newCall.Name && existing.Input == newCall.Input {
-									isNew = false
-									break
-								}
-							}
-
-							if isNew {
-								toolCalls = append(toolCalls, newCall)
-							}
-						}
-					}
-				}
-			}
-
-			eventChan <- ProviderEvent{Type: EventContentStop}
-
-			if finalResp != nil {
-
-				finishReason := message.FinishReasonEndTurn
-				if len(finalResp.Candidates) > 0 {
-					finishReason = g.finishReason(finalResp.Candidates[0].FinishReason)
-				}
-				if len(toolCalls) > 0 {
-					finishReason = message.FinishReasonToolUse
-				}
-				eventChan <- ProviderEvent{
-					Type: EventComplete,
-					Response: &ProviderResponse{
-						Content:      currentContent,
-						ToolCalls:    toolCalls,
-						Usage:        g.usage(finalResp),
-						FinishReason: finishReason,
-					},
-				}
-				return
-			}
-
-		}
-	}()
-
-	return eventChan
-}
-
-func (g *geminiClient) shouldRetry(attempts int, err error) (bool, int64, error) {
-	// Check if error is a rate limit error
-	if attempts > maxRetries {
-		return false, 0, fmt.Errorf("maximum retry attempts reached for rate limit: %d retries", maxRetries)
-	}
-
-	// Gemini doesn't have a standard error type we can check against
-	// So we'll check the error message for rate limit indicators
-	if errors.Is(err, io.EOF) {
-		return false, 0, err
-	}
-
-	errMsg := err.Error()
-	isRateLimit := false
-
-	// Check for common rate limit error messages
-	if contains(errMsg, "rate limit", "quota exceeded", "too many requests") {
-		isRateLimit = true
-	}
-
-	if !isRateLimit {
-		return false, 0, err
-	}
-
-	// Calculate backoff with jitter
-	backoffMs := 2000 * (1 << (attempts - 1))
-	jitterMs := int(float64(backoffMs) * 0.2)
-	retryMs := backoffMs + jitterMs
-
-	return true, int64(retryMs), nil
-}
-
-func (g *geminiClient) toolCalls(resp *genai.GenerateContentResponse) []message.ToolCall {
-	var toolCalls []message.ToolCall
-
-	if len(resp.Candidates) > 0 && resp.Candidates[0].Content != nil {
-		for _, part := range resp.Candidates[0].Content.Parts {
-			if part.FunctionCall != nil {
-				id := "call_" + uuid.New().String()
-				args, _ := json.Marshal(part.FunctionCall.Args)
-				toolCalls = append(toolCalls, message.ToolCall{
-					ID:    id,
-					Name:  part.FunctionCall.Name,
-					Input: string(args),
-					Type:  "function",
-				})
-			}
-		}
-	}
-
-	return toolCalls
-}
-
-func (g *geminiClient) usage(resp *genai.GenerateContentResponse) TokenUsage {
-	if resp == nil || resp.UsageMetadata == nil {
-		return TokenUsage{}
-	}
-
-	return TokenUsage{
-		InputTokens:         int64(resp.UsageMetadata.PromptTokenCount),
-		OutputTokens:        int64(resp.UsageMetadata.CandidatesTokenCount),
-		CacheCreationTokens: 0, // Not directly provided by Gemini
-		CacheReadTokens:     int64(resp.UsageMetadata.CachedContentTokenCount),
-	}
-}
-
-func WithGeminiDisableCache() GeminiOption {
-	return func(options *geminiOptions) {
-		options.disableCache = true
-	}
-}
-
-// Helper functions
-func parseJsonToMap(jsonStr string) (map[string]interface{}, error) {
-	var result map[string]interface{}
-	err := json.Unmarshal([]byte(jsonStr), &result)
-	return result, err
-}
-
-func convertSchemaProperties(parameters map[string]interface{}) map[string]*genai.Schema {
-	properties := make(map[string]*genai.Schema)
-
-	for name, param := range parameters {
-		properties[name] = convertToSchema(param)
-	}
-
-	return properties
-}
-
-func convertToSchema(param interface{}) *genai.Schema {
-	schema := &genai.Schema{Type: genai.TypeString}
-
-	paramMap, ok := param.(map[string]interface{})
-	if !ok {
-		return schema
-	}
-
-	if desc, ok := paramMap["description"].(string); ok {
-		schema.Description = desc
-	}
-
-	typeVal, hasType := paramMap["type"]
-	if !hasType {
-		return schema
-	}
-
-	typeStr, ok := typeVal.(string)
-	if !ok {
-		return schema
-	}
-
-	schema.Type = mapJSONTypeToGenAI(typeStr)
-
-	switch typeStr {
-	case "array":
-		schema.Items = processArrayItems(paramMap)
-	case "object":
-		if props, ok := paramMap["properties"].(map[string]interface{}); ok {
-			schema.Properties = convertSchemaProperties(props)
-		}
-	}
-
-	return schema
-}
-
-func processArrayItems(paramMap map[string]interface{}) *genai.Schema {
-	items, ok := paramMap["items"].(map[string]interface{})
-	if !ok {
-		return nil
-	}
-
-	return convertToSchema(items)
-}
-
-func mapJSONTypeToGenAI(jsonType string) genai.Type {
-	switch jsonType {
-	case "string":
-		return genai.TypeString
-	case "number":
-		return genai.TypeNumber
-	case "integer":
-		return genai.TypeInteger
-	case "boolean":
-		return genai.TypeBoolean
-	case "array":
-		return genai.TypeArray
-	case "object":
-		return genai.TypeObject
-	default:
-		return genai.TypeString // Default to string for unknown types
-	}
-}
-
-func contains(s string, substrs ...string) bool {
-	for _, substr := range substrs {
-		if strings.Contains(strings.ToLower(s), strings.ToLower(substr)) {
-			return true
-		}
-	}
-	return false
-}

internal/llm/provider/openai.go

@@ -1,149 +0,0 @@
-package provider
-
-import (
-	"context"
-	"errors"
-	"fmt"
-	"log/slog"
-	"github.com/openai/openai-go"
-	"github.com/openai/openai-go/option"
-	"github.com/sst/opencode/internal/llm/models"
-	"github.com/sst/opencode/internal/llm/tools"
-	"github.com/sst/opencode/internal/message"
-)
-
-type openaiOptions struct {
-	baseURL         string
-	disableCache    bool
-	reasoningEffort string
-	extraHeaders    map[string]string
-}
-
-type OpenAIOption func(*openaiOptions)
-
-type openaiClient struct {
-	providerOptions providerClientOptions
-	options         openaiOptions
-	client          openai.Client
-}
-
-type OpenAIClient ProviderClient
-
-func newOpenAIClient(opts providerClientOptions) OpenAIClient {
-	openaiOpts := openaiOptions{
-		reasoningEffort: "medium",
-	}
-	for _, o := range opts.openaiOptions {
-		o(&openaiOpts)
-	}
-
-	openaiClientOptions := []option.RequestOption{}
-	if opts.apiKey != "" {
-		openaiClientOptions = append(openaiClientOptions, option.WithAPIKey(opts.apiKey))
-	}
-	if openaiOpts.baseURL != "" {
-		openaiClientOptions = append(openaiClientOptions, option.WithBaseURL(openaiOpts.baseURL))
-	}
-
-	if openaiOpts.extraHeaders != nil {
-		for key, value := range openaiOpts.extraHeaders {
-			openaiClientOptions = append(openaiClientOptions, option.WithHeader(key, value))
-		}
-	}
-
-	client := openai.NewClient(openaiClientOptions...)
-	return &openaiClient{
-		providerOptions: opts,
-		options:         openaiOpts,
-		client:          client,
-	}
-}
-
-func (o *openaiClient) send(ctx context.Context, messages []message.Message, tools []tools.BaseTool) (response *ProviderResponse, err error) {
-	if o.providerOptions.model.ID == models.OpenAIModels[models.CodexMini].ID || o.providerOptions.model.ID == models.OpenAIModels[models.O1Pro].ID {
-		return o.sendResponseMessages(ctx, messages, tools)
-	}
-	return o.sendChatcompletionMessage(ctx, messages, tools)
-}
-
-func (o *openaiClient) stream(ctx context.Context, messages []message.Message, tools []tools.BaseTool) <-chan ProviderEvent {
-	if o.providerOptions.model.ID == models.OpenAIModels[models.CodexMini].ID || o.providerOptions.model.ID == models.OpenAIModels[models.O1Pro].ID {
-		return o.streamResponseMessages(ctx, messages, tools)
-	}
-	return o.streamChatCompletionMessages(ctx, messages, tools)
-}
-
-
-func (o *openaiClient) finishReason(reason string) message.FinishReason {
-	switch reason {
-	case "stop":
-		return message.FinishReasonEndTurn
-	case "length":
-		return message.FinishReasonMaxTokens
-	case "tool_calls":
-		return message.FinishReasonToolUse
-	default:
-		return message.FinishReasonUnknown
-	}
-}
-
-
-func (o *openaiClient) shouldRetry(attempts int, err error) (bool, int64, error) {
-	var apierr *openai.Error
-	if !errors.As(err, &apierr) {
-		return false, 0, err
-	}
-
-	if apierr.StatusCode != 429 && apierr.StatusCode != 500 {
-		return false, 0, err
-	}
-
-	if attempts > maxRetries {
-		return false, 0, fmt.Errorf("maximum retry attempts reached for rate limit: %d retries", maxRetries)
-	}
-
-	retryMs := 0
-	retryAfterValues := apierr.Response.Header.Values("Retry-After")
-
-	backoffMs := 2000 * (1 << (attempts - 1))
-	jitterMs := int(float64(backoffMs) * 0.2)
-	retryMs = backoffMs + jitterMs
-	if len(retryAfterValues) > 0 {
-		if _, err := fmt.Sscanf(retryAfterValues[0], "%d", &retryMs); err == nil {
-			retryMs = retryMs * 1000
-		}
-	}
-	return true, int64(retryMs), nil
-}
-
-
-func WithOpenAIBaseURL(baseURL string) OpenAIOption {
-	return func(options *openaiOptions) {
-		options.baseURL = baseURL
-	}
-}
-
-func WithOpenAIExtraHeaders(headers map[string]string) OpenAIOption {
-	return func(options *openaiOptions) {
-		options.extraHeaders = headers
-	}
-}
-
-func WithOpenAIDisableCache() OpenAIOption {
-	return func(options *openaiOptions) {
-		options.disableCache = true
-	}
-}
-
-func WithReasoningEffort(effort string) OpenAIOption {
-	return func(options *openaiOptions) {
-		defaultReasoningEffort := "medium"
-		switch effort {
-		case "low", "medium", "high":
-			defaultReasoningEffort = effort
-		default:
-			slog.Warn("Invalid reasoning effort, using default: medium")
-		}
-		options.reasoningEffort = defaultReasoningEffort
-	}
-}

internal/llm/provider/openai_completion.go

@@ -1,317 +0,0 @@
-package provider
-
-import (
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"log/slog"
-	"time"
-
-	"github.com/openai/openai-go"
-	"github.com/openai/openai-go/shared"
-	"github.com/sst/opencode/internal/config"
-	"github.com/sst/opencode/internal/llm/models"
-	"github.com/sst/opencode/internal/llm/tools"
-	"github.com/sst/opencode/internal/message"
-	"github.com/sst/opencode/internal/status"
-)
-
-func (o *openaiClient) convertMessagesToChatCompletionMessages(messages []message.Message) (openaiMessages []openai.ChatCompletionMessageParamUnion) {
-	// Add system message first
-	openaiMessages = append(openaiMessages, openai.SystemMessage(o.providerOptions.systemMessage))
-
-	for _, msg := range messages {
-		switch msg.Role {
-		case message.User:
-			var content []openai.ChatCompletionContentPartUnionParam
-			textBlock := openai.ChatCompletionContentPartTextParam{Text: msg.Content().String()}
-			content = append(content, openai.ChatCompletionContentPartUnionParam{OfText: &textBlock})
-			for _, binaryContent := range msg.BinaryContent() {
-				imageURL := openai.ChatCompletionContentPartImageImageURLParam{URL: binaryContent.String(models.ProviderOpenAI)}
-				imageBlock := openai.ChatCompletionContentPartImageParam{ImageURL: imageURL}
-
-				content = append(content, openai.ChatCompletionContentPartUnionParam{OfImageURL: &imageBlock})
-			}
-
-			openaiMessages = append(openaiMessages, openai.UserMessage(content))
-
-		case message.Assistant:
-			assistantMsg := openai.ChatCompletionAssistantMessageParam{
-				Role: "assistant",
-			}
-
-			if msg.Content().String() != "" {
-				assistantMsg.Content = openai.ChatCompletionAssistantMessageParamContentUnion{
-					OfString: openai.String(msg.Content().String()),
-				}
-			}
-
-			if len(msg.ToolCalls()) > 0 {
-				assistantMsg.ToolCalls = make([]openai.ChatCompletionMessageToolCallParam, len(msg.ToolCalls()))
-				for i, call := range msg.ToolCalls() {
-					assistantMsg.ToolCalls[i] = openai.ChatCompletionMessageToolCallParam{
-						ID:   call.ID,
-						Type: "function",
-						Function: openai.ChatCompletionMessageToolCallFunctionParam{
-							Name:      call.Name,
-							Arguments: call.Input,
-						},
-					}
-				}
-			}
-
-			openaiMessages = append(openaiMessages, openai.ChatCompletionMessageParamUnion{
-				OfAssistant: &assistantMsg,
-			})
-
-		case message.Tool:
-			for _, result := range msg.ToolResults() {
-				openaiMessages = append(openaiMessages,
-					openai.ToolMessage(result.Content, result.ToolCallID),
-				)
-			}
-		}
-	}
-
-	return
-}
-
-func (o *openaiClient) convertToChatCompletionTools(tools []tools.BaseTool) []openai.ChatCompletionToolParam {
-	openaiTools := make([]openai.ChatCompletionToolParam, len(tools))
-
-	for i, tool := range tools {
-		info := tool.Info()
-		openaiTools[i] = openai.ChatCompletionToolParam{
-			Function: openai.FunctionDefinitionParam{
-				Name:        info.Name,
-				Description: openai.String(info.Description),
-				Parameters: openai.FunctionParameters{
-					"type":       "object",
-					"properties": info.Parameters,
-					"required":   info.Required,
-				},
-			},
-		}
-	}
-
-	return openaiTools
-}
-
-func (o *openaiClient) preparedChatCompletionParams(messages []openai.ChatCompletionMessageParamUnion, tools []openai.ChatCompletionToolParam) openai.ChatCompletionNewParams {
-	params := openai.ChatCompletionNewParams{
-		Model:    openai.ChatModel(o.providerOptions.model.APIModel),
-		Messages: messages,
-		Tools:    tools,
-	}
-	if o.providerOptions.model.CanReason == true {
-		params.MaxCompletionTokens = openai.Int(o.providerOptions.maxTokens)
-		switch o.options.reasoningEffort {
-		case "low":
-			params.ReasoningEffort = shared.ReasoningEffortLow
-		case "medium":
-			params.ReasoningEffort = shared.ReasoningEffortMedium
-		case "high":
-			params.ReasoningEffort = shared.ReasoningEffortHigh
-		default:
-			params.ReasoningEffort = shared.ReasoningEffortMedium
-		}
-	} else {
-		params.MaxTokens = openai.Int(o.providerOptions.maxTokens)
-	}
-
-	if o.providerOptions.model.Provider == models.ProviderOpenRouter {
-		params.WithExtraFields(map[string]any{
-			"provider": map[string]any{
-				"require_parameters": true,
-			},
-		})
-	}
-
-	return params
-}
-
-func (o *openaiClient) sendChatcompletionMessage(ctx context.Context, messages []message.Message, tools []tools.BaseTool) (response *ProviderResponse, err error) {
-	params := o.preparedChatCompletionParams(o.convertMessagesToChatCompletionMessages(messages), o.convertToChatCompletionTools(tools))
-	cfg := config.Get()
-	if cfg.Debug {
-		jsonData, _ := json.Marshal(params)
-		slog.Debug("Prepared messages", "messages", string(jsonData))
-	}
-	attempts := 0
-	for {
-		attempts++
-		openaiResponse, err := o.client.Chat.Completions.New(
-			ctx,
-			params,
-		)
-		// If there is an error we are going to see if we can retry the call
-		if err != nil {
-			retry, after, retryErr := o.shouldRetry(attempts, err)
-			duration := time.Duration(after) * time.Millisecond
-			if retryErr != nil {
-				return nil, retryErr
-			}
-			if retry {
-				status.Warn(fmt.Sprintf("Retrying due to rate limit... attempt %d of %d", attempts, maxRetries), status.WithDuration(duration))
-				select {
-				case <-ctx.Done():
-					return nil, ctx.Err()
-				case <-time.After(duration):
-					continue
-				}
-			}
-			return nil, retryErr
-		}
-
-		content := ""
-		if openaiResponse.Choices[0].Message.Content != "" {
-			content = openaiResponse.Choices[0].Message.Content
-		}
-
-		toolCalls := o.chatCompletionToolCalls(*openaiResponse)
-		finishReason := o.finishReason(string(openaiResponse.Choices[0].FinishReason))
-
-		if len(toolCalls) > 0 {
-			finishReason = message.FinishReasonToolUse
-		}
-
-		return &ProviderResponse{
-			Content:      content,
-			ToolCalls:    toolCalls,
-			Usage:        o.usage(*openaiResponse),
-			FinishReason: finishReason,
-		}, nil
-	}
-}
-
-func (o *openaiClient) streamChatCompletionMessages(ctx context.Context, messages []message.Message, tools []tools.BaseTool) <-chan ProviderEvent {
-	params := o.preparedChatCompletionParams(o.convertMessagesToChatCompletionMessages(messages), o.convertToChatCompletionTools(tools))
-	params.StreamOptions = openai.ChatCompletionStreamOptionsParam{
-		IncludeUsage: openai.Bool(true),
-	}
-
-	cfg := config.Get()
-	if cfg.Debug {
-		jsonData, _ := json.Marshal(params)
-		slog.Debug("Prepared messages", "messages", string(jsonData))
-	}
-
-	attempts := 0
-	eventChan := make(chan ProviderEvent)
-
-	go func() {
-		for {
-			attempts++
-			openaiStream := o.client.Chat.Completions.NewStreaming(
-				ctx,
-				params,
-			)
-
-			acc := openai.ChatCompletionAccumulator{}
-			currentContent := ""
-			toolCalls := make([]message.ToolCall, 0)
-
-			for openaiStream.Next() {
-				chunk := openaiStream.Current()
-				acc.AddChunk(chunk)
-
-				for _, choice := range chunk.Choices {
-					if choice.Delta.Content != "" {
-						eventChan <- ProviderEvent{
-							Type:    EventContentDelta,
-							Content: choice.Delta.Content,
-						}
-						currentContent += choice.Delta.Content
-					}
-				}
-			}
-
-			err := openaiStream.Err()
-			if err == nil || errors.Is(err, io.EOF) {
-				// Stream completed successfully
-				finishReason := o.finishReason(string(acc.ChatCompletion.Choices[0].FinishReason))
-				if len(acc.ChatCompletion.Choices[0].Message.ToolCalls) > 0 {
-					toolCalls = append(toolCalls, o.chatCompletionToolCalls(acc.ChatCompletion)...)
-				}
-				if len(toolCalls) > 0 {
-					finishReason = message.FinishReasonToolUse
-				}
-
-				eventChan <- ProviderEvent{
-					Type: EventComplete,
-					Response: &ProviderResponse{
-						Content:      currentContent,
-						ToolCalls:    toolCalls,
-						Usage:        o.usage(acc.ChatCompletion),
-						FinishReason: finishReason,
-					},
-				}
-				close(eventChan)
-				return
-			}
-
-			// If there is an error we are going to see if we can retry the call
-			retry, after, retryErr := o.shouldRetry(attempts, err)
-			duration := time.Duration(after) * time.Millisecond
-			if retryErr != nil {
-				eventChan <- ProviderEvent{Type: EventError, Error: retryErr}
-				close(eventChan)
-				return
-			}
-			if retry {
-				status.Warn(fmt.Sprintf("Retrying due to rate limit... attempt %d of %d", attempts, maxRetries), status.WithDuration(duration))
-				select {
-				case <-ctx.Done():
-					// context cancelled
-					if ctx.Err() == nil {
-						eventChan <- ProviderEvent{Type: EventError, Error: ctx.Err()}
-					}
-					close(eventChan)
-					return
-				case <-time.After(duration):
-					continue
-				}
-			}
-			eventChan <- ProviderEvent{Type: EventError, Error: retryErr}
-			close(eventChan)
-			return
-		}
-	}()
-
-	return eventChan
-}
-
-
-func (o *openaiClient) chatCompletionToolCalls(completion openai.ChatCompletion) []message.ToolCall {
-	var toolCalls []message.ToolCall
-
-	if len(completion.Choices) > 0 && len(completion.Choices[0].Message.ToolCalls) > 0 {
-		for _, call := range completion.Choices[0].Message.ToolCalls {
-			toolCall := message.ToolCall{
-				ID:       call.ID,
-				Name:     call.Function.Name,
-				Input:    call.Function.Arguments,
-				Type:     "function",
-				Finished: true,
-			}
-			toolCalls = append(toolCalls, toolCall)
-		}
-	}
-
-	return toolCalls
-}
-
-func (o *openaiClient) usage(completion openai.ChatCompletion) TokenUsage {
-	cachedTokens := completion.Usage.PromptTokensDetails.CachedTokens
-	inputTokens := completion.Usage.PromptTokens - cachedTokens
-
-	return TokenUsage{
-		InputTokens:         inputTokens,
-		OutputTokens:        completion.Usage.CompletionTokens,
-		CacheCreationTokens: 0, // OpenAI doesn't provide this directly
-		CacheReadTokens:     cachedTokens,
-	}
-}
-

internal/llm/provider/openai_response.go

@@ -1,393 +0,0 @@
-package provider
-
-
-import (
-	"github.com/openai/openai-go"
-	"github.com/openai/openai-go/responses"
-	"github.com/sst/opencode/internal/llm/models"
-	"github.com/sst/opencode/internal/llm/tools"
-	"github.com/sst/opencode/internal/message"
-	"context"
-	"encoding/json"
-	"errors"
-	"fmt"
-	"io"
-	"time"
-
-	"log/slog"
-
-	"github.com/openai/openai-go/shared"
-	"github.com/sst/opencode/internal/config"
-	"github.com/sst/opencode/internal/status"
-)
-
-func (o *openaiClient) convertMessagesToResponseParams(messages []message.Message) responses.ResponseInputParam {
-	inputItems := responses.ResponseInputParam{}
-
-	inputItems = append(inputItems, responses.ResponseInputItemUnionParam{
-		OfMessage: &responses.EasyInputMessageParam{
-			Content: responses.EasyInputMessageContentUnionParam{OfString: openai.String(o.providerOptions.systemMessage)},
-			Role:    responses.EasyInputMessageRoleSystem,
-		},
-	})
-
-	for _, msg := range messages {
-		switch msg.Role {
-		case message.User:
-			inputItemContentList := responses.ResponseInputMessageContentListParam{
-				responses.ResponseInputContentUnionParam{
-					OfInputText: &responses.ResponseInputTextParam{
-						Text: msg.Content().String(),
-					},
-				},
-			}
-
-			for _, binaryContent := range msg.BinaryContent() {
-				inputItemContentList = append(inputItemContentList, responses.ResponseInputContentUnionParam{
-					OfInputImage: &responses.ResponseInputImageParam{
-						ImageURL: openai.String(binaryContent.String(models.ProviderOpenAI)),
-					},
-				})
-			}
-
-			userMsg := responses.ResponseInputItemUnionParam{
-				OfInputMessage: &responses.ResponseInputItemMessageParam{
-					Content: inputItemContentList,
-					Role:    string(responses.ResponseInputMessageItemRoleUser),
-				},
-			}
-			inputItems = append(inputItems, userMsg)
-
-		case message.Assistant:
-			if msg.Content().String() != "" {
-				assistantMsg := responses.ResponseInputItemUnionParam{
-					OfOutputMessage: &responses.ResponseOutputMessageParam{
-						Content: []responses.ResponseOutputMessageContentUnionParam{{
-							OfOutputText: &responses.ResponseOutputTextParam{
-								Text: msg.Content().String(),
-							},
-						}},
-					},
-				}
-				inputItems = append(inputItems, assistantMsg)
-			}
-
-			if len(msg.ToolCalls()) > 0 {
-				for _, call := range msg.ToolCalls() {
-					toolMsg := responses.ResponseInputItemUnionParam{
-						OfFunctionCall: &responses.ResponseFunctionToolCallParam{
-							CallID:    call.ID,
-							Name:      call.Name,
-							Arguments: call.Input,
-						},
-					}
-					inputItems = append(inputItems, toolMsg)
-				}
-			}
-
-		case message.Tool:
-			for _, result := range msg.ToolResults() {
-				toolMsg := responses.ResponseInputItemUnionParam{
-					OfFunctionCallOutput: &responses.ResponseInputItemFunctionCallOutputParam{
-						Output: result.Content,
-						CallID: result.ToolCallID,
-					},
-				}
-				inputItems = append(inputItems, toolMsg)
-			}
-		}
-	}
-
-	return inputItems
-}
-
-func (o *openaiClient) convertToResponseTools(tools []tools.BaseTool) []responses.ToolUnionParam {
-	outputTools := make([]responses.ToolUnionParam, len(tools))
-
-	for i, tool := range tools {
-		info := tool.Info()
-		outputTools[i] = responses.ToolUnionParam{
-			OfFunction: &responses.FunctionToolParam{
-				Name:        info.Name,
-				Description: openai.String(info.Description),
-				Parameters: map[string]any{
-					"type":       "object",
-					"properties": info.Parameters,
-					"required":   info.Required,
-				},
-			},
-		}
-	}
-
-	return outputTools
-}
-
-
-func (o *openaiClient) preparedResponseParams(input responses.ResponseInputParam, tools []responses.ToolUnionParam) responses.ResponseNewParams {
-	params := responses.ResponseNewParams{
-		Model: shared.ResponsesModel(o.providerOptions.model.APIModel),
-		Input: responses.ResponseNewParamsInputUnion{OfInputItemList: input},
-		Tools: tools,
-	}
-
-	params.MaxOutputTokens = openai.Int(o.providerOptions.maxTokens)
-
-	if o.providerOptions.model.CanReason == true {
-		switch o.options.reasoningEffort {
-		case "low":
-			params.Reasoning.Effort = shared.ReasoningEffortLow
-		case "medium":
-			params.Reasoning.Effort = shared.ReasoningEffortMedium
-		case "high":
-			params.Reasoning.Effort = shared.ReasoningEffortHigh
-		default:
-			params.Reasoning.Effort = shared.ReasoningEffortMedium
-		}
-	}
-
-	if o.providerOptions.model.Provider == models.ProviderOpenRouter {
-		params.WithExtraFields(map[string]any{
-			"provider": map[string]any{
-				"require_parameters": true,
-			},
-		})
-	}
-
-	return params
-}
-
-func (o *openaiClient) sendResponseMessages(ctx context.Context, messages []message.Message, tools []tools.BaseTool) (response *ProviderResponse, err error) {
-	params := o.preparedResponseParams(o.convertMessagesToResponseParams(messages), o.convertToResponseTools(tools))
-	cfg := config.Get()
-	if cfg.Debug {
-		jsonData, _ := json.Marshal(params)
-		slog.Debug("Prepared messages", "messages", string(jsonData))
-	}
-	attempts := 0
-	for {
-		attempts++
-		openaiResponse, err := o.client.Responses.New(
-			ctx,
-			params,
-		)
-		// If there is an error we are going to see if we can retry the call
-		if err != nil {
-			retry, after, retryErr := o.shouldRetry(attempts, err)
-			duration := time.Duration(after) * time.Millisecond
-			if retryErr != nil {
-				return nil, retryErr
-			}
-			if retry {
-				status.Warn(fmt.Sprintf("Retrying due to rate limit... attempt %d of %d", attempts, maxRetries), status.WithDuration(duration))
-				select {
-				case <-ctx.Done():
-					return nil, ctx.Err()
-				case <-time.After(duration):
-					continue
-				}
-			}
-			return nil, retryErr
-		}
-
-		content := ""
-		if openaiResponse.OutputText() != "" {
-			content = openaiResponse.OutputText()
-		}
-
-		toolCalls := o.responseToolCalls(*openaiResponse)
-		finishReason := o.finishReason("stop")
-
-		if len(toolCalls) > 0 {
-			finishReason = message.FinishReasonToolUse
-		}
-
-		return &ProviderResponse{
-			Content:      content,
-			ToolCalls:    toolCalls,
-			Usage:        o.responseUsage(*openaiResponse),
-			FinishReason: finishReason,
-		}, nil
-	}
-}
-
-func (o *openaiClient) streamResponseMessages(ctx context.Context, messages []message.Message, tools []tools.BaseTool) <-chan ProviderEvent {
-	eventChan := make(chan ProviderEvent)
-
-	params := o.preparedResponseParams(o.convertMessagesToResponseParams(messages), o.convertToResponseTools(tools))
-
-	cfg := config.Get()
-	if cfg.Debug {
-		jsonData, _ := json.Marshal(params)
-		slog.Debug("Prepared messages", "messages", string(jsonData))
-	}
-
-	attempts := 0
-
-	go func() {
-		for {
-			attempts++
-			stream := o.client.Responses.NewStreaming(ctx, params)
-			outputText := ""
-			currentToolCallID := ""
-			for stream.Next() {
-				event := stream.Current()
-
-				switch event := event.AsAny().(type) {
-				case responses.ResponseCompletedEvent:
-					toolCalls := o.responseToolCalls(event.Response)
-					finishReason := o.finishReason("stop")
-
-					if len(toolCalls) > 0 {
-						finishReason = message.FinishReasonToolUse
-					}
-
-					eventChan <- ProviderEvent{
-						Type: EventComplete,
-						Response: &ProviderResponse{
-							Content:      outputText,
-							ToolCalls:    toolCalls,
-							Usage:        o.responseUsage(event.Response),
-							FinishReason: finishReason,
-						},
-					}
-					close(eventChan)
-					return
-
-				case responses.ResponseTextDeltaEvent:
-					outputText += event.Delta
-					eventChan <- ProviderEvent{
-						Type:    EventContentDelta,
-						Content: event.Delta,
-					}
-
-				case responses.ResponseTextDoneEvent:
-					eventChan <- ProviderEvent{
-						Type:    EventContentStop,
-						Content: outputText,
-					}
-					close(eventChan)
-					return
-
-				case responses.ResponseOutputItemAddedEvent:
-					if event.Item.Type == "function_call" {
-						currentToolCallID = event.Item.ID
-						eventChan <- ProviderEvent{
-							Type: EventToolUseStart,
-							ToolCall: &message.ToolCall{
-								ID:       event.Item.ID,
-								Name:     event.Item.Name,
-								Finished: false,
-							},
-						}
-					}
-
-				case responses.ResponseFunctionCallArgumentsDeltaEvent:
-					if event.ItemID == currentToolCallID {
-						eventChan <- ProviderEvent{
-							Type: EventToolUseDelta,
-							ToolCall: &message.ToolCall{
-								ID:       currentToolCallID,
-								Finished: false,
-								Input:    event.Delta,
-							},
-						}
-					}
-
-				case responses.ResponseFunctionCallArgumentsDoneEvent:
-					if event.ItemID == currentToolCallID {
-						eventChan <- ProviderEvent{
-							Type: EventToolUseStop,
-							ToolCall: &message.ToolCall{
-								ID:    currentToolCallID,
-								Input: event.Arguments,
-							},
-						}
-						currentToolCallID = ""
-					}
-
-				case responses.ResponseOutputItemDoneEvent:
-					if event.Item.Type == "function_call" {
-						eventChan <- ProviderEvent{
-							Type: EventToolUseStop,
-							ToolCall: &message.ToolCall{
-								ID:       event.Item.ID,
-								Name:     event.Item.Name,
-								Input:    event.Item.Arguments,
-								Finished: true,
-							},
-						}
-						currentToolCallID = ""
-					}
-
-				}
-			}
-
-			err := stream.Err()
-			if err == nil || errors.Is(err, io.EOF) {
-				close(eventChan)
-				return
-			}
-
-			// If there is an error we are going to see if we can retry the call
-			retry, after, retryErr := o.shouldRetry(attempts, err)
-			duration := time.Duration(after) * time.Millisecond
-			if retryErr != nil {
-				eventChan <- ProviderEvent{Type: EventError, Error: retryErr}
-				close(eventChan)
-				return
-			}
-			if retry {
-				status.Warn(fmt.Sprintf("Retrying due to rate limit... attempt %d of %d", attempts, maxRetries), status.WithDuration(duration))
-				select {
-				case <-ctx.Done():
-					// context cancelled
-					if ctx.Err() == nil {
-						eventChan <- ProviderEvent{Type: EventError, Error: ctx.Err()}
-					}
-					close(eventChan)
-					return
-				case <-time.After(duration):
-					continue
-				}
-			}
-			eventChan <- ProviderEvent{Type: EventError, Error: retryErr}
-			close(eventChan)
-			return
-		}
-	}()
-
-	return eventChan
-}
-
-
-func (o *openaiClient) responseToolCalls(response responses.Response) []message.ToolCall {
-	var toolCalls []message.ToolCall
-
-	for _, output := range response.Output {
-		if output.Type == "function_call" {
-			call := output.AsFunctionCall()
-			toolCall := message.ToolCall{
-				ID:       call.ID,
-				Name:     call.Name,
-				Input:    call.Arguments,
-				Type:     "function",
-				Finished: true,
-			}
-			toolCalls = append(toolCalls, toolCall)
-		}
-	}
-
-	return toolCalls
-}
-
-func (o *openaiClient) responseUsage(response responses.Response) TokenUsage {
-	cachedTokens := response.Usage.InputTokensDetails.CachedTokens
-	inputTokens := response.Usage.InputTokens - cachedTokens
-
-	return TokenUsage{
-		InputTokens:         inputTokens,
-		OutputTokens:        response.Usage.OutputTokens,
-		CacheCreationTokens: 0, // OpenAI doesn't provide this directly
-		CacheReadTokens:     cachedTokens,
-	}
-}

internal/llm/provider/provider.go

@@ -1,269 +0,0 @@
-package provider
-
-import (
-	"context"
-	"fmt"
-	"log/slog"
-
-	"github.com/sst/opencode/internal/llm/models"
-	"github.com/sst/opencode/internal/llm/tools"
-	"github.com/sst/opencode/internal/message"
-)
-
-type EventType string
-
-const maxRetries = 8
-
-const (
-	EventContentStart  EventType = "content_start"
-	EventToolUseStart  EventType = "tool_use_start"
-	EventToolUseDelta  EventType = "tool_use_delta"
-	EventToolUseStop   EventType = "tool_use_stop"
-	EventContentDelta  EventType = "content_delta"
-	EventThinkingDelta EventType = "thinking_delta"
-	EventContentStop   EventType = "content_stop"
-	EventComplete      EventType = "complete"
-	EventError         EventType = "error"
-	EventWarning       EventType = "warning"
-)
-
-type TokenUsage struct {
-	InputTokens         int64
-	OutputTokens        int64
-	CacheCreationTokens int64
-	CacheReadTokens     int64
-}
-
-type ProviderResponse struct {
-	Content      string
-	ToolCalls    []message.ToolCall
-	Usage        TokenUsage
-	FinishReason message.FinishReason
-}
-
-type ProviderEvent struct {
-	Type EventType
-
-	Content  string
-	Thinking string
-	Response *ProviderResponse
-	ToolCall *message.ToolCall
-	Error    error
-}
-type Provider interface {
-	SendMessages(ctx context.Context, messages []message.Message, tools []tools.BaseTool) (*ProviderResponse, error)
-
-	StreamResponse(ctx context.Context, messages []message.Message, tools []tools.BaseTool) <-chan ProviderEvent
-
-	Model() models.Model
-
-	MaxTokens() int64
-}
-
-type providerClientOptions struct {
-	apiKey        string
-	model         models.Model
-	maxTokens     int64
-	systemMessage string
-
-	anthropicOptions []AnthropicOption
-	openaiOptions    []OpenAIOption
-	geminiOptions    []GeminiOption
-	bedrockOptions   []BedrockOption
-}
-
-type ProviderClientOption func(*providerClientOptions)
-
-type ProviderClient interface {
-	send(ctx context.Context, messages []message.Message, tools []tools.BaseTool) (*ProviderResponse, error)
-	stream(ctx context.Context, messages []message.Message, tools []tools.BaseTool) <-chan ProviderEvent
-}
-
-type baseProvider[C ProviderClient] struct {
-	options providerClientOptions
-	client  C
-}
-
-func NewProvider(providerName models.ModelProvider, opts ...ProviderClientOption) (Provider, error) {
-	clientOptions := providerClientOptions{}
-	for _, o := range opts {
-		o(&clientOptions)
-	}
-	switch providerName {
-	case models.ProviderAnthropic:
-		return &baseProvider[AnthropicClient]{
-			options: clientOptions,
-			client:  newAnthropicClient(clientOptions),
-		}, nil
-	case models.ProviderOpenAI:
-		return &baseProvider[OpenAIClient]{
-			options: clientOptions,
-			client:  newOpenAIClient(clientOptions),
-		}, nil
-	case models.ProviderGemini:
-		return &baseProvider[GeminiClient]{
-			options: clientOptions,
-			client:  newGeminiClient(clientOptions),
-		}, nil
-	case models.ProviderBedrock:
-		return &baseProvider[BedrockClient]{
-			options: clientOptions,
-			client:  newBedrockClient(clientOptions),
-		}, nil
-	case models.ProviderGROQ:
-		clientOptions.openaiOptions = append(clientOptions.openaiOptions,
-			WithOpenAIBaseURL("https://api.groq.com/openai/v1"),
-		)
-		return &baseProvider[OpenAIClient]{
-			options: clientOptions,
-			client:  newOpenAIClient(clientOptions),
-		}, nil
-	case models.ProviderAzure:
-		return &baseProvider[AzureClient]{
-			options: clientOptions,
-			client:  newAzureClient(clientOptions),
-		}, nil
-	case models.ProviderVertexAI:
-		return &baseProvider[VertexAIClient]{
-			options: clientOptions,
-			client:  newVertexAIClient(clientOptions),
-		}, nil
-	case models.ProviderOpenRouter:
-		clientOptions.openaiOptions = append(clientOptions.openaiOptions,
-			WithOpenAIBaseURL("https://openrouter.ai/api/v1"),
-			WithOpenAIExtraHeaders(map[string]string{
-				"HTTP-Referer": "opencode.ai",
-				"X-Title":      "OpenCode",
-			}),
-		)
-		return &baseProvider[OpenAIClient]{
-			options: clientOptions,
-			client:  newOpenAIClient(clientOptions),
-		}, nil
-	case models.ProviderXAI:
-		clientOptions.openaiOptions = append(clientOptions.openaiOptions,
-			WithOpenAIBaseURL("https://api.x.ai/v1"),
-		)
-		return &baseProvider[OpenAIClient]{
-			options: clientOptions,
-			client:  newOpenAIClient(clientOptions),
-		}, nil
-
-	case models.ProviderMock:
-		// TODO: implement mock client for test
-		panic("not implemented")
-	}
-	return nil, fmt.Errorf("provider not supported: %s", providerName)
-}
-
-func (p *baseProvider[C]) cleanMessages(messages []message.Message) (cleaned []message.Message) {
-	for _, msg := range messages {
-		// The message has no content
-		if len(msg.Parts) == 0 {
-			continue
-		}
-		cleaned = append(cleaned, msg)
-	}
-	return
-}
-
-func (p *baseProvider[C]) SendMessages(ctx context.Context, messages []message.Message, tools []tools.BaseTool) (*ProviderResponse, error) {
-	messages = p.cleanMessages(messages)
-	response, err := p.client.send(ctx, messages, tools)
-	if err == nil && response != nil {
-		slog.Debug("API request token usage",
-			"model", p.options.model.Name,
-			"input_tokens", response.Usage.InputTokens,
-			"output_tokens", response.Usage.OutputTokens,
-			"cache_creation_tokens", response.Usage.CacheCreationTokens,
-			"cache_read_tokens", response.Usage.CacheReadTokens,
-			"total_tokens", response.Usage.InputTokens+response.Usage.OutputTokens)
-	}
-	return response, err
-}
-
-func (p *baseProvider[C]) Model() models.Model {
-	return p.options.model
-}
-
-func (p *baseProvider[C]) MaxTokens() int64 {
-	return p.options.maxTokens
-}
-
-func (p *baseProvider[C]) StreamResponse(ctx context.Context, messages []message.Message, tools []tools.BaseTool) <-chan ProviderEvent {
-	messages = p.cleanMessages(messages)
-	eventChan := p.client.stream(ctx, messages, tools)
-
-	// Create a new channel to intercept events
-	wrappedChan := make(chan ProviderEvent)
-
-	go func() {
-		defer close(wrappedChan)
-
-		for event := range eventChan {
-			// Pass the event through
-			wrappedChan <- event
-
-			// Log token usage when we get the complete event
-			if event.Type == EventComplete && event.Response != nil {
-				slog.Debug("API streaming request token usage",
-					"model", p.options.model.Name,
-					"input_tokens", event.Response.Usage.InputTokens,
-					"output_tokens", event.Response.Usage.OutputTokens,
-					"cache_creation_tokens", event.Response.Usage.CacheCreationTokens,
-					"cache_read_tokens", event.Response.Usage.CacheReadTokens,
-					"total_tokens", event.Response.Usage.InputTokens+event.Response.Usage.OutputTokens)
-			}
-		}
-	}()
-
-	return wrappedChan
-}
-
-func WithAPIKey(apiKey string) ProviderClientOption {
-	return func(options *providerClientOptions) {
-		options.apiKey = apiKey
-	}
-}
-
-func WithModel(model models.Model) ProviderClientOption {
-	return func(options *providerClientOptions) {
-		options.model = model
-	}
-}
-
-func WithMaxTokens(maxTokens int64) ProviderClientOption {
-	return func(options *providerClientOptions) {
-		options.maxTokens = maxTokens
-	}
-}
-
-func WithSystemMessage(systemMessage string) ProviderClientOption {
-	return func(options *providerClientOptions) {
-		options.systemMessage = systemMessage
-	}
-}
-
-func WithAnthropicOptions(anthropicOptions ...AnthropicOption) ProviderClientOption {
-	return func(options *providerClientOptions) {
-		options.anthropicOptions = anthropicOptions
-	}
-}
-
-func WithOpenAIOptions(openaiOptions ...OpenAIOption) ProviderClientOption {
-	return func(options *providerClientOptions) {
-		options.openaiOptions = openaiOptions
-	}
-}
-
-func WithGeminiOptions(geminiOptions ...GeminiOption) ProviderClientOption {
-	return func(options *providerClientOptions) {
-		options.geminiOptions = geminiOptions
-	}
-}
-
-func WithBedrockOptions(bedrockOptions ...BedrockOption) ProviderClientOption {
-	return func(options *providerClientOptions) {
-		options.bedrockOptions = bedrockOptions
-	}
-}

internal/llm/provider/vertexai.go

@@ -1,34 +0,0 @@
-package provider
-
-import (
-	"context"
-	"log/slog"
-	"os"
-
-	"google.golang.org/genai"
-)
-
-type VertexAIClient ProviderClient
-
-func newVertexAIClient(opts providerClientOptions) VertexAIClient {
-	geminiOpts := geminiOptions{}
-	for _, o := range opts.geminiOptions {
-		o(&geminiOpts)
-	}
-
-	client, err := genai.NewClient(context.Background(), &genai.ClientConfig{
-		Project:  os.Getenv("VERTEXAI_PROJECT"),
-		Location: os.Getenv("VERTEXAI_LOCATION"),
-		Backend:  genai.BackendVertexAI,
-	})
-	if err != nil {
-		slog.Error("Failed to create VertexAI client", "error", err)
-		return nil
-	}
-
-	return &geminiClient{
-		providerOptions: opts,
-		options:         geminiOpts,
-		client:          client,
-	}
-}

internal/message/content.go

@@ -4,8 +4,6 @@ import (
 	"encoding/base64"
 	"slices"
 	"time"
-
-	"github.com/sst/opencode/internal/llm/models"
 )
 
 type MessageRole string
@@ -74,11 +72,11 @@ type BinaryContent struct {
 	Data     []byte
 }
 
-func (bc BinaryContent) String(provider models.ModelProvider) string {
+func (bc BinaryContent) String(provider string) string {
 	base64Encoded := base64.StdEncoding.EncodeToString(bc.Data)
-	if provider == models.ProviderOpenAI {
-		return "data:" + bc.MIMEType + ";base64," + base64Encoded
-	}
+	// if provider == models.ProviderOpenAI {
+	// 	return "data:" + bc.MIMEType + ";base64," + base64Encoded
+	// }
 	return base64Encoded
 }
 

internal/message/message.go

@@ -12,7 +12,6 @@ import (
 
 	"github.com/google/uuid"
 	"github.com/sst/opencode/internal/db"
-	"github.com/sst/opencode/internal/llm/models"
 	"github.com/sst/opencode/internal/pubsub"
 )
 
@@ -21,7 +20,6 @@ type Message struct {
 	Role      MessageRole
 	SessionID string
 	Parts     []ContentPart
-	Model     models.ModelID
 	CreatedAt time.Time
 	UpdatedAt time.Time
 }
@@ -35,7 +33,6 @@ const (
 type CreateMessageParams struct {
 	Role  MessageRole
 	Parts []ContentPart
-	Model models.ModelID
 }
 
 type Service interface {
@@ -104,7 +101,6 @@ func (s *service) Create(ctx context.Context, sessionID string, params CreateMes
 		SessionID: sessionID,
 		Role:      string(params.Role),
 		Parts:     string(partsJSON),
-		Model:     sql.NullString{String: string(params.Model), Valid: params.Model != ""},
 	}
 
 	dbMessage, err := s.db.CreateMessage(ctx, dbMsgParams)
@@ -312,7 +308,6 @@ func (s *service) fromDBItem(item db.Message) (Message, error) {
 		SessionID: item.SessionID,
 		Role:      MessageRole(item.Role),
 		Parts:     parts,
-		Model:     models.ModelID(item.Model.String),
 		CreatedAt: createdAt,
 		UpdatedAt: updatedAt,
 	}

internal/tui/components/chat/chat.go

@@ -29,7 +29,7 @@ func header(width int) string {
 }
 
 func lspsConfigured(width int) string {
-	cfg := config.Get()
+	// cfg := config.Get()
 	title := "LSP Servers"
 	title = ansi.Truncate(title, width, "…")
 
@@ -44,37 +44,37 @@ func lspsConfigured(width int) string {
 
 	// Get LSP names and sort them for consistent ordering
 	var lspNames []string
-	for name := range cfg.LSP {
-		lspNames = append(lspNames, name)
-	}
+	// for name := range cfg.LSP {
+	// 	lspNames = append(lspNames, name)
+	// }
 	sort.Strings(lspNames)
 
 	var lspViews []string
-	for _, name := range lspNames {
-		lsp := cfg.LSP[name]
-		lspName := baseStyle.
-			Foreground(t.Text()).
-			Render(fmt.Sprintf("• %s", name))
-
-		cmd := lsp.Command
-		cmd = ansi.Truncate(cmd, width-lipgloss.Width(lspName)-3, "…")
-
-		lspPath := baseStyle.
-			Foreground(t.TextMuted()).
-			Render(fmt.Sprintf(" (%s)", cmd))
-
-		lspViews = append(lspViews,
-			baseStyle.
-				Width(width).
-				Render(
-					lipgloss.JoinHorizontal(
-						lipgloss.Left,
-						lspName,
-						lspPath,
-					),
-				),
-		)
-	}
+	// for _, name := range lspNames {
+	// lsp := cfg.LSP[name]
+	// lspName := baseStyle.
+	// 	Foreground(t.Text()).
+	// 	Render(fmt.Sprintf("• %s", name))
+
+	// cmd := lsp.Command
+	// cmd = ansi.Truncate(cmd, width-lipgloss.Width(lspName)-3, "…")
+
+	// lspPath := baseStyle.
+	// 	Foreground(t.TextMuted()).
+	// 	Render(fmt.Sprintf(" (%s)", cmd))
+
+	// lspViews = append(lspViews,
+	// 	baseStyle.
+	// 		Width(width).
+	// 		Render(
+	// 			lipgloss.JoinHorizontal(
+	// 				lipgloss.Left,
+	// 				lspName,
+	// 				lspPath,
+	// 			),
+	// 		),
+	// )
+	// }
 
 	return baseStyle.
 		Width(width).

internal/tui/components/dialog/filepicker.go

@@ -17,7 +17,6 @@ import (
 	"github.com/charmbracelet/bubbles/viewport"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
-	"github.com/sst/opencode/internal/config"
 	"github.com/sst/opencode/internal/message"
 	"github.com/sst/opencode/internal/status"
 	"github.com/sst/opencode/internal/tui/app"
@@ -239,11 +238,11 @@ func (f *filepickerCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 }
 
 func (f *filepickerCmp) addAttachmentToMessage() (tea.Model, tea.Cmd) {
-	modeInfo := GetSelectedModel(config.Get())
-	if !modeInfo.SupportsAttachments {
-		status.Error(fmt.Sprintf("Model %s doesn't support attachments", modeInfo.Name))
-		return f, nil
-	}
+	// modeInfo := GetSelectedModel(config.Get())
+	// if !modeInfo.SupportsAttachments {
+	// 	status.Error(fmt.Sprintf("Model %s doesn't support attachments", modeInfo.Name))
+	// 	return f, nil
+	// }
 
 	selectedFilePath := f.selectedFile
 	if !isExtSupported(selectedFilePath) {

internal/tui/components/dialog/models.go

@@ -1,15 +1,10 @@
 package dialog
 
 import (
-	"fmt"
-	"slices"
-	"strings"
-
 	"github.com/charmbracelet/bubbles/key"
 	tea "github.com/charmbracelet/bubbletea"
 	"github.com/charmbracelet/lipgloss"
 	"github.com/sst/opencode/internal/config"
-	"github.com/sst/opencode/internal/llm/models"
 	"github.com/sst/opencode/internal/tui/layout"
 	"github.com/sst/opencode/internal/tui/styles"
 	"github.com/sst/opencode/internal/tui/theme"
@@ -23,7 +18,7 @@ const (
 
 // ModelSelectedMsg is sent when a model is selected
 type ModelSelectedMsg struct {
-	Model models.Model
+	// Model models.Model
 }
 
 // CloseModelDialogMsg is sent when a model is selected
@@ -36,9 +31,9 @@ type ModelDialog interface {
 }
 
 type modelDialogCmp struct {
-	models             []models.Model
-	provider           models.ModelProvider
-	availableProviders []models.ModelProvider
+	// models             []models.Model
+	// provider           models.ModelProvider
+	// availableProviders []models.ModelProvider
 
 	selectedIdx     int
 	width           int
@@ -126,7 +121,7 @@ func (m *modelDialogCmp) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 				m.switchProvider(1)
 			}
 		case key.Matches(msg, modelKeys.Enter):
-			return m, util.CmdHandler(ModelSelectedMsg{Model: m.models[m.selectedIdx]})
+			// return m, util.CmdHandler(ModelSelectedMsg{Model: m.models[m.selectedIdx]})
 		case key.Matches(msg, modelKeys.Escape):
 			return m, util.CmdHandler(CloseModelDialogMsg{})
 		}
@@ -143,8 +138,8 @@ func (m *modelDialogCmp) moveSelectionUp() {
 	if m.selectedIdx > 0 {
 		m.selectedIdx--
 	} else {
-		m.selectedIdx = len(m.models) - 1
-		m.scrollOffset = max(0, len(m.models)-numVisibleModels)
+		// m.selectedIdx = len(m.models) - 1
+		// m.scrollOffset = max(0, len(m.models)-numVisibleModels)
 	}
 
 	// Keep selection visible
@@ -155,12 +150,12 @@ func (m *modelDialogCmp) moveSelectionUp() {
 
 // moveSelectionDown moves the selection down or wraps to top
 func (m *modelDialogCmp) moveSelectionDown() {
-	if m.selectedIdx < len(m.models)-1 {
-		m.selectedIdx++
-	} else {
-		m.selectedIdx = 0
-		m.scrollOffset = 0
-	}
+	// if m.selectedIdx < len(m.models)-1 {
+	// 	m.selectedIdx++
+	// } else {
+	// 	m.selectedIdx = 0
+	// 	m.scrollOffset = 0
+	// }
 
 	// Keep selection visible
 	if m.selectedIdx >= m.scrollOffset+numVisibleModels {
@@ -172,16 +167,16 @@ func (m *modelDialogCmp) switchProvider(offset int) {
 	newOffset := m.hScrollOffset + offset
 
 	// Ensure we stay within bounds
-	if newOffset < 0 {
-		newOffset = len(m.availableProviders) - 1
-	}
-	if newOffset >= len(m.availableProviders) {
-		newOffset = 0
-	}
+	// if newOffset < 0 {
+	// 	newOffset = len(m.availableProviders) - 1
+	// }
+	// if newOffset >= len(m.availableProviders) {
+	// 	newOffset = 0
+	// }
 
 	m.hScrollOffset = newOffset
-	m.provider = m.availableProviders[m.hScrollOffset]
-	m.setupModelsForProvider(m.provider)
+	// m.provider = m.availableProviders[m.hScrollOffset]
+	// m.setupModelsForProvider(m.provider)
 }
 
 func (m *modelDialogCmp) View() string {
@@ -189,33 +184,33 @@ func (m *modelDialogCmp) View() string {
 	baseStyle := styles.BaseStyle()
 
 	// Capitalize first letter of provider name
-	providerName := strings.ToUpper(string(m.provider)[:1]) + string(m.provider[1:])
-	title := baseStyle.
-		Foreground(t.Primary()).
-		Bold(true).
-		Width(maxDialogWidth).
-		Padding(0, 0, 1).
-		Render(fmt.Sprintf("Select %s Model", providerName))
+	// providerName := strings.ToUpper(string(m.provider)[:1]) + string(m.provider[1:])
+	// title := baseStyle.
+	// 	Foreground(t.Primary()).
+	// 	Bold(true).
+	// 	Width(maxDialogWidth).
+	// 	Padding(0, 0, 1).
+	// 	Render(fmt.Sprintf("Select %s Model", providerName))
 
 	// Render visible models
-	endIdx := min(m.scrollOffset+numVisibleModels, len(m.models))
-	modelItems := make([]string, 0, endIdx-m.scrollOffset)
-
-	for i := m.scrollOffset; i < endIdx; i++ {
-		itemStyle := baseStyle.Width(maxDialogWidth)
-		if i == m.selectedIdx {
-			itemStyle = itemStyle.Background(t.Primary()).
-				Foreground(t.Background()).Bold(true)
-		}
-		modelItems = append(modelItems, itemStyle.Render(m.models[i].Name))
-	}
+	// endIdx := min(m.scrollOffset+numVisibleModels, len(m.models))
+	// modelItems := make([]string, 0, endIdx-m.scrollOffset)
+	//
+	// for i := m.scrollOffset; i < endIdx; i++ {
+	// 	itemStyle := baseStyle.Width(maxDialogWidth)
+	// 	if i == m.selectedIdx {
+	// 		itemStyle = itemStyle.Background(t.Primary()).
+	// 			Foreground(t.Background()).Bold(true)
+	// 	}
+	// 	modelItems = append(modelItems, itemStyle.Render(m.models[i].Name))
+	// }
 
 	scrollIndicator := m.getScrollIndicators(maxDialogWidth)
 
 	content := lipgloss.JoinVertical(
 		lipgloss.Left,
-		title,
-		baseStyle.Width(maxDialogWidth).Render(lipgloss.JoinVertical(lipgloss.Left, modelItems...)),
+		// title,
+		// baseStyle.Width(maxDialogWidth).Render(lipgloss.JoinVertical(lipgloss.Left, modelItems...)),
 		scrollIndicator,
 	)
 
@@ -230,22 +225,22 @@ func (m *modelDialogCmp) View() string {
 func (m *modelDialogCmp) getScrollIndicators(maxWidth int) string {
 	var indicator string
 
-	if len(m.models) > numVisibleModels {
-		if m.scrollOffset > 0 {
-			indicator += "↑ "
-		}
-		if m.scrollOffset+numVisibleModels < len(m.models) {
-			indicator += "↓ "
-		}
-	}
+	// if len(m.models) > numVisibleModels {
+	// 	if m.scrollOffset > 0 {
+	// 		indicator += "↑ "
+	// 	}
+	// 	if m.scrollOffset+numVisibleModels < len(m.models) {
+	// 		indicator += "↓ "
+	// 	}
+	// }
 
 	if m.hScrollPossible {
 		if m.hScrollOffset > 0 {
 			indicator = "← " + indicator
 		}
-		if m.hScrollOffset < len(m.availableProviders)-1 {
-			indicator += "→"
-		}
+		// if m.hScrollOffset < len(m.availableProviders)-1 {
+		// 	indicator += "→"
+		// }
 	}
 
 	if indicator == "" {
@@ -268,51 +263,52 @@ func (m *modelDialogCmp) BindingKeys() []key.Binding {
 }
 
 func (m *modelDialogCmp) setupModels() {
-	cfg := config.Get()
-	modelInfo := GetSelectedModel(cfg)
-	m.availableProviders = getEnabledProviders(cfg)
-	m.hScrollPossible = len(m.availableProviders) > 1
-
-	m.provider = modelInfo.Provider
-	m.hScrollOffset = findProviderIndex(m.availableProviders, m.provider)
-
-	m.setupModelsForProvider(m.provider)
+	// cfg := config.Get()
+	// modelInfo := GetSelectedModel(cfg)
+	// m.availableProviders = getEnabledProviders(cfg)
+	// m.hScrollPossible = len(m.availableProviders) > 1
+	//
+	// m.provider = modelInfo.Provider
+	// m.hScrollOffset = findProviderIndex(m.availableProviders, m.provider)
+	//
+	// m.setupModelsForProvider(m.provider)
 }
 
-func GetSelectedModel(cfg *config.Config) models.Model {
-
-	agentCfg := cfg.Agents[config.AgentPrimary]
-	selectedModelId := agentCfg.Model
-	return models.SupportedModels[selectedModelId]
+func GetSelectedModel(cfg *config.Config) string {
+	return "Claude Sonnet 4"
+	// agentCfg := cfg.Agents[config.AgentPrimary]
+	// selectedModelId := agentCfg.Model
+	// return models.SupportedModels[selectedModelId]
 }
 
-func getEnabledProviders(cfg *config.Config) []models.ModelProvider {
-	var providers []models.ModelProvider
-	for providerId, provider := range cfg.Providers {
-		if !provider.Disabled {
-			providers = append(providers, providerId)
-		}
-	}
-
-	// Sort by provider popularity
-	slices.SortFunc(providers, func(a, b models.ModelProvider) int {
-		rA := models.ProviderPopularity[a]
-		rB := models.ProviderPopularity[b]
-
-		// models not included in popularity ranking default to last
-		if rA == 0 {
-			rA = 999
-		}
-		if rB == 0 {
-			rB = 999
-		}
-		return rA - rB
-	})
-	return providers
+func getEnabledProviders(cfg *config.Config) []string {
+	return []string{"anthropic", "openai", "google"}
+	// var providers []models.ModelProvider
+	// for providerId, provider := range cfg.Providers {
+	// 	if !provider.Disabled {
+	// 		providers = append(providers, providerId)
+	// 	}
+	// }
+	//
+	// // Sort by provider popularity
+	// slices.SortFunc(providers, func(a, b models.ModelProvider) int {
+	// 	rA := models.ProviderPopularity[a]
+	// 	rB := models.ProviderPopularity[b]
+	//
+	// 	// models not included in popularity ranking default to last
+	// 	if rA == 0 {
+	// 		rA = 999
+	// 	}
+	// 	if rB == 0 {
+	// 		rB = 999
+	// 	}
+	// 	return rA - rB
+	// })
+	// return providers
 }
 
 // findProviderIndex returns the index of the provider in the list, or -1 if not found
-func findProviderIndex(providers []models.ModelProvider, provider models.ModelProvider) int {
+func findProviderIndex(providers []string, provider string) int {
 	for i, p := range providers {
 		if p == provider {
 			return i
@@ -321,50 +317,51 @@ func findProviderIndex(providers []models.ModelProvider, provider models.ModelPr
 	return -1
 }
 
-func (m *modelDialogCmp) setupModelsForProvider(provider models.ModelProvider) {
-	cfg := config.Get()
-	agentCfg := cfg.Agents[config.AgentPrimary]
-	selectedModelId := agentCfg.Model
+func (m *modelDialogCmp) setupModelsForProvider(provider string) {
+	// cfg := config.Get()
+	// agentCfg := cfg.Agents[config.AgentPrimary]
+	// selectedModelId := agentCfg.Model
 
-	m.provider = provider
-	m.models = getModelsForProvider(provider)
+	// m.provider = provider
+	// m.models = getModelsForProvider(provider)
 	m.selectedIdx = 0
 	m.scrollOffset = 0
 
 	// Try to select the current model if it belongs to this provider
-	if provider == models.SupportedModels[selectedModelId].Provider {
-		for i, model := range m.models {
-			if model.ID == selectedModelId {
-				m.selectedIdx = i
-				// Adjust scroll position to keep selected model visible
-				if m.selectedIdx >= numVisibleModels {
-					m.scrollOffset = m.selectedIdx - (numVisibleModels - 1)
-				}
-				break
-			}
-		}
-	}
+	// if provider == models.SupportedModels[selectedModelId].Provider {
+	// 	for i, model := range m.models {
+	// 		if model.ID == selectedModelId {
+	// 			m.selectedIdx = i
+	// 			// Adjust scroll position to keep selected model visible
+	// 			if m.selectedIdx >= numVisibleModels {
+	// 				m.scrollOffset = m.selectedIdx - (numVisibleModels - 1)
+	// 			}
+	// 			break
+	// 		}
+	// 	}
+	// }
 }
 
-func getModelsForProvider(provider models.ModelProvider) []models.Model {
-	var providerModels []models.Model
-	for _, model := range models.SupportedModels {
-		if model.Provider == provider {
-			providerModels = append(providerModels, model)
-		}
-	}
+func getModelsForProvider(provider string) []string {
+	return []string{"Claude Sonnet 4"}
+	// var providerModels []models.Model
+	// for _, model := range models.SupportedModels {
+	// 	if model.Provider == provider {
+	// 		providerModels = append(providerModels, model)
+	// 	}
+	// }
 
 	// reverse alphabetical order (if llm naming was consistent latest would appear first)
-	slices.SortFunc(providerModels, func(a, b models.Model) int {
-		if a.Name > b.Name {
-			return -1
-		} else if a.Name < b.Name {
-			return 1
-		}
-		return 0
-	})
-
-	return providerModels
+	// slices.SortFunc(providerModels, func(a, b models.Model) int {
+	// 	if a.Name > b.Name {
+	// 		return -1
+	// 	} else if a.Name < b.Name {
+	// 		return 1
+	// 	}
+	// 	return 0
+	// })
+
+	// return providerModels
 }
 
 func NewModelDialogCmp() ModelDialog {