From e50270877907f7528a6ad30c72c8a9581b1e1e41 Mon Sep 17 00:00:00 2001
From: Nuri Lacka <nurilacka@gmail.com>
Date: Thu, 10 Sep 2026 12:18:35 +0200
Subject: [PATCH] fix: improve project import error messages

Include the selected folder name in the "no dbt_project.yml" error so
users know exactly which folder failed validation. Surface service error
messages directly in the toast instead of re-mapping through fragile
string matching, so "already imported" and other specific errors are
shown verbatim.
---
 src/main/services/projects.service.ts        |  2 +-
 src/renderer/screens/selectProject/index.tsx | 11 +++--------
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/main/services/projects.service.ts b/src/main/services/projects.service.ts
index ef468515..3de07805 100644
--- a/src/main/services/projects.service.ts
+++ b/src/main/services/projects.service.ts
@@ -525,7 +525,7 @@ export default class ProjectsService {
       const dbtRoot = await this.findDbtProjectRoot(projectPath);
       if (!dbtRoot) {
         throw new Error(
-          'No dbt_project.yml found. Please ensure this is a valid dbt project.',
+          `"${path.basename(selectedPath)}" does not contain a dbt_project.yml file. Please select a valid dbt project folder.`,
         );
       }
       projectPath = dbtRoot;
diff --git a/src/renderer/screens/selectProject/index.tsx b/src/renderer/screens/selectProject/index.tsx
index 995bffbf..fc81fba8 100644
--- a/src/renderer/screens/selectProject/index.tsx
+++ b/src/renderer/screens/selectProject/index.tsx
@@ -715,20 +715,15 @@ const SelectProject: React.FC = () => {
                           return;
                         }
 
-                        // Show more specific error messages
                         if (error.message.includes('compressed')) {
                           toast.error(
                             'Failed to extract compressed file. Please ensure it contains a valid dbt project.',
                           );
-                        } else if (error.message.includes('validation')) {
-                          toast.error(
-                            'Invalid dbt project structure. Please ensure the folder contains a valid dbt_project.yml file.',
-                          );
-                        } else if (error.message.includes('already exists')) {
-                          toast.error(error.message);
                         } else {
                           toast.error(
-                            'Failed to import project. Please try again.',
+                            error instanceof Error
+                              ? error.message
+                              : 'Failed to import project. Please try again.',
                           );
                         }
                       }