Merge remote-tracking branch 'origin/main' into storybook-tool-messages

Author: ammario

src/App.tsx

@@ -257,7 +257,9 @@ function App() {
     }
   };
 
-  const handleRemoveWorkspace = async (workspaceId: string) => {
+  const handleRemoveWorkspace = async (
+    workspaceId: string
+  ): Promise<{ success: boolean; error?: string }> => {
     const result = await window.api.workspace.remove(workspaceId);
     if (result.success) {
       // Reload config since backend has updated it
@@ -272,8 +274,10 @@ function App() {
       if (selectedWorkspace?.workspaceId === workspaceId) {
         setSelectedWorkspace(null);
       }
+      return { success: true };
     } else {
       console.error("Failed to remove workspace:", result.error);
+      return { success: false, error: result.error };
     }
   };
 
@@ -327,7 +331,7 @@ function App() {
           onAddProject={() => void handleAddProject()}
           onAddWorkspace={(projectPath) => void handleAddWorkspace(projectPath)}
           onRemoveProject={(path) => void handleRemoveProject(path)}
-          onRemoveWorkspace={(workspaceId) => void handleRemoveWorkspace(workspaceId)}
+          onRemoveWorkspace={handleRemoveWorkspace}
           onRenameWorkspace={handleRenameWorkspace}
         />
         <MainContent>

src/components/ProjectSidebar.tsx

@@ -297,7 +297,7 @@ const WorkspaceNameInput = styled.input`
   }
 `;
 
-const RenameErrorContainer = styled.div`
+const WorkspaceErrorContainer = styled.div`
   position: absolute;
   top: 100%;
   left: 28px;
@@ -332,7 +332,7 @@ interface ProjectSidebarProps {
   onAddProject: () => void;
   onAddWorkspace: (projectPath: string) => void;
   onRemoveProject: (path: string) => void;
-  onRemoveWorkspace: (workspaceId: string) => void;
+  onRemoveWorkspace: (workspaceId: string) => Promise<{ success: boolean; error?: string }>;
   onRenameWorkspace: (
     workspaceId: string,
     newName: string
@@ -365,6 +365,9 @@ const ProjectSidebar: React.FC<ProjectSidebarProps> = ({
   const [editingWorkspaceId, setEditingWorkspaceId] = useState<string | null>(null);
   const [editingName, setEditingName] = useState<string>("");
   const [renameError, setRenameError] = useState<string | null>(null);
+  const [removeError, setRemoveError] = useState<{ workspaceId: string; error: string } | null>(
+    null
+  );
 
   const getProjectName = (path: string) => {
     if (!path || typeof path !== "string") {
@@ -423,6 +426,20 @@ const ProjectSidebar: React.FC<ProjectSidebarProps> = ({
     }
   };
 
+  const handleRemoveWorkspace = async (workspaceId: string) => {
+    const result = await onRemoveWorkspace(workspaceId);
+    if (!result.success) {
+      setRemoveError({
+        workspaceId,
+        error: result.error ?? "Failed to remove workspace",
+      });
+      // Clear error after 5 seconds
+      setTimeout(() => {
+        setRemoveError(null);
+      }, 5000);
+    }
+  };
+
   // Handle keyboard shortcuts
   useEffect(() => {
     const handleKeyDown = (e: KeyboardEvent) => {
@@ -533,14 +550,17 @@ const ProjectSidebar: React.FC<ProjectSidebarProps> = ({
                         <WorkspaceRemoveBtn
                           onClick={(e) => {
                             e.stopPropagation();
-                            onRemoveWorkspace(workspaceId);
+                            void handleRemoveWorkspace(workspaceId);
                           }}
                           title="Remove workspace"
                         >
                           ×
                         </WorkspaceRemoveBtn>
                         {isEditing && renameError && (
-                          <RenameErrorContainer>{renameError}</RenameErrorContainer>
+                          <WorkspaceErrorContainer>{renameError}</WorkspaceErrorContainer>
+                        )}
+                        {!isEditing && removeError?.workspaceId === workspaceId && (
+                          <WorkspaceErrorContainer>{removeError.error}</WorkspaceErrorContainer>
                         )}
                       </WorkspaceItem>
                     );