feat(workspaces): add project groups

src-tauri/src/types.rs

@@ -152,12 +152,22 @@ pub(crate) struct WorktreeInfo {
     pub(crate) branch: String,
 }
 
+#[derive(Debug, Serialize, Deserialize, Clone)]
+pub(crate) struct WorkspaceGroup {
+    pub(crate) id: String,
+    pub(crate) name: String,
+    #[serde(default, rename = "sortOrder")]
+    pub(crate) sort_order: Option<u32>,
+}
+
 #[derive(Debug, Serialize, Deserialize, Clone, Default)]
 pub(crate) struct WorkspaceSettings {
     #[serde(default, rename = "sidebarCollapsed")]
     pub(crate) sidebar_collapsed: bool,
     #[serde(default, rename = "sortOrder")]
     pub(crate) sort_order: Option<u32>,
+    #[serde(default, rename = "groupId")]
+    pub(crate) group_id: Option<String>,
     #[serde(default, rename = "gitRoot")]
     pub(crate) git_root: Option<String>,
 }
@@ -210,6 +220,8 @@ pub(crate) struct AppSettings {
         rename = "dictationHoldKey"
     )]
     pub(crate) dictation_hold_key: String,
+    #[serde(default = "default_workspace_groups", rename = "workspaceGroups")]
+    pub(crate) workspace_groups: Vec<WorkspaceGroup>,
 }
 
 #[derive(Debug, Serialize, Deserialize, Clone)]
@@ -265,6 +277,10 @@ fn default_dictation_hold_key() -> String {
     "alt".to_string()
 }
 
+fn default_workspace_groups() -> Vec<WorkspaceGroup> {
+    Vec::new()
+}
+
 impl Default for AppSettings {
     fn default() -> Self {
         Self {
@@ -282,6 +298,7 @@ impl Default for AppSettings {
             dictation_model_id: default_dictation_model_id(),
             dictation_preferred_language: None,
             dictation_hold_key: default_dictation_hold_key(),
+            workspace_groups: default_workspace_groups(),
         }
     }
 }
@@ -305,6 +322,7 @@ mod tests {
         assert_eq!(settings.dictation_model_id, "base");
         assert!(settings.dictation_preferred_language.is_none());
         assert_eq!(settings.dictation_hold_key, "alt");
+        assert!(settings.workspace_groups.is_empty());
     }
 
     #[test]
@@ -317,5 +335,6 @@ mod tests {
         assert!(entry.parent_id.is_none());
         assert!(entry.worktree.is_none());
         assert!(entry.settings.sort_order.is_none());
+        assert!(entry.settings.group_id.is_none());
     }
 }

src-tauri/src/workspaces.rs

@@ -586,6 +586,7 @@ mod tests {
             settings: WorkspaceSettings {
                 sidebar_collapsed: false,
                 sort_order,
+                group_id: None,
                 git_root: None,
             },
         }

src/App.tsx

@@ -274,6 +274,10 @@ function MainApp() {
 
   const {
     workspaces,
+    workspaceGroups,
+    groupedWorkspaces,
+    getWorkspaceGroupName,
+    ungroupedLabel,
     activeWorkspace,
     activeWorkspaceId,
     setActiveWorkspaceId,
@@ -283,13 +287,20 @@ function MainApp() {
     markWorkspaceConnected,
     updateWorkspaceSettings,
     updateWorkspaceCodexBin,
+    createWorkspaceGroup,
+    renameWorkspaceGroup,
+    moveWorkspaceGroup,
+    deleteWorkspaceGroup,
+    assignWorkspaceGroup,
     removeWorkspace,
     removeWorktree,
     hasLoaded,
     refreshWorkspaces
   } = useWorkspaces({
     onDebug: addDebugEntry,
-    defaultCodexBin: appSettings.codexBin
+    defaultCodexBin: appSettings.codexBin,
+    appSettings,
+    onUpdateAppSettings: queueSaveSettings,
   });
 
   useEffect(() => {
@@ -557,6 +568,7 @@ function MainApp() {
       message: string;
       timestamp: number;
       projectName: string;
+      groupName?: string | null;
       workspaceId: string;
       isProcessing: boolean;
     }> = [];
@@ -572,6 +584,7 @@ function MainApp() {
           message: entry.text,
           timestamp: entry.timestamp,
           projectName: workspace.name,
+          groupName: getWorkspaceGroupName(workspace.id),
           workspaceId: workspace.id,
           isProcessing: threadStatusById[thread.id]?.isProcessing ?? false
         });
@@ -580,6 +593,7 @@ function MainApp() {
     return entries.sort((a, b) => b.timestamp - a.timestamp).slice(0, 3);
   }, [
     lastAgentMessageByThread,
+    getWorkspaceGroupName,
     threadStatusById,
     threadsByWorkspace,
     workspaces
@@ -793,8 +807,17 @@ function MainApp() {
     workspaceId: string,
     direction: "up" | "down"
   ) => {
+    const target = workspaces.find((entry) => entry.id === workspaceId);
+    if (!target || (target.kind ?? "main") === "worktree") {
+      return;
+    }
+    const targetGroupId = target.settings.groupId ?? null;
     const ordered = workspaces
-      .filter((entry) => (entry.kind ?? "main") !== "worktree")
+      .filter(
+        (entry) =>
+          (entry.kind ?? "main") !== "worktree" &&
+          (entry.settings.groupId ?? null) === targetGroupId,
+      )
       .slice()
       .sort((a, b) => {
         const orderDiff = orderValue(a) - orderValue(b);
@@ -882,6 +905,8 @@ function MainApp() {
     compactGitBackNode,
   } = useLayoutNodes({
     workspaces,
+    groupedWorkspaces,
+    hasWorkspaceGroups: workspaceGroups.length > 0,
     threadsByWorkspace,
     threadStatusById,
     threadListLoadingByWorkspace,
@@ -1235,7 +1260,9 @@ function MainApp() {
       )}
       {settingsOpen && (
         <SettingsView
-          workspaces={workspaces}
+          workspaceGroups={workspaceGroups}
+          groupedWorkspaces={groupedWorkspaces}
+          ungroupedLabel={ungroupedLabel}
           onClose={() => {
             setSettingsOpen(false);
             setSettingsSection(null);
@@ -1244,6 +1271,11 @@ function MainApp() {
           onDeleteWorkspace={(workspaceId) => {
             void removeWorkspace(workspaceId);
           }}
+          onCreateWorkspaceGroup={createWorkspaceGroup}
+          onRenameWorkspaceGroup={renameWorkspaceGroup}
+          onMoveWorkspaceGroup={moveWorkspaceGroup}
+          onDeleteWorkspaceGroup={deleteWorkspaceGroup}
+          onAssignWorkspaceGroup={assignWorkspaceGroup}
           reduceTransparency={reduceTransparency}
           onToggleTransparency={setReduceTransparency}
           appSettings={appSettings}