fix: synchronize workspace detection markers and improve Qdrant error handling

Author: doITmagic

cmd/rag-code-mcp/main.go

@@ -1203,9 +1203,9 @@ func ensureIDERules(cfg *config.Config, filePath string) {
 	}
 
 	workspaceRoot := ""
-	markers := []string{
-		".git", "go.mod", "package.json", "composer.json", "requirements.txt",
-		"vhost.conf",
+	markers := []string{".git", "go.mod", "package.json", "composer.json"}
+	if cfg != nil && len(cfg.Workspace.DetectionMarkers) > 0 {
+		markers = cfg.Workspace.DetectionMarkers
 	}
 
 	checkDir := dir

internal/config/loader.go

@@ -42,6 +42,10 @@ func Load(path string) (*Config, error) {
 	// Apply environment variable overrides
 	applyEnvOverrides(&cfg)
 
+	// Auto-migrate again after env overrides (in memory) to ensure any deprecated models
+	// from environment variables are also updated
+	migrateEmbeddingModel(&cfg)
+
 	// Validate configuration
 	if err := validate(&cfg); err != nil {
 		return nil, fmt.Errorf("invalid configuration: %w", err)
@@ -276,11 +280,6 @@ func migrateEmbeddingModel(cfg *Config) bool {
 
 // validate checks if the configuration is valid
 func validate(cfg *Config) error {
-	// Auto-migrate deprecated embedding models
-	if migrateEmbeddingModel(cfg) {
-		log.Printf("✓ Configuration migrated to stable embedding model")
-	}
-
 	// Default to ollama if provider is not set
 	if cfg.LLM.Provider == "" {
 		cfg.LLM.Provider = "ollama"

internal/tools/hybrid_search.go

@@ -154,6 +154,15 @@ func (t *HybridSearchTool) Execute(ctx context.Context, params map[string]interf
 		docs, err = searchMemory.Search(ctx, queryEmbedding, fetchLimit)
 	}
 	if err != nil {
+		errLower := strings.ToLower(err.Error())
+		if strings.Contains(errLower, "dimension mismatch") ||
+			(strings.Contains(errLower, "expected:") && (strings.Contains(errLower, "vector") || strings.Contains(errLower, "dimension"))) {
+			return "", fmt.Errorf("❌ Vector dimension mismatch in collection '%s'.\n\n"+
+				"This usually happens when you change the embedding model (e.g., from nomic to mxbai).\n"+
+				"To fix this, please delete and recreate the index by running the 'index_workspace' tool with 'recreate': true.\n\n"+
+				"Error details: %v",
+				collectionName, err)
+		}
 		return "", fmt.Errorf("search failed: %w", err)
 	}
 

internal/tools/search_local_index.go

@@ -185,8 +185,9 @@ func (t *SearchLocalIndexTool) Execute(ctx context.Context, params map[string]in
 
 		if searchErr != nil {
 			// Check for vector dimension mismatch (common when changing models)
-			if strings.Contains(strings.ToLower(searchErr.Error()), "dimension mismatch") ||
-				strings.Contains(strings.ToLower(searchErr.Error()), "expected:") {
+			errLower := strings.ToLower(searchErr.Error())
+			if strings.Contains(errLower, "dimension mismatch") ||
+				(strings.Contains(errLower, "expected:") && (strings.Contains(errLower, "vector") || strings.Contains(errLower, "dimension"))) {
 				return fmt.Sprintf("❌ Vector dimension mismatch in collection '%s'.\n\n"+
 					"This usually happens when you change the embedding model (e.g., from nomic to mxbai).\n"+
 					"To fix this, please delete and recreate the index by running:\n"+