Merge pull request #9 from InterestingSoftware/settings-and-ui

Settings and UI

Author: liam-russell

package.json

@@ -27,6 +27,8 @@
     }
   },
   "dependencies": {
+    "@fontsource/fira-code": "^5.2.7",
+    "@fontsource/plus-jakarta-sans": "^5.2.8",
     "@fontsource/space-grotesk": "^5.2.10",
     "@monaco-editor/loader": "^1.7.0",
     "@tauri-apps/api": "^2",

pnpm-lock.yaml

@@ -17,6 +17,17 @@ pub struct EditorInfo {
     pub installed: bool,
 }
 
+#[derive(Serialize, Clone)]
+#[serde(rename_all = "camelCase")]
+pub struct GitToolInfo {
+    pub id: String,
+    pub name: String,
+    pub command: String,
+    pub installed: bool,
+    pub supports_diff: bool,
+    pub supports_merge: bool,
+}
+
 // ── Known Editors ──
 // Each entry: (id, display_name, cli_command, optional macOS app bundle path).
 
@@ -27,6 +38,15 @@ struct EditorCandidate {
     mac_bundle_bin: Option<&'static str>,
 }
 
+struct GitToolCandidate {
+    id: &'static str,
+    name: &'static str,
+    command: &'static str,
+    mac_bundle_bin: Option<&'static str>,
+    supports_diff: bool,
+    supports_merge: bool,
+}
+
 fn known_editors() -> Vec<EditorCandidate> {
     vec![
         EditorCandidate {
@@ -94,6 +114,113 @@ fn known_editors() -> Vec<EditorCandidate> {
     ]
 }
 
+fn known_git_tools() -> Vec<GitToolCandidate> {
+    vec![
+        GitToolCandidate {
+            id: "vscode",
+            name: "VS Code",
+            command: "code",
+            mac_bundle_bin: Some(
+                "/Applications/Visual Studio Code.app/Contents/Resources/app/bin/code",
+            ),
+            supports_diff: true,
+            supports_merge: true,
+        },
+        GitToolCandidate {
+            id: "cursor",
+            name: "Cursor",
+            command: "cursor",
+            mac_bundle_bin: Some("/Applications/Cursor.app/Contents/Resources/app/bin/cursor"),
+            supports_diff: true,
+            supports_merge: true,
+        },
+        GitToolCandidate {
+            id: "windsurf",
+            name: "Windsurf",
+            command: "windsurf",
+            mac_bundle_bin: Some(
+                "/Applications/Windsurf.app/Contents/Resources/app/bin/windsurf",
+            ),
+            supports_diff: true,
+            supports_merge: true,
+        },
+        GitToolCandidate {
+            id: "zed",
+            name: "Zed",
+            command: "zed",
+            mac_bundle_bin: Some("/Applications/Zed.app/Contents/MacOS/cli"),
+            supports_diff: true,
+            supports_merge: true,
+        },
+        GitToolCandidate {
+            id: "sublime",
+            name: "Sublime Text",
+            command: "subl",
+            mac_bundle_bin: Some(
+                "/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl",
+            ),
+            supports_diff: true,
+            supports_merge: true,
+        },
+        GitToolCandidate {
+            id: "vimdiff",
+            name: "Vimdiff",
+            command: "vimdiff",
+            mac_bundle_bin: None,
+            supports_diff: true,
+            supports_merge: true,
+        },
+        GitToolCandidate {
+            id: "nvimdiff",
+            name: "Neovim diff",
+            command: "nvimdiff",
+            mac_bundle_bin: None,
+            supports_diff: true,
+            supports_merge: true,
+        },
+        GitToolCandidate {
+            id: "meld",
+            name: "Meld",
+            command: "meld",
+            mac_bundle_bin: None,
+            supports_diff: true,
+            supports_merge: true,
+        },
+        GitToolCandidate {
+            id: "kdiff3",
+            name: "KDiff3",
+            command: "kdiff3",
+            mac_bundle_bin: None,
+            supports_diff: true,
+            supports_merge: true,
+        },
+        GitToolCandidate {
+            id: "bcompare",
+            name: "Beyond Compare",
+            command: "bcompare",
+            mac_bundle_bin: None,
+            supports_diff: true,
+            supports_merge: true,
+        },
+        GitToolCandidate {
+            id: "p4merge",
+            name: "P4Merge",
+            command: "p4merge",
+            mac_bundle_bin: None,
+            supports_diff: true,
+            supports_merge: true,
+        },
+        GitToolCandidate {
+            id: "opendiff",
+            name: "FileMerge (opendiff)",
+            command: "opendiff",
+            mac_bundle_bin: None,
+            supports_diff: true,
+            supports_merge: true,
+        },
+    ]
+}
+
 fn is_command_available(cmd: &str) -> bool {
     command_exists(cmd)
 }
@@ -112,6 +239,18 @@ fn resolve_editor(editor: &EditorCandidate) -> Option<String> {
     None
 }
 
+fn resolve_git_tool(tool: &GitToolCandidate) -> Option<String> {
+    if is_command_available(tool.command) {
+        return Some(tool.command.to_string());
+    }
+    if let Some(bundle_path) = tool.mac_bundle_bin {
+        if Path::new(bundle_path).exists() {
+            return Some(bundle_path.to_string());
+        }
+    }
+    None
+}
+
 /// Parse a shell-like command string, respecting double and single quotes.
 /// e.g. `"/path/with spaces/code" --wait` → ["/path/with spaces/code", "--wait"]
 /// Also handles unquoted paths by probing the filesystem for known editors.
@@ -231,6 +370,26 @@ pub fn detect_editors() -> Vec<EditorInfo> {
         .collect()
 }
 
+#[tauri::command]
+pub fn detect_git_tools() -> Vec<GitToolInfo> {
+    known_git_tools()
+        .into_iter()
+        .map(|tool| {
+            let resolved = resolve_git_tool(&tool);
+            GitToolInfo {
+                id: tool.id.to_string(),
+                name: tool.name.to_string(),
+                command: resolved
+                    .clone()
+                    .unwrap_or_else(|| tool.command.to_string()),
+                installed: resolved.is_some(),
+                supports_diff: tool.supports_diff,
+                supports_merge: tool.supports_merge,
+            }
+        })
+        .collect()
+}
+
 #[tauri::command]
 pub fn get_git_config(key: String) -> Result<String, String> {
     let key = validate_git_config_key(&key)?;

src-tauri/src/editor.rs

@@ -21,6 +21,7 @@ pub enum GitAction {
     WorktreeList,
     ListRefs,
     CommitGraph,
+    CountCommits,
     CreateManagedWorktree,
     DeleteManagedWorktree,
     PruneWorktrees,
@@ -45,11 +46,12 @@ pub enum GitAction {
 
 impl GitAction {
     #[cfg(test)]
-    pub const ALL: [GitAction; 24] = [
+    pub const ALL: [GitAction; 25] = [
         GitAction::GitInfo,
         GitAction::WorktreeList,
         GitAction::ListRefs,
         GitAction::CommitGraph,
+        GitAction::CountCommits,
         GitAction::CreateManagedWorktree,
         GitAction::DeleteManagedWorktree,
         GitAction::PruneWorktrees,
@@ -78,6 +80,7 @@ impl GitAction {
             GitAction::WorktreeList => "worktree_list",
             GitAction::ListRefs => "list_refs",
             GitAction::CommitGraph => "commit_graph",
+            GitAction::CountCommits => "count_commits",
             GitAction::CreateManagedWorktree => "create_managed_worktree",
             GitAction::DeleteManagedWorktree => "delete_managed_worktree",
             GitAction::PruneWorktrees => "prune_worktrees",

src-tauri/src/git/helpers.rs

@@ -280,6 +280,27 @@ pub async fn list_refs(repo_path: String) -> Result<RefsResult, String> {
     })
 }
 
+#[tauri::command]
+pub async fn count_commits(repo_path: String) -> Result<u64, String> {
+    let canonical = normalize_existing_path(&repo_path)?;
+    let output = run_git(
+        GitAction::CountCommits,
+        &[
+            "-C",
+            &canonical.to_string_lossy(),
+            "rev-list",
+            "--count",
+            "--all",
+        ],
+    )?;
+    let output = ensure_git_success(output, "Failed to count commits")?;
+    let stdout = String::from_utf8_lossy(&output.stdout);
+    stdout
+        .trim()
+        .parse::<u64>()
+        .map_err(|_| "Failed to parse commit count".to_string())
+}
+
 #[tauri::command]
 pub async fn get_commit_graph(
     repo_path: String,