Merge pull request 'Features/repo mangament' (#4) from Features/repo_mangament into master

Reviewed-on: #4

.gitignore

@@ -4,4 +4,5 @@
 *.log
 .idea
 .DS_Store
-~
+~
+.codex*

package-lock.json

@@ -1,12 +1,12 @@
 {
   "name": "tauri-git-lite",
-  "version": "2026.7.1",
+  "version": "2026.7.2",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "tauri-git-lite",
-      "version": "2026.7.1",
+      "version": "2026.7.2",
       "dependencies": {
         "@lucide/svelte": "^1.21.0",
         "@tailwindcss/vite": "^4.3.1",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "git-lite",
-  "version": "2026.7.1",
+  "version": "2026.7.2",
   "private": true,
   "type": "module",
   "scripts": {

src-tauri/src/git.rs

@@ -208,6 +208,12 @@ pub fn open_repository(path: String) -> Result<GitStatus, String> {
     status_for_repo(&repo)
 }
 
+#[tauri::command]
+pub fn open_repo_in_explorer(path: String) -> Result<(), String> {
+    let repo = resolve_repo(&path)?;
+    open_path_in_file_manager(&repo)
+}
+
 #[derive(Debug, Clone, Serialize)]
 pub struct RepositoryBundle {
     pub status: GitStatus,
@@ -341,6 +347,42 @@ pub fn create_branch(
     status_for_repo(&repo)
 }
 
+#[tauri::command]
+pub fn rename_branch(
+    path: String,
+    old_branch: String,
+    new_branch: String,
+) -> Result<GitStatus, String> {
+    let repo = resolve_repo(&path)?;
+    let old_branch = validate_existing_local_branch_name(&repo, &old_branch)?;
+    let new_branch = validate_new_branch_name(&repo, &new_branch)?;
+
+    run_git(
+        &repo,
+        [
+            "branch",
+            "-m",
+            "--",
+            old_branch.as_str(),
+            new_branch.as_str(),
+        ],
+    )?;
+    status_for_repo(&repo)
+}
+
+#[tauri::command]
+pub fn delete_branch(path: String, branch: String) -> Result<GitStatus, String> {
+    let repo = resolve_repo(&path)?;
+    let branch = validate_existing_local_branch_name(&repo, &branch)?;
+    let status = status_for_repo(&repo)?;
+    if status.current_branch.as_deref() == Some(branch.as_str()) {
+        return Err("Der aktuelle Branch kann nicht geloescht werden.".to_string());
+    }
+
+    run_git(&repo, ["branch", "-d", "--", branch.as_str()])?;
+    status_for_repo(&repo)
+}
+
 #[tauri::command]
 pub fn stage_files(path: String, files: Vec<String>) -> Result<GitStatus, String> {
     let repo = resolve_repo(&path)?;
@@ -385,6 +427,59 @@ pub fn restore_files(path: String, files: Vec<String>, staged: bool) -> Result<G
     status_for_repo(&repo)
 }
 
+#[tauri::command]
+pub fn get_file_patch(path: String, file: String, staged: bool) -> Result<String, String> {
+    let repo = resolve_repo(&path)?;
+    validate_files(std::slice::from_ref(&file))?;
+
+    let base_args = if staged {
+        &[
+            "diff",
+            "--cached",
+            "--no-ext-diff",
+            "--no-textconv",
+            "--unified=3",
+        ][..]
+    } else {
+        &["diff", "--no-ext-diff", "--no-textconv", "--unified=3"][..]
+    };
+    let output = run_git_with_paths(&repo, base_args, &[file])?;
+    Ok(String::from_utf8_lossy(&output).to_string())
+}
+
+#[tauri::command]
+pub fn apply_file_patch(
+    path: String,
+    file: String,
+    patch: String,
+    action: String,
+) -> Result<GitStatus, String> {
+    let repo = resolve_repo(&path)?;
+    validate_files(std::slice::from_ref(&file))?;
+    if patch.trim().is_empty() {
+        return Err("Kein Patch ausgewaehlt.".to_string());
+    }
+
+    let patch_path = write_temp_patch(&patch)?;
+    let result = match action.as_str() {
+        "stage" => check_apply_patch(&repo, &patch_path, &["--cached"])
+            .and_then(|_| run_apply_patch(&repo, &patch_path, &["--cached"])),
+        "unstage" => check_apply_patch(&repo, &patch_path, &["--cached", "--reverse"])
+            .and_then(|_| run_apply_patch(&repo, &patch_path, &["--cached", "--reverse"])),
+        "discard-unstaged" => check_apply_patch(&repo, &patch_path, &["--reverse"])
+            .and_then(|_| run_apply_patch(&repo, &patch_path, &["--reverse"])),
+        "discard-staged" => check_apply_patch(&repo, &patch_path, &["--cached", "--reverse"])
+            .and_then(|_| check_apply_patch(&repo, &patch_path, &["--reverse"]))
+            .and_then(|_| run_apply_patch(&repo, &patch_path, &["--cached", "--reverse"]))
+            .and_then(|_| run_apply_patch(&repo, &patch_path, &["--reverse"])),
+        _ => Err("Ungueltige Patch-Aktion.".to_string()),
+    };
+
+    let _ = std::fs::remove_file(&patch_path);
+    result?;
+    status_for_repo(&repo)
+}
+
 #[tauri::command]
 pub fn commit(path: String, message: String) -> Result<GitStatus, String> {
     let repo = resolve_repo(&path)?;
@@ -1261,6 +1356,36 @@ fn resolve_repo(path: &str) -> Result<PathBuf, String> {
     Ok(PathBuf::from(top_level))
 }
 
+#[cfg(windows)]
+fn open_path_in_file_manager(path: &Path) -> Result<(), String> {
+    let native_path = path.to_string_lossy().replace('/', "\\");
+    let mut command = Command::new("explorer.exe");
+    command.arg(native_path);
+    command.creation_flags(CREATE_NO_WINDOW);
+    command
+        .spawn()
+        .map_err(|err| format!("Explorer konnte nicht gestartet werden: {err}"))?;
+    Ok(())
+}
+
+#[cfg(target_os = "macos")]
+fn open_path_in_file_manager(path: &Path) -> Result<(), String> {
+    Command::new("open")
+        .arg(path)
+        .spawn()
+        .map_err(|err| format!("Finder konnte nicht gestartet werden: {err}"))?;
+    Ok(())
+}
+
+#[cfg(all(unix, not(target_os = "macos")))]
+fn open_path_in_file_manager(path: &Path) -> Result<(), String> {
+    Command::new("xdg-open")
+        .arg(path)
+        .spawn()
+        .map_err(|err| format!("Dateimanager konnte nicht gestartet werden: {err}"))?;
+    Ok(())
+}
+
 fn verify_commit(repo: &Path, commit: &str) -> Result<String, String> {
     let commit = commit.trim();
     if commit.is_empty() {
@@ -2014,6 +2139,41 @@ fn validate_new_branch_name(repo: &Path, branch: &str) -> Result<String, String>
     Ok(normalized)
 }
 
+fn validate_existing_local_branch_name(repo: &Path, branch: &str) -> Result<String, String> {
+    let branch = branch.trim();
+    if branch.is_empty() {
+        return Err("Branch-Name darf nicht leer sein.".to_string());
+    }
+
+    let normalized = validate_branch_ref_name(branch)?;
+    if !ref_exists(repo, &format!("refs/heads/{normalized}"))? {
+        return Err(format!(
+            "Lokaler Branch '{normalized}' wurde nicht gefunden."
+        ));
+    }
+
+    Ok(normalized)
+}
+
+fn validate_branch_ref_name(branch: &str) -> Result<String, String> {
+    let output = git_command()
+        .args(["check-ref-format", "--branch", branch])
+        .output()
+        .map_err(|err| format!("Git konnte nicht gestartet werden. Ist Git installiert? {err}"))?;
+
+    if !output.status.success() {
+        let details = command_output_details(&output);
+        return Err(format!("Ungueltiger Branch-Name: {details}"));
+    }
+
+    let normalized = String::from_utf8_lossy(&output.stdout).trim().to_string();
+    Ok(if normalized.is_empty() {
+        branch.to_string()
+    } else {
+        normalized
+    })
+}
+
 fn ref_exists(repo: &Path, ref_name: &str) -> Result<bool, String> {
     let output = git_command()
         .arg("-C")
@@ -2184,6 +2344,45 @@ fn validate_files(files: &[String]) -> Result<(), String> {
     Ok(())
 }
 
+fn write_temp_patch(patch: &str) -> Result<PathBuf, String> {
+    let counter = CANCELLABLE_GIT_OUTPUT_COUNTER.fetch_add(1, Ordering::Relaxed);
+    let path = std::env::temp_dir().join(format!(
+        "gitlite_patch_{}_{}.patch",
+        std::process::id(),
+        counter
+    ));
+    std::fs::write(&path, patch.as_bytes())
+        .map_err(|err| format!("Patch-Datei konnte nicht geschrieben werden: {err}"))?;
+    Ok(path)
+}
+
+fn check_apply_patch(repo: &Path, patch_path: &Path, options: &[&str]) -> Result<(), String> {
+    run_apply_patch_command(repo, patch_path, options, true)
+}
+
+fn run_apply_patch(repo: &Path, patch_path: &Path, options: &[&str]) -> Result<(), String> {
+    run_apply_patch_command(repo, patch_path, options, false)
+}
+
+fn run_apply_patch_command(
+    repo: &Path,
+    patch_path: &Path,
+    options: &[&str],
+    check_only: bool,
+) -> Result<(), String> {
+    let mut args = Vec::with_capacity(options.len() + 5);
+    args.push(OsString::from("apply"));
+    if check_only {
+        args.push(OsString::from("--check"));
+    }
+    args.extend(options.iter().map(OsString::from));
+    args.push(OsString::from("--recount"));
+    args.push(OsString::from("--whitespace=nowarn"));
+    args.push(patch_path.as_os_str().to_os_string());
+
+    run_git(repo, args).map(|_| ())
+}
+
 #[cfg(unix)]
 fn write_askpass_script() -> Result<std::path::PathBuf, String> {
     use std::os::unix::fs::PermissionsExt;
@@ -3388,6 +3587,140 @@ mod tests {
         assert!(err.contains("existiert bereits"));
     }
 
+    #[test]
+    fn rename_branch_renames_existing_local_branch() {
+        let repo = init_temp_repo("rename_branch");
+        commit_initial_file(&repo.path);
+        let current = git_output_test(&repo.path, ["rev-parse", "--abbrev-ref", "HEAD"]);
+        run_git_test(&repo.path, ["branch", "feature/old-panel"]);
+
+        let status = rename_branch(
+            repo.path.to_string_lossy().to_string(),
+            "feature/old-panel".to_string(),
+            "feature/new-panel".to_string(),
+        )
+        .unwrap();
+
+        assert_eq!(status.current_branch.as_deref(), Some(current.as_str()));
+        assert!(
+            !ref_exists(&repo.path, "refs/heads/feature/old-panel").unwrap(),
+            "old branch should be gone"
+        );
+        assert!(
+            ref_exists(&repo.path, "refs/heads/feature/new-panel").unwrap(),
+            "new branch should exist"
+        );
+    }
+
+    #[test]
+    fn delete_branch_removes_local_branch_but_rejects_current_branch() {
+        let repo = init_temp_repo("delete_branch");
+        commit_initial_file(&repo.path);
+        let current = git_output_test(&repo.path, ["rev-parse", "--abbrev-ref", "HEAD"]);
+        run_git_test(&repo.path, ["branch", "stale"]);
+
+        let status =
+            delete_branch(repo.path.to_string_lossy().to_string(), "stale".to_string()).unwrap();
+
+        assert_eq!(status.current_branch.as_deref(), Some(current.as_str()));
+        assert!(
+            !ref_exists(&repo.path, "refs/heads/stale").unwrap(),
+            "deleted branch should be gone"
+        );
+
+        let err = delete_branch(repo.path.to_string_lossy().to_string(), current).unwrap_err();
+        assert!(err.contains("aktuelle Branch"));
+    }
+
+    #[test]
+    fn apply_file_patch_stages_and_discards_selected_changes() {
+        let repo = init_temp_repo("apply_file_patch");
+        fs::write(repo.path.join("old.txt"), "one\ntwo\nthree\n")
+            .expect("initial file should be written");
+        run_git_test(&repo.path, ["add", "old.txt"]);
+        run_git_test(&repo.path, ["commit", "-q", "-m", "init"]);
+
+        fs::write(repo.path.join("old.txt"), "one\nTWO\nthree\nfour\n")
+            .expect("changed file should be written");
+
+        let selected_patch = "diff --git a/old.txt b/old.txt\n--- a/old.txt\n+++ b/old.txt\n@@ -1,3 +1,3 @@\n one\n-two\n+TWO\n three\n";
+        let status = apply_file_patch(
+            repo.path.to_string_lossy().to_string(),
+            "old.txt".to_string(),
+            selected_patch.to_string(),
+            "stage".to_string(),
+        )
+        .expect("selected line should stage");
+
+        assert_eq!(status.files[0].staged, Some(FileStatusKind::Modified));
+        assert_eq!(status.files[0].unstaged, Some(FileStatusKind::Modified));
+        assert_eq!(
+            git_output_test(&repo.path, ["show", ":old.txt"]),
+            "one\nTWO\nthree"
+        );
+        assert_eq!(
+            fs::read_to_string(repo.path.join("old.txt"))
+                .expect("working tree should be readable")
+                .replace("\r\n", "\n"),
+            "one\nTWO\nthree\nfour\n"
+        );
+
+        let unstaged_patch = get_file_patch(
+            repo.path.to_string_lossy().to_string(),
+            "old.txt".to_string(),
+            false,
+        )
+        .expect("unstaged patch should load");
+        assert!(unstaged_patch.contains("+four"));
+
+        let status = apply_file_patch(
+            repo.path.to_string_lossy().to_string(),
+            "old.txt".to_string(),
+            unstaged_patch,
+            "discard-unstaged".to_string(),
+        )
+        .expect("unstaged line should discard");
+
+        assert_eq!(status.files[0].staged, Some(FileStatusKind::Modified));
+        assert_eq!(status.files[0].unstaged, None);
+        assert_eq!(
+            fs::read_to_string(repo.path.join("old.txt"))
+                .expect("working tree should be readable")
+                .replace("\r\n", "\n"),
+            "one\nTWO\nthree\n"
+        );
+    }
+
+    #[test]
+    fn get_file_patch_splits_distant_changes_like_interactive_diff() {
+        let repo = init_temp_repo("file_patch_hunks");
+        let original = (1..=30)
+            .map(|line| format!("line {line}\n"))
+            .collect::<String>();
+        fs::write(repo.path.join("old.txt"), original).expect("initial file should be written");
+        run_git_test(&repo.path, ["add", "old.txt"]);
+        run_git_test(&repo.path, ["commit", "-q", "-m", "init"]);
+
+        let changed = (1..=30)
+            .map(|line| match line {
+                5 => "line five changed\n".to_string(),
+                20 => "line twenty changed\n".to_string(),
+                _ => format!("line {line}\n"),
+            })
+            .collect::<String>();
+        fs::write(repo.path.join("old.txt"), changed).expect("changed file should be written");
+
+        let patch = get_file_patch(
+            repo.path.to_string_lossy().to_string(),
+            "old.txt".to_string(),
+            false,
+        )
+        .expect("patch should load");
+        let hunk_count = patch.lines().filter(|line| line.starts_with("@@ ")).count();
+
+        assert_eq!(hunk_count, 2, "{patch}");
+    }
+
     #[test]
     fn restore_to_commit_resets_branch_to_selected_commit() {
         let repo = init_temp_repo("restore_to_commit");

src-tauri/src/main.rs

@@ -3,12 +3,12 @@
 mod git;
 
 use git::{
-    cancel_code_search, checkout_branch, commit, compare_commits, compare_file_to_head,
-    compare_file_to_parent, create_branch, cred_delete, cred_load, cred_save,
-    diff_file_against_working_tree, get_remote_url, get_status, list_branches, list_commits,
-    list_file_history, list_repository_files, merge_branch, open_repository,
-    open_repository_bundle, pull, push,
-    read_conflict, resolve_conflict, resolve_conflict_side, restore_file_from_commit,
+    apply_file_patch, cancel_code_search, checkout_branch, commit, compare_commits,
+    compare_file_to_head, compare_file_to_parent, create_branch, cred_delete, cred_load, cred_save,
+    delete_branch, diff_file_against_working_tree, get_file_patch, get_remote_url, get_status,
+    list_branches, list_commits, list_file_history, list_repository_files, merge_branch,
+    open_repo_in_explorer, open_repository, open_repository_bundle, pull, push, read_conflict,
+    rename_branch, resolve_conflict, resolve_conflict_side, restore_file_from_commit,
     restore_files, restore_to_commit, search_code_introductions, stage_files, unstage_files,
     SearchCancellationState,
 };
@@ -20,13 +20,18 @@ fn main() {
         .plugin(tauri_plugin_dialog::init())
         .invoke_handler(tauri::generate_handler![
             open_repository,
+            open_repo_in_explorer,
             get_status,
             list_branches,
             checkout_branch,
             create_branch,
+            rename_branch,
+            delete_branch,
             stage_files,
             unstage_files,
             restore_files,
+            get_file_patch,
+            apply_file_patch,
             commit,
             pull,
             push,

src-tauri/tauri.conf.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
   "productName": "GitLite",
-  "version": "2026.7.1",
+  "version": "2026.7.2",
   "identifier": "com.git-lite",
   "build": {
     "beforeDevCommand": "npm run dev",

src/App.svelte

@@ -2,7 +2,7 @@
   import { onDestroy, onMount, tick } from "svelte";
   import { open as openDialog } from "@tauri-apps/plugin-dialog";
   import { check, type DownloadEvent, type Update } from "@tauri-apps/plugin-updater";
-  import { AlertCircle, Check, FolderOpen, GitBranch, GitMerge, LoaderCircle } from "@lucide/svelte";
+  import { AlertCircle, BookOpen, FolderOpen, GitBranch, GitMerge, LoaderCircle, Plus, Search, X } from "@lucide/svelte";
 
   import TitleBar from "./lib/TitleBar.svelte";
   import BranchPanel from "./lib/components/BranchPanel.svelte";
@@ -14,7 +14,9 @@
   import FileHistoryPanel from "./lib/components/FileHistoryPanel.svelte";
   import GlobalSearchDialog from "./lib/components/GlobalSearchDialog.svelte";
   import HistoryPanel from "./lib/components/HistoryPanel.svelte";
+  import LinePatchDialog from "./lib/components/LinePatchDialog.svelte";
   import NewBranchDialog from "./lib/components/NewBranchDialog.svelte";
+  import RenameBranchDialog from "./lib/components/RenameBranchDialog.svelte";
   import RepoLoadingOverlay from "./lib/components/RepoLoadingOverlay.svelte";
   import ResolveDialog from "./lib/components/ResolveDialog.svelte";
   import StatusPanel from "./lib/components/StatusPanel.svelte";
@@ -25,7 +27,9 @@
     commit,
     compareCommits,
     cancelCodeSearch,
+    applyFilePatch,
     createBranch,
+    deleteBranch,
     diffFileAgainstWorkingTree,
     compareFileToParent,
     getStatus,
@@ -34,13 +38,16 @@
     listFileHistory,
     listRepositoryFiles,
     mergeBranch,
+    openRepoInExplorer,
     openRepositoryBundle,
     pull,
     push,
+    renameBranch,
     getRemoteUrl,
     credLoad,
     credSave,
     credDelete,
+    getFilePatch,
     readConflict,
     resolveConflict,
     resolveConflictSide,
@@ -65,6 +72,7 @@
     GitRepositoryFile,
     GitSearchHit,
     GitStatus,
+    PatchApplyAction,
     PreparedResolution,
     StoredCredential,
   } from "./lib/types";
@@ -77,11 +85,29 @@
   } from "./lib/credentials";
 
   type UpdateToastState = "available" | "downloading" | "installed" | "error";
+  type AppView = "management" | "repository";
+
+  interface RepoTab {
+    path: string;
+    name: string;
+    branch: string | null;
+    ahead: number;
+    behind: number;
+    changed: number;
+    lastOpened: number;
+  }
+
+  const OPEN_REPOS_KEY = "gitlite.openRepos.v1";
+  const RECENT_REPOS_KEY = "gitlite.recentRepos.v1";
 
   // ── State ──────────────────────────────────────────────────────────────────
 
   let repoPath = "";
   let activeRepoPath = "";
+  let activeView: AppView = "management";
+  let repoTabs: RepoTab[] = [];
+  let recentRepoPaths: string[] = [];
+  let repoSearch = "";
   let status: GitStatus | null = null;
   let branches: GitBranchInfo[] = [];
   let commits: GitCommit[] = [];
@@ -98,11 +124,18 @@
   let compareTo = "";
   let comparison: GitCommitComparison | null = null;
   let newBranchCommit: GitCommit | null = null;
+  let renameBranchTarget: GitBranchInfo | null = null;
   let compareSelectOpen = false;
   let compareDialogOpen = false;
   let selectedDiffPath = "";
   let diffHighlightQuery = "";
   let pendingRestoreFile: { commit: GitCommit; file: GitCommitFile } | null = null;
+  let linePatchOpen = false;
+  let linePatchFile: GitFileStatus | null = null;
+  let linePatchStaged = false;
+  let linePatchText = "";
+  let linePatchLoading = false;
+  let linePatchError = "";
   let globalSearchOpen = false;
   let lastSearchQuery = "";
   let globalSearchResults: GitSearchHit[] = [];
@@ -137,6 +170,7 @@
 
   $: isBusy = operation.length > 0;
   $: hasRepository = activeRepoPath.length > 0 && status !== null;
+  $: workspaceActive = activeView === "repository" && hasRepository;
   $: openingRepo = operation === "Opening repository";
   $: repoDisplayName = ((repoPath || activeRepoPath).split(/[\\/]/).filter(Boolean).pop()) ?? "";
   $: changedFiles = status?.files ?? [];
@@ -151,10 +185,20 @@
   $: canCompare = hasRepository && compareFrom.length > 0 && compareTo.length > 0 && compareFrom !== compareTo && !isBusy;
   $: localBranches = branches.filter((b) => !b.remote);
   $: remoteBranches = branches.filter((b) => b.remote);
+  $: repoSearchTerm = repoSearch.trim().toLowerCase();
+  $: openRepoRows = repoTabs.filter(repoMatchesSearch);
+  $: recentRepoRows = recentRepoPaths
+    .filter((path) => !repoTabs.some((tab) => sameRepoPath(tab.path, path)))
+    .map(repoRowFromPath)
+    .filter(repoMatchesSearch);
+  $: allRepoRows = uniqueRepoPaths([...repoTabs.map((tab) => tab.path), ...recentRepoPaths])
+    .map(repoRowFromPath)
+    .filter(repoMatchesSearch);
 
   // ── Lifecycle ──────────────────────────────────────────────────────────────
 
   onMount(() => {
+    loadRepoLists();
     autoRefreshTimer = setInterval(() => { void autoRefreshTick(); }, AUTO_REFRESH_INTERVAL);
     void checkForUpdates();
   });
@@ -170,7 +214,7 @@
   }
 
   async function autoRefreshTick() {
-    if (!autoRefreshEnabled || !activeRepoPath || isBusy || autoRefreshInFlight || resolveDialogOpen || compareDialogOpen || compareSelectOpen || newBranchCommit || globalSearchOpen) return;
+    if (!autoRefreshEnabled || activeView !== "repository" || !activeRepoPath || isBusy || autoRefreshInFlight || resolveDialogOpen || compareDialogOpen || compareSelectOpen || newBranchCommit || globalSearchOpen) return;
     autoRefreshInFlight = true;
     try {
       // Cheap fast path: only fetch status; skip the heavy reload if nothing changed.
@@ -267,11 +311,148 @@
 
   // ── Utilities ──────────────────────────────────────────────────────────────
 
+  function repoNameFromPath(path: string): string {
+    return path.split(/[\\/]/).filter(Boolean).pop() ?? path;
+  }
+
+  function repoKey(path: string): string {
+    return path.replace(/\\/g, "/").trim().toLowerCase();
+  }
+
+  function sameRepoPath(left: string, right: string): boolean {
+    return repoKey(left) === repoKey(right);
+  }
+
+  function uniqueRepoPaths(paths: string[]): string[] {
+    const seen = new Set<string>();
+    const result: string[] = [];
+    for (const path of paths) {
+      const trimmed = path.trim();
+      if (!trimmed) continue;
+      const key = repoKey(trimmed);
+      if (seen.has(key)) continue;
+      seen.add(key);
+      result.push(trimmed);
+    }
+    return result;
+  }
+
+  function repoRowFromPath(path: string): RepoTab {
+    return repoTabs.find((tab) => sameRepoPath(tab.path, path)) ?? {
+      path,
+      name: repoNameFromPath(path),
+      branch: null,
+      ahead: 0,
+      behind: 0,
+      changed: 0,
+      lastOpened: 0,
+    };
+  }
+
+  function repoMatchesSearch(repo: RepoTab): boolean {
+    if (!repoSearchTerm) return true;
+    return repo.name.toLowerCase().includes(repoSearchTerm)
+      || repo.path.toLowerCase().includes(repoSearchTerm)
+      || (repo.branch ?? "").toLowerCase().includes(repoSearchTerm);
+  }
+
+  function loadRepoLists() {
+    try {
+      const openValue = JSON.parse(localStorage.getItem(OPEN_REPOS_KEY) ?? "[]") as unknown;
+      const recentValue = JSON.parse(localStorage.getItem(RECENT_REPOS_KEY) ?? "[]") as unknown;
+      const openPaths = Array.isArray(openValue)
+        ? openValue.map((item) => typeof item === "string" ? item : "").filter(Boolean)
+        : [];
+      const recentPaths = Array.isArray(recentValue)
+        ? recentValue.map((item) => typeof item === "string" ? item : "").filter(Boolean)
+        : [];
+
+      repoTabs = uniqueRepoPaths(openPaths).map((path) => ({
+        path,
+        name: repoNameFromPath(path),
+        branch: null,
+        ahead: 0,
+        behind: 0,
+        changed: 0,
+        lastOpened: 0,
+      }));
+      recentRepoPaths = uniqueRepoPaths([...recentPaths, ...openPaths]);
+    } catch {
+      repoTabs = [];
+      recentRepoPaths = [];
+    }
+  }
+
+  function persistRepoLists() {
+    try {
+      localStorage.setItem(OPEN_REPOS_KEY, JSON.stringify(repoTabs.map((tab) => tab.path)));
+      localStorage.setItem(RECENT_REPOS_KEY, JSON.stringify(recentRepoPaths));
+    } catch {
+      // Local storage is best-effort only; the Git workflow must keep working without it.
+    }
+  }
+
+  function rememberRecentRepo(path: string) {
+    recentRepoPaths = uniqueRepoPaths([path, ...recentRepoPaths]).slice(0, 40);
+    persistRepoLists();
+  }
+
+  function upsertRepoTab(path: string, nextStatus?: GitStatus | null) {
+    const existing = repoTabs.find((tab) => sameRepoPath(tab.path, path));
+    const next: RepoTab = {
+      path,
+      name: repoNameFromPath(path),
+      branch: nextStatus?.current_branch ?? existing?.branch ?? null,
+      ahead: nextStatus?.ahead ?? existing?.ahead ?? 0,
+      behind: nextStatus?.behind ?? existing?.behind ?? 0,
+      changed: nextStatus?.files.length ?? existing?.changed ?? 0,
+      lastOpened: Date.now(),
+    };
+
+    repoTabs = existing
+      ? repoTabs.map((tab) => sameRepoPath(tab.path, path) ? next : tab)
+      : [...repoTabs, next];
+    rememberRecentRepo(path);
+  }
+
+  function resetRepositoryState(clearActive = false) {
+    if (clearActive) {
+      activeRepoPath = "";
+      repoPath = "";
+      status = null;
+      lastStatusFingerprint = "";
+    }
+    branches = [];
+    commits = [];
+    repoFiles = [];
+    selectedExplorerPath = "";
+    selectedExplorerKind = "file";
+    expandedExplorerPaths = new Set();
+    expandedCommitHashes = new Set();
+    fileHistory = [];
+    compareFrom = "";
+    compareTo = "";
+    comparison = null;
+    compareSelectOpen = false;
+    compareDialogOpen = false;
+    selectedDiffPath = "";
+    pendingRestoreFile = null;
+    newBranchCommit = null;
+    globalSearchResults = [];
+    globalSearchOpen = false;
+    globalSearchError = "";
+    resolveDialogOpen = false;
+    conflictTarget = "";
+    conflict = null;
+    preparedResolutions = {};
+  }
+
   function applyStatus(nextStatus: GitStatus) {
     status = nextStatus;
     activeRepoPath = nextStatus.repo_path || activeRepoPath || repoPath.trim();
     repoPath = activeRepoPath;
     lastStatusFingerprint = statusFingerprint(nextStatus);
+    upsertRepoTab(activeRepoPath, nextStatus);
   }
 
   function errorToMessage(error: unknown): string {
@@ -375,17 +556,10 @@
       // Single backend round-trip: resolves the repo and reads status, branches,
       // commits and files in one pass instead of four sequential git calls.
       const bundle = await openRepositoryBundle(path, 100);
+      resetRepositoryState(false);
       applyStatus(bundle.status);
-      branches = []; commits = []; repoFiles = [];
-      selectedExplorerPath = ""; selectedExplorerKind = "file";
-      expandedExplorerPaths = new Set(); expandedCommitHashes = new Set();
-      fileHistory = []; compareFrom = ""; compareTo = "";
-      comparison = null; compareSelectOpen = false; compareDialogOpen = false; selectedDiffPath = ""; pendingRestoreFile = null;
-      newBranchCommit = null;
       if (globalSearchBusy) void cancelGlobalSearch();
-      globalSearchResults = []; globalSearchOpen = false; globalSearchError = "";
-      resolveDialogOpen = false; conflictTarget = ""; conflict = null;
-      preparedResolutions = {};
+      activeView = "repository";
       await refreshBranchList(activeRepoPath, bundle.branches);
       await refreshCommitHistory(activeRepoPath, bundle.commits);
       await refreshExplorerFiles(activeRepoPath, bundle.files);
@@ -409,6 +583,55 @@
     }
   }
 
+  function openRepoManagement() {
+    if (isBusy) return;
+    activeView = "management";
+  }
+
+  async function selectRepoTab(path: string) {
+    if (isBusy) return;
+    if (activeView === "repository" && sameRepoPath(activeRepoPath, path)) return;
+    await openRepo(path);
+  }
+
+  async function closeRepoTab(path: string, event?: MouseEvent) {
+    event?.stopPropagation();
+    if (isBusy) return;
+
+    const index = repoTabs.findIndex((tab) => sameRepoPath(tab.path, path));
+    const remaining = repoTabs.filter((tab) => !sameRepoPath(tab.path, path));
+    const next = remaining[index] ?? remaining[index - 1] ?? null;
+    repoTabs = remaining;
+    persistRepoLists();
+
+    if (!sameRepoPath(activeRepoPath, path)) return;
+    if (next) {
+      await openRepo(next.path);
+    } else {
+      resetRepositoryState(true);
+      activeView = "management";
+    }
+  }
+
+  async function removeRepoFromManagement(path: string, event?: MouseEvent) {
+    event?.stopPropagation();
+    if (isBusy) return;
+    recentRepoPaths = recentRepoPaths.filter((recentPath) => !sameRepoPath(recentPath, path));
+    persistRepoLists();
+    if (repoTabs.some((tab) => sameRepoPath(tab.path, path))) {
+      await closeRepoTab(path);
+    }
+  }
+
+  async function openActiveRepoInExplorer() {
+    if (!activeRepoPath || isBusy) return;
+    try {
+      await openRepoInExplorer(activeRepoPath);
+    } catch (error) {
+      errorMessage = errorToMessage(error);
+    }
+  }
+
   async function refreshRepo() {
     if (!activeRepoPath) { await openRepo(); return; }
     await runOperation("Refreshing", async () => {
@@ -443,6 +666,45 @@
     });
   }
 
+  function renameLocalBranch(branch: GitBranchInfo) {
+    if (!activeRepoPath || branch.remote) return;
+    renameBranchTarget = branch;
+  }
+
+  async function submitRenameBranch(branchName: string) {
+    const branch = renameBranchTarget;
+    const name = branchName.trim();
+    if (!activeRepoPath || !branch || branch.remote || !name || name === branch.name) return;
+
+    await runOperation(`Renaming ${branch.name}`, async () => {
+      applyStatus(await renameBranch(activeRepoPath, branch.name, name));
+      renameBranchTarget = null;
+      await refreshBranchList(activeRepoPath);
+      await refreshCommitHistory(activeRepoPath);
+      await refreshExplorerFiles(activeRepoPath);
+      await refreshFileHistory(activeRepoPath);
+    });
+  }
+
+  async function deleteLocalBranch(branch: GitBranchInfo) {
+    if (!activeRepoPath || branch.remote) return;
+    if (branch.current) {
+      errorMessage = "The current branch cannot be deleted.";
+      return;
+    }
+
+    const confirmed = window.confirm(`Delete local branch "${branch.name}"?\n\nGit will refuse if the branch has unmerged changes.`);
+    if (!confirmed) return;
+
+    await runOperation(`Deleting ${branch.name}`, async () => {
+      applyStatus(await deleteBranch(activeRepoPath, branch.name));
+      await refreshBranchList(activeRepoPath);
+      await refreshCommitHistory(activeRepoPath);
+      await refreshExplorerFiles(activeRepoPath);
+      await refreshFileHistory(activeRepoPath);
+    });
+  }
+
   function openNewBranchDialog(commit: GitCommit) {
     if (!activeRepoPath || isBusy) return;
     newBranchCommit = commit;
@@ -675,6 +937,77 @@
     });
   }
 
+  async function openLinePatch(file: GitFileStatus, staged: boolean) {
+    if (!activeRepoPath) return;
+    linePatchOpen = true;
+    linePatchFile = file;
+    linePatchStaged = staged;
+    linePatchText = "";
+    linePatchError = "";
+    linePatchLoading = true;
+
+    try {
+      linePatchText = await getFilePatch(activeRepoPath, file.path, staged);
+    } catch (error) {
+      linePatchError = errorToMessage(error);
+      errorMessage = linePatchError;
+    } finally {
+      linePatchLoading = false;
+    }
+  }
+
+  async function refreshLinePatch() {
+    if (!activeRepoPath || !linePatchFile) return;
+    await openLinePatch(linePatchFile, linePatchStaged);
+  }
+
+  function closeLinePatch() {
+    if (isBusy) return;
+    linePatchOpen = false;
+    linePatchFile = null;
+    linePatchText = "";
+    linePatchError = "";
+  }
+
+  function patchOperationLabel(action: PatchApplyAction, file: GitFileStatus): string {
+    switch (action) {
+      case "stage":
+        return `Staging hunk in ${file.path}`;
+      case "unstage":
+        return `Unstaging hunk in ${file.path}`;
+      default:
+        return `Discarding hunk in ${file.path}`;
+    }
+  }
+
+  async function applyLinePatch(action: PatchApplyAction, patch: string) {
+    if (!activeRepoPath || !linePatchFile || isBusy) return;
+    const file = linePatchFile;
+    operation = patchOperationLabel(action, file);
+    errorMessage = "";
+    linePatchError = "";
+
+    try {
+      applyStatus(await applyFilePatch(activeRepoPath, file.path, patch, action));
+      await refreshExplorerFiles(activeRepoPath);
+      await refreshFileHistory(activeRepoPath);
+
+      const updatedPatch = await getFilePatch(activeRepoPath, file.path, linePatchStaged);
+      if (updatedPatch.trim()) {
+        linePatchText = updatedPatch;
+      } else {
+        linePatchOpen = false;
+        linePatchFile = null;
+        linePatchText = "";
+      }
+    } catch (error) {
+      linePatchError = errorToMessage(error);
+      errorMessage = linePatchError;
+    } finally {
+      operation = "";
+    }
+  }
+
   async function stageAllFiles() {
     const paths = changedFiles.filter((f) => f.unstaged !== null).map((f) => f.path);
     if (paths.length === 0) return;
@@ -978,21 +1311,24 @@
 
   // ── Event handlers ─────────────────────────────────────────────────────────
 
-  function submitRepo(event: SubmitEvent) { event.preventDefault(); void openRepo(); }
-
   function handleWindowKeydown(event: KeyboardEvent) {
     if (event.key === "Escape" && compareDialogOpen) closeCompareDialog();
     else if (event.key === "Escape" && newBranchCommit) newBranchCommit = null;
+    else if (event.key === "Escape" && renameBranchTarget) renameBranchTarget = null;
     else if (event.key === "Escape" && compareSelectOpen) compareSelectOpen = false;
     else if (event.key === "Escape" && globalSearchOpen) closeGlobalSearchDialog();
   }
+
+  function handleWindowContextMenu(event: MouseEvent) {
+    event.preventDefault();
+  }
 </script>
 
 <svelte:head>
   <title>GitLite</title>
 </svelte:head>
 
-<svelte:window on:keydown={handleWindowKeydown} />
+<svelte:window on:keydown={handleWindowKeydown} on:contextmenu={handleWindowContextMenu} />
 
 <main class="shell">
   <TitleBar
@@ -1000,7 +1336,7 @@
     ahead={status?.ahead ?? 0}
     behind={status?.behind ?? 0}
     repoName={activeRepoPath ? (activeRepoPath.split(/[\\/]/).filter(Boolean).slice(-1)[0] ?? "") : ""}
-    {hasRepository}
+    hasRepository={workspaceActive}
     {isBusy}
     {operation}
     {autoRefreshEnabled}
@@ -1010,43 +1346,65 @@
     onRefresh={refreshRepo}
     onSearch={() => { globalSearchOpen = true; }}
     onCompare={openCompareSelect}
+    onOpenInExplorer={openActiveRepoInExplorer}
     onToggleAutoRefresh={toggleAutoRefresh}
   />
 
   <div class="shell-body">
 
-    <!-- Repository path form -->
-    <header class="topbar">
-      <form class="repo-form" onsubmit={submitRepo}>
-        <label for="repo-path">Repository</label>
-        <input
-          id="repo-path"
-          bind:value={repoPath}
-          autocomplete="off"
-          spellcheck="false"
-          placeholder="/path/to/repository"
-          disabled={isBusy}
-        />
-        <button
-          class="btn-secondary repo-browse"
-          type="button"
-          onclick={chooseRepositoryFolder}
-          disabled={isBusy}
-          title="Repository-Ordner auswaehlen"
-          aria-label="Repository-Ordner auswaehlen"
-        >
-          <FolderOpen size={16} aria-hidden="true" />
-          Browse
-        </button>
-        <button class="btn-primary" type="submit" disabled={isBusy || repoPath.trim().length === 0}>
-          {#if operation === "Opening repository"}
-            <LoaderCircle class="spin" size={16} aria-hidden="true" />
-          {:else}
-            <Check size={16} aria-hidden="true" />
-          {/if}
-          Open
-        </button>
-      </form>
+    <header class="repo-tabbar" aria-label="Repository tabs">
+      <button
+        class="repo-tab management"
+        class:active={activeView === "management"}
+        type="button"
+        onclick={openRepoManagement}
+        disabled={isBusy}
+        title="Repository Management"
+      >
+        <BookOpen size={14} aria-hidden="true" />
+        Repository Management
+      </button>
+
+      <div class="repo-tabs-scroll">
+        {#each repoTabs as repo (repo.path)}
+          <div class="repo-tab-wrap" class:active={activeView === "repository" && sameRepoPath(activeRepoPath, repo.path)}>
+            <button
+              class="repo-tab"
+              type="button"
+              onclick={() => selectRepoTab(repo.path)}
+              disabled={isBusy}
+              title={repo.path}
+            >
+              <FolderOpen size={14} aria-hidden="true" />
+              <span>{repo.name}</span>
+              {#if repo.branch}
+                <strong>{repo.branch}</strong>
+              {/if}
+            </button>
+            <button
+              class="repo-tab-close"
+              type="button"
+              onclick={(event) => closeRepoTab(repo.path, event)}
+              disabled={isBusy}
+              aria-label={`Close ${repo.name}`}
+              title="Close repository tab"
+            >
+              <X size={13} aria-hidden="true" />
+            </button>
+          </div>
+        {/each}
+      </div>
+
+      <button
+        class="repo-tab-add"
+        type="button"
+        onclick={chooseRepositoryFolder}
+        disabled={isBusy}
+        title="Open repository folder"
+        aria-label="Open repository folder"
+      >
+        <Plus size={15} aria-hidden="true" />
+      </button>
     </header>
 
     <!-- Status notices -->
@@ -1064,7 +1422,7 @@
       </section>
     {/if}
 
-    {#if hasConflicts}
+    {#if workspaceActive && hasConflicts}
       <section class="notice conflict" role="alert">
         <GitMerge size={17} aria-hidden="true" />
         <span>{conflictedFiles.length} {conflictedFiles.length === 1 ? "file has" : "files have"} merge conflicts.</span>
@@ -1072,8 +1430,121 @@
       </section>
     {/if}
 
-    <!-- Workspace -->
-    <section class="workspace" aria-label="Git workspace">
+    {#if activeView === "management"}
+      <section class="repo-management" aria-label="Repository Management">
+        <div class="repo-management-head">
+          <div>
+            <span class="eyebrow">Repository Management</span>
+            <h1>Repositories</h1>
+          </div>
+          <div class="repo-management-actions">
+            <button class="btn-secondary" type="button" onclick={chooseRepositoryFolder} disabled={isBusy}>
+              <FolderOpen size={15} aria-hidden="true" />
+              Browse
+            </button>
+          </div>
+        </div>
+
+        <div class="repo-management-tools">
+          <div class="repo-search">
+            <Search size={15} aria-hidden="true" />
+            <input
+              bind:value={repoSearch}
+              autocomplete="off"
+              spellcheck="false"
+              placeholder="Search repositories"
+              aria-label="Search repositories"
+            />
+          </div>
+        </div>
+
+        <div class="repo-sections">
+          <section class="repo-section">
+            <header>
+              <h2>Open repositories</h2>
+              <span>{openRepoRows.length}</span>
+            </header>
+            {#if openRepoRows.length === 0}
+              <div class="repo-empty">No open repositories.</div>
+            {:else}
+              <div class="repo-table">
+                {#each openRepoRows as repo (repo.path)}
+                  <div class="repo-row">
+                    <button class="repo-row-main" type="button" onclick={() => selectRepoTab(repo.path)} disabled={isBusy}>
+                      <span class="repo-row-name">{repo.name}</span>
+                      <span class="repo-row-path">{repo.path}</span>
+                      <span class="repo-row-meta">
+                        {#if repo.branch}<strong><GitBranch size={11} aria-hidden="true" />{repo.branch}</strong>{/if}
+                        {#if repo.ahead > 0}<em class="ahead">↑ {repo.ahead}</em>{/if}
+                        {#if repo.behind > 0}<em class="behind">↓ {repo.behind}</em>{/if}
+                        {#if repo.changed > 0}<em>{repo.changed} changed</em>{/if}
+                      </span>
+                    </button>
+                    <button class="repo-row-icon" type="button" onclick={(event) => closeRepoTab(repo.path, event)} disabled={isBusy} title="Close tab" aria-label={`Close ${repo.name}`}>
+                      <X size={14} aria-hidden="true" />
+                    </button>
+                  </div>
+                {/each}
+              </div>
+            {/if}
+          </section>
+
+          <section class="repo-section">
+            <header>
+              <h2>Recent repositories</h2>
+              <span>{recentRepoRows.length}</span>
+            </header>
+            {#if recentRepoRows.length === 0}
+              <div class="repo-empty">No recent repositories.</div>
+            {:else}
+              <div class="repo-table">
+                {#each recentRepoRows as repo (repo.path)}
+                  <div class="repo-row">
+                    <button class="repo-row-main" type="button" onclick={() => openRepo(repo.path)} disabled={isBusy}>
+                      <span class="repo-row-name">{repo.name}</span>
+                      <span class="repo-row-path">{repo.path}</span>
+                      <span class="repo-row-meta quiet">recent</span>
+                    </button>
+                    <button class="repo-row-icon" type="button" onclick={(event) => removeRepoFromManagement(repo.path, event)} disabled={isBusy} title="Remove from recent" aria-label={`Remove ${repo.name}`}>
+                      <X size={14} aria-hidden="true" />
+                    </button>
+                  </div>
+                {/each}
+              </div>
+            {/if}
+          </section>
+
+          <section class="repo-section">
+            <header>
+              <h2>All repositories</h2>
+              <span>{allRepoRows.length}</span>
+            </header>
+            {#if allRepoRows.length === 0}
+              <div class="repo-empty">Browse for a repository to add it here.</div>
+            {:else}
+              <div class="repo-table">
+                {#each allRepoRows as repo (repo.path)}
+                  <div class="repo-row">
+                    <button class="repo-row-main" type="button" onclick={() => openRepo(repo.path)} disabled={isBusy}>
+                      <span class="repo-row-name">{repo.name}</span>
+                      <span class="repo-row-path">{repo.path}</span>
+                      <span class="repo-row-meta">
+                        {#if repo.branch}<strong><GitBranch size={11} aria-hidden="true" />{repo.branch}</strong>{:else}<em>known repo</em>{/if}
+                      </span>
+                    </button>
+                    <button class="repo-row-icon" type="button" onclick={(event) => removeRepoFromManagement(repo.path, event)} disabled={isBusy} title="Remove" aria-label={`Remove ${repo.name}`}>
+                      <X size={14} aria-hidden="true" />
+                    </button>
+                  </div>
+                {/each}
+              </div>
+            {/if}
+          </section>
+        </div>
+      </section>
+    {:else}
+      <!-- Workspace -->
+      <section class="workspace" aria-label="Git workspace">
 
       <!-- Left sidebar: branches + explorer -->
       <aside class="left-sidebar" aria-label="Repository navigation">
@@ -1086,6 +1557,8 @@
           onCheckout={checkout}
           onMerge={merge}
           onCreateBranch={createNewBranch}
+          onRenameBranch={renameLocalBranch}
+          onDeleteBranch={deleteLocalBranch}
         />
         <ExplorerPanel
           {repoFiles}
@@ -1129,6 +1602,7 @@
             onStage={stageFile}
             onUnstage={unstageFile}
             onDiscard={discardFile}
+            onPatch={openLinePatch}
             onStageAll={stageAllFiles}
             onUnstageAll={unstageAllFiles}
           />
@@ -1173,6 +1647,7 @@
         />
       </aside>
     </section>
+    {/if}
   </div>
 </main>
 
@@ -1189,6 +1664,20 @@
   />
 {/if}
 
+{#if linePatchOpen && linePatchFile}
+  <LinePatchDialog
+    file={linePatchFile}
+    staged={linePatchStaged}
+    patch={linePatchText}
+    {isBusy}
+    isLoading={linePatchLoading}
+    error={linePatchError}
+    onClose={closeLinePatch}
+    onRefresh={refreshLinePatch}
+    onApply={applyLinePatch}
+  />
+{/if}
+
 {#if globalSearchOpen}
   <GlobalSearchDialog
     {hasRepository}
@@ -1219,6 +1708,16 @@
   />
 {/if}
 
+<!-- Rename a local branch from the branch context menu -->
+{#if renameBranchTarget}
+  <RenameBranchDialog
+    branch={renameBranchTarget}
+    {isBusy}
+    onRename={submitRenameBranch}
+    onClose={() => { renameBranchTarget = null; }}
+  />
+{/if}
+
 <!-- Compare: pick the two commits to diff -->
 {#if compareSelectOpen}
   <CompareSelectDialog

src/app.css

@@ -365,6 +365,271 @@
   .repo-form label { color: var(--color-ink-faint); font-size: 11.5px; font-weight: 700; text-transform: uppercase; letter-spacing: 0.04em; white-space: nowrap; }
   .repo-browse { min-width: 104px; }
 
+  /* --- Repository tabs + management --- */
+
+  .repo-tabbar {
+    display: grid;
+    grid-template-columns: auto minmax(0, 1fr) auto;
+    align-items: stretch;
+    min-height: 40px;
+    border: 1px solid var(--color-border-subtle);
+    border-radius: 10px;
+    background: rgba(16, 17, 29, 0.9);
+    overflow: hidden;
+  }
+
+  .repo-tabs-scroll {
+    display: flex;
+    align-items: stretch;
+    min-width: 0;
+    overflow-x: auto;
+    overflow-y: hidden;
+  }
+
+  .repo-tab-wrap {
+    display: flex;
+    align-items: stretch;
+    min-width: 0;
+    border-right: 1px solid var(--color-border-subtle);
+    background: rgba(255,255,255,0.015);
+  }
+  .repo-tab-wrap.active {
+    background: rgba(90, 140, 248, 0.16);
+    box-shadow: inset 0 -2px 0 var(--color-primary);
+  }
+
+  .repo-tab {
+    min-height: 38px;
+    min-width: 0;
+    max-width: 250px;
+    padding: 0 10px;
+    border: 0;
+    border-right: 1px solid var(--color-border-subtle);
+    border-radius: 0;
+    background: transparent;
+    color: var(--color-ink-muted);
+    font-size: 12px;
+    font-weight: 700;
+  }
+  .repo-tab.management {
+    max-width: none;
+    min-width: 190px;
+  }
+  .repo-tab.active,
+  .repo-tab-wrap.active .repo-tab {
+    color: var(--color-ink);
+  }
+  .repo-tab span {
+    min-width: 0;
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .repo-tab strong {
+    flex: 0 0 auto;
+    max-width: 90px;
+    overflow: hidden;
+    padding: 2px 6px;
+    border-radius: 4px;
+    background: rgba(94, 110, 156, 0.18);
+    color: var(--color-ink-dim);
+    font-size: 10.5px;
+    font-family: var(--font-mono);
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .repo-tab-close,
+  .repo-tab-add {
+    min-height: 38px;
+    min-width: 38px;
+    padding: 0;
+    border: 0;
+    border-radius: 0;
+    background: transparent;
+    color: var(--color-ink-faint);
+  }
+  .repo-tab-add {
+    border-left: 1px solid var(--color-border-subtle);
+  }
+
+  .repo-management {
+    display: grid;
+    grid-template-rows: auto auto minmax(0, 1fr);
+    flex: 1 1 0;
+    min-height: 0;
+    border: 1px solid var(--color-border);
+    border-radius: 12px;
+    background: rgba(20, 21, 34, 0.82);
+    overflow: hidden;
+  }
+
+  .repo-management-head,
+  .repo-management-tools {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 12px;
+    padding: 12px 16px;
+    border-bottom: 1px solid var(--color-border-subtle);
+    background: var(--color-surface-dim);
+  }
+  .repo-management-head h1 {
+    margin: 2px 0 0;
+    color: var(--color-ink);
+    font-size: 18px;
+    line-height: 1.2;
+  }
+  .repo-management-actions {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+  }
+
+  .repo-management-tools {
+    padding: 9px 16px;
+    background: rgba(12, 13, 24, 0.72);
+  }
+  .repo-search {
+    position: relative;
+    width: min(620px, 100%);
+  }
+  .repo-search svg {
+    position: absolute;
+    left: 10px;
+    top: 50%;
+    color: var(--color-ink-faint);
+    transform: translateY(-50%);
+    pointer-events: none;
+  }
+  .repo-search input {
+    padding-left: 34px;
+  }
+
+  .repo-sections {
+    min-height: 0;
+    overflow: auto;
+    padding: 14px 16px 18px;
+  }
+
+  .repo-section {
+    border: 1px solid var(--color-border-subtle);
+    border-radius: 8px;
+    background: rgba(255,255,255,0.018);
+    overflow: hidden;
+  }
+  .repo-section + .repo-section { margin-top: 12px; }
+  .repo-section > header {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    min-height: 38px;
+    padding: 0 12px;
+    border-bottom: 1px solid var(--color-border-subtle);
+    background: rgba(255,255,255,0.045);
+  }
+  .repo-section h2 {
+    margin: 0;
+    color: var(--color-ink);
+    font-size: 13px;
+    font-weight: 800;
+  }
+  .repo-section > header span {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    min-width: 20px;
+    min-height: 20px;
+    border-radius: 999px;
+    background: rgba(94, 110, 156, 0.18);
+    color: var(--color-ink-dim);
+    font-size: 11px;
+    font-weight: 800;
+  }
+
+  .repo-empty {
+    padding: 20px 24px;
+    color: var(--color-ink-faint);
+    font-size: 13px;
+    font-style: italic;
+  }
+
+  .repo-table {
+    display: grid;
+  }
+  .repo-row {
+    display: grid;
+    grid-template-columns: minmax(0, 1fr) auto;
+    align-items: stretch;
+    min-height: 36px;
+    border-bottom: 1px solid rgba(255,255,255,0.035);
+  }
+  .repo-row:last-child { border-bottom: 0; }
+  .repo-row-main {
+    display: grid;
+    grid-template-columns: minmax(160px, 220px) minmax(220px, 1fr) minmax(160px, 360px);
+    justify-content: stretch;
+    min-height: 36px;
+    padding: 0 10px 0 28px;
+    border: 0;
+    border-radius: 0;
+    background: transparent;
+    text-align: left;
+  }
+  .repo-row-main:hover:not(:disabled) {
+    background: rgba(90, 140, 248, 0.08);
+  }
+  .repo-row-name,
+  .repo-row-path,
+  .repo-row-meta {
+    display: inline-flex;
+    align-items: center;
+    min-width: 0;
+    overflow: hidden;
+    color: var(--color-ink-muted);
+    font-size: 12px;
+    font-weight: 700;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .repo-row-path {
+    color: var(--color-ink-faint);
+    font-family: var(--font-mono);
+    font-size: 11.5px;
+    font-weight: 500;
+  }
+  .repo-row-meta {
+    gap: 5px;
+    justify-content: flex-start;
+    color: var(--color-ink-dim);
+  }
+  .repo-row-meta strong,
+  .repo-row-meta em {
+    display: inline-flex;
+    align-items: center;
+    gap: 4px;
+    min-height: 20px;
+    padding: 0 6px;
+    border-radius: 4px;
+    background: rgba(94, 110, 156, 0.18);
+    color: var(--color-ink-dim);
+    font-size: 10.5px;
+    font-style: normal;
+    font-weight: 800;
+  }
+  .repo-row-meta .ahead { color: #4eca76; }
+  .repo-row-meta .behind { color: #e0a040; }
+  .repo-row-icon {
+    min-height: 36px;
+    min-width: 36px;
+    padding: 0;
+    border: 0;
+    border-left: 1px solid rgba(255,255,255,0.035);
+    border-radius: 0;
+    background: transparent;
+    color: var(--color-ink-faint);
+  }
+
   /* --- Notices --- */
 
   .notice {
@@ -721,6 +986,8 @@
     align-items: center;
     gap: 6px;
   }
+  .branch-panel { position: relative; }
+
   .branch-create-toggle {
     width: 26px;
     min-width: 26px;
@@ -827,6 +1094,60 @@
     font-size: 12px;
   }
 
+  .branch-folder-row {
+    display: grid;
+    grid-template-columns: auto auto minmax(0, 1fr) auto;
+    align-items: center;
+    justify-content: stretch;
+    gap: 7px;
+    width: 100%;
+    min-height: 34px;
+    padding: 5px 8px;
+    padding-left: calc(8px + var(--branch-indent, 0px));
+    border: 1px solid transparent;
+    border-radius: 8px;
+    background: transparent;
+    color: var(--color-ink-dim);
+    text-align: left;
+  }
+  .branch-folder-row + .branch-folder-row,
+  .branch-folder-row + .branch-row,
+  .branch-row + .branch-folder-row {
+    margin-top: 3px;
+  }
+  .branch-folder-row:hover:not(:disabled) {
+    border-color: var(--color-border-subtle);
+    background: var(--color-surface-hover);
+    color: var(--color-ink);
+  }
+  .branch-folder-row.current {
+    border-color: rgba(78,202,118,0.2);
+    background: rgba(78,202,118,0.08);
+  }
+  .branch-folder-row svg { color: var(--color-ink-faint); }
+  .branch-folder-row.current svg { color: #4eca76; }
+  .branch-folder-name {
+    overflow: hidden;
+    color: var(--color-ink-muted);
+    font-size: 12.5px;
+    font-weight: 800;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .branch-folder-count {
+    display: inline-flex;
+    align-items: center;
+    justify-content: center;
+    min-width: 20px;
+    min-height: 18px;
+    padding: 0 6px;
+    border-radius: 999px;
+    color: var(--color-ink-dim);
+    background: rgba(94,110,156,0.14);
+    font-size: 10px;
+    font-weight: 800;
+  }
+
   .branch-row {
     display: grid;
     grid-template-columns: minmax(0, 1fr) auto;
@@ -834,6 +1155,7 @@
     gap: 8px;
     min-height: 46px;
     padding: 7px 8px;
+    padding-left: calc(8px + var(--branch-indent, 0px));
     border: 1px solid transparent;
     border-radius: 8px;
     transition: background 120ms, border-color 120ms;
@@ -853,6 +1175,57 @@
 
   .branch-actions { display: flex; align-items: center; justify-content: flex-end; gap: 5px; }
 
+  .branch-context-menu {
+    position: absolute;
+    z-index: 120;
+    display: grid;
+    gap: 2px;
+    min-width: 184px;
+    padding: 5px;
+    border: 1px solid var(--color-border);
+    border-radius: 8px;
+    background: var(--color-surface);
+    box-shadow: 0 18px 50px rgba(0,0,0,0.35);
+  }
+
+  .branch-context-menu button {
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    gap: 8px;
+    width: 100%;
+    min-height: 30px;
+    padding: 6px 8px;
+    border-color: transparent;
+    border-radius: 6px;
+    background: transparent;
+    color: var(--color-ink-muted);
+    font-size: 12px;
+    font-weight: 700;
+    text-align: left;
+  }
+
+  .branch-context-menu button:hover:not(:disabled) {
+    border-color: var(--color-border-subtle);
+    background: rgba(255,255,255,0.06);
+    color: var(--color-ink);
+  }
+
+  .branch-context-menu button.danger {
+    color: #ff9aa8;
+  }
+
+  .branch-context-menu button.danger:hover:not(:disabled) {
+    border-color: rgba(255,92,117,0.34);
+    background: rgba(255,92,117,0.12);
+    color: #ffd0d6;
+  }
+
+  .branch-context-menu button:disabled {
+    cursor: not-allowed;
+    opacity: 0.48;
+  }
+
   /* --- Explorer --- */
 
   .explorer-head-actions { display: flex; align-items: center; gap: 5px; flex: 0 0 auto; }
@@ -1094,6 +1467,11 @@
     width: min(1180px, calc(100vw - 32px));
     height: min(840px, calc(100vh - 32px));
   }
+  .line-patch-dialog {
+    grid-template-rows: auto minmax(0, 1fr);
+    width: min(1320px, calc(100vw - 32px));
+    height: min(860px, calc(100vh - 32px));
+  }
   .compare-select-dialog {
     display: block;
     width: min(720px, calc(100vw - 32px));
@@ -1108,12 +1486,25 @@
     max-height: calc(100vh - 32px);
     overflow: auto;
   }
+  .rename-branch-dialog {
+    display: block;
+    width: min(520px, calc(100vw - 32px));
+    height: auto;
+    max-height: calc(100vh - 32px);
+    overflow: auto;
+  }
   .new-branch-form {
     display: flex;
     flex-direction: column;
     gap: 14px;
     padding: 16px;
   }
+  .rename-branch-form {
+    display: flex;
+    flex-direction: column;
+    gap: 14px;
+    padding: 16px;
+  }
   .new-branch-target {
     display: flex;
     align-items: center;
@@ -1311,6 +1702,112 @@
 
   .prepared-tag { display: inline-flex; align-items: center; gap: 4px; margin-right: auto; color: #4eca76; font-size: 12px; font-weight: 700; }
 
+  .line-patch-body {
+    display: grid;
+    grid-template-rows: minmax(0, 1fr);
+    min-height: 0;
+    overflow: hidden;
+  }
+
+  .line-patch-scroll {
+    min-height: 0;
+    overflow: auto;
+    background: #0b0b14;
+  }
+
+  .line-patch-hunk {
+    border-bottom: 1px solid var(--color-border-subtle);
+  }
+
+  .line-patch-hunk-head {
+    position: sticky;
+    top: 0;
+    left: 0;
+    z-index: 1;
+    display: flex;
+    align-items: center;
+    justify-content: flex-start;
+    gap: 12px;
+    width: max-content;
+    min-width: 100%;
+    padding: 7px 10px;
+    border-bottom: 1px solid var(--color-border-subtle);
+    background: rgba(20, 22, 36, 0.96);
+  }
+  .line-patch-hunk-head code {
+    color: var(--color-accent);
+    font-family: var(--font-mono);
+    font-size: 12px;
+    white-space: pre;
+  }
+  .line-patch-hunk-actions {
+    display: flex;
+    align-items: center;
+    gap: 6px;
+    flex: 0 0 auto;
+    padding-left: 16px;
+  }
+  .line-patch-hunk-button {
+    min-height: 22px;
+    padding: 0 8px;
+    border: 1px solid var(--color-border-subtle);
+    border-radius: 3px;
+    background: rgba(255, 255, 255, 0.03);
+    color: var(--color-ink);
+    font-size: 12px;
+    font-weight: 700;
+    line-height: 1;
+  }
+  .line-patch-hunk-button:hover:not(:disabled) {
+    background: rgba(255, 255, 255, 0.08);
+  }
+  .line-patch-hunk-button.discard {
+    border-color: rgba(255, 90, 103, 0.7);
+    color: #ffccd1;
+  }
+  .line-patch-hunk-button.stage,
+  .line-patch-hunk-button.unstage {
+    border-color: rgba(78, 202, 118, 0.72);
+    color: #bff1ce;
+  }
+
+  .line-patch-lines {
+    min-width: max-content;
+    font-family: var(--font-mono);
+    font-size: 12px;
+  }
+
+  .line-patch-row {
+    display: grid;
+    grid-template-columns: 22px minmax(max-content, 1fr);
+    align-items: start;
+    min-height: 22px;
+    padding: 1px 10px 1px 28px;
+    color: var(--color-ink-muted);
+  }
+  .line-patch-row.add {
+    background: rgba(78, 202, 118, 0.09);
+    color: #bff1ce;
+  }
+  .line-patch-row.delete {
+    background: rgba(255, 90, 103, 0.1);
+    color: #ffccd1;
+  }
+  .line-patch-row.meta {
+    color: var(--color-ink-faint);
+  }
+  .line-patch-prefix {
+    color: var(--color-ink-faint);
+    text-align: center;
+    user-select: none;
+  }
+  .line-patch-row.add .line-patch-prefix { color: #4eca76; }
+  .line-patch-row.delete .line-patch-prefix { color: #ff6b7a; }
+  .line-patch-row code {
+    white-space: pre;
+    font-family: var(--font-mono);
+  }
+
   .global-search-body {
     display: grid;
     grid-template-rows: auto auto minmax(0, 1fr);
@@ -2269,6 +2766,12 @@
   .left-sidebar   { grid-template-rows: minmax(200px, 1fr) minmax(240px, 1.2fr); min-height: 440px; }
   .top-section    { grid-template-columns: minmax(0, 1fr); grid-template-rows: minmax(0, 1fr) 190px; }
   .repo-form      { grid-template-columns: 1fr; }
+  .repo-tabbar    { grid-template-columns: minmax(0, 1fr) auto; }
+  .repo-tab.management { min-width: 0; }
+  .repo-tabs-scroll { grid-column: 1 / -1; order: 2; border-top: 1px solid var(--color-border-subtle); }
+  .repo-row-main  { grid-template-columns: minmax(0, 1fr); gap: 2px; align-content: center; padding-left: 12px; }
+  .repo-row       { min-height: 58px; }
+  .repo-row-icon  { min-height: 58px; }
   .repo-path      { display: none; }
   .repo-summary   { height: 40px; }
   .change-lanes   { grid-template-columns: 1fr; }

src/lib/TitleBar.svelte

@@ -1,7 +1,7 @@
 <script lang="ts">
   import { onDestroy, onMount } from "svelte";
   import { getCurrentWindow } from "@tauri-apps/api/window";
-  import { Download, GitBranch, GitCompare, LoaderCircle, Minus, RefreshCw, Search, Upload, X } from "@lucide/svelte";
+  import { Download, FolderOpen, GitBranch, GitCompare, LoaderCircle, Minus, RefreshCw, Search, Upload, X } from "@lucide/svelte";
 
   export let branch: string = "";
   export let ahead: number = 0;
@@ -17,6 +17,7 @@
   export let onRefresh: () => void = () => {};
   export let onSearch: () => void = () => {};
   export let onCompare: () => void = () => {};
+  export let onOpenInExplorer: () => void = () => {};
   export let onToggleAutoRefresh: () => void = () => {};
 
   const win = getCurrentWindow();
@@ -82,6 +83,17 @@
   <!-- Right: actions + window controls -->
   <div class="titlebar-right">
     <div class="titlebar-actions" role="toolbar" aria-label="Repository actions">
+      <button
+        class="tb-action"
+        onclick={onOpenInExplorer}
+        disabled={!hasRepository || isBusy}
+        title="Open repository in Explorer"
+        aria-label="Open repository in Explorer"
+      >
+        <FolderOpen size={14} aria-hidden="true" />
+        <span class="tb-action-label">Explorer</span>
+      </button>
+
       <button
         class="tb-action"
         onclick={onSearch}

src/lib/components/BranchPanel.svelte

@@ -1,7 +1,46 @@
 <script lang="ts">
-  import { Check, ChevronDown, ChevronRight, GitBranch, GitMerge, Plus, X } from "@lucide/svelte";
+  import { Check, ChevronDown, ChevronRight, Folder, FolderOpen, GitBranch, GitMerge, Pencil, Plus, Trash2, X } from "@lucide/svelte";
   import type { GitBranch as GitBranchInfo } from "../types";
 
+  type BranchTreeNode = BranchFolderNode | BranchLeafNode;
+
+  interface BranchFolderNode {
+    kind: "folder";
+    id: string;
+    name: string;
+    children: BranchTreeNode[];
+    branchCount: number;
+    current: boolean;
+    folders: Map<string, BranchFolderNode>;
+  }
+
+  interface BranchLeafNode {
+    kind: "branch";
+    id: string;
+    branch: GitBranchInfo;
+    displayName: string;
+  }
+
+  type BranchRow = BranchFolderRow | BranchLeafRow;
+
+  interface BranchFolderRow {
+    kind: "folder";
+    id: string;
+    name: string;
+    depth: number;
+    branchCount: number;
+    current: boolean;
+  }
+
+  interface BranchLeafRow {
+    kind: "branch";
+    id: string;
+    branch: GitBranchInfo;
+    displayName: string;
+    depth: number;
+    scopeLabel: string;
+  }
+
   interface Props {
     branches: GitBranchInfo[];
     localBranches: GitBranchInfo[];
@@ -11,6 +50,8 @@
     onCheckout: (branch: GitBranchInfo) => void;
     onMerge: (branch: GitBranchInfo) => void;
     onCreateBranch: (branchName: string) => void | Promise<void>;
+    onRenameBranch: (branch: GitBranchInfo) => void | Promise<void>;
+    onDeleteBranch: (branch: GitBranchInfo) => void | Promise<void>;
   }
 
   let {
@@ -22,6 +63,8 @@
     onCheckout = () => {},
     onMerge = () => {},
     onCreateBranch = () => {},
+    onRenameBranch = () => {},
+    onDeleteBranch = () => {},
   }: Props = $props();
 
   let localOpen = $state(true);
@@ -29,6 +72,118 @@
   let createOpen = $state(false);
   let newBranchName = $state("");
   let createInput = $state<HTMLInputElement | null>(null);
+  let panelElement = $state<HTMLElement | null>(null);
+  let contextBranch = $state<GitBranchInfo | null>(null);
+  let contextMenuX = $state(0);
+  let contextMenuY = $state(0);
+  let collapsedBranchFolders = $state<Set<string>>(new Set());
+
+  let localBranchRows = $derived(buildBranchRows("local", localBranches, "local"));
+  let remoteBranchRows = $derived(buildBranchRows("remote", remoteBranches, "remote"));
+
+  function createFolder(id: string, name: string): BranchFolderNode {
+    return {
+      kind: "folder",
+      id,
+      name,
+      children: [],
+      branchCount: 0,
+      current: false,
+      folders: new Map(),
+    };
+  }
+
+  function buildBranchRows(scope: string, branchList: GitBranchInfo[], scopeLabel: string): BranchRow[] {
+    const root = createFolder(`${scope}:root`, "");
+
+    for (const branch of branchList) {
+      const parts = branch.name.split("/").filter(Boolean);
+      const displayName = parts.length > 0 ? parts[parts.length - 1] : branch.name;
+      const folderParts = parts.slice(0, -1);
+      let parent = root;
+
+      for (let index = 0; index < folderParts.length; index += 1) {
+        const folderName = folderParts[index];
+        const folderPath = folderParts.slice(0, index + 1).join("/");
+        let folder = parent.folders.get(folderName);
+
+        if (!folder) {
+          folder = createFolder(`${scope}:folder:${folderPath}`, folderName);
+          parent.folders.set(folderName, folder);
+          parent.children.push(folder);
+        }
+
+        folder.branchCount += 1;
+        folder.current ||= branch.current;
+        parent = folder;
+      }
+
+      parent.children.push({
+        kind: "branch",
+        id: `${scope}:branch:${branch.name}`,
+        branch,
+        displayName,
+      });
+    }
+
+    sortBranchNodes(root.children);
+
+    const rows: BranchRow[] = [];
+    flattenBranchNodes(root.children, rows, 0, scopeLabel);
+    return rows;
+  }
+
+  function sortBranchNodes(nodes: BranchTreeNode[]) {
+    nodes.sort((left, right) => {
+      if (left.kind !== right.kind) return left.kind === "folder" ? -1 : 1;
+      const leftName = left.kind === "folder" ? left.name : left.displayName;
+      const rightName = right.kind === "folder" ? right.name : right.displayName;
+      return leftName.localeCompare(rightName, undefined, { sensitivity: "base" });
+    });
+
+    for (const node of nodes) {
+      if (node.kind === "folder") sortBranchNodes(node.children);
+    }
+  }
+
+  function flattenBranchNodes(nodes: BranchTreeNode[], rows: BranchRow[], depth: number, scopeLabel: string) {
+    for (const node of nodes) {
+      if (node.kind === "folder") {
+        rows.push({
+          kind: "folder",
+          id: node.id,
+          name: node.name,
+          depth,
+          branchCount: node.branchCount,
+          current: node.current,
+        });
+
+        if (isBranchFolderOpen(node.id)) {
+          flattenBranchNodes(node.children, rows, depth + 1, scopeLabel);
+        }
+      } else {
+        rows.push({
+          kind: "branch",
+          id: node.id,
+          branch: node.branch,
+          displayName: node.displayName,
+          depth,
+          scopeLabel,
+        });
+      }
+    }
+  }
+
+  function isBranchFolderOpen(id: string) {
+    return !collapsedBranchFolders.has(id);
+  }
+
+  function toggleBranchFolder(id: string) {
+    const next = new Set(collapsedBranchFolders);
+    if (next.has(id)) next.delete(id);
+    else next.add(id);
+    collapsedBranchFolders = next;
+  }
 
   function openCreateForm() {
     if (!hasRepository || isBusy) return;
@@ -50,9 +205,56 @@
     createOpen = false;
     localOpen = true;
   }
+
+  function checkoutOnDoubleClick(event: MouseEvent, branch: GitBranchInfo) {
+    if (branch.current || isBusy) return;
+    const target = event.target instanceof HTMLElement ? event.target : null;
+    if (target?.closest("button")) return;
+    onCheckout(branch);
+  }
+
+  function openBranchContextMenu(event: MouseEvent, branch: GitBranchInfo) {
+    event.preventDefault();
+    event.stopPropagation();
+    if (isBusy || branch.remote) return;
+
+    const rect = panelElement?.getBoundingClientRect();
+    const rawX = rect ? event.clientX - rect.left : event.offsetX;
+    const rawY = rect ? event.clientY - rect.top : event.offsetY;
+    const maxX = Math.max(8, (rect?.width ?? window.innerWidth) - 192);
+    const maxY = Math.max(8, (rect?.height ?? window.innerHeight) - 92);
+
+    contextBranch = branch;
+    contextMenuX = Math.max(8, Math.min(rawX, maxX));
+    contextMenuY = Math.max(8, Math.min(rawY, maxY));
+  }
+
+  function closeBranchContextMenu() {
+    contextBranch = null;
+  }
+
+  async function renameContextBranch() {
+    const branch = contextBranch;
+    if (!branch || isBusy) return;
+    closeBranchContextMenu();
+    await onRenameBranch(branch);
+  }
+
+  async function deleteContextBranch() {
+    const branch = contextBranch;
+    if (!branch || branch.current || isBusy) return;
+    closeBranchContextMenu();
+    await onDeleteBranch(branch);
+  }
+
+  function handleWindowKeydown(event: KeyboardEvent) {
+    if (event.key === "Escape") closeBranchContextMenu();
+  }
 </script>
 
-<section class="panel grid grid-rows-[auto_1fr] overflow-hidden" aria-label="Branches">
+<svelte:window on:click={closeBranchContextMenu} on:keydown={handleWindowKeydown} />
+
+<section bind:this={panelElement} class="panel branch-panel grid grid-rows-[auto_1fr] overflow-hidden" aria-label="Branches">
   <div class="section-head">
     <div>
       <span class="eyebrow">Branches</span>
@@ -120,29 +322,58 @@
           {#if localBranches.length === 0}
             <div class="branch-empty">No local branches.</div>
           {:else}
-            {#each localBranches as branch (branch.name)}
-              <article class="branch-row" class:current={branch.current}>
-                <div class="branch-info">
-                  <GitBranch size={16} aria-hidden="true" />
-                  <div>
-                    <strong>{branch.name}</strong>
-                    <span>local</span>
+            {#each localBranchRows as row (row.id)}
+              {#if row.kind === "folder"}
+                <button
+                  class="branch-folder-row"
+                  class:current={row.current}
+                  style={`--branch-indent: ${row.depth * 16}px;`}
+                  type="button"
+                  onclick={() => toggleBranchFolder(row.id)}
+                  aria-expanded={isBranchFolderOpen(row.id)}
+                  title={`${row.name} (${row.branchCount})`}
+                >
+                  {#if isBranchFolderOpen(row.id)}
+                    <ChevronDown size={14} aria-hidden="true" />
+                    <FolderOpen size={15} aria-hidden="true" />
+                  {:else}
+                    <ChevronRight size={14} aria-hidden="true" />
+                    <Folder size={15} aria-hidden="true" />
+                  {/if}
+                  <span class="branch-folder-name">{row.name}</span>
+                  <span class="branch-folder-count">{row.branchCount}</span>
+                </button>
+              {:else}
+                <article
+                  class="branch-row"
+                  class:current={row.branch.current}
+                  style={`--branch-indent: ${row.depth * 16}px;`}
+                  ondblclick={(event) => checkoutOnDoubleClick(event, row.branch)}
+                  oncontextmenu={(event) => openBranchContextMenu(event, row.branch)}
+                  title={row.branch.current ? "Current branch" : row.branch.name}
+                >
+                  <div class="branch-info">
+                    <GitBranch size={16} aria-hidden="true" />
+                    <div>
+                      <strong>{row.displayName}</strong>
+                      <span>{row.scopeLabel}</span>
+                    </div>
                   </div>
-                </div>
-                {#if branch.current}
-                  <span class="pill pill-active">Current</span>
-                {:else}
-                  <div class="branch-actions">
-                    <button class="btn-sm" type="button" onclick={() => onCheckout(branch)} disabled={isBusy}>
-                      Checkout
-                    </button>
-                    <button class="btn-sm" type="button" onclick={() => onMerge(branch)} disabled={isBusy} title="Merge into current">
-                      <GitMerge size={15} aria-hidden="true" />
-                      Merge
-                    </button>
-                  </div>
-                {/if}
-              </article>
+                  {#if row.branch.current}
+                    <span class="pill pill-active">Current</span>
+                  {:else}
+                    <div class="branch-actions">
+                      <button class="btn-sm" type="button" onclick={() => onCheckout(row.branch)} disabled={isBusy}>
+                        Checkout
+                      </button>
+                      <button class="btn-sm" type="button" onclick={() => onMerge(row.branch)} disabled={isBusy} title="Merge into current">
+                        <GitMerge size={15} aria-hidden="true" />
+                        Merge
+                      </button>
+                    </div>
+                  {/if}
+                </article>
+              {/if}
             {/each}
           {/if}
         {/if}
@@ -168,33 +399,87 @@
           {#if remoteBranches.length === 0}
             <div class="branch-empty">No remote branches.</div>
           {:else}
-            {#each remoteBranches as branch (branch.name)}
-              <article class="branch-row" class:current={branch.current}>
-                <div class="branch-info">
-                  <GitBranch size={16} aria-hidden="true" />
-                  <div>
-                    <strong>{branch.name}</strong>
-                    <span>remote</span>
+            {#each remoteBranchRows as row (row.id)}
+              {#if row.kind === "folder"}
+                <button
+                  class="branch-folder-row"
+                  class:current={row.current}
+                  style={`--branch-indent: ${row.depth * 16}px;`}
+                  type="button"
+                  onclick={() => toggleBranchFolder(row.id)}
+                  aria-expanded={isBranchFolderOpen(row.id)}
+                  title={`${row.name} (${row.branchCount})`}
+                >
+                  {#if isBranchFolderOpen(row.id)}
+                    <ChevronDown size={14} aria-hidden="true" />
+                    <FolderOpen size={15} aria-hidden="true" />
+                  {:else}
+                    <ChevronRight size={14} aria-hidden="true" />
+                    <Folder size={15} aria-hidden="true" />
+                  {/if}
+                  <span class="branch-folder-name">{row.name}</span>
+                  <span class="branch-folder-count">{row.branchCount}</span>
+                </button>
+              {:else}
+                <article
+                  class="branch-row"
+                  class:current={row.branch.current}
+                  style={`--branch-indent: ${row.depth * 16}px;`}
+                  ondblclick={(event) => checkoutOnDoubleClick(event, row.branch)}
+                  title={row.branch.current ? "Current branch" : row.branch.name}
+                >
+                  <div class="branch-info">
+                    <GitBranch size={16} aria-hidden="true" />
+                    <div>
+                      <strong>{row.displayName}</strong>
+                      <span>{row.scopeLabel}</span>
+                    </div>
                   </div>
-                </div>
-                {#if branch.current}
-                  <span class="pill pill-active">Current</span>
-                {:else}
-                  <div class="branch-actions">
-                    <button class="btn-sm" type="button" onclick={() => onCheckout(branch)} disabled={isBusy}>
-                      Checkout
-                    </button>
-                    <button class="btn-sm" type="button" onclick={() => onMerge(branch)} disabled={isBusy} title="Merge into current">
-                      <GitMerge size={15} aria-hidden="true" />
-                      Merge
-                    </button>
-                  </div>
-                {/if}
-              </article>
+                  {#if row.branch.current}
+                    <span class="pill pill-active">Current</span>
+                  {:else}
+                    <div class="branch-actions">
+                      <button class="btn-sm" type="button" onclick={() => onCheckout(row.branch)} disabled={isBusy}>
+                        Checkout
+                      </button>
+                      <button class="btn-sm" type="button" onclick={() => onMerge(row.branch)} disabled={isBusy} title="Merge into current">
+                        <GitMerge size={15} aria-hidden="true" />
+                        Merge
+                      </button>
+                    </div>
+                  {/if}
+                </article>
+              {/if}
             {/each}
           {/if}
         {/if}
       </div>
     </div>
   {/if}
+
+  {#if contextBranch}
+    <div
+      class="branch-context-menu"
+      style={`left: ${contextMenuX}px; top: ${contextMenuY}px;`}
+      role="menu"
+      tabindex="-1"
+      aria-label={`Actions for ${contextBranch.name}`}
+    >
+      <button type="button" role="menuitem" onclick={renameContextBranch} disabled={isBusy}>
+        <Pencil size={14} aria-hidden="true" />
+        Rename
+      </button>
+      <button
+        class="danger"
+        type="button"
+        role="menuitem"
+        onclick={deleteContextBranch}
+        disabled={isBusy || contextBranch.current}
+        title={contextBranch.current ? "Current branch cannot be deleted" : "Delete local branch"}
+      >
+        <Trash2 size={14} aria-hidden="true" />
+        Delete
+      </button>
+    </div>
+  {/if}
 </section>

src/lib/components/LinePatchDialog.svelte

@@ -0,0 +1,189 @@
+<script lang="ts">
+  import { LoaderCircle, X } from "@lucide/svelte";
+  import type { GitFileStatus, PatchApplyAction } from "../types";
+
+  type PatchLineKind = "context" | "add" | "delete" | "meta";
+
+  interface PatchLine {
+    id: string;
+    text: string;
+    kind: PatchLineKind;
+  }
+
+  interface PatchHunk {
+    id: string;
+    header: string;
+    lines: PatchLine[];
+  }
+
+  interface ParsedPatch {
+    headerLines: string[];
+    hunks: PatchHunk[];
+    binary: boolean;
+  }
+
+  interface Props {
+    file: GitFileStatus;
+    staged: boolean;
+    patch: string;
+    isBusy: boolean;
+    isLoading: boolean;
+    error: string;
+    onClose: () => void;
+    onRefresh: () => void | Promise<void>;
+    onApply: (action: PatchApplyAction, patch: string) => void | Promise<void>;
+  }
+
+  let {
+    file,
+    staged = false,
+    patch = "",
+    isBusy = false,
+    isLoading = false,
+    error = "",
+    onClose = () => {},
+    onRefresh = () => {},
+    onApply = () => {},
+  }: Props = $props();
+
+  let parsed = $state<ParsedPatch>({ headerLines: [], hunks: [], binary: false });
+
+  let scopeLabel = $derived(staged ? "Staged changes" : "Unstaged changes");
+  let displayPath = $derived(file.old_path ? `${file.old_path} -> ${file.path}` : file.path);
+
+  $effect(() => {
+    parsed = parsePatch(patch);
+  });
+
+  function parsePatch(input: string): ParsedPatch {
+    const normalized = input.replace(/\r\n/g, "\n");
+    const lines = normalized.split("\n");
+    if (lines[lines.length - 1] === "") lines.pop();
+
+    const headerLines: string[] = [];
+    const hunks: PatchHunk[] = [];
+    let current: PatchHunk | null = null;
+
+    for (const line of lines) {
+      if (line.startsWith("@@ ")) {
+        current = { id: `hunk-${hunks.length}`, header: line, lines: [] };
+        hunks.push(current);
+        continue;
+      }
+
+      if (!current) {
+        headerLines.push(line);
+        continue;
+      }
+
+      const kind = patchLineKind(line);
+      current.lines.push({
+        id: `${current.id}-line-${current.lines.length}`,
+        text: line,
+        kind,
+      });
+    }
+
+    return {
+      headerLines,
+      hunks,
+      binary: /(^|\n)(Binary files|GIT binary patch|literal \d+)/.test(normalized),
+    };
+  }
+
+  function patchLineKind(line: string): PatchLineKind {
+    if (line.startsWith("+") && !line.startsWith("+++")) return "add";
+    if (line.startsWith("-") && !line.startsWith("---")) return "delete";
+    if (line.startsWith(" ")) return "context";
+    return "meta";
+  }
+
+  function linePrefix(line: PatchLine): string {
+    if (line.kind === "add") return "+";
+    if (line.kind === "delete") return "-";
+    if (line.kind === "meta") return "\\";
+    return " ";
+  }
+
+  function lineBody(line: PatchLine): string {
+    if (line.kind === "meta") return line.text;
+    return line.text.slice(1);
+  }
+
+  function buildHunkPatch(hunk: PatchHunk): string {
+    return `${[...parsed.headerLines, hunk.header, ...hunk.lines.map((line) => line.text)].join("\n")}\n`;
+  }
+
+  async function applyHunkAction(action: PatchApplyAction, hunk: PatchHunk) {
+    if (isBusy || isLoading) return;
+    await onApply(action, buildHunkPatch(hunk));
+  }
+</script>
+
+<div class="dialog-backdrop" role="presentation">
+  <div class="dialog line-patch-dialog" role="dialog" aria-modal="true" aria-label="Line patch">
+    <header class="dialog-header">
+      <div>
+        <span class="eyebrow">{scopeLabel}</span>
+        <p class="dialog-title" title={displayPath}>{displayPath}</p>
+      </div>
+      <div class="dialog-header-actions">
+        <button class="btn-sm" type="button" onclick={onRefresh} disabled={isBusy || isLoading}>Refresh</button>
+        <button class="btn-sm dialog-close" type="button" onclick={onClose} disabled={isBusy} aria-label="Close">
+          <X size={16} aria-hidden="true" />
+        </button>
+      </div>
+    </header>
+
+    <div class="line-patch-body">
+      {#if isLoading}
+        <div class="blank-state">
+          <LoaderCircle class="spin" size={18} aria-hidden="true" />
+          Loading patch...
+        </div>
+      {:else if error}
+        <div class="blank-state">{error}</div>
+      {:else if !patch.trim()}
+        <div class="blank-state">No line patch available for this file.</div>
+      {:else if parsed.binary || parsed.hunks.length === 0}
+        <div class="blank-state">This change cannot be split into text lines.</div>
+      {:else}
+        <div class="line-patch-scroll">
+          {#each parsed.hunks as hunk (hunk.id)}
+            <section class="line-patch-hunk">
+              <div class="line-patch-hunk-head">
+                <code>{hunk.header}</code>
+                <div class="line-patch-hunk-actions">
+                  {#if staged}
+                    <button class="line-patch-hunk-button discard" type="button" onclick={() => applyHunkAction("discard-staged", hunk)} disabled={isBusy}>
+                      Discard Hunk
+                    </button>
+                    <button class="line-patch-hunk-button unstage" type="button" onclick={() => applyHunkAction("unstage", hunk)} disabled={isBusy}>
+                      Unstage Hunk
+                    </button>
+                  {:else}
+                    <button class="line-patch-hunk-button discard" type="button" onclick={() => applyHunkAction("discard-unstaged", hunk)} disabled={isBusy}>
+                      Discard Hunk
+                    </button>
+                    <button class="line-patch-hunk-button stage" type="button" onclick={() => applyHunkAction("stage", hunk)} disabled={isBusy}>
+                      Stage Hunk
+                    </button>
+                  {/if}
+                </div>
+              </div>
+
+              <div class="line-patch-lines">
+                {#each hunk.lines as line (line.id)}
+                  <div class={`line-patch-row ${line.kind}`}>
+                    <span class="line-patch-prefix">{linePrefix(line)}</span>
+                    <code>{lineBody(line)}</code>
+                  </div>
+                {/each}
+              </div>
+            </section>
+          {/each}
+        </div>
+      {/if}
+    </div>
+  </div>
+</div>

src/lib/components/RenameBranchDialog.svelte

@@ -0,0 +1,77 @@
+<script lang="ts">
+  import { GitBranch, LoaderCircle, X } from "@lucide/svelte";
+  import type { GitBranch as GitBranchInfo } from "../types";
+
+  interface Props {
+    branch: GitBranchInfo;
+    isBusy: boolean;
+    onRename: (name: string) => void;
+    onClose: () => void;
+  }
+
+  let {
+    branch,
+    isBusy = false,
+    onRename = () => {},
+    onClose = () => {},
+  }: Props = $props();
+
+  let name = $state("");
+
+  $effect(() => {
+    name = branch.name;
+  });
+
+  function submit(event: SubmitEvent) {
+    event.preventDefault();
+    const value = name.trim();
+    if (!value || value === branch.name) return;
+    onRename(value);
+  }
+</script>
+
+<div
+  class="dialog-backdrop"
+  role="presentation"
+  onclick={(e) => { if (e.target === e.currentTarget) onClose(); }}
+>
+  <div class="dialog rename-branch-dialog" role="dialog" aria-modal="true" aria-label="Rename branch" tabindex="-1">
+    <header class="dialog-header">
+      <div>
+        <span class="eyebrow">Rename branch</span>
+        <h2 class="mt-0.5 text-ink text-base font-bold leading-tight">{branch.name}</h2>
+      </div>
+      <button class="dialog-close" type="button" onclick={onClose} title="Close">
+        <X size={18} aria-hidden="true" />
+      </button>
+    </header>
+
+    <form class="rename-branch-form" onsubmit={submit}>
+      <label class="new-branch-field">
+        <span>Branch name</span>
+        <!-- svelte-ignore a11y_autofocus -->
+        <input
+          bind:value={name}
+          autocomplete="off"
+          spellcheck="false"
+          disabled={isBusy}
+          autofocus
+        />
+      </label>
+
+      <div class="new-branch-actions">
+        <button class="btn-secondary" type="button" onclick={onClose} disabled={isBusy}>
+          Cancel
+        </button>
+        <button class="btn-primary" type="submit" disabled={isBusy || name.trim().length === 0 || name.trim() === branch.name}>
+          {#if isBusy}
+            <LoaderCircle class="spin" size={16} aria-hidden="true" />
+          {:else}
+            <GitBranch size={16} aria-hidden="true" />
+          {/if}
+          Rename
+        </button>
+      </div>
+    </form>
+  </div>
+</div>

src/lib/components/StatusPanel.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { Check, RotateCcw, Undo2 } from "@lucide/svelte";
+  import { Check, FileDiff, RotateCcw, Undo2 } from "@lucide/svelte";
   import type { FileStatusKind, GitFileStatus, GitStatus } from "../types";
 
   interface Props {
@@ -12,6 +12,7 @@
     onStage: (file: GitFileStatus) => void;
     onUnstage: (file: GitFileStatus) => void;
     onDiscard: (file: GitFileStatus, staged: boolean) => void;
+    onPatch: (file: GitFileStatus, staged: boolean) => void;
     onStageAll: () => void;
     onUnstageAll: () => void;
   }
@@ -26,6 +27,7 @@
     onStage = () => {},
     onUnstage = () => {},
     onDiscard = () => {},
+    onPatch = () => {},
     onStageAll = () => {},
     onUnstageAll = () => {},
   }: Props = $props();
@@ -46,6 +48,10 @@
     return file.old_path ? `${baseName(file.old_path)} -> ${baseName(file.path)}` : baseName(file.path);
   }
 
+  function canPatch(kind: FileStatusKind | null): boolean {
+    return kind === "modified";
+  }
+
   let hasUnstaged = $derived(changedFiles.some((f) => f.unstaged !== null));
   let hasStaged = $derived(changedFiles.some((f) => f.staged !== null));
 </script>
@@ -113,6 +119,10 @@
                     <Undo2 size={14} aria-hidden="true" />
                     Unstage
                   </button>
+                  <button class="btn-sm" type="button" onclick={() => onPatch(file, true)} disabled={isBusy || !canPatch(file.staged)} title="Stage, unstage, or discard selected lines">
+                    <FileDiff size={14} aria-hidden="true" />
+                    Details
+                  </button>
                   <button class="btn-sm" type="button" onclick={() => onDiscard(file, true)} disabled={isBusy} title="Discard staged changes">
                     <RotateCcw size={14} aria-hidden="true" />
                     Discard
@@ -134,6 +144,10 @@
                     <Check size={14} aria-hidden="true" />
                     Stage
                   </button>
+                  <button class="btn-sm" type="button" onclick={() => onPatch(file, false)} disabled={isBusy || !canPatch(file.unstaged)} title="Stage or discard selected lines">
+                    <FileDiff size={14} aria-hidden="true" />
+                    Details
+                  </button>
                   <button class="btn-sm" type="button" onclick={() => onDiscard(file, false)} disabled={isBusy} title="Discard unstaged changes">
                     <RotateCcw size={14} aria-hidden="true" />
                     Discard

src/lib/git.ts

@@ -8,6 +8,7 @@ import type {
   GitRepositoryFile,
   GitSearchHit,
   GitStatus,
+  PatchApplyAction,
   RepositoryBundle,
   StoredCredential,
 } from "./types";
@@ -16,6 +17,10 @@ export function openRepository(path: string): Promise<GitStatus> {
   return invoke<GitStatus>("open_repository", { path });
 }
 
+export function openRepoInExplorer(path: string): Promise<void> {
+  return invoke<void>("open_repo_in_explorer", { path });
+}
+
 export function openRepositoryBundle(path: string, commitLimit = 100): Promise<RepositoryBundle> {
   return invoke<RepositoryBundle>("open_repository_bundle", { path, commitLimit });
 }
@@ -40,6 +45,18 @@ export function createBranch(
   return invoke<GitStatus>("create_branch", { path, branch, startPoint: startPoint ?? null });
 }
 
+export function renameBranch(
+  path: string,
+  oldBranch: string,
+  newBranch: string,
+): Promise<GitStatus> {
+  return invoke<GitStatus>("rename_branch", { path, oldBranch, newBranch });
+}
+
+export function deleteBranch(path: string, branch: string): Promise<GitStatus> {
+  return invoke<GitStatus>("delete_branch", { path, branch });
+}
+
 export function stageFiles(path: string, files: string[]): Promise<GitStatus> {
   return invoke<GitStatus>("stage_files", { path, files });
 }
@@ -56,6 +73,19 @@ export function restoreFiles(
   return invoke<GitStatus>("restore_files", { path, files, staged });
 }
 
+export function getFilePatch(path: string, file: string, staged: boolean): Promise<string> {
+  return invoke<string>("get_file_patch", { path, file, staged });
+}
+
+export function applyFilePatch(
+  path: string,
+  file: string,
+  patch: string,
+  action: PatchApplyAction,
+): Promise<GitStatus> {
+  return invoke<GitStatus>("apply_file_patch", { path, file, patch, action });
+}
+
 export function commit(path: string, message: string): Promise<GitStatus> {
   return invoke<GitStatus>("commit", { path, message });
 }

src/lib/types.ts

@@ -24,6 +24,8 @@ export interface GitFileStatus {
   unstaged: FileStatusKind | null;
 }
 
+export type PatchApplyAction = "stage" | "unstage" | "discard-unstaged" | "discard-staged";
+
 export interface GitBranch {
   name: string;
   current: boolean;