refactor: improve SoC re Projects between renderer and main

Author: ammario

src/App.tsx

@@ -171,7 +171,6 @@ function AppInner() {
 
   const { workspaceMetadata, createWorkspace, removeWorkspace, renameWorkspace } =
     useWorkspaceManagement({
-      projects,
       selectedWorkspace,
       onProjectsUpdate: handleProjectsUpdate,
       onSelectedWorkspaceUpdate: setSelectedWorkspace,
@@ -220,12 +219,15 @@ function AppInner() {
   };
 
   const handleGetSecrets = useCallback(async (projectPath: string) => {
-    return await window.api.secrets.get(projectPath);
+    return await window.api.projects.secrets.get(projectPath);
   }, []);
 
   const handleUpdateSecrets = useCallback(
     async (projectPath: string, secrets: Array<{ key: string; value: string }>) => {
-      await window.api.secrets.update(projectPath, secrets);
+      const result = await window.api.projects.secrets.update(projectPath, secrets);
+      if (!result.success) {
+        console.error("Failed to update secrets:", result.error);
+      }
     },
     []
   );

src/constants/ipc-constants.ts

@@ -4,20 +4,19 @@
  */
 
 export const IPC_CHANNELS = {
-  // Config channels
-  CONFIG_LOAD: "config:load",
-  CONFIG_SAVE: "config:save",
-
   // Dialog channels
   DIALOG_SELECT_DIR: "dialog:selectDirectory",
 
   // Provider channels
   PROVIDERS_SET_CONFIG: "providers:setConfig",
   PROVIDERS_LIST: "providers:list",
 
-  // Secrets channels
-  SECRETS_GET: "secrets:get",
-  SECRETS_UPDATE: "secrets:update",
+  // Project channels
+  PROJECT_CREATE: "project:create",
+  PROJECT_REMOVE: "project:remove",
+  PROJECT_LIST: "project:list",
+  PROJECT_SECRETS_GET: "project:secrets:get",
+  PROJECT_SECRETS_UPDATE: "project:secrets:update",
 
   // Workspace channels
   WORKSPACE_LIST: "workspace:list",

src/hooks/useProjectManagement.ts

@@ -13,53 +13,56 @@ export function useProjectManagement() {
 
   const loadProjects = async () => {
     try {
-      console.log("Loading projects from config...");
-      const config = await window.api.config.load();
-      console.log("Received config:", config);
+      console.log("Loading projects...");
+      const projectsList = await window.api.projects.list();
+      console.log("Received projects:", projectsList);
 
-      if (config && Array.isArray(config.projects)) {
-        console.log("Projects array length:", config.projects.length);
-        const projectsMap = new Map<string, ProjectConfig>(config.projects);
-        console.log("Created projects map, size:", projectsMap.size);
-        setProjects(projectsMap);
-      } else {
-        console.log("No projects or invalid format");
-        setProjects(new Map());
-      }
+      const projectsMap = new Map<string, ProjectConfig>(projectsList.map((p) => [p.path, p]));
+      console.log("Created projects map, size:", projectsMap.size);
+      setProjects(projectsMap);
     } catch (error) {
-      console.error("Failed to load config:", error);
+      console.error("Failed to load projects:", error);
       setProjects(new Map());
     }
   };
 
   const addProject = async () => {
     try {
       const selectedPath = await window.api.dialog.selectDirectory();
-      if (selectedPath && !projects.has(selectedPath)) {
+      if (!selectedPath) return;
+
+      if (projects.has(selectedPath)) {
+        console.log("Project already exists:", selectedPath);
+        return;
+      }
+
+      const result = await window.api.projects.create(selectedPath);
+      if (result.success) {
         const newProjects = new Map(projects);
-        newProjects.set(selectedPath, { path: selectedPath, workspaces: [] });
+        newProjects.set(selectedPath, result.data);
         setProjects(newProjects);
-
-        await window.api.config.save({
-          projects: Array.from(newProjects.entries()),
-        });
+      } else {
+        console.error("Failed to create project:", result.error);
       }
     } catch (error) {
       console.error("Failed to add project:", error);
     }
   };
 
   const removeProject = async (path: string) => {
-    const newProjects = new Map(projects);
-    newProjects.delete(path);
-    setProjects(newProjects);
-
     try {
-      await window.api.config.save({
-        projects: Array.from(newProjects.entries()),
-      });
+      const result = await window.api.projects.remove(path);
+      if (result.success) {
+        const newProjects = new Map(projects);
+        newProjects.delete(path);
+        setProjects(newProjects);
+      } else {
+        console.error("Failed to remove project:", result.error);
+        // Show error to user - they might need to remove workspaces first
+        alert(result.error);
+      }
     } catch (error) {
-      console.error("Failed to save config:", error);
+      console.error("Failed to remove project:", error);
     }
   };
 

src/hooks/useWorkspaceManagement.ts

@@ -4,7 +4,6 @@ import type { WorkspaceSelection } from "@/components/ProjectSidebar";
 import type { ProjectConfig } from "@/config";
 
 interface UseWorkspaceManagementProps {
-  projects: Map<string, ProjectConfig>;
   selectedWorkspace: WorkspaceSelection | null;
   onProjectsUpdate: (projects: Map<string, ProjectConfig>) => void;
   onSelectedWorkspaceUpdate: (workspace: WorkspaceSelection | null) => void;
@@ -14,7 +13,6 @@ interface UseWorkspaceManagementProps {
  * Hook to manage workspace operations (create, remove, rename, list)
  */
 export function useWorkspaceManagement({
-  projects,
   selectedWorkspace,
   onProjectsUpdate,
   onSelectedWorkspaceUpdate,
@@ -43,30 +41,21 @@ export function useWorkspaceManagement({
   const createWorkspace = async (projectPath: string, branchName: string) => {
     const result = await window.api.workspace.create(projectPath, branchName);
     if (result.success) {
-      // Update the project config with the new workspace
-      const newProjects = new Map(projects);
-      const projectConfig = newProjects.get(projectPath);
-      if (projectConfig) {
-        projectConfig.workspaces.push({
-          path: result.metadata.workspacePath,
-        });
-        onProjectsUpdate(newProjects);
-
-        await window.api.config.save({
-          projects: Array.from(newProjects.entries()),
-        });
+      // Backend has already updated the config - reload projects to get updated state
+      const projectsList = await window.api.projects.list();
+      const loadedProjects = new Map(projectsList.map((p) => [p.path, p]));
+      onProjectsUpdate(loadedProjects);
 
-        // Reload workspace metadata to get the new workspace ID
-        await loadWorkspaceMetadata();
+      // Reload workspace metadata to get the new workspace ID
+      await loadWorkspaceMetadata();
 
-        // Return the new workspace selection
-        return {
-          projectPath,
-          projectName: result.metadata.projectName,
-          workspacePath: result.metadata.workspacePath,
-          workspaceId: result.metadata.id,
-        };
-      }
+      // Return the new workspace selection
+      return {
+        projectPath,
+        projectName: result.metadata.projectName,
+        workspacePath: result.metadata.workspacePath,
+        workspaceId: result.metadata.id,
+      };
     } else {
       throw new Error(result.error);
     }
@@ -77,9 +66,9 @@ export function useWorkspaceManagement({
   ): Promise<{ success: boolean; error?: string }> => {
     const result = await window.api.workspace.remove(workspaceId);
     if (result.success) {
-      // Reload config since backend has updated it
-      const config = await window.api.config.load();
-      const loadedProjects = new Map(config.projects);
+      // Backend has already updated the config - reload projects to get updated state
+      const projectsList = await window.api.projects.list();
+      const loadedProjects = new Map(projectsList.map((p) => [p.path, p]));
       onProjectsUpdate(loadedProjects);
 
       // Reload workspace metadata
@@ -102,9 +91,9 @@ export function useWorkspaceManagement({
   ): Promise<{ success: boolean; error?: string }> => {
     const result = await window.api.workspace.rename(workspaceId, newName);
     if (result.success) {
-      // Reload config since backend has updated it
-      const config = await window.api.config.load();
-      const loadedProjects = new Map(config.projects);
+      // Backend has already updated the config - reload projects to get updated state
+      const projectsList = await window.api.projects.list();
+      const loadedProjects = new Map(projectsList.map((p) => [p.path, p]));
       onProjectsUpdate(loadedProjects);
 
       // Reload workspace metadata

src/preload.ts

@@ -25,10 +25,6 @@ import { IPC_CHANNELS, getChatChannel } from "./constants/ipc-constants";
 
 // Build the API implementation using the shared interface
 const api: IPCApi = {
-  config: {
-    load: () => ipcRenderer.invoke(IPC_CHANNELS.CONFIG_LOAD),
-    save: (config) => ipcRenderer.invoke(IPC_CHANNELS.CONFIG_SAVE, config),
-  },
   dialog: {
     selectDirectory: () => ipcRenderer.invoke(IPC_CHANNELS.DIALOG_SELECT_DIR),
   },
@@ -37,10 +33,15 @@ const api: IPCApi = {
       ipcRenderer.invoke(IPC_CHANNELS.PROVIDERS_SET_CONFIG, provider, keyPath, value),
     list: () => ipcRenderer.invoke(IPC_CHANNELS.PROVIDERS_LIST),
   },
-  secrets: {
-    get: (projectPath) => ipcRenderer.invoke(IPC_CHANNELS.SECRETS_GET, projectPath),
-    update: (projectPath, secrets) =>
-      ipcRenderer.invoke(IPC_CHANNELS.SECRETS_UPDATE, projectPath, secrets),
+  projects: {
+    create: (projectPath) => ipcRenderer.invoke(IPC_CHANNELS.PROJECT_CREATE, projectPath),
+    remove: (projectPath) => ipcRenderer.invoke(IPC_CHANNELS.PROJECT_REMOVE, projectPath),
+    list: () => ipcRenderer.invoke(IPC_CHANNELS.PROJECT_LIST),
+    secrets: {
+      get: (projectPath) => ipcRenderer.invoke(IPC_CHANNELS.PROJECT_SECRETS_GET, projectPath),
+      update: (projectPath, secrets) =>
+        ipcRenderer.invoke(IPC_CHANNELS.PROJECT_SECRETS_UPDATE, projectPath, secrets),
+    },
   },
   workspace: {
     list: () => ipcRenderer.invoke(IPC_CHANNELS.WORKSPACE_LIST),