Refactor command parsing logic across backends to utilize a unified CommandParserConfig structure

pkg/backends/llamacpp/parser.go

@@ -1,13 +1,7 @@
 package llamacpp
 
 import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
+	"llamactl/pkg/backends"
 )
 
 // ParseLlamaCommand parses a llama-server command string into LlamaServerOptions
@@ -17,270 +11,25 @@ import (
 // 3. Args only: "--model file.gguf --gpu-layers 32"
 // 4. Multiline commands with backslashes
 func ParseLlamaCommand(command string) (*LlamaServerOptions, error) {
-	// 1. Normalize the command - handle multiline with backslashes
-	trimmed := normalizeMultilineCommand(command)
-	if trimmed == "" {
-		return nil, fmt.Errorf("command cannot be empty")
-	}
-
-	// 2. Extract arguments from command
-	args, err := extractArgumentsFromCommand(trimmed)
-	if err != nil {
-		return nil, err
-	}
-
-	// 3. Parse arguments into map
-	options := make(map[string]any)
-
-	// Known multi-valued flags (snake_case form)
-	multiValued := map[string]struct{}{
-		"override_tensor":       {},
-		"override_kv":           {},
-		"lora":                  {},
-		"lora_scaled":           {},
-		"control_vector":        {},
-		"control_vector_scaled": {},
-		"dry_sequence_breaker":  {},
-		"logit_bias":            {},
-	}
-
-	i := 0
-	for i < len(args) {
-		arg := args[i]
-
-		if !strings.HasPrefix(arg, "-") { // skip positional / stray values
-			i++
-			continue
-		}
-
-		// Reject malformed flags with more than two leading dashes (e.g. ---model) to surface user mistakes
-		if strings.HasPrefix(arg, "---") {
-			return nil, fmt.Errorf("malformed flag: %s", arg)
-		}
-
-		// Unified parsing for --flag=value vs --flag value
-		var rawFlag, rawValue string
-		hasEquals := false
-		if strings.Contains(arg, "=") {
-			parts := strings.SplitN(arg, "=", 2)
-			rawFlag = parts[0]
-			rawValue = parts[1] // may be empty string
-			hasEquals = true
-		} else {
-			rawFlag = arg
-		}
-
-		flagCore := strings.TrimPrefix(strings.TrimPrefix(rawFlag, "-"), "-")
-		flagName := strings.ReplaceAll(flagCore, "-", "_")
-
-		// Detect value if not in equals form
-		valueProvided := hasEquals
-		if !hasEquals {
-			if i+1 < len(args) && !isFlag(args[i+1]) { // next token is value
-				rawValue = args[i+1]
-				valueProvided = true
-			}
-		}
-
-		// Determine if multi-valued flag
-		_, isMulti := multiValued[flagName]
-
-		// Normalization helper: ensure slice for multi-valued flags
-		appendValue := func(valStr string) {
-			if existing, ok := options[flagName]; ok {
-				// Existing value; ensure slice semantics for multi-valued flags or repeated occurrences
-				if slice, ok := existing.([]string); ok {
-					options[flagName] = append(slice, valStr)
-					return
-				}
-				// Convert scalar to slice
-				options[flagName] = []string{fmt.Sprintf("%v", existing), valStr}
-				return
-			}
-			// First value
-			if isMulti {
-				options[flagName] = []string{valStr}
-			} else {
-				// We'll parse type below for single-valued flags
-				options[flagName] = valStr
-			}
-		}
-
-		if valueProvided {
-			// Use raw token for multi-valued flags; else allow typed parsing
-			appendValue(rawValue)
-			if !isMulti { // convert to typed value if scalar
-				if strVal, ok := options[flagName].(string); ok { // still scalar
-					options[flagName] = parseValue(strVal)
-				}
-			}
-			// Advance index: if we consumed a following token as value (non equals form), skip it
-			if !hasEquals && i+1 < len(args) && rawValue == args[i+1] {
-				i += 2
-			} else {
-				i++
-			}
-			continue
-		}
-
-		// Boolean flag (no value)
-		options[flagName] = true
-		i++
-	}
-
-	// 4. Convert to LlamaServerOptions using existing UnmarshalJSON
-	jsonData, err := json.Marshal(options)
-	if err != nil {
-		return nil, fmt.Errorf("failed to marshal parsed options: %w", err)
+	config := backends.CommandParserConfig{
+		ExecutableNames: []string{"llama-server"},
+		MultiValuedFlags: map[string]struct{}{
+			"override_tensor":       {},
+			"override_kv":           {},
+			"lora":                  {},
+			"lora_scaled":           {},
+			"control_vector":        {},
+			"control_vector_scaled": {},
+			"dry_sequence_breaker":  {},
+			"logit_bias":            {},
+		},
 	}
 
 	var llamaOptions LlamaServerOptions
-	if err := json.Unmarshal(jsonData, &llamaOptions); err != nil {
-		return nil, fmt.Errorf("failed to parse command options: %w", err)
-	}
-
-	// 5. Return LlamaServerOptions
-	return &llamaOptions, nil
-}
-
-// parseValue attempts to parse a string value into the most appropriate type
-func parseValue(value string) any {
-	// Surrounding matching quotes (single or double)
-	if l := len(value); l >= 2 {
-		if (value[0] == '"' && value[l-1] == '"') || (value[0] == '\'' && value[l-1] == '\'') {
-			value = value[1 : l-1]
-		}
-	}
-
-	lower := strings.ToLower(value)
-	if lower == "true" {
-		return true
-	}
-	if lower == "false" {
-		return false
-	}
-
-	if intVal, err := strconv.Atoi(value); err == nil {
-		return intVal
-	}
-	if floatVal, err := strconv.ParseFloat(value, 64); err == nil {
-		return floatVal
-	}
-	return value
-}
-
-// normalizeMultilineCommand handles multiline commands with backslashes
-func normalizeMultilineCommand(command string) string {
-	// Handle escaped newlines (backslash followed by newline)
-	re := regexp.MustCompile(`\\\s*\n\s*`)
-	normalized := re.ReplaceAllString(command, " ")
-
-	// Clean up extra whitespace
-	re = regexp.MustCompile(`\s+`)
-	normalized = re.ReplaceAllString(normalized, " ")
-
-	return strings.TrimSpace(normalized)
-}
-
-// extractArgumentsFromCommand extracts arguments from various command formats
-func extractArgumentsFromCommand(command string) ([]string, error) {
-	// Split command into tokens respecting quotes
-	tokens, err := splitCommandTokens(command)
-	if err != nil {
+	if err := backends.ParseCommand(command, config, &llamaOptions); err != nil {
 		return nil, err
 	}
 
-	if len(tokens) == 0 {
-		return nil, fmt.Errorf("no command tokens found")
-	}
-
-	// Check if first token looks like an executable
-	firstToken := tokens[0]
-
-	// Case 1: Full path to executable (contains path separator or ends with llama-server)
-	if strings.Contains(firstToken, string(filepath.Separator)) ||
-		strings.HasSuffix(filepath.Base(firstToken), "llama-server") {
-		return tokens[1:], nil // Return everything except the executable
-	}
-
-	// Case 2: Just "llama-server" command
-	if strings.ToLower(firstToken) == "llama-server" {
-		return tokens[1:], nil // Return everything except the command
-	}
-
-	// Case 3: Arguments only (starts with a flag)
-	if strings.HasPrefix(firstToken, "-") {
-		return tokens, nil // Return all tokens as arguments
-	}
-
-	// Case 4: Unknown format - might be a different executable name
-	// Be permissive and assume it's the executable
-	return tokens[1:], nil
+	return &llamaOptions, nil
 }
 
-// splitCommandTokens splits a command string into tokens, respecting quotes
-func splitCommandTokens(command string) ([]string, error) {
-	var tokens []string
-	var current strings.Builder
-	inQuotes := false
-	quoteChar := byte(0)
-	escaped := false
-
-	for i := 0; i < len(command); i++ {
-		c := command[i]
-
-		if escaped {
-			current.WriteByte(c)
-			escaped = false
-			continue
-		}
-
-		if c == '\\' {
-			escaped = true
-			current.WriteByte(c)
-			continue
-		}
-
-		if !inQuotes && (c == '"' || c == '\'') {
-			inQuotes = true
-			quoteChar = c
-			current.WriteByte(c)
-		} else if inQuotes && c == quoteChar {
-			inQuotes = false
-			quoteChar = 0
-			current.WriteByte(c)
-		} else if !inQuotes && (c == ' ' || c == '\t') {
-			if current.Len() > 0 {
-				tokens = append(tokens, current.String())
-				current.Reset()
-			}
-		} else {
-			current.WriteByte(c)
-		}
-	}
-
-	if inQuotes {
-		return nil, errors.New("unterminated quoted string")
-	}
-
-	if current.Len() > 0 {
-		tokens = append(tokens, current.String())
-	}
-
-	return tokens, nil
-}
-
-// isFlag determines if a string is a command line flag or a value
-// Handles the special case where negative numbers should be treated as values, not flags
-func isFlag(arg string) bool {
-	if !strings.HasPrefix(arg, "-") {
-		return false
-	}
-
-	// Special case: if it's a negative number, treat it as a value
-	if _, err := strconv.ParseFloat(arg, 64); err == nil {
-		return false
-	}
-
-	return true
-}

pkg/backends/mlx/parser.go

@@ -1,12 +1,7 @@
 package mlx
 
 import (
-	"encoding/json"
-	"fmt"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
+	"llamactl/pkg/backends"
 )
 
 // ParseMlxCommand parses a mlx_lm.server command string into MlxServerOptions
@@ -16,97 +11,16 @@ import (
 // 3. Args only: "--model model/path --host 0.0.0.0"
 // 4. Multiline commands with backslashes
 func ParseMlxCommand(command string) (*MlxServerOptions, error) {
-	// 1. Normalize the command - handle multiline with backslashes
-	trimmed := normalizeMultilineCommand(command)
-	if trimmed == "" {
-		return nil, fmt.Errorf("command cannot be empty")
-	}
-
-	// 2. Extract arguments from command
-	args, err := extractArgumentsFromCommand(trimmed)
-	if err != nil {
-		return nil, err
-	}
-
-	// 3. Parse arguments into map
-	options := make(map[string]any)
-
-	i := 0
-	for i < len(args) {
-		arg := args[i]
-
-		if !strings.HasPrefix(arg, "-") { // skip positional / stray values
-			i++
-			continue
-		}
-
-		// Reject malformed flags with more than two leading dashes (e.g. ---model) to surface user mistakes
-		if strings.HasPrefix(arg, "---") {
-			return nil, fmt.Errorf("malformed flag: %s", arg)
-		}
-
-		// Unified parsing for --flag=value vs --flag value
-		var rawFlag, rawValue string
-		hasEquals := false
-		if strings.Contains(arg, "=") {
-			parts := strings.SplitN(arg, "=", 2)
-			rawFlag = parts[0]
-			rawValue = parts[1] // may be empty string
-			hasEquals = true
-		} else {
-			rawFlag = arg
-		}
-
-		flagCore := strings.TrimPrefix(strings.TrimPrefix(rawFlag, "-"), "-")
-		flagName := strings.ReplaceAll(flagCore, "-", "_")
-
-		// Detect value if not in equals form
-		valueProvided := hasEquals
-		if !hasEquals {
-			if i+1 < len(args) && !isFlag(args[i+1]) { // next token is value
-				rawValue = args[i+1]
-				valueProvided = true
-			}
-		}
-
-		if valueProvided {
-			// MLX-specific validation for certain flags
-			if flagName == "log_level" && !isValidLogLevel(rawValue) {
-				return nil, fmt.Errorf("invalid log level: %s", rawValue)
-			}
-			
-			options[flagName] = parseValue(rawValue)
-			
-			// Advance index: if we consumed a following token as value (non equals form), skip it
-			if !hasEquals && i+1 < len(args) && rawValue == args[i+1] {
-				i += 2
-			} else {
-				i++
-			}
-			continue
-		}
-
-		// Boolean flag (no value) - MLX specific boolean flags
-		if flagName == "trust_remote_code" || flagName == "use_default_chat_template" {
-			options[flagName] = true
-		} else {
-			options[flagName] = true
-		}
-		i++
-	}
-
-	// 4. Convert to MlxServerOptions using existing UnmarshalJSON
-	jsonData, err := json.Marshal(options)
-	if err != nil {
-		return nil, fmt.Errorf("failed to marshal parsed options: %w", err)
+	config := backends.CommandParserConfig{
+		ExecutableNames:  []string{"mlx_lm.server"},
+		MultiValuedFlags: map[string]struct{}{}, // MLX has no multi-valued flags
 	}
 
 	var mlxOptions MlxServerOptions
-	if err := json.Unmarshal(jsonData, &mlxOptions); err != nil {
-		return nil, fmt.Errorf("failed to parse command options: %w", err)
+	if err := backends.ParseCommand(command, config, &mlxOptions); err != nil {
+		return nil, err
 	}
 
-	// 5. Return MlxServerOptions
 	return &mlxOptions, nil
 }
 
@@ -121,134 +35,3 @@ func isValidLogLevel(level string) bool {
 	return false
 }
 
-// parseValue attempts to parse a string value into the most appropriate type
-func parseValue(value string) any {
-	// Surrounding matching quotes (single or double)
-	if l := len(value); l >= 2 {
-		if (value[0] == '"' && value[l-1] == '"') || (value[0] == '\'' && value[l-1] == '\'') {
-			value = value[1 : l-1]
-		}
-	}
-
-	lower := strings.ToLower(value)
-	if lower == "true" {
-		return true
-	}
-	if lower == "false" {
-		return false
-	}
-
-	if intVal, err := strconv.Atoi(value); err == nil {
-		return intVal
-	}
-	if floatVal, err := strconv.ParseFloat(value, 64); err == nil {
-		return floatVal
-	}
-	return value
-}
-
-// normalizeMultilineCommand handles multiline commands with backslashes
-func normalizeMultilineCommand(command string) string {
-	// Handle escaped newlines (backslash followed by newline)
-	re := regexp.MustCompile(`\\\s*\n\s*`)
-	normalized := re.ReplaceAllString(command, " ")
-
-	// Clean up extra whitespace
-	re = regexp.MustCompile(`\s+`)
-	normalized = re.ReplaceAllString(normalized, " ")
-
-	return strings.TrimSpace(normalized)
-}
-
-// extractArgumentsFromCommand extracts arguments from various command formats
-func extractArgumentsFromCommand(command string) ([]string, error) {
-	// Split command into tokens respecting quotes
-	tokens, err := splitCommandTokens(command)
-	if err != nil {
-		return nil, err
-	}
-
-	if len(tokens) == 0 {
-		return nil, fmt.Errorf("no command tokens found")
-	}
-
-	// Check if first token looks like an executable
-	firstToken := tokens[0]
-
-	// Case 1: Full path to executable (contains path separator or ends with mlx_lm.server)
-	if strings.Contains(firstToken, string(filepath.Separator)) ||
-		strings.HasSuffix(filepath.Base(firstToken), "mlx_lm.server") {
-		return tokens[1:], nil // Return everything except the executable
-	}
-
-	// Case 2: Just "mlx_lm.server" command
-	if strings.ToLower(firstToken) == "mlx_lm.server" {
-		return tokens[1:], nil // Return everything except the command
-	}
-
-	// Case 3: Arguments only (starts with a flag)
-	if strings.HasPrefix(firstToken, "-") {
-		return tokens, nil // Return all tokens as arguments
-	}
-
-	// Case 4: Unknown format - might be a different executable name
-	// Be permissive and assume it's the executable
-	return tokens[1:], nil
-}
-
-// splitCommandTokens splits a command string into tokens, respecting quotes
-func splitCommandTokens(command string) ([]string, error) {
-	var tokens []string
-	var current strings.Builder
-	inQuotes := false
-	quoteChar := byte(0)
-	escaped := false
-
-	for i := 0; i < len(command); i++ {
-		c := command[i]
-
-		if escaped {
-			current.WriteByte(c)
-			escaped = false
-			continue
-		}
-
-		if c == '\\' {
-			escaped = true
-			current.WriteByte(c)
-			continue
-		}
-
-		if !inQuotes && (c == '"' || c == '\'') {
-			inQuotes = true
-			quoteChar = c
-			current.WriteByte(c)
-		} else if inQuotes && c == quoteChar {
-			inQuotes = false
-			quoteChar = 0
-			current.WriteByte(c)
-		} else if !inQuotes && (c == ' ' || c == '\t' || c == '\n') {
-			if current.Len() > 0 {
-				tokens = append(tokens, current.String())
-				current.Reset()
-			}
-		} else {
-			current.WriteByte(c)
-		}
-	}
-
-	if inQuotes {
-		return nil, fmt.Errorf("unclosed quote in command")
-	}
-
-	if current.Len() > 0 {
-		tokens = append(tokens, current.String())
-	}
-
-	return tokens, nil
-}
-
-// isFlag checks if a string looks like a command line flag
-func isFlag(s string) bool {
-	return strings.HasPrefix(s, "-")
-}

pkg/backends/parser.go

@@ -0,0 +1,310 @@
+package backends
+
+import (
+	"encoding/json"
+	"errors"
+	"fmt"
+	"path/filepath"
+	"regexp"
+	"strconv"
+	"strings"
+)
+
+// CommandParserConfig holds configuration for parsing command line arguments
+type CommandParserConfig struct {
+	// ExecutableNames are the names of executables to detect (e.g., "llama-server", "mlx_lm.server")
+	ExecutableNames []string
+	// SubcommandNames are optional subcommands (e.g., "serve" for vllm)
+	SubcommandNames []string
+	// MultiValuedFlags are flags that can accept multiple values
+	MultiValuedFlags map[string]struct{}
+}
+
+// ParseCommand parses a command string using the provided configuration
+func ParseCommand(command string, config CommandParserConfig, target any) error {
+	// 1. Normalize the command - handle multiline with backslashes
+	trimmed := normalizeMultilineCommand(command)
+	if trimmed == "" {
+		return fmt.Errorf("command cannot be empty")
+	}
+
+	// 2. Extract arguments from command
+	args, err := extractArgumentsFromCommand(trimmed, config)
+	if err != nil {
+		return err
+	}
+
+	// 3. Parse arguments into map
+	options := make(map[string]any)
+
+	i := 0
+	for i < len(args) {
+		arg := args[i]
+
+		if !strings.HasPrefix(arg, "-") { // skip positional / stray values
+			i++
+			continue
+		}
+
+		// Reject malformed flags with more than two leading dashes (e.g. ---model) to surface user mistakes
+		if strings.HasPrefix(arg, "---") {
+			return fmt.Errorf("malformed flag: %s", arg)
+		}
+
+		// Unified parsing for --flag=value vs --flag value
+		var rawFlag, rawValue string
+		hasEquals := false
+		if strings.Contains(arg, "=") {
+			parts := strings.SplitN(arg, "=", 2)
+			rawFlag = parts[0]
+			rawValue = parts[1] // may be empty string
+			hasEquals = true
+		} else {
+			rawFlag = arg
+		}
+
+		flagCore := strings.TrimPrefix(strings.TrimPrefix(rawFlag, "-"), "-")
+		flagName := strings.ReplaceAll(flagCore, "-", "_")
+
+		// Detect value if not in equals form
+		valueProvided := hasEquals
+		if !hasEquals {
+			if i+1 < len(args) && !isFlag(args[i+1]) { // next token is value
+				rawValue = args[i+1]
+				valueProvided = true
+			}
+		}
+
+		// Determine if multi-valued flag
+		_, isMulti := config.MultiValuedFlags[flagName]
+
+		// Normalization helper: ensure slice for multi-valued flags
+		appendValue := func(valStr string) {
+			if existing, ok := options[flagName]; ok {
+				// Existing value; ensure slice semantics for multi-valued flags or repeated occurrences
+				if slice, ok := existing.([]string); ok {
+					options[flagName] = append(slice, valStr)
+					return
+				}
+				// Convert scalar to slice
+				options[flagName] = []string{fmt.Sprintf("%v", existing), valStr}
+				return
+			}
+			// First value
+			if isMulti {
+				options[flagName] = []string{valStr}
+			} else {
+				// We'll parse type below for single-valued flags
+				options[flagName] = valStr
+			}
+		}
+
+		if valueProvided {
+			// Use raw token for multi-valued flags; else allow typed parsing
+			appendValue(rawValue)
+			if !isMulti { // convert to typed value if scalar
+				if strVal, ok := options[flagName].(string); ok { // still scalar
+					options[flagName] = parseValue(strVal)
+				}
+			}
+			// Advance index: if we consumed a following token as value (non equals form), skip it
+			if !hasEquals && i+1 < len(args) && rawValue == args[i+1] {
+				i += 2
+			} else {
+				i++
+			}
+			continue
+		}
+
+		// Boolean flag (no value)
+		options[flagName] = true
+		i++
+	}
+
+	// 4. Convert to target struct using JSON marshaling
+	jsonData, err := json.Marshal(options)
+	if err != nil {
+		return fmt.Errorf("failed to marshal parsed options: %w", err)
+	}
+
+	if err := json.Unmarshal(jsonData, target); err != nil {
+		return fmt.Errorf("failed to parse command options: %w", err)
+	}
+
+	return nil
+}
+
+// parseValue attempts to parse a string value into the most appropriate type
+func parseValue(value string) any {
+	// Surrounding matching quotes (single or double)
+	if l := len(value); l >= 2 {
+		if (value[0] == '"' && value[l-1] == '"') || (value[0] == '\'' && value[l-1] == '\'') {
+			value = value[1 : l-1]
+		}
+	}
+
+	lower := strings.ToLower(value)
+	if lower == "true" {
+		return true
+	}
+	if lower == "false" {
+		return false
+	}
+
+	if intVal, err := strconv.Atoi(value); err == nil {
+		return intVal
+	}
+	if floatVal, err := strconv.ParseFloat(value, 64); err == nil {
+		return floatVal
+	}
+	return value
+}
+
+// normalizeMultilineCommand handles multiline commands with backslashes
+func normalizeMultilineCommand(command string) string {
+	// Handle escaped newlines (backslash followed by newline)
+	re := regexp.MustCompile(`\\\s*\n\s*`)
+	normalized := re.ReplaceAllString(command, " ")
+
+	// Clean up extra whitespace
+	re = regexp.MustCompile(`\s+`)
+	normalized = re.ReplaceAllString(normalized, " ")
+
+	return strings.TrimSpace(normalized)
+}
+
+// extractArgumentsFromCommand extracts arguments from various command formats
+func extractArgumentsFromCommand(command string, config CommandParserConfig) ([]string, error) {
+	// Split command into tokens respecting quotes
+	tokens, err := splitCommandTokens(command)
+	if err != nil {
+		return nil, err
+	}
+
+	if len(tokens) == 0 {
+		return nil, fmt.Errorf("no command tokens found")
+	}
+
+	firstToken := tokens[0]
+
+	// Check for full path executable
+	if strings.Contains(firstToken, string(filepath.Separator)) {
+		baseName := filepath.Base(firstToken)
+		for _, execName := range config.ExecutableNames {
+			if strings.HasSuffix(baseName, execName) {
+				return skipExecutableAndSubcommands(tokens[1:], config.SubcommandNames)
+			}
+		}
+		// Unknown executable, assume it's still an executable
+		return skipExecutableAndSubcommands(tokens[1:], config.SubcommandNames)
+	}
+
+	// Check for simple executable names
+	lowerFirstToken := strings.ToLower(firstToken)
+	for _, execName := range config.ExecutableNames {
+		if lowerFirstToken == strings.ToLower(execName) {
+			return skipExecutableAndSubcommands(tokens[1:], config.SubcommandNames)
+		}
+	}
+
+	// Check for subcommands (like "serve" for vllm)
+	for _, subCmd := range config.SubcommandNames {
+		if lowerFirstToken == strings.ToLower(subCmd) {
+			return tokens[1:], nil // Return everything except the subcommand
+		}
+	}
+
+	// Arguments only (starts with a flag)
+	if strings.HasPrefix(firstToken, "-") {
+		return tokens, nil // Return all tokens as arguments
+	}
+
+	// Unknown format - might be a different executable name
+	return skipExecutableAndSubcommands(tokens[1:], config.SubcommandNames)
+}
+
+// skipExecutableAndSubcommands removes subcommands from the beginning of tokens
+func skipExecutableAndSubcommands(tokens []string, subcommands []string) ([]string, error) {
+	if len(tokens) == 0 {
+		return tokens, nil
+	}
+
+	// Check if first token is a subcommand
+	if len(subcommands) > 0 && len(tokens) > 0 {
+		lowerFirstToken := strings.ToLower(tokens[0])
+		for _, subCmd := range subcommands {
+			if lowerFirstToken == strings.ToLower(subCmd) {
+				return tokens[1:], nil // Skip the subcommand
+			}
+		}
+	}
+
+	return tokens, nil
+}
+
+// splitCommandTokens splits a command string into tokens, respecting quotes
+func splitCommandTokens(command string) ([]string, error) {
+	var tokens []string
+	var current strings.Builder
+	inQuotes := false
+	quoteChar := byte(0)
+	escaped := false
+
+	for i := 0; i < len(command); i++ {
+		c := command[i]
+
+		if escaped {
+			current.WriteByte(c)
+			escaped = false
+			continue
+		}
+
+		if c == '\\' {
+			escaped = true
+			current.WriteByte(c)
+			continue
+		}
+
+		if !inQuotes && (c == '"' || c == '\'') {
+			inQuotes = true
+			quoteChar = c
+			current.WriteByte(c)
+		} else if inQuotes && c == quoteChar {
+			inQuotes = false
+			quoteChar = 0
+			current.WriteByte(c)
+		} else if !inQuotes && (c == ' ' || c == '\t' || c == '\n') {
+			if current.Len() > 0 {
+				tokens = append(tokens, current.String())
+				current.Reset()
+			}
+		} else {
+			current.WriteByte(c)
+		}
+	}
+
+	if inQuotes {
+		return nil, errors.New("unterminated quoted string")
+	}
+
+	if current.Len() > 0 {
+		tokens = append(tokens, current.String())
+	}
+
+	return tokens, nil
+}
+
+// isFlag determines if a string is a command line flag or a value
+// Handles the special case where negative numbers should be treated as values, not flags
+func isFlag(arg string) bool {
+	if !strings.HasPrefix(arg, "-") {
+		return false
+	}
+
+	// Special case: if it's a negative number, treat it as a value
+	if _, err := strconv.ParseFloat(arg, 64); err == nil {
+		return false
+	}
+
+	return true
+}

pkg/backends/vllm/parser.go

@@ -1,13 +1,7 @@
 package vllm
 
 import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"path/filepath"
-	"regexp"
-	"strconv"
-	"strings"
+	"llamactl/pkg/backends"
 )
 
 // ParseVllmCommand parses a vLLM serve command string into VllmServerOptions
@@ -18,285 +12,25 @@ import (
 // 4. Args only: "--model MODEL_NAME --other-args"
 // 5. Multiline commands with backslashes
 func ParseVllmCommand(command string) (*VllmServerOptions, error) {
-	// 1. Normalize the command - handle multiline with backslashes
-	trimmed := normalizeMultilineCommand(command)
-	if trimmed == "" {
-		return nil, fmt.Errorf("command cannot be empty")
-	}
-
-	// 2. Extract arguments from command
-	args, err := extractArgumentsFromCommand(trimmed)
-	if err != nil {
-		return nil, err
-	}
-
-	// 3. Parse arguments into map
-	options := make(map[string]any)
-
-	// Known multi-valued flags (snake_case form)
-	multiValued := map[string]struct{}{
-		"middleware":         {},
-		"api_key":            {},
-		"allowed_origins":    {},
-		"allowed_methods":    {},
-		"allowed_headers":    {},
-		"lora_modules":       {},
-		"prompt_adapters":    {},
-	}
-
-	i := 0
-	for i < len(args) {
-		arg := args[i]
-
-		if !strings.HasPrefix(arg, "-") { // skip positional / stray values
-			i++
-			continue
-		}
-
-		// Reject malformed flags with more than two leading dashes (e.g. ---model) to surface user mistakes
-		if strings.HasPrefix(arg, "---") {
-			return nil, fmt.Errorf("malformed flag: %s", arg)
-		}
-
-		// Unified parsing for --flag=value vs --flag value
-		var rawFlag, rawValue string
-		hasEquals := false
-		if strings.Contains(arg, "=") {
-			parts := strings.SplitN(arg, "=", 2)
-			rawFlag = parts[0]
-			rawValue = parts[1] // may be empty string
-			hasEquals = true
-		} else {
-			rawFlag = arg
-		}
-
-		flagCore := strings.TrimPrefix(strings.TrimPrefix(rawFlag, "-"), "-")
-		flagName := strings.ReplaceAll(flagCore, "-", "_")
-
-		// Detect value if not in equals form
-		valueProvided := hasEquals
-		if !hasEquals {
-			if i+1 < len(args) && !isFlag(args[i+1]) { // next token is value
-				rawValue = args[i+1]
-				valueProvided = true
-			}
-		}
-
-		// Determine if multi-valued flag
-		_, isMulti := multiValued[flagName]
-
-		// Normalization helper: ensure slice for multi-valued flags
-		appendValue := func(valStr string) {
-			if existing, ok := options[flagName]; ok {
-				// Existing value; ensure slice semantics for multi-valued flags or repeated occurrences
-				if slice, ok := existing.([]string); ok {
-					options[flagName] = append(slice, valStr)
-					return
-				}
-				// Convert scalar to slice
-				options[flagName] = []string{fmt.Sprintf("%v", existing), valStr}
-				return
-			}
-			// First value
-			if isMulti {
-				options[flagName] = []string{valStr}
-			} else {
-				// We'll parse type below for single-valued flags
-				options[flagName] = valStr
-			}
-		}
-
-		if valueProvided {
-			// Use raw token for multi-valued flags; else allow typed parsing
-			appendValue(rawValue)
-			if !isMulti { // convert to typed value if scalar
-				if strVal, ok := options[flagName].(string); ok { // still scalar
-					options[flagName] = parseValue(strVal)
-				}
-			}
-			// Advance index: if we consumed a following token as value (non equals form), skip it
-			if !hasEquals && i+1 < len(args) && rawValue == args[i+1] {
-				i += 2
-			} else {
-				i++
-			}
-			continue
-		}
-
-		// Boolean flag (no value)
-		options[flagName] = true
-		i++
-	}
-
-	// 4. Convert to VllmServerOptions using existing UnmarshalJSON
-	jsonData, err := json.Marshal(options)
-	if err != nil {
-		return nil, fmt.Errorf("failed to marshal parsed options: %w", err)
+	config := backends.CommandParserConfig{
+		ExecutableNames: []string{"vllm"},
+		SubcommandNames: []string{"serve"},
+		MultiValuedFlags: map[string]struct{}{
+			"middleware":      {},
+			"api_key":         {},
+			"allowed_origins": {},
+			"allowed_methods": {},
+			"allowed_headers": {},
+			"lora_modules":    {},
+			"prompt_adapters": {},
+		},
 	}
 
 	var vllmOptions VllmServerOptions
-	if err := json.Unmarshal(jsonData, &vllmOptions); err != nil {
-		return nil, fmt.Errorf("failed to parse command options: %w", err)
-	}
-
-	// 5. Return VllmServerOptions
-	return &vllmOptions, nil
-}
-
-// parseValue attempts to parse a string value into the most appropriate type
-func parseValue(value string) any {
-	// Surrounding matching quotes (single or double)
-	if l := len(value); l >= 2 {
-		if (value[0] == '"' && value[l-1] == '"') || (value[0] == '\'' && value[l-1] == '\'') {
-			value = value[1 : l-1]
-		}
-	}
-
-	lower := strings.ToLower(value)
-	if lower == "true" {
-		return true
-	}
-	if lower == "false" {
-		return false
-	}
-
-	if intVal, err := strconv.Atoi(value); err == nil {
-		return intVal
-	}
-	if floatVal, err := strconv.ParseFloat(value, 64); err == nil {
-		return floatVal
-	}
-	return value
-}
-
-// normalizeMultilineCommand handles multiline commands with backslashes
-func normalizeMultilineCommand(command string) string {
-	// Handle escaped newlines (backslash followed by newline)
-	re := regexp.MustCompile(`\\\s*\n\s*`)
-	normalized := re.ReplaceAllString(command, " ")
-
-	// Clean up extra whitespace
-	re = regexp.MustCompile(`\s+`)
-	normalized = re.ReplaceAllString(normalized, " ")
-
-	return strings.TrimSpace(normalized)
-}
-
-// extractArgumentsFromCommand extracts arguments from various command formats
-func extractArgumentsFromCommand(command string) ([]string, error) {
-	// Split command into tokens respecting quotes
-	tokens, err := splitCommandTokens(command)
-	if err != nil {
+	if err := backends.ParseCommand(command, config, &vllmOptions); err != nil {
 		return nil, err
 	}
 
-	if len(tokens) == 0 {
-		return nil, fmt.Errorf("no command tokens found")
-	}
-
-	// Check if first token looks like an executable
-	firstToken := tokens[0]
-
-	// Case 1: Full path to executable (contains path separator or ends with vllm)
-	if strings.Contains(firstToken, string(filepath.Separator)) ||
-		strings.HasSuffix(filepath.Base(firstToken), "vllm") {
-		// Check if second token is "serve"
-		if len(tokens) > 1 && strings.ToLower(tokens[1]) == "serve" {
-			return tokens[2:], nil // Return everything except executable and serve
-		}
-		return tokens[1:], nil // Return everything except the executable
-	}
-
-	// Case 2: Just "vllm" command
-	if strings.ToLower(firstToken) == "vllm" {
-		// Check if second token is "serve"
-		if len(tokens) > 1 && strings.ToLower(tokens[1]) == "serve" {
-			return tokens[2:], nil // Return everything except vllm and serve
-		}
-		return tokens[1:], nil // Return everything except vllm
-	}
-
-	// Case 3: Just "serve" command
-	if strings.ToLower(firstToken) == "serve" {
-		return tokens[1:], nil // Return everything except serve
-	}
-
-	// Case 4: Arguments only (starts with a flag)
-	if strings.HasPrefix(firstToken, "-") {
-		return tokens, nil // Return all tokens as arguments
-	}
-
-	// Case 5: Unknown format - might be a different executable name
-	// Be permissive and assume it's the executable
-	if len(tokens) > 1 && strings.ToLower(tokens[1]) == "serve" {
-		return tokens[2:], nil // Return everything except executable and serve
-	}
-	return tokens[1:], nil
+	return &vllmOptions, nil
 }
 
-// splitCommandTokens splits a command string into tokens, respecting quotes
-func splitCommandTokens(command string) ([]string, error) {
-	var tokens []string
-	var current strings.Builder
-	inQuotes := false
-	quoteChar := byte(0)
-	escaped := false
-
-	for i := 0; i < len(command); i++ {
-		c := command[i]
-
-		if escaped {
-			current.WriteByte(c)
-			escaped = false
-			continue
-		}
-
-		if c == '\\' {
-			escaped = true
-			current.WriteByte(c)
-			continue
-		}
-
-		if !inQuotes && (c == '"' || c == '\'') {
-			inQuotes = true
-			quoteChar = c
-			current.WriteByte(c)
-		} else if inQuotes && c == quoteChar {
-			inQuotes = false
-			quoteChar = 0
-			current.WriteByte(c)
-		} else if !inQuotes && (c == ' ' || c == '\t') {
-			if current.Len() > 0 {
-				tokens = append(tokens, current.String())
-				current.Reset()
-			}
-		} else {
-			current.WriteByte(c)
-		}
-	}
-
-	if inQuotes {
-		return nil, errors.New("unterminated quoted string")
-	}
-
-	if current.Len() > 0 {
-		tokens = append(tokens, current.String())
-	}
-
-	return tokens, nil
-}
-
-// isFlag determines if a string is a command line flag or a value
-// Handles the special case where negative numbers should be treated as values, not flags
-func isFlag(arg string) bool {
-	if !strings.HasPrefix(arg, "-") {
-		return false
-	}
-
-	// Special case: if it's a negative number, treat it as a value
-	if _, err := strconv.ParseFloat(arg, 64); err == nil {
-		return false
-	}
-
-	return true
-}