feat(status-panel): enhance UI and add new functionality

This update introduces several improvements to the StatusPanel component, enhancing the user interface and experience. A new function has been added to simplify file path handling, and the overlay now features a more dynamic design with animated elements for better visual feedback during operations.

- Added baseName function for improved path handling
- Enhanced status overlay with animations and new design elements
- Updated file staging and unstaging messages for clarity

.claude/settings.local.json

@@ -92,7 +92,15 @@
       "Bash(rustfmt --check --edition 2021 src/git.rs)",
       "Bash(awk *)",
       "Bash(rustfmt --edition 2021 /tmp/blame_chunk.rs)",
-      "Read(//tmp/**)"
+      "Read(//tmp/**)",
+      "Bash(identify src-tauri/icons/GitCat.ico)",
+      "Bash(python3 -c \"import PIL; print\\(PIL.__version__\\)\")",
+      "Bash(python3 *)",
+      "Bash(xxd -l 16 src-tauri/icons/GitCat.ico)",
+      "Bash(pkg-config --exists openssl)",
+      "Bash(sudo apt-get install -y libssl-dev pkg-config)",
+      "Bash(dpkg -L libssl3t64)",
+      "Bash(grep *)"
     ]
   }
 }

README.md

@@ -1 +1,51 @@
+<div align="center">
 
+<img src="public/splash-icon.png" alt="Gitty Logo" width="360">
+
+# Gitty
+
+**A lightweight, modern Git client built with Tauri.**
+
+Fast, simple, and designed for developers who want a clean Git experience without unnecessary complexity.
+
+</div>
+
+---
+
+## ✨ Features
+
+- 🚀 Fast native performance
+- 🌿 Branch management
+- 📝 Commit history
+- 🔄 Pull, Push & Fetch
+- 🔀 Merge & Rebase
+- 📦 Repository management
+- 🎨 Modern and intuitive UI
+
+---
+
+## 📸 Preview
+
+> Screenshots coming soon.
+
+---
+
+## 🛠️ Built With
+
+- **Tauri**
+- **Rust**
+- **Svelte**
+
+---
+
+## 🚧 Status
+
+Gitty is currently under active development.
+
+Contributions, feedback and feature requests are always welcome!
+
+---
+
+## 📄 License
+
+MIT License

cicd_tool/main.py

@@ -4,14 +4,14 @@ import json
 import os
 from datetime import datetime, timezone
 from pathlib import Path
-from typing import Any, Iterable, List, Optional
+from typing import Any, Iterable, List, NamedTuple, Optional
 from urllib.parse import urlparse
 
 from minio import Minio
 from minio.error import S3Error
 
 
-# cicd_tool lives inside the GitLite repo, so its parent dir is the app root.
+# cicd_tool lives inside the Gitty repo, so its parent dir is the app root.
 PROJECT_DIR = Path(__file__).resolve().parent.parent
 ARTIFACT_ROOT = PROJECT_DIR / "src-tauri" / "target" / "release" / "bundle"
 
@@ -20,6 +20,11 @@ class ConfigurationError(RuntimeError):
     """Raised when required configuration values are missing or invalid."""
 
 
+class PublishTarget(NamedTuple):
+    bucket_name: str
+    app_dir: str
+
+
 def _resolve_version(version_arg: Optional[str]) -> str:
     """Resolve the version to publish, falling back to tauri.conf.json."""
     if version_arg and version_arg.lower() not in {"auto"}:
@@ -259,6 +264,71 @@ def _build_latest_payload(
     }
 
 
+def _parse_publish_targets(primary_bucket: str, primary_app_dir: str) -> list[PublishTarget]:
+    targets = [PublishTarget(primary_bucket, primary_app_dir)]
+    raw_legacy_targets = os.environ.get("LEGACY_UPDATE_TARGETS", "gitlite:gitlite")
+
+    for raw_target in raw_legacy_targets.split(","):
+        value = raw_target.strip()
+        if not value:
+            continue
+
+        if ":" in value:
+            bucket_name, app_dir = value.split(":", 1)
+        else:
+            bucket_name = value
+            app_dir = value
+
+        target = PublishTarget(bucket_name.strip().lower(), app_dir.strip("/"))
+        if target.bucket_name and target not in targets:
+            targets.append(target)
+
+    return targets
+
+
+def _publish_target(
+    client: Minio,
+    target: PublishTarget,
+    version: str,
+    platform: str,
+    artifacts: Iterable[Path],
+    primary_artifact: Path,
+    signature: str,
+    artifact_base_url: str,
+) -> None:
+    _ensure_bucket(client, target.bucket_name)
+    existing_latest_json = _read_existing_latest_json(client, target.bucket_name)
+    latest_payload = _build_latest_payload(
+        version=version,
+        platform=platform,
+        primary_artifact=primary_artifact,
+        signature=signature,
+        artifact_base_url=artifact_base_url,
+        app_dir=target.app_dir,
+        existing_payload=existing_latest_json,
+    )
+    latest_json = json.dumps(latest_payload, separators=(",", ":"))
+
+    for artifact in artifacts:
+        object_segments = [part for part in (version, artifact.name) if part]
+        object_name = "/".join(object_segments)
+        client.fput_object(target.bucket_name, object_name, str(artifact))
+        print(f"Uploaded {artifact.name} -> s3://{target.bucket_name}/{object_name}")
+
+    latest_bytes = latest_json.encode("utf-8")
+    client.put_object(
+        bucket_name=target.bucket_name,
+        object_name="latest.json",
+        data=io.BytesIO(latest_bytes),
+        length=len(latest_bytes),
+        content_type="application/json",
+    )
+    print(
+        f"Uploaded latest.json for {platform} -> "
+        f"s3://{target.bucket_name}/latest.json"
+    )
+
+
 def main(version: Optional[str] = None, app_dir: Optional[str] = None) -> None:
     resolved_version = _resolve_version(version)
     artifact_base_url = os.environ.get("ARTIFACT_BASE_URL", "")
@@ -266,9 +336,10 @@ def main(version: Optional[str] = None, app_dir: Optional[str] = None) -> None:
         raise ConfigurationError("ARTIFACT_BASE_URL is required")
 
     # S3/MinIO bucket names must be lowercase, so normalise regardless of how the
-    # S3_BUCKET variable is cased (e.g. "GitLite" -> "gitlite").
+    # S3_BUCKET variable is cased (e.g. "Gitty" -> "gitty").
-    bucket_name = (os.environ.get("S3_BUCKET") or "gitlite").lower()
+    bucket_name = (os.environ.get("S3_BUCKET") or "gitty").lower()
-    bucket_prefix = (app_dir or os.environ.get("APP_DIR") or "gitlite").strip("/")
+    bucket_prefix = (app_dir or os.environ.get("APP_DIR") or "gitty").strip("/")
+    publish_targets = _parse_publish_targets(bucket_name, bucket_prefix)
 
     artifacts = _collect_artifacts()
     if not artifacts:
@@ -287,9 +358,10 @@ def main(version: Optional[str] = None, app_dir: Optional[str] = None) -> None:
     signature = _read_signature(primary)
 
     client = _create_minio_client()
-    _ensure_bucket(client, bucket_name)
-    existing_latest_json = _read_existing_latest_json(client, bucket_name)
 
+    local_dist_dir = PROJECT_DIR / "dist"
+    local_dist_dir.mkdir(parents=True, exist_ok=True)
+    latest_json_path = local_dist_dir / "latest.json"
     latest_payload = _build_latest_payload(
         version=resolved_version,
         platform=platform,
@@ -297,39 +369,26 @@ def main(version: Optional[str] = None, app_dir: Optional[str] = None) -> None:
         signature=signature,
         artifact_base_url=artifact_base_url,
         app_dir=bucket_prefix,
-        existing_payload=existing_latest_json,
     )
     latest_json = json.dumps(latest_payload, separators=(",", ":"))
-
-    local_dist_dir = PROJECT_DIR / "dist"
-    local_dist_dir.mkdir(parents=True, exist_ok=True)
-    latest_json_path = local_dist_dir / "latest.json"
     latest_json_path.write_text(latest_json + "\n", encoding="utf-8")
 
-    for artifact in artifacts:
+    for target in publish_targets:
-        object_segments = [part for part in (resolved_version, artifact.name) if part]
+        _publish_target(
-        object_name = "/".join(object_segments)
+            client=client,
-        client.fput_object(bucket_name, object_name, str(artifact))
+            target=target,
-        print(f"Uploaded {artifact.name} -> s3://{bucket_name}/{object_name}")
+            version=resolved_version,
-
+            platform=platform,
-    latest_object_name = "latest.json"
+            artifacts=artifacts,
-    latest_bytes = latest_json.encode("utf-8")
+            primary_artifact=primary,
-    client.put_object(
+            signature=signature,
-        bucket_name=bucket_name,
+            artifact_base_url=artifact_base_url,
-        object_name=latest_object_name,
-        data=io.BytesIO(latest_bytes),
-        length=len(latest_bytes),
-        content_type="application/json",
-    )
-    print(
-        f"Uploaded latest.json for {platform} -> "
-        f"s3://{bucket_name}/{latest_object_name}"
         )
 
 
 if __name__ == "__main__":
     parser = argparse.ArgumentParser(
-        description="Upload GitLite release artifacts to MinIO."
+        description="Upload Gitty release artifacts to MinIO."
     )
     parser.add_argument(
         "-v",
@@ -340,7 +399,7 @@ if __name__ == "__main__":
     parser.add_argument(
         "--app-dir",
         default=None,
-        help="App directory prefix inside the bucket (defaults to gitlite).",
+        help="App directory prefix inside the bucket (defaults to gitty).",
     )
     args = parser.parse_args()
 

index.html

@@ -3,7 +3,7 @@
   <head>
     <meta charset="UTF-8" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>Tauri Git Lite</title>
+    <title>Gitty</title>
   </head>
   <body>
     <div id="app"></div>

package-lock.json

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

package.json

@@ -1,11 +1,12 @@
 {
-  "name": "git-lite",
+  "name": "gitty",
-  "version": "2026.7.14",
+  "version": "2026.7.16",
   "private": true,
   "type": "module",
   "scripts": {
     "dev": "vite --host 127.0.0.1",
     "build": "vite build",
+    "icons": "node scripts/generate-app-icons.mjs",
     "preview": "vite preview --host 127.0.0.1",
     "tauri": "tauri",
     "tauri:dev": "tauri dev",

public/splashscreen.html

@@ -0,0 +1,241 @@
+<!doctype html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+    <title>Gitty</title>
+    <style>
+      :root {
+        color-scheme: dark;
+        --ink: #f3f5ff;
+        --muted: #9aa3c5;
+        --purple: #9b70ff;
+        --orange: #ff6d26;
+        --panel: rgba(15, 18, 31, 0.9);
+        font-family: Inter, ui-sans-serif, system-ui, -apple-system, BlinkMacSystemFont, "Segoe UI", sans-serif;
+      }
+
+      * {
+        box-sizing: border-box;
+      }
+
+      html,
+      body {
+        width: 100%;
+        height: 100%;
+        margin: 0;
+        overflow: hidden;
+        background: #050712;
+      }
+
+      body {
+        display: grid;
+        place-items: center;
+        background:
+          radial-gradient(circle at 50% 38%, rgba(137, 92, 255, 0.22), transparent 36%),
+          linear-gradient(135deg, #050712 0%, #080b16 48%, #140b18 100%);
+      }
+
+      .grid {
+        position: fixed;
+        inset: 0;
+        opacity: 0.28;
+        background-image:
+          linear-gradient(rgba(151, 118, 255, 0.12) 1px, transparent 1px),
+          linear-gradient(90deg, rgba(255, 109, 38, 0.08) 1px, transparent 1px);
+        background-size: 42px 42px;
+        mask-image: radial-gradient(circle at center, black 0%, transparent 70%);
+        animation: grid-drift 10s linear infinite;
+      }
+
+      .splash {
+        position: relative;
+        display: grid;
+        justify-items: center;
+        gap: 16px;
+        width: 100vw;
+        height: 100vh;
+        align-content: center;
+        padding: 32px;
+        border: 0;
+        border-radius: 0;
+        background:
+          linear-gradient(180deg, rgba(23, 26, 43, 0.92), rgba(12, 15, 27, 0.94)),
+          var(--panel);
+        box-shadow: inset 0 1px 0 rgba(255, 255, 255, 0.04);
+        overflow: hidden;
+      }
+
+      .mark {
+        position: relative;
+        display: grid;
+        place-items: center;
+        width: 174px;
+        height: 174px;
+        isolation: isolate;
+      }
+
+      .halo {
+        position: absolute;
+        inset: 10px;
+        border: 1px solid rgba(151, 118, 255, 0.25);
+        border-radius: 36px;
+        transform: rotate(45deg);
+        animation: halo-breathe 2.4s ease-in-out infinite;
+      }
+
+      .halo.secondary {
+        inset: 25px;
+        border-color: rgba(255, 109, 38, 0.28);
+        animation-direction: reverse;
+      }
+
+      .traces {
+        position: absolute;
+        inset: -18px;
+        width: 210px;
+        height: 210px;
+        overflow: visible;
+      }
+
+      .trace {
+        fill: none;
+        stroke-width: 3;
+        stroke-linecap: round;
+        stroke-dasharray: 165;
+        stroke-dashoffset: 165;
+        filter: drop-shadow(0 0 8px rgba(151, 118, 255, 0.55));
+        animation: trace-draw 2.6s ease-in-out infinite;
+      }
+
+      .trace.main {
+        stroke: var(--purple);
+      }
+
+      .trace.branch {
+        stroke: var(--orange);
+        animation-delay: 0.28s;
+      }
+
+      .trace.base {
+        stroke: rgba(255, 255, 255, 0.42);
+        stroke-dasharray: 128;
+        stroke-dashoffset: 128;
+        animation-delay: 0.55s;
+      }
+
+      .icon {
+        position: relative;
+        z-index: 1;
+        width: 136px;
+        height: 136px;
+        object-fit: contain;
+        filter:
+          drop-shadow(0 18px 24px rgba(0, 0, 0, 0.55))
+          drop-shadow(0 0 18px rgba(151, 118, 255, 0.3));
+        animation: icon-float 2.4s ease-in-out infinite;
+      }
+
+      .copy {
+        position: relative;
+        display: grid;
+        gap: 4px;
+        justify-items: center;
+        text-align: center;
+      }
+
+      .copy strong {
+        color: var(--ink);
+        font-size: 22px;
+        font-weight: 900;
+        line-height: 1;
+      }
+
+      .copy span {
+        color: var(--muted);
+        font-size: 12.5px;
+        font-weight: 700;
+      }
+
+      .bar {
+        position: relative;
+        width: 230px;
+        height: 4px;
+        margin-top: 2px;
+        overflow: hidden;
+        border-radius: 999px;
+        background: rgba(151, 118, 255, 0.14);
+      }
+
+      .bar span {
+        position: absolute;
+        inset: 0;
+        width: 46%;
+        border-radius: inherit;
+        background: linear-gradient(90deg, transparent, var(--purple) 40%, var(--orange) 74%, transparent);
+        box-shadow: 0 0 16px rgba(255, 109, 38, 0.32);
+        animation: bar-slide 1.35s ease-in-out infinite;
+      }
+
+      @keyframes grid-drift {
+        to { transform: translate3d(42px, 42px, 0); }
+      }
+
+      @keyframes icon-float {
+        0%, 100% { transform: translateY(0) scale(1); }
+        50% { transform: translateY(-5px) scale(1.015); }
+      }
+
+      @keyframes halo-breathe {
+        0%, 100% { opacity: 0.35; transform: rotate(45deg) scale(0.95); }
+        50% { opacity: 0.8; transform: rotate(45deg) scale(1.04); }
+      }
+
+      @keyframes trace-draw {
+        0% { stroke-dashoffset: 165; opacity: 0; }
+        36% { opacity: 1; }
+        64%, 100% { stroke-dashoffset: 0; opacity: 0.72; }
+      }
+
+      @keyframes bar-slide {
+        0% { transform: translateX(-120%); }
+        100% { transform: translateX(320%); }
+      }
+
+      @media (prefers-reduced-motion: reduce) {
+        .grid,
+        .halo,
+        .trace,
+        .icon,
+        .bar span {
+          animation: none;
+        }
+
+        .trace {
+          stroke-dashoffset: 0;
+          opacity: 0.72;
+        }
+      }
+    </style>
+  </head>
+  <body>
+    <div class="grid" aria-hidden="true"></div>
+    <main class="splash" role="status" aria-live="polite">
+      <div class="mark" aria-hidden="true">
+        <span class="halo"></span>
+        <span class="halo secondary"></span>
+        <svg class="traces" viewBox="0 0 220 220">
+          <path class="trace main" d="M28 154 C72 114, 88 108, 110 110 S156 116, 192 68" />
+          <path class="trace branch" d="M62 74 C100 88, 126 124, 158 166" />
+          <path class="trace base" d="M46 180 L174 180" />
+        </svg>
+        <img class="icon" src="/splash-icon.png" alt="" />
+      </div>
+      <div class="copy">
+        <strong>Gitty</strong>
+        <span>Starting workspace</span>
+      </div>
+      <div class="bar" aria-hidden="true"><span></span></div>
+    </main>
+  </body>
+</html>

scripts/generate-app-icons.mjs

@@ -0,0 +1,266 @@
+import { Buffer } from "node:buffer";
+import { mkdirSync, readFileSync, writeFileSync } from "node:fs";
+import { dirname, join } from "node:path";
+import { fileURLToPath } from "node:url";
+import { deflateSync, inflateSync } from "node:zlib";
+
+const root = dirname(dirname(fileURLToPath(import.meta.url)));
+const iconsDir = join(root, "src-tauri", "icons");
+const sourcePath = join(iconsDir, "GitCat_org.png");
+
+const pngSizes = [32, 64, 128, 512];
+const icoSizes = [16, 24, 32, 48, 64, 128, 256];
+
+function decodePng(buffer) {
+  if (buffer.subarray(0, 8).toString("hex") !== "89504e470d0a1a0a") {
+    throw new Error("Source icon must be a PNG file.");
+  }
+
+  let width = 0;
+  let height = 0;
+  const idatChunks = [];
+
+  for (let offset = 8; offset < buffer.length; ) {
+    const length = buffer.readUInt32BE(offset);
+    const type = buffer.subarray(offset + 4, offset + 8).toString("ascii");
+    const dataStart = offset + 8;
+    const dataEnd = dataStart + length;
+    const data = buffer.subarray(dataStart, dataEnd);
+
+    if (type === "IHDR") {
+      width = data.readUInt32BE(0);
+      height = data.readUInt32BE(4);
+      if (data[8] !== 8 || data[9] !== 6) {
+        throw new Error("Source icon must be an 8-bit RGBA PNG.");
+      }
+    } else if (type === "IDAT") {
+      idatChunks.push(data);
+    } else if (type === "IEND") {
+      break;
+    }
+
+    offset = dataEnd + 4;
+  }
+
+  const stride = width * 4;
+  const raw = inflateSync(Buffer.concat(idatChunks));
+  const rgba = Buffer.alloc(width * height * 4);
+
+  for (let y = 0; y < height; y += 1) {
+    const rowStart = y * (stride + 1);
+    const filter = raw[rowStart];
+    const input = raw.subarray(rowStart + 1, rowStart + 1 + stride);
+    const priorOffset = (y - 1) * stride;
+    const outputOffset = y * stride;
+
+    for (let x = 0; x < stride; x += 1) {
+      const left = x >= 4 ? rgba[outputOffset + x - 4] : 0;
+      const up = y > 0 ? rgba[priorOffset + x] : 0;
+      const upLeft = y > 0 && x >= 4 ? rgba[priorOffset + x - 4] : 0;
+      let value = input[x];
+
+      if (filter === 1) value += left;
+      else if (filter === 2) value += up;
+      else if (filter === 3) value += Math.floor((left + up) / 2);
+      else if (filter === 4) value += paeth(left, up, upLeft);
+      else if (filter !== 0) throw new Error(`Unsupported PNG filter: ${filter}`);
+
+      rgba[outputOffset + x] = value & 0xff;
+    }
+  }
+
+  return { width, height, rgba };
+}
+
+function paeth(left, up, upLeft) {
+  const estimate = left + up - upLeft;
+  const distanceLeft = Math.abs(estimate - left);
+  const distanceUp = Math.abs(estimate - up);
+  const distanceUpLeft = Math.abs(estimate - upLeft);
+
+  if (distanceLeft <= distanceUp && distanceLeft <= distanceUpLeft) return left;
+  if (distanceUp <= distanceUpLeft) return up;
+  return upLeft;
+}
+
+function visibleSquare(image, alphaThreshold = 8) {
+  let minX = image.width;
+  let minY = image.height;
+  let maxX = -1;
+  let maxY = -1;
+
+  for (let y = 0; y < image.height; y += 1) {
+    for (let x = 0; x < image.width; x += 1) {
+      const alpha = image.rgba[(y * image.width + x) * 4 + 3];
+      if (alpha > alphaThreshold) {
+        minX = Math.min(minX, x);
+        minY = Math.min(minY, y);
+        maxX = Math.max(maxX, x);
+        maxY = Math.max(maxY, y);
+      }
+    }
+  }
+
+  if (maxX < 0 || maxY < 0) {
+    throw new Error("Source icon has no visible pixels.");
+  }
+
+  const visibleWidth = maxX - minX + 1;
+  const visibleHeight = maxY - minY + 1;
+  const side = Math.max(visibleWidth, visibleHeight);
+  const centerX = (minX + maxX) / 2;
+  const centerY = (minY + maxY) / 2;
+  const left = Math.max(0, Math.min(image.width - side, Math.round(centerX - side / 2)));
+  const top = Math.max(0, Math.min(image.height - side, Math.round(centerY - side / 2)));
+
+  return { left, top, side };
+}
+
+function resizePng(image, crop, size) {
+  const rgba = Buffer.alloc(size * size * 4);
+  const scale = crop.side / size;
+
+  for (let y = 0; y < size; y += 1) {
+    for (let x = 0; x < size; x += 1) {
+      const sourceX = crop.left + (x + 0.5) * scale - 0.5;
+      const sourceY = crop.top + (y + 0.5) * scale - 0.5;
+      const pixel = sampleBilinear(image, sourceX, sourceY);
+      const offset = (y * size + x) * 4;
+      rgba[offset] = pixel.r;
+      rgba[offset + 1] = pixel.g;
+      rgba[offset + 2] = pixel.b;
+      rgba[offset + 3] = pixel.a;
+    }
+  }
+
+  return encodePng(size, size, rgba);
+}
+
+function sampleBilinear(image, x, y) {
+  const x0 = Math.max(0, Math.min(image.width - 1, Math.floor(x)));
+  const y0 = Math.max(0, Math.min(image.height - 1, Math.floor(y)));
+  const x1 = Math.max(0, Math.min(image.width - 1, x0 + 1));
+  const y1 = Math.max(0, Math.min(image.height - 1, y0 + 1));
+  const tx = x - x0;
+  const ty = y - y0;
+  const top = mixPixels(getPixel(image, x0, y0), getPixel(image, x1, y0), tx);
+  const bottom = mixPixels(getPixel(image, x0, y1), getPixel(image, x1, y1), tx);
+
+  return mixPixels(top, bottom, ty);
+}
+
+function getPixel(image, x, y) {
+  const offset = (y * image.width + x) * 4;
+  return {
+    r: image.rgba[offset],
+    g: image.rgba[offset + 1],
+    b: image.rgba[offset + 2],
+    a: image.rgba[offset + 3],
+  };
+}
+
+function mixPixels(a, b, t) {
+  return {
+    r: Math.round(a.r + (b.r - a.r) * t),
+    g: Math.round(a.g + (b.g - a.g) * t),
+    b: Math.round(a.b + (b.b - a.b) * t),
+    a: Math.round(a.a + (b.a - a.a) * t),
+  };
+}
+
+const crcTable = new Uint32Array(256);
+for (let n = 0; n < 256; n += 1) {
+  let c = n;
+  for (let k = 0; k < 8; k += 1) {
+    c = c & 1 ? 0xedb88320 ^ (c >>> 1) : c >>> 1;
+  }
+  crcTable[n] = c >>> 0;
+}
+
+function crc32(buffer) {
+  let crc = 0xffffffff;
+  for (const byte of buffer) {
+    crc = crcTable[(crc ^ byte) & 0xff] ^ (crc >>> 8);
+  }
+  return (crc ^ 0xffffffff) >>> 0;
+}
+
+function chunk(type, payload) {
+  const typeBytes = Buffer.from(type);
+  const out = Buffer.alloc(12 + payload.length);
+  out.writeUInt32BE(payload.length, 0);
+  typeBytes.copy(out, 4);
+  payload.copy(out, 8);
+  out.writeUInt32BE(crc32(Buffer.concat([typeBytes, payload])), out.length - 4);
+  return out;
+}
+
+function encodePng(width, height, rgba) {
+  const header = Buffer.from([137, 80, 78, 71, 13, 10, 26, 10]);
+  const ihdr = Buffer.alloc(13);
+  ihdr.writeUInt32BE(width, 0);
+  ihdr.writeUInt32BE(height, 4);
+  ihdr[8] = 8;
+  ihdr[9] = 6;
+
+  const raw = Buffer.alloc((width * 4 + 1) * height);
+  for (let y = 0; y < height; y += 1) {
+    const rowStart = y * (width * 4 + 1);
+    raw[rowStart] = 0;
+    rgba.copy(raw, rowStart + 1, y * width * 4, (y + 1) * width * 4);
+  }
+
+  return Buffer.concat([
+    header,
+    chunk("IHDR", ihdr),
+    chunk("IDAT", deflateSync(raw, { level: 9 })),
+    chunk("IEND", Buffer.alloc(0)),
+  ]);
+}
+
+function makeIco(images) {
+  const header = Buffer.alloc(6);
+  header.writeUInt16LE(0, 0);
+  header.writeUInt16LE(1, 2);
+  header.writeUInt16LE(images.length, 4);
+
+  const entries = Buffer.alloc(images.length * 16);
+  let offset = 6 + images.length * 16;
+
+  images.forEach((image, index) => {
+    const entry = index * 16;
+    entries[entry] = image.size >= 256 ? 0 : image.size;
+    entries[entry + 1] = image.size >= 256 ? 0 : image.size;
+    entries[entry + 2] = 0;
+    entries[entry + 3] = 0;
+    entries.writeUInt16LE(1, entry + 4);
+    entries.writeUInt16LE(32, entry + 6);
+    entries.writeUInt32LE(image.png.length, entry + 8);
+    entries.writeUInt32LE(offset, entry + 12);
+    offset += image.png.length;
+  });
+
+  return Buffer.concat([header, entries, ...images.map((image) => image.png)]);
+}
+
+mkdirSync(iconsDir, { recursive: true });
+
+const source = decodePng(readFileSync(sourcePath));
+const crop = visibleSquare(source);
+const rendered = new Map(
+  [...new Set([...pngSizes, ...icoSizes])].map((size) => [size, resizePng(source, crop, size)]),
+);
+
+writeFileSync(join(iconsDir, "32x32.png"), rendered.get(32));
+writeFileSync(join(iconsDir, "64x64.png"), rendered.get(64));
+writeFileSync(join(iconsDir, "128x128.png"), rendered.get(128));
+writeFileSync(join(iconsDir, "icon.png"), rendered.get(512));
+writeFileSync(join(iconsDir, "icon.ico"), makeIco(icoSizes.map((size) => ({ size, png: rendered.get(size) }))));
+
+console.log(`Read ${join("src-tauri", "icons", "GitCat_org.png")}`);
+console.log(`Cropped visible icon area to ${crop.side}x${crop.side} at ${crop.left},${crop.top}`);
+console.log(`Wrote ${join("src-tauri", "icons", "32x32.png")}`);
+console.log(`Wrote ${join("src-tauri", "icons", "64x64.png")}`);
+console.log(`Wrote ${join("src-tauri", "icons", "128x128.png")}`);
+console.log(`Wrote ${join("src-tauri", "icons", "icon.png")}`);
+console.log(`Wrote ${join("src-tauri", "icons", "icon.ico")} (${icoSizes.length} sizes)`);

scripts/generate-icon.mjs

@@ -1,3 +1,7 @@
+import "./generate-app-icons.mjs";
+
+process.exit(0);
+
 import { Buffer } from "node:buffer";
 import { mkdirSync, writeFileSync } from "node:fs";
 import { dirname, join } from "node:path";

src-tauri/Cargo.lock

@@ -2532,7 +2532,7 @@ dependencies = [
 ]
 
 [[package]]
-name = "git_lite"
+name = "gitty"
 version = "0.1.0"
 dependencies = [
  "commit_ai",
@@ -2543,6 +2543,7 @@ dependencies = [
  "tauri-build",
  "tauri-plugin-aptabase",
  "tauri-plugin-dialog",
+ "tauri-plugin-single-instance",
  "tauri-plugin-updater",
  "tokio",
 ]
@@ -3420,7 +3421,7 @@ dependencies = [
  "security-framework 2.11.1",
  "security-framework 3.7.0",
  "windows-sys 0.60.2",
- "zbus",
+ "zbus 4.4.0",
  "zeroize",
 ]
 
@@ -5895,7 +5896,7 @@ dependencies = [
  "rand 0.8.6",
  "serde",
  "sha2",
- "zbus",
+ "zbus 4.4.0",
 ]
 
 [[package]]
@@ -7066,6 +7067,21 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "tauri-plugin-single-instance"
+version = "2.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c8f29386f5e9fdc699182388a33ee80a56de436d91b67459e86afef426282af"
+dependencies = [
+ "serde",
+ "serde_json",
+ "tauri",
+ "thiserror 2.0.18",
+ "tracing",
+ "windows-sys 0.60.2",
+ "zbus 5.17.0",
+]
+
 [[package]]
 name = "tauri-plugin-updater"
 version = "2.10.1"
@@ -9126,9 +9142,44 @@ dependencies = [
  "uds_windows",
  "windows-sys 0.52.0",
  "xdg-home",
- "zbus_macros",
+ "zbus_macros 4.4.0",
- "zbus_names",
+ "zbus_names 3.0.0",
- "zvariant",
+ "zvariant 4.2.0",
+]
+
+[[package]]
+name = "zbus"
+version = "5.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a28b97f866896a4be7aefd2b5a8e01bb6773d19a775d54ab28b4d094b9a4480e"
+dependencies = [
+ "async-broadcast",
+ "async-executor",
+ "async-io",
+ "async-lock",
+ "async-process",
+ "async-recursion",
+ "async-task",
+ "async-trait",
+ "blocking",
+ "enumflags2",
+ "event-listener",
+ "futures-core",
+ "futures-lite",
+ "hex",
+ "libc",
+ "ordered-stream",
+ "rustix",
+ "serde",
+ "serde_repr",
+ "tracing",
+ "uds_windows",
+ "uuid 1.23.4",
+ "windows-sys 0.61.2",
+ "winnow 1.0.3",
+ "zbus_macros 5.17.0",
+ "zbus_names 4.3.3",
+ "zvariant 5.13.0",
 ]
 
 [[package]]
@@ -9141,7 +9192,22 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 2.0.118",
- "zvariant_utils",
+ "zvariant_utils 2.1.0",
+]
+
+[[package]]
+name = "zbus_macros"
+version = "5.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5e05ad887425eecf5e8384dc2406a4a9313eb73468712fc1cdea362eb4fe0469"
+dependencies = [
+ "proc-macro-crate 3.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.118",
+ "zbus_names 4.3.3",
+ "zvariant 5.13.0",
+ "zvariant_utils 3.5.0",
 ]
 
 [[package]]
@@ -9152,7 +9218,18 @@ checksum = "4b9b1fef7d021261cc16cba64c351d291b715febe0fa10dc3a443ac5a5022e6c"
 dependencies = [
  "serde",
  "static_assertions",
- "zvariant",
+ "zvariant 4.2.0",
+]
+
+[[package]]
+name = "zbus_names"
+version = "4.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1039ca249fee9559680f3a9f05b55e0761fee51af4f6c1e7d8c1f31e549721d2"
+dependencies = [
+ "serde",
+ "winnow 1.0.3",
+ "zvariant 5.13.0",
 ]
 
 [[package]]
@@ -9313,7 +9390,21 @@ dependencies = [
  "enumflags2",
  "serde",
  "static_assertions",
- "zvariant_derive",
+ "zvariant_derive 4.2.0",
+]
+
+[[package]]
+name = "zvariant"
+version = "5.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7cf057bb00bf5c9ad77abb6147b0ca4818236a1858416e9d988e40d6322fefa7"
+dependencies = [
+ "endi",
+ "enumflags2",
+ "serde",
+ "winnow 1.0.3",
+ "zvariant_derive 5.13.0",
+ "zvariant_utils 3.5.0",
 ]
 
 [[package]]
@@ -9326,7 +9417,20 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 2.0.118",
- "zvariant_utils",
+ "zvariant_utils 2.1.0",
+]
+
+[[package]]
+name = "zvariant_derive"
+version = "5.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8118ca6bda77bfc0ab51d660db0c955f2505eef854c9a449435bccb616933b31"
+dependencies = [
+ "proc-macro-crate 3.5.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.118",
+ "zvariant_utils 3.5.0",
 ]
 
 [[package]]
@@ -9339,3 +9443,16 @@ dependencies = [
  "quote",
  "syn 2.0.118",
 ]
+
+[[package]]
+name = "zvariant_utils"
+version = "3.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90cb9383f9b45290407a1258b202d3f8f01db719eb60b4e4055c6375af4fc7c7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "serde",
+ "syn 2.0.118",
+ "winnow 1.0.3",
+]

src-tauri/Cargo.toml

@@ -1,5 +1,5 @@
 [package]
-name = "git_lite"
+name = "gitty"
 version = "0.1.0"
 description = "Rust backend for a lightweight Git desktop client"
 edition = "2024"
@@ -26,6 +26,7 @@ tokio = "1.52.3"
 tauri-build = { version = "2", features = [] }
 
 [target.'cfg(not(any(target_os = "android", target_os = "ios")))'.dependencies]
+tauri-plugin-single-instance = "2"
 tauri-plugin-updater = "2"
 
 # ── Build profiles ───────────────────────────────────────────────────────────

src-tauri/icons/android/mipmap-anydpi-v26/ic_launcher.xml

@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="utf-8"?>
+<adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
+  <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
+  <background android:drawable="@color/ic_launcher_background"/>
+</adaptive-icon>

src-tauri/icons/android/values/ic_launcher_background.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+  <color name="ic_launcher_background">#fff</color>
+</resources>

src-tauri/nsis-hooks.nsh

@@ -0,0 +1,72 @@
+!macro GITTY_MIGRATE_LEGACY_DATA_DIR oldDir newDir
+  ${IfNot} ${FileExists} "${newDir}\*.*"
+  ${AndIf} ${FileExists} "${oldDir}\*.*"
+    Rename "${oldDir}" "${newDir}"
+  ${EndIf}
+!macroend
+
+!macro GITTY_UNINSTALL_LEGACY_GITLITE rootKey
+  ClearErrors
+  ReadRegStr $R0 ${rootKey} "Software\Microsoft\Windows\CurrentVersion\Uninstall\GitLite" "UninstallString"
+  ${If} "$R0" != ""
+    ReadRegStr $R1 ${rootKey} "Software\git-lite\GitLite" ""
+    ${If} "$R1" == ""
+      ReadRegStr $R1 ${rootKey} "Software\Microsoft\Windows\CurrentVersion\Uninstall\GitLite" "InstallLocation"
+    ${EndIf}
+
+    DetailPrint "Removing legacy GitLite installation"
+    ${If} "$R1" != ""
+      ExecWait '$R0 /S _?=$R1' $R2
+    ${Else}
+      ExecWait '$R0 /S' $R2
+    ${EndIf}
+  ${EndIf}
+
+  DeleteRegKey ${rootKey} "Software\Microsoft\Windows\CurrentVersion\Uninstall\GitLite"
+  DeleteRegKey ${rootKey} "Software\git-lite\GitLite"
+  DeleteRegKey /ifempty ${rootKey} "Software\git-lite"
+!macroend
+
+!macro GITTY_CLEANUP_LEGACY_SHORTCUTS
+  Delete "$DESKTOP\GitLite.lnk"
+  Delete "$SMPROGRAMS\GitLite.lnk"
+  RMDir /r "$SMPROGRAMS\GitLite"
+!macroend
+
+!macro GITTY_REGISTER_INSTALL
+  WriteRegStr HKCU "${MANUPRODUCTKEY}" "" "$INSTDIR"
+  WriteRegStr HKCU "${UNINSTKEY}" "MainBinaryName" "${MAINBINARYNAME}.exe"
+  WriteRegStr HKCU "${UNINSTKEY}" "DisplayName" "${PRODUCTNAME}"
+  WriteRegStr HKCU "${UNINSTKEY}" "DisplayIcon" "$\"$INSTDIR\${MAINBINARYNAME}.exe$\""
+  WriteRegStr HKCU "${UNINSTKEY}" "DisplayVersion" "${VERSION}"
+  WriteRegStr HKCU "${UNINSTKEY}" "Publisher" "${MANUFACTURER}"
+  WriteRegStr HKCU "${UNINSTKEY}" "InstallLocation" "$\"$INSTDIR$\""
+  WriteRegStr HKCU "${UNINSTKEY}" "UninstallString" "$\"$INSTDIR\uninstall.exe$\""
+  WriteRegStr HKCU "${UNINSTKEY}" "QuietUninstallString" "$\"$INSTDIR\uninstall.exe$\" /S"
+  WriteRegDWORD HKCU "${UNINSTKEY}" "NoModify" "1"
+  WriteRegDWORD HKCU "${UNINSTKEY}" "NoRepair" "1"
+!macroend
+
+!macro GITTY_CREATE_UPDATE_SHORTCUTS
+  CreateShortcut "$SMPROGRAMS\${PRODUCTNAME}.lnk" "$INSTDIR\${MAINBINARYNAME}.exe"
+  !insertmacro SetLnkAppUserModelId "$SMPROGRAMS\${PRODUCTNAME}.lnk"
+  CreateShortcut "$DESKTOP\${PRODUCTNAME}.lnk" "$INSTDIR\${MAINBINARYNAME}.exe"
+  !insertmacro SetLnkAppUserModelId "$DESKTOP\${PRODUCTNAME}.lnk"
+!macroend
+
+!macro NSIS_HOOK_PREINSTALL
+  !insertmacro GITTY_MIGRATE_LEGACY_DATA_DIR "$APPDATA\com.git-lite" "$APPDATA\com.gitty"
+  !insertmacro GITTY_MIGRATE_LEGACY_DATA_DIR "$LOCALAPPDATA\com.git-lite" "$LOCALAPPDATA\com.gitty"
+  !insertmacro GITTY_UNINSTALL_LEGACY_GITLITE HKCU
+  !insertmacro GITTY_UNINSTALL_LEGACY_GITLITE HKLM
+!macroend
+
+!macro NSIS_HOOK_POSTINSTALL
+  !insertmacro GITTY_CLEANUP_LEGACY_SHORTCUTS
+  !insertmacro GITTY_REGISTER_INSTALL
+  !insertmacro GITTY_CREATE_UPDATE_SHORTCUTS
+!macroend
+
+!macro NSIS_HOOK_POSTUNINSTALL
+  !insertmacro GITTY_CLEANUP_LEGACY_SHORTCUTS
+!macroend

src-tauri/src/git.rs

@@ -681,7 +681,14 @@ pub fn create_tag(
         Some(message) => {
             run_git(
                 &repo,
-                ["tag", "-a", name.as_str(), "-m", message.as_str(), target.as_str()],
+                [
+                    "tag",
+                    "-a",
+                    name.as_str(),
+                    "-m",
+                    message.as_str(),
+                    target.as_str(),
+                ],
             )?;
         }
         None => {
@@ -755,7 +762,11 @@ fn validate_existing_tag_name(repo: &Path, name: &str) -> Result<String, String>
 
 fn validate_tag_ref_name(name: &str) -> Result<String, String> {
     let output = git_command()
-        .args(["check-ref-format", "--allow-onelevel", &format!("refs/tags/{name}")])
+        .args([
+            "check-ref-format",
+            "--allow-onelevel",
+            &format!("refs/tags/{name}"),
+        ])
         .output()
         .map_err(|err| format!("Could not start Git. Is Git installed? {err}"))?;
 
@@ -778,7 +789,8 @@ fn validate_tag_ref_name(name: &str) -> Result<String, String> {
 }
 
 #[tauri::command]
-pub fn stage_files(path: String, files: Vec<String>) -> Result<GitStatus, String> {
+pub async fn stage_files(path: String, files: Vec<String>) -> Result<GitStatus, String> {
+    tauri::async_runtime::spawn_blocking(move || -> Result<GitStatus, String> {
         let repo = resolve_repo(&path)?;
         validate_files(&files)?;
 
@@ -803,10 +815,14 @@ pub fn stage_files(path: String, files: Vec<String>) -> Result<GitStatus, String
         }
 
         status_for_repo(&repo)
+    })
+    .await
+    .map_err(|err| format!("Could not stage files: {err}"))?
 }
 
 #[tauri::command]
-pub fn unstage_files(path: String, files: Vec<String>) -> Result<GitStatus, String> {
+pub async fn unstage_files(path: String, files: Vec<String>) -> Result<GitStatus, String> {
+    tauri::async_runtime::spawn_blocking(move || -> Result<GitStatus, String> {
         let repo = resolve_repo(&path)?;
         validate_files(&files)?;
 
@@ -816,10 +832,14 @@ pub fn unstage_files(path: String, files: Vec<String>) -> Result<GitStatus, Stri
         }
 
         status_for_repo(&repo)
+    })
+    .await
+    .map_err(|err| format!("Could not unstage files: {err}"))?
 }
 
 #[tauri::command]
-pub fn restore_files(path: String, files: Vec<String>, staged: bool) -> Result<GitStatus, String> {
+pub async fn restore_files(path: String, files: Vec<String>, staged: bool) -> Result<GitStatus, String> {
+    tauri::async_runtime::spawn_blocking(move || -> Result<GitStatus, String> {
         let repo = resolve_repo(&path)?;
         validate_files(&files)?;
 
@@ -835,6 +855,9 @@ pub fn restore_files(path: String, files: Vec<String>, staged: bool) -> Result<G
         }
 
         status_for_repo(&repo)
+    })
+    .await
+    .map_err(|err| format!("Could not restore files: {err}"))?
 }
 
 #[tauri::command]
@@ -1044,7 +1067,8 @@ pub fn apply_file_patch(
 }
 
 #[tauri::command]
-pub fn commit(path: String, message: String) -> Result<GitStatus, String> {
+pub async fn commit(path: String, message: String) -> Result<GitStatus, String> {
+    tauri::async_runtime::spawn_blocking(move || -> Result<GitStatus, String> {
         let repo = resolve_repo(&path)?;
         if message.trim().is_empty() {
             return Err("Commit message must not be empty.".to_string());
@@ -1057,10 +1081,14 @@ pub fn commit(path: String, message: String) -> Result<GitStatus, String> {
 
         run_git(&repo, ["commit", "-m", message.as_str()])?;
         status_for_repo(&repo)
+    })
+    .await
+    .map_err(|err| format!("Could not commit: {err}"))?
 }
 
 #[tauri::command]
-pub fn amend_commit(path: String, message: Option<String>) -> Result<GitStatus, String> {
+pub async fn amend_commit(path: String, message: Option<String>) -> Result<GitStatus, String> {
+    tauri::async_runtime::spawn_blocking(move || -> Result<GitStatus, String> {
         let repo = resolve_repo(&path)?;
         if verify_commit(&repo, "HEAD").is_err() {
             return Err("There is no commit to amend.".to_string());
@@ -1085,6 +1113,9 @@ pub fn amend_commit(path: String, message: Option<String>) -> Result<GitStatus,
         }
 
         status_for_repo(&repo)
+    })
+    .await
+    .map_err(|err| format!("Could not amend commit: {err}"))?
 }
 
 #[tauri::command]
@@ -1096,7 +1127,11 @@ pub fn last_commit_message(path: String) -> Result<Option<String>, String> {
 
     let output = run_git(&repo, ["log", "-1", "--format=%B", "HEAD"])?;
     let message = String::from_utf8_lossy(&output).trim_end().to_string();
-    Ok(if message.is_empty() { None } else { Some(message) })
+    Ok(if message.is_empty() {
+        None
+    } else {
+        Some(message)
+    })
 }
 
 #[tauri::command]
@@ -1117,11 +1152,12 @@ pub fn undo_last_commit(path: String) -> Result<GitStatus, String> {
 }
 
 #[tauri::command]
-pub fn pull(
+pub async fn pull(
     path: String,
     username: Option<String>,
     password: Option<String>,
 ) -> Result<GitStatus, String> {
+    tauri::async_runtime::spawn_blocking(move || -> Result<GitStatus, String> {
         let repo = resolve_repo(&path)?;
         let pull_args = ["pull", "--no-rebase", "--ff", "--no-edit"];
         let output = match (username.as_deref(), password.as_deref()) {
@@ -1150,6 +1186,9 @@ pub fn pull(
             return Err(format!("AUTH_FAILED:{details}"));
         }
         Err(format!("Git command failed: {details}"))
+    })
+    .await
+    .map_err(|err| format!("Could not pull: {err}"))?
 }
 
 #[tauri::command]
@@ -1188,11 +1227,12 @@ pub async fn fetch(
 }
 
 #[tauri::command]
-pub fn push(
+pub async fn push(
     path: String,
     username: Option<String>,
     password: Option<String>,
 ) -> Result<GitStatus, String> {
+    tauri::async_runtime::spawn_blocking(move || -> Result<GitStatus, String> {
         let repo = resolve_repo(&path)?;
         let push_args = push_args_for_repo(&repo)?;
         match (username.as_deref(), password.as_deref()) {
@@ -1204,6 +1244,9 @@ pub fn push(
             }
         }
         status_for_repo(&repo)
+    })
+    .await
+    .map_err(|err| format!("Could not push: {err}"))?
 }
 
 // ── Credential storage (OS keychain) ────────────────────────────────────────
@@ -1373,7 +1416,8 @@ pub fn cred_delete(key: String) -> Result<(), String> {
 }
 
 #[tauri::command]
-pub fn merge_branch(path: String, branch: String) -> Result<GitStatus, String> {
+pub async fn merge_branch(path: String, branch: String) -> Result<GitStatus, String> {
+    tauri::async_runtime::spawn_blocking(move || -> Result<GitStatus, String> {
         let repo = resolve_repo(&path)?;
         let branch = branch.trim();
         if branch.is_empty() {
@@ -1410,10 +1454,14 @@ pub fn merge_branch(path: String, branch: String) -> Result<GitStatus, String> {
         };
 
         Err(format!("Merge failed: {details}"))
+    })
+    .await
+    .map_err(|err| format!("Could not merge: {err}"))?
 }
 
 #[tauri::command]
-pub fn rebase_branch(path: String, branch: String) -> Result<GitStatus, String> {
+pub async fn rebase_branch(path: String, branch: String) -> Result<GitStatus, String> {
+    tauri::async_runtime::spawn_blocking(move || -> Result<GitStatus, String> {
         let repo = resolve_repo(&path)?;
         let branch = branch.trim();
         if branch.is_empty() {
@@ -1428,6 +1476,9 @@ pub fn rebase_branch(path: String, branch: String) -> Result<GitStatus, String>
             .map_err(|err| format!("Could not start Git. Is Git installed? {err}"))?;
 
         rebase_status_or_error(&repo, output, "Rebase failed", true)
+    })
+    .await
+    .map_err(|err| format!("Could not rebase: {err}"))?
 }
 
 #[tauri::command]
@@ -1479,7 +1530,8 @@ fn rebase_status_or_error(
 }
 
 #[tauri::command]
-pub fn cherry_pick_commit(path: String, commit: String) -> Result<GitStatus, String> {
+pub async fn cherry_pick_commit(path: String, commit: String) -> Result<GitStatus, String> {
+    tauri::async_runtime::spawn_blocking(move || -> Result<GitStatus, String> {
         let repo = resolve_repo(&path)?;
         let commit_hash = verify_commit(&repo, &commit)?;
 
@@ -1492,6 +1544,9 @@ pub fn cherry_pick_commit(path: String, commit: String) -> Result<GitStatus, Str
             .map_err(|err| format!("Could not start Git. Is Git installed? {err}"))?;
 
         cherry_pick_status_or_error(&repo, output, "Cherry-pick failed")
+    })
+    .await
+    .map_err(|err| format!("Could not cherry-pick: {err}"))?
 }
 
 #[tauri::command]
@@ -4826,12 +4881,12 @@ mod tests {
         }));
     }
 
-    #[test]
+    #[tokio::test]
     #[cfg_attr(
         windows,
         ignore = "Git for Windows can fail local pull tests with a sh signal pipe error"
     )]
-    fn pull_merges_diverging_branch_instead_of_requiring_fast_forward() {
+    async fn pull_merges_diverging_branch_instead_of_requiring_fast_forward() {
         let repo = init_temp_repo("pull_diverged");
         commit_initial_file(&repo.path);
         let base_branch = git_output_test(&repo.path, ["rev-parse", "--abbrev-ref", "HEAD"]);
@@ -4861,7 +4916,9 @@ mod tests {
             ],
         );
 
-        let status = pull(repo.path.to_string_lossy().to_string(), None, None).unwrap();
+        let status = pull(repo.path.to_string_lossy().to_string(), None, None)
+            .await
+            .unwrap();
 
         assert!(status.clean, "{:?}", status.files);
         assert!(repo.path.join("remote.txt").exists());
@@ -4910,12 +4967,12 @@ mod tests {
         );
     }
 
-    #[test]
+    #[tokio::test]
     #[cfg_attr(
         windows,
         ignore = "Git for Windows can fail local push tests with a sh signal pipe error"
     )]
-    fn push_sets_upstream_for_branch_without_tracking_remote() {
+    async fn push_sets_upstream_for_branch_without_tracking_remote() {
         let repo = init_temp_repo("push_sets_upstream_integration");
         let remote = init_bare_temp_repo("push_sets_upstream_integration_remote");
         commit_initial_file(&repo.path);
@@ -4932,7 +4989,9 @@ mod tests {
             ["remote", "add", "origin", remote.path.to_str().unwrap()],
         );
 
-        let status = push(repo.path.to_string_lossy().to_string(), None, None).unwrap();
+        let status = push(repo.path.to_string_lossy().to_string(), None, None)
+            .await
+            .unwrap();
 
         assert_eq!(
             status.upstream.as_deref(),
@@ -5000,8 +5059,8 @@ mod tests {
         assert_eq!(contents.replace("\r\n", "\n"), "resolved\n");
     }
 
-    #[test]
+    #[tokio::test]
-    fn commit_rejects_unresolved_merge_conflicts() {
+    async fn commit_rejects_unresolved_merge_conflicts() {
         let repo = init_temp_repo("commit_rejects_conflicts");
         fs::write(repo.path.join("file.txt"), "base\n").expect("base file should be written");
         run_git_test(&repo.path, ["add", "file.txt"]);
@@ -5027,6 +5086,7 @@ mod tests {
             repo.path.to_string_lossy().to_string(),
             "should not commit".to_string(),
         )
+        .await
         .unwrap_err();
 
         assert!(err.contains("Merge conflicts"));
@@ -5544,7 +5604,8 @@ mod tests {
     fn get_file_blame_attributes_lines_to_the_commits_that_introduced_them() {
         let repo = init_temp_repo("file_blame");
         commit_initial_file(&repo.path);
-        fs::write(repo.path.join("old.txt"), "original\ntwo\n").expect("tracked file should change");
+        fs::write(repo.path.join("old.txt"), "original\ntwo\n")
+            .expect("tracked file should change");
         run_git_test(&repo.path, ["add", "old.txt"]);
         run_git_test(&repo.path, ["commit", "-q", "-m", "add second line"]);
 

src-tauri/src/main.rs

@@ -19,17 +19,45 @@ use git::{
     restore_to_commit, search_code_introductions, stage_files, stash_apply, stash_drop, stash_pop,
     stash_push, undo_last_commit, unstage_files,
 };
+use tauri::{Manager, AppHandle};
+
+#[tauri::command]
+fn close_splashscreen(app: tauri::AppHandle) -> Result<(), String> {
+    if let Some(window) = app.get_webview_window("splashscreen") {
+        let _ = window.hide();
+        window
+            .destroy()
+            .map_err(|error| format!("failed to destroy splashscreen: {error}"))?;
+    }
+
+    if let Some(window) = app.get_webview_window("main") {
+        window
+            .show()
+            .map_err(|error| format!("failed to show main window: {error}"))?;
+        let _ = window.set_focus();
+    }
+
+    Ok(())
+}
 
 #[tokio::main]
 async fn main() {
     tauri::Builder::default()
+        .plugin(tauri_plugin_single_instance::init(|app, _, _| {
+            #[cfg(desktop)]
+            let _ = app.get_webview_window("main")
+                .expect("no main window")
+                .set_focus();
+        }))
         .plugin(tauri_plugin_updater::Builder::new().build())
-        .plugin(tauri_plugin_aptabase::Builder::new("A-SH-1344793789").with_options(
+        .plugin(
-                tauri_plugin_aptabase::InitOptions {
+            tauri_plugin_aptabase::Builder::new("A-SH-1344793789")
+                .with_options(tauri_plugin_aptabase::InitOptions {
                     host: Some("https://aptabase.cbsk-tech.de".to_string()),
-                        flush_interval:None
+                    flush_interval: None,
-                }
+                })
-        ).build())
+                .build(),
+        )
         .manage(SearchCancellationState::default())
         .manage(commit_ai::CommitAiEngine::new())
         .plugin(tauri_plugin_dialog::init())
@@ -97,7 +125,8 @@ async fn main() {
             cred_load,
             cred_save,
             cred_delete,
-            set_sync_badge
+            set_sync_badge,
+            close_splashscreen
         ])
         .run(tauri::generate_context!())
         .expect("error while running tauri application");

src-tauri/tauri.conf.json

@@ -1,8 +1,8 @@
 {
   "$schema": "https://schema.tauri.app/config/2",
-  "productName": "GitLite",
+  "productName": "Gitty",
-  "version": "2026.7.14",
+  "version": "2026.7.16",
-  "identifier": "com.git-lite",
+  "identifier": "com.gitty",
   "build": {
     "beforeDevCommand": "npm run dev",
     "devUrl": "http://127.0.0.1:1420",
@@ -13,13 +13,26 @@
     "windows": [
       {
         "label": "main",
-        "title": "GitLite",
+        "title": "Gitty",
         "width": 1200,
         "height": 800,
         "minWidth": 900,
         "minHeight": 600,
+        "visible": false,
         "decorations": false,
         "shadow": true
+      },
+      {
+        "label": "splashscreen",
+        "url": "splashscreen.html",
+        "title": "Gitty",
+        "width": 460,
+        "height": 420,
+        "resizable": false,
+        "decorations": false,
+        "center": true,
+        "skipTaskbar": true,
+        "shadow": true
       }
     ],
     "security": {
@@ -32,13 +45,18 @@
       "nsis"
     ],
     "icon": [
-      "icons/icon.png",
+      "icons/32x32.png",
+      "icons/128x128.png",
+      "icons/128x128@2x.png",
+      "icons/icon.icns",
       "icons/icon.ico"
     ],
     "createUpdaterArtifacts": true,
     "windows": {
       "nsis": {
-        "installMode": "currentUser"
+        "installMode": "currentUser",
+        "installerIcon": "icons/icon.ico",
+        "installerHooks": "nsis-hooks.nsh"
       }
     }
   },
@@ -46,6 +64,7 @@
     "updater": {
       "pubkey": "dW50cnVzdGVkIGNvbW1lbnQ6IG1pbmlzaWduIHB1YmxpYyBrZXk6IDdDNEJGRTZERTREOTc5QjkKUldTNWVkbmtiZjVMZk02YzdpenVLOVltREJpRkFrc2F4dUwzaTV5M3pacFRVR0tmd25xSGtjK1MK",
       "endpoints": [
+        "https://cdn.cbsk-tech.de/gitty/latest.json",
         "https://cdn.cbsk-tech.de/gitlite/latest.json"
       ]
     }

src/app.css

@@ -477,8 +477,8 @@
   .titlebar-brand {
     display: flex;
     align-items: center;
-    gap: 7px;
+    gap: 8px;
-    padding: 0 14px;
+    padding: 0 13px 0 11px;
     height: 100%;
     font-size: 13px;
     font-weight: 700;
@@ -486,7 +486,19 @@
     color: var(--color-bar-text);
     border-right: 1px solid rgba(255,255,255,0.06);
   }
-  .titlebar-brand svg { color: #ffd343; filter: drop-shadow(0 0 10px rgba(255,211,67,0.3)); flex-shrink: 0; }
+  .titlebar-brand-icon {
+    display: grid;
+    place-items: center;
+    width: 24px;
+    height: 24px;
+    flex: 0 0 24px;
+  }
+  .titlebar-brand-icon img {
+    width: 24px;
+    height: 24px;
+    object-fit: contain;
+    filter: drop-shadow(0 1px 3px rgba(0,0,0,0.5));
+  }
 
   .tb-version {
     margin-left: 1px;
@@ -782,7 +794,7 @@
   }
   .repo-row {
     display: grid;
-    grid-template-columns: minmax(0, 1fr) auto;
+    grid-template-columns: minmax(0, 1fr) auto auto;
     align-items: stretch;
     min-height: 36px;
     border-bottom: 1px solid rgba(255,255,255,0.035);
@@ -852,6 +864,12 @@
     background: transparent;
     color: var(--color-ink-faint);
   }
+  .repo-row-favorite.active {
+    color: #e0c15f;
+  }
+  .repo-row-favorite.active svg {
+    fill: currentColor;
+  }
 
   /* --- Notices --- */
 
@@ -1078,63 +1096,120 @@
 
   .workspace {
     display: grid;
-    grid-template-columns: clamp(220px, 18vw, 280px) minmax(0, 1fr) minmax(560px, var(--history-aside-width, 620px));
+    grid-template-columns: minmax(220px, var(--left-sidebar-width, 280px)) 8px minmax(0, 1fr) 8px minmax(560px, var(--history-aside-width, 620px));
     flex: 1 1 0;
     min-width: 0;
     min-height: 0;
-    gap: 8px;
+    column-gap: 0;
+    row-gap: 8px;
   }
 
   .history-aside {
     position: relative;
     display: grid;
-    grid-template-columns: minmax(0, 1fr) 300px;
+    grid-template-columns: minmax(0, 1fr) 8px minmax(240px, var(--file-history-width, 300px));
     min-width: 0;
     min-height: 0;
-    gap: 8px;
+    column-gap: 0;
+    row-gap: 8px;
   }
 
-  .history-resize-handle {
+  .history-aside.file-history-collapsed {
-    position: absolute;
+    grid-template-columns: minmax(0, 1fr) 0 42px;
-    z-index: 20;
+  }
-    top: 0;
+
-    bottom: 0;
+  .left-sidebar-resize-handle,
-    left: -7px;
+  .history-resize-handle,
-    width: 12px;
+  .file-history-resize-handle {
+    position: relative;
+    z-index: 10;
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    min-width: 8px;
     cursor: col-resize;
     touch-action: none;
   }
-  .history-resize-handle::before {
+  .left-sidebar-resize-handle::before,
+  .history-resize-handle::before,
+  .file-history-resize-handle::before {
     content: "";
-    position: absolute;
+    width: 3px;
-    top: 12px;
+    height: 40px;
-    bottom: 12px;
-    left: 5px;
-    width: 2px;
     border-radius: 999px;
-    background: transparent;
+    background: var(--color-border);
-    transition: background 120ms ease, box-shadow 120ms ease;
+    transition: background-color 0.15s ease, box-shadow 0.15s ease;
   }
+  .left-sidebar-resize-handle:hover::before,
+  .left-sidebar-resize-handle.resizing::before,
   .history-resize-handle:hover::before,
-  .history-resize-handle.resizing::before {
+  .history-resize-handle.resizing::before,
-    background: rgba(65,209,255,0.62);
+  .file-history-resize-handle:hover::before,
+  .file-history-resize-handle.resizing::before {
+    background: var(--color-accent);
     box-shadow: 0 0 14px rgba(65,209,255,0.3);
   }
-  .history-resize-handle:focus-visible {
+  .left-sidebar-resize-handle:focus-visible,
+  .history-resize-handle:focus-visible,
+  .file-history-resize-handle:focus-visible {
     outline: 2px solid var(--color-primary);
     outline-offset: 2px;
   }
 
+  .history-aside.file-history-collapsed .file-history-resize-handle {
+    pointer-events: none;
+  }
+  .history-aside.file-history-collapsed .file-history-resize-handle::before {
+    display: none;
+  }
+
   .left-sidebar {
     display: grid;
-    grid-template-rows: minmax(170px, 0.75fr) minmax(150px, 0.55fr) minmax(220px, 1fr);
+    grid-template-rows: minmax(180px, var(--branch-panel-height, 260px)) 14px minmax(150px, var(--stash-panel-height, 190px)) 14px minmax(220px, 1fr);
+    align-content: start;
     min-width: 0;
     min-height: 0;
-    gap: 8px;
+    gap: 0;
+  }
+
+  .left-panel-resize-handle {
+    min-height: 14px;
+    margin: 0;
+  }
+
+  .left-panel-resize-placeholder {
+    display: block;
+    min-height: 0;
+    min-width: 0;
+  }
+
+  .left-sidebar.branch-collapsed {
+    grid-template-rows: auto 0 minmax(150px, var(--stash-panel-height, 190px)) 14px minmax(220px, 1fr);
+  }
+
+  .left-sidebar.explorer-collapsed {
+    grid-template-rows: minmax(180px, var(--branch-panel-height, 260px)) 14px minmax(150px, var(--stash-panel-height, 190px)) 0 auto;
+  }
+
+  .left-sidebar.branch-collapsed.explorer-collapsed {
+    grid-template-rows: auto 0 minmax(150px, var(--stash-panel-height, 190px)) 0 auto;
   }
 
   .left-sidebar:has(.stash-panel.collapsed) {
-    grid-template-rows: minmax(170px, 0.85fr) auto minmax(220px, 1.15fr);
+    grid-template-rows: minmax(180px, var(--branch-panel-height, 260px)) 14px auto 0 minmax(220px, 1fr);
+  }
+
+  .left-sidebar.branch-collapsed:has(.stash-panel.collapsed) {
+    grid-template-rows: auto 0 auto 0 minmax(220px, 1fr);
+  }
+
+  .left-sidebar.explorer-collapsed:has(.stash-panel.collapsed) {
+    grid-template-rows: minmax(180px, var(--branch-panel-height, 260px)) 14px auto 0 auto;
+  }
+
+  .left-sidebar.branch-collapsed.explorer-collapsed:has(.stash-panel.collapsed) {
+    grid-template-rows: auto 0 auto 0 auto;
+    align-content: start;
   }
 
   /* --- Main panel --- */
@@ -1245,6 +1320,7 @@
   .file-row { display: grid; gap: 8px; padding: 10px; border: 1px solid var(--color-border-subtle); border-radius: 8px; background: var(--color-surface-raised); }
   .file-row + .file-row { margin-top: 6px; }
   .file-row.selected { border-color: rgba(90,140,248,0.36); background: rgba(90,140,248,0.1); }
+  .file-row.active { box-shadow: inset 3px 0 0 rgba(65,209,255,0.7); }
 
   .file-title-button {
     justify-content: flex-start;
@@ -1295,6 +1371,13 @@
     border-bottom: 1px solid var(--color-border-subtle);
     background: var(--color-surface-dim);
   }
+  .status-selection-count {
+    padding: 0 7px;
+    color: var(--color-ink-dim);
+    font-size: 11.5px;
+    font-weight: 800;
+    white-space: nowrap;
+  }
 
   /* --- Stash panel --- */
 
@@ -1456,6 +1539,9 @@
     gap: 6px;
   }
   .branch-panel { position: relative; }
+  .branch-panel.collapsed {
+    grid-template-rows: auto;
+  }
 
   .branch-create-toggle {
     width: 26px;
@@ -1653,7 +1739,8 @@
 
   .branch-context-menu,
   .history-context-menu,
-  .explorer-context-menu {
+  .explorer-context-menu,
+  .repo-tab-context-menu {
     z-index: 120;
     display: grid;
     gap: 2px;
@@ -1667,11 +1754,13 @@
 
   .branch-context-menu,
   .history-context-menu { position: absolute; }
-  .explorer-context-menu { position: fixed; }
+  .explorer-context-menu,
+  .repo-tab-context-menu { position: fixed; }
 
   .branch-context-menu button,
   .history-context-menu button,
-  .explorer-context-menu button {
+  .explorer-context-menu button,
+  .repo-tab-context-menu button {
     display: flex;
     align-items: center;
     justify-content: flex-start;
@@ -1690,14 +1779,16 @@
 
   .branch-context-menu button:hover:not(:disabled),
   .history-context-menu button:hover:not(:disabled),
-  .explorer-context-menu button:hover:not(:disabled) {
+  .explorer-context-menu button:hover:not(:disabled),
+  .repo-tab-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 .menu-separator,
-  .history-context-menu .menu-separator {
+  .history-context-menu .menu-separator,
+  .repo-tab-context-menu .menu-separator {
     height: 1px;
     margin: 4px 3px;
     background: var(--color-border-subtle);
@@ -1715,7 +1806,8 @@
 
   .branch-context-menu button:disabled,
   .history-context-menu button:disabled,
-  .explorer-context-menu button:disabled {
+  .explorer-context-menu button:disabled,
+  .repo-tab-context-menu button:disabled {
     cursor: not-allowed;
     opacity: 0.48;
   }
@@ -1723,6 +1815,9 @@
   /* --- Explorer --- */
 
   .explorer-panel { position: relative; }
+  .explorer-panel.collapsed {
+    grid-template-rows: auto;
+  }
 
   .explorer-head-actions { display: flex; align-items: center; gap: 5px; flex: 0 0 auto; }
   .explorer-bulk-button {
@@ -2103,8 +2198,75 @@
     background: rgba(65,209,255,0.08);
     color: var(--color-ink);
   }
+  .file-history-panel.collapsed {
+    display: grid;
+    grid-template-rows: 1fr;
+    overflow: hidden;
+  }
+  .file-history-rail-toggle {
+    display: grid;
+    grid-template-rows: auto minmax(0, 1fr) auto;
+    justify-items: center;
+    gap: 8px;
+    width: 100%;
+    height: 100%;
+    min-width: 0;
+    min-height: 0;
+    padding: 12px 0;
+    border: 0;
+    border-radius: 0;
+    color: var(--color-ink-dim);
+    background: linear-gradient(180deg, rgba(100,108,255,0.12), rgba(65,209,255,0.04));
+  }
+  .file-history-rail-toggle:hover:not(:disabled) {
+    color: var(--color-ink);
+    background: linear-gradient(180deg, rgba(100,108,255,0.18), rgba(65,209,255,0.08));
+  }
+  .file-history-rail-toggle span {
+    writing-mode: vertical-rl;
+    text-orientation: mixed;
+    overflow: hidden;
+    color: currentColor;
+    font-size: 11px;
+    font-weight: 800;
+    letter-spacing: 0.04em;
+    text-transform: uppercase;
+    white-space: nowrap;
+  }
+  .file-history-rail-toggle small {
+    display: inline-grid;
+    place-items: center;
+    min-width: 22px;
+    min-height: 22px;
+    border-radius: 999px;
+    color: var(--color-ink);
+    background: rgba(94,110,156,0.18);
+    font-size: 11px;
+    font-weight: 800;
+  }
   .file-history-head { align-items: flex-start; }
   .file-history-heading { min-width: 0; flex: 1 1 auto; overflow: hidden; }
+  .file-history-head-actions {
+    display: flex;
+    align-items: center;
+    flex: 0 0 auto;
+    gap: 6px;
+  }
+  .file-history-toggle {
+    width: 26px;
+    min-width: 26px;
+    min-height: 26px;
+    padding: 0;
+    border-color: rgba(65,209,255,0.2);
+    border-radius: 7px;
+    color: var(--color-ink-dim);
+    background: rgba(65,209,255,0.06);
+  }
+  .file-history-toggle:hover:not(:disabled) {
+    border-color: rgba(65,209,255,0.45);
+    color: #ffffff;
+    background: rgba(65,209,255,0.13);
+  }
   .section-head .file-history-name {
     display: -webkit-box;
     max-height: 2.4em;
@@ -2141,73 +2303,118 @@
     flex-direction: column;
     align-items: center;
     justify-content: center;
-    gap: 12px;
+    gap: 10px;
-    min-height: 140px;
+    min-height: 156px;
-    padding: 20px;
+    padding: 22px;
+    overflow: hidden;
+    background:
+      radial-gradient(circle at center 42%, rgba(151, 118, 255, 0.12), transparent 52%),
+      linear-gradient(180deg, rgba(15, 18, 31, 0.55), transparent);
   }
 
-  .file-history-loading-graph { width: 56px; height: 56px; overflow: visible; }
+  .file-history-loading-mark {
-
+    position: relative;
-  .file-history-loading-graph .fhl-ring {
+    display: grid;
-    fill: none;
+    place-items: center;
-    stroke: rgba(100, 108, 255, 0.22);
+    width: 86px;
-    stroke-width: 3;
+    height: 86px;
-    stroke-dasharray: 26 18;
+    isolation: isolate;
-    transform-origin: 60px 60px;
-    animation: fhl-ring-spin 5s linear infinite;
   }
 
-  .file-history-loading-graph .fhl-trunk,
+  .file-history-loading-halo {
-  .file-history-loading-graph .fhl-branch {
+    position: absolute;
+    inset: 10px;
+    border: 1px solid rgba(151, 118, 255, 0.24);
+    border-radius: 18px;
+    transform: rotate(45deg);
+    animation: fhl-halo-breathe 2.4s ease-in-out infinite;
+  }
+
+  .file-history-loading-traces {
+    position: absolute;
+    inset: -12px;
+    width: 110px;
+    height: 110px;
+    overflow: visible;
+  }
+
+  .file-history-loading-traces .fhl-trace {
     fill: none;
-    stroke: url(#fhl-line);
+    stroke-width: 2.5;
-    stroke-width: 5;
     stroke-linecap: round;
+    stroke-dasharray: 92;
+    stroke-dashoffset: 92;
+    filter: drop-shadow(0 0 6px rgba(151, 118, 255, 0.5));
+    animation: fhl-trace-draw 2.4s ease-in-out infinite;
+  }
+  .file-history-loading-traces .fhl-trace-main {
+    stroke: #9b70ff;
+  }
+  .file-history-loading-traces .fhl-trace-branch {
+    stroke: #ff6d26;
+    animation-delay: 0.28s;
   }
 
-  .file-history-loading-graph .fhl-branch {
+  .file-history-loading-icon {
-    stroke-dasharray: 90;
+    position: relative;
-    stroke-dashoffset: 90;
+    z-index: 1;
-    animation: fhl-branch-draw 2.4s ease-in-out infinite;
+    width: 64px;
+    height: 64px;
+    object-fit: contain;
+    filter:
+      drop-shadow(0 10px 14px rgba(0, 0, 0, 0.45))
+      drop-shadow(0 0 12px rgba(151, 118, 255, 0.28));
+    animation: fhl-icon-float 2.4s ease-in-out infinite;
   }
 
-  .file-history-loading-graph .fhl-node {
-    fill: var(--color-surface-alt);
-    stroke: url(#fhl-line);
-    stroke-width: 5;
-    animation: fhl-node-pulse 2.4s ease-in-out infinite;
-  }
-  .file-history-loading-graph .fhl-n1 { animation-delay: 0s; }
-  .file-history-loading-graph .fhl-n2 { animation-delay: 0.5s; }
-  .file-history-loading-graph .fhl-n3 { animation-delay: 1s; }
-  .file-history-loading-graph .fhl-n4 { animation-delay: 1.5s; }
-
   .file-history-loading-label {
     color: var(--color-ink-faint);
     font-size: 12.5px;
-    font-weight: 600;
+    font-weight: 800;
-    letter-spacing: 0.01em;
   }
 
-  @keyframes fhl-ring-spin { to { transform: rotate(360deg); } }
+  .file-history-loading-bar {
-  @keyframes fhl-branch-draw {
+    position: relative;
-    0% { stroke-dashoffset: 90; opacity: 0.35; }
+    width: 118px;
-    45% { stroke-dashoffset: 0; opacity: 1; }
+    height: 3px;
-    100% { stroke-dashoffset: 0; opacity: 1; }
+    overflow: hidden;
+    border-radius: 999px;
+    background: rgba(151, 118, 255, 0.14);
   }
-  @keyframes fhl-node-pulse {
+  .file-history-loading-bar span {
-    0%, 100% { fill: var(--color-surface-alt); filter: none; }
+    position: absolute;
-    50% {
+    inset: 0;
-      fill: var(--color-primary);
+    width: 46%;
-      filter: drop-shadow(0 0 6px rgba(100, 108, 255, 0.8));
+    border-radius: inherit;
+    background: linear-gradient(90deg, transparent, #9b70ff 42%, #ff6d26 74%, transparent);
+    box-shadow: 0 0 12px rgba(255, 109, 38, 0.26);
+    animation: fhl-bar-slide 1.35s ease-in-out infinite;
   }
+
+  @keyframes fhl-halo-breathe {
+    0%, 100% { opacity: 0.35; transform: rotate(45deg) scale(0.94); }
+    50% { opacity: 0.8; transform: rotate(45deg) scale(1.04); }
+  }
+  @keyframes fhl-icon-float {
+    0%, 100% { transform: translateY(0) scale(1); }
+    50% { transform: translateY(-3px) scale(1.02); }
+  }
+  @keyframes fhl-trace-draw {
+    0% { stroke-dashoffset: 92; opacity: 0; }
+    36% { opacity: 1; }
+    64%, 100% { stroke-dashoffset: 0; opacity: 0.72; }
+  }
+  @keyframes fhl-bar-slide {
+    0% { transform: translateX(-120%); }
+    100% { transform: translateX(320%); }
   }
 
   @media (prefers-reduced-motion: reduce) {
-    .file-history-loading-graph .fhl-ring,
+    .file-history-loading-halo,
-    .file-history-loading-graph .fhl-branch,
+    .file-history-loading-traces .fhl-trace,
-    .file-history-loading-graph .fhl-node { animation: none; }
+    .file-history-loading-icon,
-    .file-history-loading-graph .fhl-branch { stroke-dashoffset: 0; }
+    .file-history-loading-bar span { animation: none; }
+    .file-history-loading-traces .fhl-trace { stroke-dashoffset: 0; opacity: 0.72; }
   }
 
   /* --- Git graph --- */
@@ -3114,6 +3321,45 @@
     font-weight: 800;
   }
 
+  .blame-search-bar {
+    position: relative;
+    display: flex;
+    align-items: center;
+    min-height: 38px;
+    padding: 6px 10px;
+    border-bottom: 1px solid var(--color-border-subtle);
+    background: #111321;
+  }
+  .blame-search-bar svg {
+    position: absolute;
+    left: 20px;
+    color: var(--color-ink-faint);
+    pointer-events: none;
+  }
+  .blame-search-bar input {
+    width: 100%;
+    height: 26px;
+    padding: 0 34px;
+    border: 1px solid var(--color-border-subtle);
+    border-radius: 6px;
+    background: #0b0e18;
+    color: var(--color-ink);
+    font-size: 12px;
+  }
+  .blame-search-clear {
+    position: absolute;
+    right: 14px;
+    width: 24px;
+    height: 24px;
+    padding: 0;
+    border: 0;
+    background: transparent;
+    color: var(--color-ink-faint);
+  }
+  .blame-search-clear svg {
+    position: static;
+  }
+
   .blame-column-headers {
     grid-template-columns: minmax(300px, 340px) minmax(0, 1fr);
   }
@@ -3227,6 +3473,12 @@
   .blame-group:hover .blame-line-code {
     background: #151a2b;
   }
+  .blame-search-hit {
+    padding: 0 1px;
+    border-radius: 3px;
+    background: rgba(240,182,72,0.28);
+    color: #f3d487;
+  }
 
   .global-search-body {
     display: grid;
@@ -4147,27 +4399,52 @@
 /* --- Responsive breakpoints --- */
 
 @media (min-width: 1800px) {
-  .workspace    { grid-template-columns: 320px minmax(0, 1fr) minmax(560px, var(--history-aside-width, 680px)); }
+  .workspace    { grid-template-columns: minmax(220px, var(--left-sidebar-width, 320px)) 8px minmax(0, 1fr) 8px minmax(560px, var(--history-aside-width, 680px)); }
 }
 
 @media (max-width: 1400px) {
-  .workspace { grid-template-columns: clamp(200px, 17vw, 265px) minmax(0, 1fr) minmax(540px, var(--history-aside-width, 580px)); }
+  .workspace { grid-template-columns: minmax(200px, var(--left-sidebar-width, 265px)) 8px minmax(0, 1fr) 8px minmax(540px, var(--history-aside-width, 580px)); }
 }
 
 /* Stack CommitPanel below StatusPanel; history panels stay side by side */
 @media (max-width: 1100px) {
-  .workspace    { grid-template-columns: clamp(185px, 16vw, 220px) minmax(0, 1fr) minmax(500px, var(--history-aside-width, 560px)); }
+  .workspace    { grid-template-columns: minmax(185px, var(--left-sidebar-width, 220px)) 8px minmax(0, 1fr) 8px minmax(500px, var(--history-aside-width, 560px)); }
   .top-section  { grid-template-columns: minmax(0, 1fr); grid-template-rows: minmax(0, 1fr) 14px var(--commit-panel-height, 190px); }
 }
 
 /* Compact: stack history panels vertically, narrow sidebars */
 @media (max-width: 960px) {
-  .workspace      { grid-template-columns: 180px minmax(0, 1fr) 300px; gap: 6px; }
+  .workspace      { grid-template-columns: 180px 8px minmax(0, 1fr) 0 300px; row-gap: 6px; }
-  .history-aside  { grid-template-columns: 1fr; grid-template-rows: minmax(0, 1.3fr) minmax(0, 0.7fr); }
+  .history-aside  { grid-template-columns: 1fr; grid-template-rows: minmax(0, 1.3fr) minmax(0, 0.7fr); row-gap: 6px; }
-  .history-resize-handle { display: none; }
+  .history-aside.file-history-collapsed { grid-template-columns: 1fr; grid-template-rows: minmax(0, 1fr) 42px; }
+  .history-resize-handle,
+  .file-history-resize-handle { display: none; }
   .shell-body     { gap: 6px; }
-  .left-sidebar   { gap: 6px; grid-template-rows: minmax(150px, 0.7fr) minmax(145px, 0.55fr) minmax(190px, 1fr); }
+  .left-sidebar {
-  .left-sidebar:has(.stash-panel.collapsed) { grid-template-rows: minmax(150px, 0.8fr) auto minmax(190px, 1.1fr); }
+    grid-template-rows: minmax(180px, var(--branch-panel-height, 230px)) 14px minmax(150px, var(--stash-panel-height, 170px)) 14px minmax(220px, 1fr);
+  }
+  .left-sidebar:has(.stash-panel.collapsed) {
+    grid-template-rows: minmax(180px, var(--branch-panel-height, 230px)) 14px auto 0 minmax(220px, 1fr);
+  }
+  .left-sidebar.branch-collapsed {
+    grid-template-rows: auto 0 minmax(150px, var(--stash-panel-height, 170px)) 14px minmax(220px, 1fr);
+  }
+  .left-sidebar.explorer-collapsed {
+    grid-template-rows: minmax(180px, var(--branch-panel-height, 230px)) 14px minmax(150px, var(--stash-panel-height, 170px)) 0 auto;
+  }
+  .left-sidebar.branch-collapsed:has(.stash-panel.collapsed) {
+    grid-template-rows: auto 0 auto 0 minmax(220px, 1fr);
+  }
+  .left-sidebar.explorer-collapsed:has(.stash-panel.collapsed) {
+    grid-template-rows: minmax(180px, var(--branch-panel-height, 230px)) 14px auto 0 auto;
+  }
+  .left-sidebar.branch-collapsed.explorer-collapsed {
+    grid-template-rows: auto 0 minmax(150px, var(--stash-panel-height, 170px)) 0 auto;
+  }
+  .left-sidebar.branch-collapsed.explorer-collapsed:has(.stash-panel.collapsed) {
+    grid-template-rows: auto 0 auto 0 auto;
+    align-content: start;
+  }
   .section-head   { min-height: 40px; padding: 6px 10px; }
   .repo-summary   { height: 40px; padding: 0 10px; }
   .repo-branch    { max-width: 160px; }
@@ -4183,9 +4460,35 @@
   body            { overflow: auto; }
   .shell-body     { min-height: 100%; gap: 6px; }
   .workspace      { grid-template-columns: 1fr; gap: 6px; }
+  .left-sidebar-resize-handle { display: none; }
   .history-aside  { grid-template-columns: 1fr; grid-template-rows: minmax(200px, 1fr) minmax(150px, 0.5fr); min-height: 380px; }
-  .left-sidebar   { grid-template-rows: minmax(180px, 0.9fr) minmax(150px, 0.55fr) minmax(220px, 1fr); min-height: 560px; }
+  .history-aside.file-history-collapsed { grid-template-rows: minmax(200px, 1fr) 42px; }
-  .left-sidebar:has(.stash-panel.collapsed) { grid-template-rows: minmax(180px, 1fr) auto minmax(220px, 1.1fr); }
+  .left-sidebar {
+    grid-template-rows: minmax(180px, var(--branch-panel-height, 240px)) 14px minmax(150px, var(--stash-panel-height, 180px)) 14px minmax(220px, 1fr);
+    min-height: 560px;
+  }
+  .left-sidebar:has(.stash-panel.collapsed) {
+    grid-template-rows: minmax(180px, var(--branch-panel-height, 240px)) 14px auto 0 minmax(220px, 1fr);
+  }
+  .left-sidebar.branch-collapsed {
+    grid-template-rows: auto 0 minmax(150px, var(--stash-panel-height, 180px)) 14px minmax(220px, 1fr);
+  }
+  .left-sidebar.explorer-collapsed {
+    grid-template-rows: minmax(120px, var(--branch-panel-height, 240px)) 14px minmax(150px, var(--stash-panel-height, 180px)) 0 auto;
+  }
+  .left-sidebar.branch-collapsed:has(.stash-panel.collapsed) {
+    grid-template-rows: auto 0 auto 0 minmax(0, 1fr);
+  }
+  .left-sidebar.explorer-collapsed:has(.stash-panel.collapsed) {
+    grid-template-rows: minmax(120px, var(--branch-panel-height, 240px)) 14px auto 0 auto;
+  }
+  .left-sidebar.branch-collapsed.explorer-collapsed {
+    grid-template-rows: auto 0 minmax(150px, var(--stash-panel-height, 180px)) 0 auto;
+  }
+  .left-sidebar.branch-collapsed.explorer-collapsed:has(.stash-panel.collapsed) {
+    grid-template-rows: auto 0 auto 0 auto;
+    align-content: start;
+  }
   .top-section    { grid-template-columns: minmax(0, 1fr); grid-template-rows: minmax(0, 1fr) 14px var(--commit-panel-height, 190px); }
   .repo-form      { grid-template-columns: 1fr; }
   .repo-tabbar    { grid-template-columns: minmax(0, 1fr) auto; }
@@ -4208,7 +4511,7 @@
   .dialog-body    { grid-template-columns: 1fr; grid-template-rows: minmax(120px, 0.4fr) minmax(0, 1fr); }
   .compare-dialog .dialog-body { grid-template-columns: 1fr; grid-template-rows: minmax(120px, 0.4fr) minmax(0, 1fr); }
   .global-search-options { grid-template-columns: 1fr; }
-  .file-search-split { grid-template-columns: 1fr; grid-template-rows: minmax(150px, 0.9fr) minmax(220px, 1fr); }
+  .file-search-split { grid-template-columns: 1fr; grid-template-rows: minmax(150px, 0.9fr) minmax(0, 1fr); }
   .file-search-column { border-right: none; border-bottom: 1px solid var(--color-border-subtle); }
   .file-search-hit { grid-template-columns: auto minmax(0, 1fr); align-items: start; }
   .file-search-hit .status-badge,

src/lib/TitleBar.svelte

@@ -3,6 +3,7 @@
   import { getVersion } from "@tauri-apps/api/app";
   import { getCurrentWindow } from "@tauri-apps/api/window";
   import { CloudDownload, Download, FolderOpen, GitBranch, GitCompare, LoaderCircle, Minus, RefreshCw, Search, Settings, Upload, X } from "@lucide/svelte";
+  import iconUrl from "../../src-tauri/icons/icon.png";
 
   export let branch: string = "";
   export let ahead: number = 0;
@@ -44,25 +45,10 @@
 <header class="titlebar" data-tauri-drag-region>
   <!-- Brand -->
   <div class="titlebar-brand" data-tauri-drag-region>
-    <svg
+    <span class="titlebar-brand-icon" data-tauri-drag-region>
-      width="15"
+      <img src={iconUrl} alt="" data-tauri-drag-region />
-      height="15"
+    </span>
-      viewBox="0 0 24 24"
+    <span data-tauri-drag-region>Gitty</span>
-      fill="none"
-      stroke="currentColor"
-      stroke-width="2"
-      stroke-linecap="round"
-      stroke-linejoin="round"
-      aria-hidden="true"
-      data-tauri-drag-region
-    >
-      <circle cx="12" cy="18" r="3" />
-      <circle cx="6" cy="6" r="3" />
-      <circle cx="18" cy="6" r="3" />
-      <path d="M18 9v1a2 2 0 0 1-2 2H8a2 2 0 0 1-2-2V9" />
-      <line x1="12" y1="12" x2="12" y2="15" />
-    </svg>
-    <span data-tauri-drag-region>GitLite</span>
     {#if appVersion}
       <span class="tb-version" data-tauri-drag-region title="Version {appVersion}">v{appVersion}</span>
     {/if}

src/lib/components/AnalyticsNoticeDialog.svelte

@@ -30,7 +30,7 @@
       </div>
       <div class="analytics-notice-copy">
         <p>
-          GitLite can send anonymous usage events to Aptabase so crashes, rough edges, and commonly used workflows are easier to improve.
+          Gitty can send anonymous usage events to Aptabase so crashes, rough edges, and commonly used workflows are easier to improve.
         </p>
         <p>
           Events do not include repository paths, remote URLs, branch names, commit messages, diffs, file names, credentials, or source code.

src/lib/components/AppSettingsDialog.svelte

@@ -29,7 +29,7 @@
   <div class="dialog app-settings-dialog" role="dialog" aria-modal="true" aria-label="Settings" tabindex="-1">
     <header class="dialog-header">
       <div>
-        <span class="eyebrow">GitLite</span>
+        <span class="eyebrow">Gitty</span>
         <h2 class="dialog-title">Settings</h2>
       </div>
       <button class="dialog-close" type="button" onclick={onClose} title="Close">

src/lib/components/BlameDialog.svelte

@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { FileCode, LoaderCircle, X } from "@lucide/svelte";
+  import { FileCode, LoaderCircle, Search, X } from "@lucide/svelte";
   import type { GitBlameLine } from "../types";
 
   interface BlameGroup {
@@ -14,6 +14,11 @@
     lines: GitBlameLine[];
   }
 
+  interface TextSegment {
+    text: string;
+    matched: boolean;
+  }
+
   interface Props {
     filePath: string;
     lines: GitBlameLine[];
@@ -32,6 +37,8 @@
     onClose = () => {},
   }: Props = $props();
 
+  let blameSearch = $state("");
+
   function groupBlameLines(source: GitBlameLine[]): BlameGroup[] {
     const groups: BlameGroup[] = [];
     for (const line of source) {
@@ -67,7 +74,56 @@
     return `${group.authorName} <${group.authorEmail}>\n${group.summary}\n${group.hash}`;
   }
 
-  let groups = $derived(groupBlameLines(lines));
+  function blameLineSearchText(line: GitBlameLine): string {
+    return [
+      line.line_number,
+      line.content,
+      line.commit_hash,
+      line.short_hash,
+      line.author_name,
+      line.author_email,
+      formatBlameDate(line.author_time),
+      line.summary,
+      line.is_uncommitted ? "uncommitted not committed yet" : "",
+    ].join("\n").toLowerCase();
+  }
+
+  function lineMatchesSearch(line: GitBlameLine, query: string): boolean {
+    return !query || blameLineSearchText(line).includes(query);
+  }
+
+  function textSegments(value: string | number): TextSegment[] {
+    const text = String(value ?? "");
+    const query = blameSearch.trim();
+    if (!query || !text) return [{ text, matched: false }];
+
+    const lowerText = text.toLowerCase();
+    const lowerQuery = query.toLowerCase();
+    const segments: TextSegment[] = [];
+    let cursor = 0;
+    let matchIndex = lowerText.indexOf(lowerQuery);
+
+    while (matchIndex !== -1) {
+      if (matchIndex > cursor) {
+        segments.push({ text: text.slice(cursor, matchIndex), matched: false });
+      }
+      const end = matchIndex + query.length;
+      segments.push({ text: text.slice(matchIndex, end), matched: true });
+      cursor = end;
+      matchIndex = lowerText.indexOf(lowerQuery, cursor);
+    }
+
+    if (cursor < text.length) {
+      segments.push({ text: text.slice(cursor), matched: false });
+    }
+
+    return segments.length > 0 ? segments : [{ text, matched: false }];
+  }
+
+  let searchQuery = $derived(blameSearch.trim().toLowerCase());
+  let searchActive = $derived(searchQuery.length > 0);
+  let visibleLines = $derived(searchActive ? lines.filter((line) => lineMatchesSearch(line, searchQuery)) : lines);
+  let groups = $derived(groupBlameLines(visibleLines));
 </script>
 
 <div class="dialog-backdrop" role="presentation">
@@ -93,13 +149,28 @@
         </div>
       {:else if error}
         <div class="blank-state">{error}</div>
-      {:else if groups.length === 0}
+      {:else if lines.length === 0}
         <div class="blank-state">No blame information available for this file.</div>
       {:else}
         <div class="diff-header blame-code-header">
           <FileCode size={13} aria-hidden="true" />
           <span title={filePath}>{filePath}</span>
-          <strong>{lines.length} lines</strong>
+          <strong>{searchActive ? `${visibleLines.length} of ${lines.length} lines` : `${lines.length} lines`}</strong>
+        </div>
+        <div class="blame-search-bar">
+          <Search size={14} aria-hidden="true" />
+          <input
+            bind:value={blameSearch}
+            autocomplete="off"
+            spellcheck="false"
+            placeholder="Search blame"
+            aria-label="Search blame"
+          />
+          {#if searchActive}
+            <button class="btn-sm blame-search-clear" type="button" onclick={() => { blameSearch = ""; }} aria-label="Clear blame search">
+              <X size={14} aria-hidden="true" />
+            </button>
+          {/if}
         </div>
         <div class="split-col-headers blame-column-headers">
           <div class="split-col-label blame-commit-col-label">Commit</div>
@@ -107,26 +178,50 @@
         </div>
         <div class="split-diff blame-diff" role="table" aria-label="File blame">
           <div class="split-pane blame-scroll">
+            {#if groups.length === 0}
+              <div class="blank-state">No matches found.</div>
+            {:else}
               <div class="blame-code-table">
                 {#each groups as group (group.id)}
                   <div class="blame-group" class:uncommitted={group.isUncommitted} title={groupTooltip(group)}>
                     <div class="blame-meta">
-                    <span class="blame-hash">{group.isUncommitted ? "Uncommitted" : group.shortHash}</span>
+                      <span class="blame-hash">
-                    <span class="blame-author">{group.isUncommitted ? "Not committed yet" : group.authorName}</span>
+                        {#each textSegments(group.isUncommitted ? "Uncommitted" : group.shortHash) as segment, index (`hash-${group.id}-${index}`)}
-                    <span class="blame-summary">{group.summary || "No commit message"}</span>
+                          {#if segment.matched}<mark class="blame-search-hit">{segment.text}</mark>{:else}{segment.text}{/if}
+                        {/each}
+                      </span>
+                      <span class="blame-author">
+                        {#each textSegments(group.isUncommitted ? "Not committed yet" : group.authorName) as segment, index (`author-${group.id}-${index}`)}
+                          {#if segment.matched}<mark class="blame-search-hit">{segment.text}</mark>{:else}{segment.text}{/if}
+                        {/each}
+                      </span>
+                      <span class="blame-summary">
+                        {#each textSegments(group.summary || "No commit message") as segment, index (`summary-${group.id}-${index}`)}
+                          {#if segment.matched}<mark class="blame-search-hit">{segment.text}</mark>{:else}{segment.text}{/if}
+                        {/each}
+                      </span>
                       {#if !group.isUncommitted}
-                      <span class="blame-date">{formatBlameDate(group.authorTime)}</span>
+                        <span class="blame-date">
+                          {#each textSegments(formatBlameDate(group.authorTime)) as segment, index (`date-${group.id}-${index}`)}
+                            {#if segment.matched}<mark class="blame-search-hit">{segment.text}</mark>{:else}{segment.text}{/if}
+                          {/each}
+                        </span>
                       {/if}
                     </div>
                     <div class="split-pane-grid blame-lines">
                       {#each group.lines as line (line.line_number)}
                         <span class="split-num blame-line-number">{line.line_number}</span>
-                      <code class="split-cell blame-line-code">{line.content}</code>
+                        <code class="split-cell blame-line-code">
+                          {#each textSegments(line.content) as segment, index (`line-${line.line_number}-${index}`)}
+                            {#if segment.matched}<mark class="blame-search-hit">{segment.text}</mark>{:else}{segment.text}{/if}
+                          {/each}
+                        </code>
                       {/each}
                     </div>
                   </div>
                 {/each}
               </div>
+            {/if}
           </div>
         </div>
       {/if}

src/lib/components/BranchPanel.svelte

@@ -57,6 +57,8 @@
     onCreateTag: (name: string, message: string) => void | Promise<void>;
     onDeleteTag: (tag: GitTag) => void | Promise<void>;
     onPushTag: (tag: GitTag) => void | Promise<void>;
+    collapsed?: boolean;
+    onToggleCollapsed?: () => void;
   }
 
   let {
@@ -75,6 +77,8 @@
     onCreateTag = () => {},
     onDeleteTag = () => {},
     onPushTag = () => {},
+    collapsed = false,
+    onToggleCollapsed = () => {},
   }: Props = $props();
 
   let localOpen = $state(true);
@@ -355,7 +359,7 @@
 
 <svelte:window on:click={closeAllContextMenus} on:keydown={handleWindowKeydown} on:contextmenu|capture={closeAllContextMenus} />
 
-<section bind:this={panelElement} class="panel branch-panel grid grid-rows-[auto_1fr] overflow-hidden" aria-label="Branches">
+<section bind:this={panelElement} class="panel branch-panel grid grid-rows-[auto_1fr] overflow-hidden" class:collapsed aria-label="Branches">
   <div class="section-head">
     <div>
       <span class="eyebrow">Branches</span>
@@ -373,10 +377,26 @@
         <Plus size={14} aria-hidden="true" />
       </button>
       <span class="pill pill-count">{branches.length}</span>
+      <button
+        class="branch-create-toggle panel-collapse-toggle"
+        type="button"
+        onclick={onToggleCollapsed}
+        aria-expanded={!collapsed}
+        title={collapsed ? "Expand branches" : "Collapse branches"}
+        aria-label={collapsed ? "Expand branches panel" : "Collapse branches panel"}
+      >
+        {#if collapsed}
+          <ChevronRight size={14} aria-hidden="true" />
+        {:else}
+          <ChevronDown size={14} aria-hidden="true" />
+        {/if}
+      </button>
     </div>
   </div>
 
-  {#if !hasRepository}
+  {#if collapsed}
+    <!-- collapsed -->
+  {:else if !hasRepository}
     <p class="blank-state">Open a repository to list branches.</p>
   {:else if branches.length === 0 && tags.length === 0}
     <p class="blank-state">No branches returned.</p>

src/lib/components/ExplorerPanel.svelte

@@ -38,6 +38,8 @@
     onSelectNode: (node: ExplorerNode) => void;
     onOpenFile: (node: ExplorerNode) => void;
     onBlame: (node: ExplorerNode) => void;
+    collapsed?: boolean;
+    onToggleCollapsed?: () => void;
   }
 
   let {
@@ -53,6 +55,8 @@
     onSelectNode = () => {},
     onOpenFile = () => {},
     onBlame = () => {},
+    collapsed = false,
+    onToggleCollapsed = () => {},
   }: Props = $props();
 
   let contextNode = $state<ExplorerNode | null>(null);
@@ -203,7 +207,7 @@
 
 <svelte:window on:click={closeFileContextMenu} on:keydown={handleWindowKeydown} on:contextmenu|capture={closeFileContextMenu} />
 
-<section class="panel explorer-panel grid grid-rows-[auto_1fr] overflow-hidden" aria-label="File explorer">
+<section class="panel explorer-panel grid grid-rows-[auto_1fr] overflow-hidden" class:collapsed aria-label="File explorer">
   <div class="section-head">
     <div>
       <span class="eyebrow">Explorer</span>
@@ -231,10 +235,26 @@
         <Folder size={14} aria-hidden="true" />
       </button>
       <span class="pill pill-count">{repoFiles.length}</span>
+      <button
+        class="explorer-bulk-button panel-collapse-toggle"
+        type="button"
+        onclick={onToggleCollapsed}
+        aria-expanded={!collapsed}
+        title={collapsed ? "Expand file explorer" : "Collapse file explorer"}
+        aria-label={collapsed ? "Expand file explorer panel" : "Collapse file explorer panel"}
+      >
+        {#if collapsed}
+          <ChevronRight size={14} aria-hidden="true" />
+        {:else}
+          <ChevronDown size={14} aria-hidden="true" />
+        {/if}
+      </button>
     </div>
   </div>
 
-  {#if !hasRepository}
+  {#if collapsed}
+    <!-- collapsed -->
+  {:else if !hasRepository}
     <p class="blank-state">Open a repository to browse files.</p>
   {:else if repoFiles.length === 0}
     <p class="blank-state">No files returned.</p>

src/lib/components/FileHistoryPanel.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
-  import { GitCompare, History, RotateCcw } from "@lucide/svelte";
+  import { ChevronLeft, ChevronRight, GitCompare, History, RotateCcw } from "@lucide/svelte";
+  import iconUrl from "../../../src-tauri/icons/icon.png";
   import type { GitCommit } from "../types";
 
   interface Props {
@@ -11,6 +12,8 @@
     isLoading?: boolean;
     onDiff: (commit: GitCommit) => void;
     onRestore: (commit: GitCommit) => void;
+    collapsed?: boolean;
+    onToggleCollapsed?: () => void;
   }
 
   let {
@@ -22,6 +25,8 @@
     isLoading = false,
     onDiff = () => {},
     onRestore = () => {},
+    collapsed = false,
+    onToggleCollapsed = () => {},
   }: Props = $props();
 
   function formatCommitDate(value: string): string {
@@ -75,7 +80,23 @@
   }
 </script>
 
-<section class="panel grid grid-rows-[auto_1fr] overflow-hidden" aria-label="Selected file history">
+<section class="panel file-history-panel grid grid-rows-[auto_1fr] overflow-hidden" class:collapsed aria-label="Selected file history">
+  {#if collapsed}
+    <button
+      class="file-history-rail-toggle"
+      type="button"
+      onclick={onToggleCollapsed}
+      aria-expanded={!collapsed}
+      title="Expand file history"
+      aria-label="Expand file history panel"
+    >
+      <ChevronLeft size={16} aria-hidden="true" />
+      <span>File history</span>
+      {#if selectedExplorerPath}
+        <small>{fileHistory.length}</small>
+      {/if}
+    </button>
+  {:else}
   <div class="section-head file-history-head">
     <div class="file-history-heading">
       <span class="eyebrow">{selectedExplorerLabel}</span>
@@ -84,7 +105,19 @@
         use:pathTooltip={selectedExplorerPath}
       >{selectedExplorerPath ? fileName(selectedExplorerPath) : "No file"}</h2>
     </div>
+    <div class="file-history-head-actions">
       <span class="pill pill-count file-history-count">{fileHistory.length}</span>
+      <button
+        class="file-history-toggle panel-collapse-toggle"
+        type="button"
+        onclick={onToggleCollapsed}
+        aria-expanded={!collapsed}
+        title="Collapse file history"
+        aria-label="Collapse file history panel"
+      >
+        <ChevronRight size={14} aria-hidden="true" />
+      </button>
+    </div>
   </div>
 
   {#if !hasRepository}
@@ -93,22 +126,16 @@
     <div class="blank-state">Select a file in Explorer.</div>
   {:else if isLoading}
     <div class="file-history-loading" role="status" aria-live="polite">
-      <svg class="file-history-loading-graph" viewBox="0 0 120 120" aria-hidden="true">
+      <div class="file-history-loading-mark" aria-hidden="true">
-        <defs>
+        <span class="file-history-loading-halo"></span>
-          <linearGradient id="fhl-line" x1="0" y1="0" x2="1" y2="1">
+        <svg class="file-history-loading-traces" viewBox="0 0 120 120">
-            <stop offset="0%" stop-color="#646cff" />
+          <path class="fhl-trace fhl-trace-main" d="M14 82 C38 60, 48 58, 60 60 S84 66, 106 36" />
-            <stop offset="100%" stop-color="#41d1ff" />
+          <path class="fhl-trace fhl-trace-branch" d="M28 36 C52 48, 70 70, 91 94" />
-          </linearGradient>
-        </defs>
-        <circle class="fhl-ring" cx="60" cy="60" r="52" />
-        <path class="fhl-trunk" d="M42 22 L42 98" />
-        <path class="fhl-branch" d="M42 44 C42 62, 82 58, 82 76 L82 88" />
-        <circle class="fhl-node fhl-n1" cx="42" cy="30" r="6" />
-        <circle class="fhl-node fhl-n2" cx="42" cy="60" r="6" />
-        <circle class="fhl-node fhl-n3" cx="82" cy="88" r="6" />
-        <circle class="fhl-node fhl-n4" cx="42" cy="90" r="6" />
         </svg>
+        <img src={iconUrl} alt="" class="file-history-loading-icon" />
+      </div>
       <span class="file-history-loading-label">Loading history…</span>
+      <span class="file-history-loading-bar" aria-hidden="true"><span></span></span>
     </div>
   {:else if fileHistory.length === 0}
     <div class="blank-state">No history returned for this selection.</div>
@@ -141,4 +168,5 @@
       {/each}
     </div>
   {/if}
+  {/if}
 </section>

src/lib/components/RepoLoadingOverlay.svelte

@@ -1,33 +1,23 @@
 <script lang="ts">
+  import iconUrl from "../../../src-tauri/icons/icon.png";
+
   export let label = "Opening repository";
   export let repoName = "";
 </script>
 
 <div class="repo-loading" role="status" aria-live="polite">
+  <div class="repo-loading-grid" aria-hidden="true"></div>
   <div class="repo-loading-card">
-    <!-- Animated git graph: nodes light up in sequence while a branch draws itself -->
+    <div class="repo-loading-mark">
-    <svg class="git-graph" viewBox="0 0 120 120" aria-hidden="true">
+      <span class="repo-loading-halo halo-one"></span>
-      <defs>
+      <span class="repo-loading-halo halo-two"></span>
-        <linearGradient id="gl-line" x1="0" y1="0" x2="1" y2="1">
+      <svg class="repo-loading-traces" viewBox="0 0 220 220" aria-hidden="true">
-          <stop offset="0%" stop-color="#646cff" />
+        <path class="trace trace-main" d="M28 154 C72 114, 88 108, 110 110 S156 116, 192 68" />
-          <stop offset="100%" stop-color="#41d1ff" />
+        <path class="trace trace-branch" d="M62 74 C100 88, 126 124, 158 166" />
-        </linearGradient>
+        <path class="trace trace-cut" d="M46 180 L174 180" />
-      </defs>
-
-      <!-- rotating dashed ring -->
-      <circle class="ring" cx="60" cy="60" r="52" />
-
-      <!-- main trunk -->
-      <path class="trunk" d="M42 22 L42 98" />
-      <!-- branch forking off and merging back -->
-      <path class="branch" d="M42 44 C42 62, 82 58, 82 76 L82 88" />
-
-      <!-- commit nodes -->
-      <circle class="node n1" cx="42" cy="30" r="6" />
-      <circle class="node n2" cx="42" cy="60" r="6" />
-      <circle class="node n3" cx="82" cy="88" r="6" />
-      <circle class="node n4" cx="42" cy="90" r="6" />
       </svg>
+      <img src={iconUrl} alt="" class="repo-loading-icon" />
+    </div>
 
     <div class="repo-loading-text">
       <span class="repo-loading-label">{label}…</span>
@@ -43,69 +33,118 @@
 <style>
   .repo-loading {
     position: fixed;
-    top: var(--app-titlebar-height, 42px);
+    top: calc(var(--app-titlebar-height, 42px) + 56px);
     right: 0;
     bottom: 0;
     left: 0;
     z-index: 400;
     display: grid;
     place-items: center;
-    background: #050712;
+    overflow: hidden;
+    background:
+      radial-gradient(circle at 50% 42%, rgba(137, 92, 255, 0.18), transparent 34%),
+      linear-gradient(135deg, #050712 0%, #080b16 46%, #120b18 100%);
     animation: overlay-in 180ms ease;
   }
 
+  .repo-loading-grid {
+    position: absolute;
+    inset: 0;
+    opacity: 0.28;
+    background-image:
+      linear-gradient(rgba(151, 118, 255, 0.12) 1px, transparent 1px),
+      linear-gradient(90deg, rgba(255, 109, 38, 0.08) 1px, transparent 1px);
+    background-size: 42px 42px;
+    mask-image: radial-gradient(circle at center, black 0%, transparent 68%);
+    animation: grid-drift 10s linear infinite;
+  }
+
   .repo-loading-card {
+    position: relative;
     display: flex;
     flex-direction: column;
     align-items: center;
-    gap: 20px;
+    gap: 18px;
-    padding: 34px 46px;
+    width: min(420px, calc(100vw - 42px));
-    border: 1px solid var(--color-border);
+    padding: 30px 34px 28px;
-    border-radius: 18px;
+    border: 1px solid rgba(160, 124, 255, 0.24);
-    background: var(--color-surface-raised);
+    border-radius: 16px;
-    box-shadow: 0 24px 70px rgba(0, 0, 0, 0.55);
+    background:
+      linear-gradient(180deg, rgba(23, 26, 43, 0.9), rgba(12, 15, 27, 0.92)),
+      var(--color-surface-raised);
+    box-shadow:
+      0 26px 90px rgba(0, 0, 0, 0.62),
+      inset 0 1px 0 rgba(255, 255, 255, 0.06);
   }
 
-  .git-graph {
+  .repo-loading-mark {
-    width: 118px;
+    position: relative;
-    height: 118px;
+    width: 168px;
+    height: 168px;
+    display: grid;
+    place-items: center;
+    isolation: isolate;
+  }
+
+  .repo-loading-halo {
+    position: absolute;
+    inset: 10px;
+    border: 1px solid rgba(151, 118, 255, 0.24);
+    border-radius: 34px;
+    transform: rotate(45deg);
+  }
+  .repo-loading-halo.halo-one {
+    animation: halo-breathe 2.4s ease-in-out infinite;
+  }
+  .repo-loading-halo.halo-two {
+    inset: 24px;
+    border-color: rgba(255, 109, 38, 0.26);
+    animation: halo-breathe 2.4s ease-in-out infinite reverse;
+  }
+
+  .repo-loading-traces {
+    position: absolute;
+    inset: -18px;
+    width: 204px;
+    height: 204px;
     overflow: visible;
+    z-index: 0;
   }
-
+  .repo-loading-traces .trace {
-  .git-graph .ring {
     fill: none;
-    stroke: rgba(100, 108, 255, 0.22);
+    stroke-width: 3;
-    stroke-width: 2;
-    stroke-dasharray: 26 18;
-    transform-origin: 60px 60px;
-    animation: ring-spin 5s linear infinite;
-  }
-
-  .git-graph .trunk,
-  .git-graph .branch {
-    fill: none;
-    stroke: url(#gl-line);
-    stroke-width: 4;
     stroke-linecap: round;
+    stroke-dasharray: 165;
+    stroke-dashoffset: 165;
+    filter: drop-shadow(0 0 8px rgba(151, 118, 255, 0.55));
+    animation: trace-draw 2.6s ease-in-out infinite;
+  }
+  .repo-loading-traces .trace-main {
+    stroke: #9b70ff;
+  }
+  .repo-loading-traces .trace-branch {
+    stroke: #ff6d26;
+    animation-delay: 0.28s;
+  }
+  .repo-loading-traces .trace-cut {
+    stroke: rgba(255, 255, 255, 0.42);
+    stroke-dasharray: 128;
+    stroke-dashoffset: 128;
+    animation-delay: 0.55s;
   }
 
-  .git-graph .branch {
+  .repo-loading-icon {
-    stroke-dasharray: 90;
+    position: relative;
-    stroke-dashoffset: 90;
+    z-index: 1;
-    animation: branch-draw 2.4s ease-in-out infinite;
+    width: 132px;
+    height: 132px;
+    object-fit: contain;
+    filter:
+      drop-shadow(0 18px 24px rgba(0, 0, 0, 0.55))
+      drop-shadow(0 0 18px rgba(151, 118, 255, 0.28));
+    animation: icon-float 2.4s ease-in-out infinite;
   }
 
-  .git-graph .node {
-    fill: var(--color-surface-alt);
-    stroke: url(#gl-line);
-    stroke-width: 4;
-    animation: node-pulse 2.4s ease-in-out infinite;
-  }
-  .git-graph .n1 { animation-delay: 0s; }
-  .git-graph .n2 { animation-delay: 0.5s; }
-  .git-graph .n3 { animation-delay: 1s; }
-  .git-graph .n4 { animation-delay: 1.5s; }
-
   .repo-loading-text {
     display: flex;
     flex-direction: column;
@@ -117,8 +156,7 @@
   .repo-loading-label {
     color: var(--color-ink);
     font-size: 15px;
-    font-weight: 600;
+    font-weight: 800;
-    letter-spacing: 0.01em;
   }
 
   .repo-loading-name {
@@ -133,45 +171,48 @@
 
   .repo-loading-bar {
     position: relative;
-    width: 180px;
+    width: min(230px, 100%);
-    height: 3px;
+    height: 4px;
     overflow: hidden;
-    border-radius: 3px;
+    border-radius: 999px;
-    background: rgba(100, 108, 255, 0.16);
+    background: rgba(151, 118, 255, 0.14);
   }
   .repo-loading-bar span {
     position: absolute;
     inset: 0;
-    width: 40%;
+    width: 46%;
-    border-radius: 3px;
+    border-radius: inherit;
-    background: linear-gradient(90deg, transparent, var(--color-accent), transparent);
+    background: linear-gradient(90deg, transparent, #9b70ff 40%, #ff6d26 74%, transparent);
-    animation: bar-slide 1.3s ease-in-out infinite;
+    box-shadow: 0 0 16px rgba(255, 109, 38, 0.32);
+    animation: bar-slide 1.35s ease-in-out infinite;
   }
 
   @keyframes overlay-in { from { opacity: 0; } to { opacity: 1; } }
-  @keyframes ring-spin { to { transform: rotate(360deg); } }
+  @keyframes grid-drift { to { transform: translate3d(42px, 42px, 0); } }
+  @keyframes icon-float {
+    0%, 100% { transform: translateY(0) scale(1); }
+    50% { transform: translateY(-5px) scale(1.015); }
+  }
+  @keyframes halo-breathe {
+    0%, 100% { opacity: 0.35; transform: rotate(45deg) scale(0.95); }
+    50% { opacity: 0.8; transform: rotate(45deg) scale(1.04); }
+  }
   @keyframes bar-slide {
     0% { transform: translateX(-120%); }
     100% { transform: translateX(320%); }
   }
-  @keyframes branch-draw {
+  @keyframes trace-draw {
-    0% { stroke-dashoffset: 90; opacity: 0.35; }
+    0% { stroke-dashoffset: 165; opacity: 0; }
-    45% { stroke-dashoffset: 0; opacity: 1; }
+    36% { opacity: 1; }
-    100% { stroke-dashoffset: 0; opacity: 1; }
+    64%, 100% { stroke-dashoffset: 0; opacity: 0.72; }
-  }
-  @keyframes node-pulse {
-    0%, 100% { fill: var(--color-surface-alt); filter: none; }
-    50% {
-      fill: var(--color-primary);
-      filter: drop-shadow(0 0 6px rgba(100, 108, 255, 0.8));
-    }
   }
 
   @media (prefers-reduced-motion: reduce) {
-    .git-graph .ring,
+    .repo-loading-grid,
-    .git-graph .branch,
+    .repo-loading-halo,
-    .git-graph .node,
+    .repo-loading-traces .trace,
+    .repo-loading-icon,
     .repo-loading-bar span { animation: none; }
-    .git-graph .branch { stroke-dashoffset: 0; }
+    .repo-loading-traces .trace { stroke-dashoffset: 0; opacity: 0.72; }
   }
 </style>

src/lib/components/StashPanel.svelte

@@ -11,6 +11,8 @@
     onApply: (stash: GitStash) => void;
     onPop: (stash: GitStash) => void;
     onDrop: (stash: GitStash) => void;
+    collapsed?: boolean;
+    onToggleCollapsed?: () => void;
   }
 
   let {
@@ -22,11 +24,12 @@
     onApply = () => {},
     onPop = () => {},
     onDrop = () => {},
+    collapsed = false,
+    onToggleCollapsed = () => {},
   }: Props = $props();
 
   let message = $state("");
   let includeUntracked = $state(true);
-  let open = $state(false);
 
   function submitPush() {
     onPush(message, includeUntracked);
@@ -38,31 +41,32 @@
   }
 </script>
 
-<section class="panel stash-panel overflow-hidden" class:collapsed={!open} aria-label="Git stash">
+<section class="panel stash-panel overflow-hidden" class:collapsed aria-label="Git stash">
   <div class="section-head">
     <div>
       <span class="eyebrow">Stash</span>
       <h2 class="mt-0.5 text-ink text-base font-bold leading-tight">Shelved changes</h2>
     </div>
     <div class="stash-head-actions">
+      <span class="pill pill-count">{stashes.length}</span>
       <button
-        class="stash-toggle"
+        class="stash-toggle panel-collapse-toggle"
         type="button"
-        onclick={() => { open = !open; }}
+        onclick={onToggleCollapsed}
-        aria-expanded={open}
+        aria-expanded={!collapsed}
-        title={open ? "Collapse stash panel" : "Expand stash panel"}
+        title={collapsed ? "Expand stash panel" : "Collapse stash panel"}
+        aria-label={collapsed ? "Expand stash panel" : "Collapse stash panel"}
       >
-        {#if open}
+        {#if collapsed}
-          <ChevronDown size={14} aria-hidden="true" />
-        {:else}
           <ChevronRight size={14} aria-hidden="true" />
+        {:else}
+          <ChevronDown size={14} aria-hidden="true" />
         {/if}
       </button>
-      <span class="pill pill-count">{stashes.length}</span>
     </div>
   </div>
 
-  {#if !open}
+  {#if collapsed}
     <!-- collapsed -->
   {:else if !hasRepository}
     <div class="blank-state">No repository loaded.</div>

src/lib/components/StatusPanel.svelte

@@ -1,5 +1,6 @@
 <script lang="ts">
   import { Check, FileDiff, RotateCcw, Undo2 } from "@lucide/svelte";
+  import iconUrl from "../../../src-tauri/icons/icon.png";
   import type { FileStatusKind, GitFileStatus, GitStatus } from "../types";
 
   interface Props {
@@ -8,11 +9,12 @@
     unstagedCount: number;
     hasRepository: boolean;
     isBusy: boolean;
+    operation: string;
     status: GitStatus | null;
     selectedFilePath: string;
     onSelectFile: (file: GitFileStatus) => void;
-    onStage: (file: GitFileStatus) => void;
+    onStage: (files: GitFileStatus[]) => void;
-    onUnstage: (file: GitFileStatus) => void;
+    onUnstage: (files: GitFileStatus[]) => void;
     onDiscard: (file: GitFileStatus, staged: boolean) => void;
     onPatch: (file: GitFileStatus, staged: boolean) => void;
     onStageAll: () => void;
@@ -25,6 +27,7 @@
     unstagedCount = 0,
     hasRepository = false,
     isBusy = false,
+    operation = "",
     status = null,
     selectedFilePath = "",
     onSelectFile = () => {},
@@ -56,11 +59,87 @@
     return kind === "modified";
   }
 
+  function fileKey(file: GitFileStatus): string {
+    return `${file.old_path ?? ""}:${file.path}`;
+  }
+
+  let selectedStatusPaths = $state<Set<string>>(new Set());
+  let selectionAnchorKey = $state("");
+
+  function isStatusSelected(file: GitFileStatus): boolean {
+    return selectedStatusPaths.has(fileKey(file));
+  }
+
+  function selectedFiles(): GitFileStatus[] {
+    return changedFiles.filter((file) => selectedStatusPaths.has(fileKey(file)));
+  }
+
+  function selectedStageTargets(file: GitFileStatus): GitFileStatus[] {
+    const files = isStatusSelected(file) ? selectedFiles() : [file];
+    return files.filter((item) => item.unstaged !== null);
+  }
+
+  function selectedUnstageTargets(file: GitFileStatus): GitFileStatus[] {
+    const files = isStatusSelected(file) ? selectedFiles() : [file];
+    return files.filter((item) => item.staged !== null);
+  }
+
+  function handleFileSelect(event: MouseEvent, file: GitFileStatus) {
+    const key = fileKey(file);
+    const allKeys = changedFiles.map(fileKey);
+    const next = new Set(selectedStatusPaths);
+
+    if (event.shiftKey && selectionAnchorKey) {
+      const anchorIndex = allKeys.indexOf(selectionAnchorKey);
+      const currentIndex = allKeys.indexOf(key);
+      if (anchorIndex >= 0 && currentIndex >= 0) {
+        const start = Math.min(anchorIndex, currentIndex);
+        const end = Math.max(anchorIndex, currentIndex);
+        for (const itemKey of allKeys.slice(start, end + 1)) next.add(itemKey);
+      } else {
+        next.add(key);
+      }
+    } else if (event.ctrlKey || event.metaKey) {
+      if (next.has(key)) next.delete(key);
+      else next.add(key);
+      selectionAnchorKey = key;
+    } else {
+      next.clear();
+      next.add(key);
+      selectionAnchorKey = key;
+    }
+
+    selectedStatusPaths = next;
+    onSelectFile(file);
+  }
+
+  function stageFromFile(file: GitFileStatus) {
+    const targets = selectedStageTargets(file);
+    if (targets.length === 0) return;
+    onStage(targets);
+  }
+
+  function unstageFromFile(file: GitFileStatus) {
+    const targets = selectedUnstageTargets(file);
+    if (targets.length === 0) return;
+    onUnstage(targets);
+  }
+
   let hasUnstaged = $derived(changedFiles.some((f) => f.unstaged !== null));
   let hasStaged = $derived(changedFiles.some((f) => f.staged !== null));
+  let selectedCount = $derived(changedFiles.filter((f) => selectedStatusPaths.has(fileKey(f))).length);
+  let selectedUnstagedCount = $derived(changedFiles.filter((f) => selectedStatusPaths.has(fileKey(f)) && f.unstaged !== null).length);
+  let selectedStagedCount = $derived(changedFiles.filter((f) => selectedStatusPaths.has(fileKey(f)) && f.staged !== null).length);
+
+  $effect(() => {
+    const validKeys = new Set(changedFiles.map(fileKey));
+    const next = new Set([...selectedStatusPaths].filter((key) => validKeys.has(key)));
+    if (next.size !== selectedStatusPaths.size) selectedStatusPaths = next;
+    if (selectionAnchorKey && !validKeys.has(selectionAnchorKey)) selectionAnchorKey = "";
+  });
 </script>
 
-<section class="panel grid grid-rows-[auto_auto_1fr] overflow-hidden" aria-label="Working tree status">
+<section class="panel relative grid grid-rows-[auto_auto_1fr] overflow-hidden" aria-label="Working tree status">
   <div class="section-head">
     <div>
       <span class="eyebrow">Working tree</span>
@@ -94,6 +173,29 @@
         <Undo2 size={14} aria-hidden="true" />
         Unstage all
       </button>
+      {#if selectedCount > 1}
+        <span class="status-selection-count">{selectedCount} selected</span>
+        <button
+          class="btn-sm"
+          type="button"
+          onclick={() => onStage(changedFiles.filter((file) => selectedStatusPaths.has(fileKey(file)) && file.unstaged !== null))}
+          disabled={isBusy || selectedUnstagedCount === 0}
+          title="Stage selected unstaged files"
+        >
+          <Check size={14} aria-hidden="true" />
+          Stage selected
+        </button>
+        <button
+          class="btn-sm"
+          type="button"
+          onclick={() => onUnstage(changedFiles.filter((file) => selectedStatusPaths.has(fileKey(file)) && file.staged !== null))}
+          disabled={isBusy || selectedStagedCount === 0}
+          title="Unstage selected staged files"
+        >
+          <Undo2 size={14} aria-hidden="true" />
+          Unstage selected
+        </button>
+      {/if}
     </div>
   {/if}
 
@@ -108,13 +210,14 @@
       {#each changedFiles as file (`${file.old_path ?? ""}:${file.path}`)}
         <article
           class="file-row"
-          class:selected={selectedFilePath === file.path}
+          class:selected={isStatusSelected(file)}
+          class:active={selectedFilePath === file.path}
         >
           <div class="file-title">
             <button
               class="file-title-button"
               type="button"
-              onclick={() => onSelectFile(file)}
+              onclick={(event) => handleFileSelect(event, file)}
               title={`Select ${displayPath(file)} in Explorer`}
             >
               <strong>{fileName(file)}</strong>
@@ -129,9 +232,10 @@
               </div>
               <div class="lane-actions">
                 {#if file.staged}
-                  <button class="btn-sm" type="button" onclick={() => onUnstage(file)} disabled={isBusy} title="Unstage file">
+                  {@const unstageTargets = selectedUnstageTargets(file)}
+                  <button class="btn-sm" type="button" onclick={() => unstageFromFile(file)} disabled={isBusy || unstageTargets.length === 0} title={unstageTargets.length > 1 ? `Unstage ${unstageTargets.length} selected files` : "Unstage file"}>
                     <Undo2 size={14} aria-hidden="true" />
-                    Unstage
+                    {unstageTargets.length > 1 ? `Unstage ${unstageTargets.length}` : "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" />
@@ -154,9 +258,10 @@
               </div>
               <div class="lane-actions">
                 {#if file.unstaged}
-                  <button class="btn-sm" type="button" onclick={() => onStage(file)} disabled={isBusy} title="Stage file">
+                  {@const stageTargets = selectedStageTargets(file)}
+                  <button class="btn-sm" type="button" onclick={() => stageFromFile(file)} disabled={isBusy || stageTargets.length === 0} title={stageTargets.length > 1 ? `Stage ${stageTargets.length} selected files` : "Stage file"}>
                     <Check size={14} aria-hidden="true" />
-                    Stage
+                    {stageTargets.length > 1 ? `Stage ${stageTargets.length}` : "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" />
@@ -176,4 +281,177 @@
       {/each}
     </div>
   {/if}
+
+  {#if isBusy && hasRepository}
+    <div class="status-panel-overlay" role="status" aria-live="polite">
+      <div class="status-panel-overlay-card">
+        <div class="status-panel-overlay-mark">
+          <span class="status-panel-overlay-halo halo-one"></span>
+          <span class="status-panel-overlay-halo halo-two"></span>
+          <svg class="status-panel-overlay-traces" viewBox="0 0 220 220" aria-hidden="true">
+            <path class="trace trace-main" d="M28 154 C72 114, 88 108, 110 110 S156 116, 192 68" />
+            <path class="trace trace-branch" d="M62 74 C100 88, 126 124, 158 166" />
+            <path class="trace trace-cut" d="M46 180 L174 180" />
+          </svg>
+          <img src={iconUrl} alt="" class="status-panel-overlay-icon" />
+        </div>
+        <span class="status-panel-overlay-label">{operation || "Working"}…</span>
+        <div class="status-panel-overlay-bar"><span></span></div>
+      </div>
+    </div>
+  {/if}
 </section>
+
+<style>
+  .status-panel-overlay {
+    position: absolute;
+    inset: 0;
+    z-index: 20;
+    display: grid;
+    place-items: center;
+    background:
+      radial-gradient(circle at 50% 38%, rgba(137, 92, 255, 0.16), transparent 55%),
+      rgba(8, 9, 16, 0.58);
+    backdrop-filter: blur(4px);
+    animation: status-panel-overlay-in 120ms ease;
+  }
+
+  .status-panel-overlay-card {
+    display: flex;
+    flex-direction: column;
+    align-items: center;
+    gap: 12px;
+    width: min(300px, calc(100% - 32px));
+    padding: 26px 28px 26px;
+    border: 1px solid rgba(160, 124, 255, 0.24);
+    border-radius: 16px;
+    background:
+      linear-gradient(180deg, rgba(23, 26, 43, 0.9), rgba(12, 15, 27, 0.92)),
+      var(--color-surface-raised);
+    color: var(--color-ink);
+    box-shadow: 0 18px 44px rgba(0, 0, 0, 0.38), inset 0 1px 0 rgba(255, 255, 255, 0.06);
+  }
+
+  .status-panel-overlay-mark {
+    position: relative;
+    width: 104px;
+    height: 104px;
+    display: grid;
+    place-items: center;
+    isolation: isolate;
+  }
+
+  .status-panel-overlay-halo {
+    position: absolute;
+    inset: 6px;
+    border: 1px solid rgba(151, 118, 255, 0.24);
+    border-radius: 22px;
+    transform: rotate(45deg);
+  }
+  .status-panel-overlay-halo.halo-one {
+    animation: status-panel-overlay-halo-breathe 2.4s ease-in-out infinite;
+  }
+  .status-panel-overlay-halo.halo-two {
+    inset: 16px;
+    border-color: rgba(255, 109, 38, 0.26);
+    animation: status-panel-overlay-halo-breathe 2.4s ease-in-out infinite reverse;
+  }
+
+  .status-panel-overlay-traces {
+    position: absolute;
+    inset: -12px;
+    width: 128px;
+    height: 128px;
+    overflow: visible;
+    z-index: 0;
+  }
+  .status-panel-overlay-traces .trace {
+    fill: none;
+    stroke-width: 3;
+    stroke-linecap: round;
+    stroke-dasharray: 165;
+    stroke-dashoffset: 165;
+    filter: drop-shadow(0 0 6px rgba(151, 118, 255, 0.55));
+    animation: status-panel-overlay-trace-draw 2.6s ease-in-out infinite;
+  }
+  .status-panel-overlay-traces .trace-main { stroke: #9b70ff; }
+  .status-panel-overlay-traces .trace-branch {
+    stroke: #ff6d26;
+    animation-delay: 0.28s;
+  }
+  .status-panel-overlay-traces .trace-cut {
+    stroke: rgba(255, 255, 255, 0.42);
+    stroke-dasharray: 128;
+    stroke-dashoffset: 128;
+    animation-delay: 0.55s;
+  }
+
+  .status-panel-overlay-icon {
+    position: relative;
+    z-index: 1;
+    width: 64px;
+    height: 64px;
+    object-fit: contain;
+    filter:
+      drop-shadow(0 8px 12px rgba(0, 0, 0, 0.5))
+      drop-shadow(0 0 10px rgba(151, 118, 255, 0.28));
+    animation: status-panel-overlay-icon-float 2.4s ease-in-out infinite;
+  }
+
+  .status-panel-overlay-label {
+    max-width: 100%;
+    overflow: hidden;
+    color: var(--color-ink);
+    font-size: 14px;
+    font-weight: 700;
+    text-align: center;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+
+  .status-panel-overlay-bar {
+    position: relative;
+    width: min(190px, 100%);
+    height: 4px;
+    overflow: hidden;
+    border-radius: 999px;
+    background: rgba(151, 118, 255, 0.14);
+  }
+  .status-panel-overlay-bar span {
+    position: absolute;
+    inset: 0;
+    width: 46%;
+    border-radius: inherit;
+    background: linear-gradient(90deg, transparent, #9b70ff 40%, #ff6d26 74%, transparent);
+    box-shadow: 0 0 12px rgba(255, 109, 38, 0.32);
+    animation: status-panel-overlay-bar-slide 1.35s ease-in-out infinite;
+  }
+
+  @keyframes status-panel-overlay-in { from { opacity: 0; } to { opacity: 1; } }
+  @keyframes status-panel-overlay-icon-float {
+    0%, 100% { transform: translateY(0) scale(1); }
+    50% { transform: translateY(-3px) scale(1.015); }
+  }
+  @keyframes status-panel-overlay-halo-breathe {
+    0%, 100% { opacity: 0.35; transform: rotate(45deg) scale(0.95); }
+    50% { opacity: 0.8; transform: rotate(45deg) scale(1.04); }
+  }
+  @keyframes status-panel-overlay-bar-slide {
+    0% { transform: translateX(-120%); }
+    100% { transform: translateX(320%); }
+  }
+  @keyframes status-panel-overlay-trace-draw {
+    0% { stroke-dashoffset: 165; opacity: 0; }
+    36% { opacity: 1; }
+    64%, 100% { stroke-dashoffset: 0; opacity: 0.72; }
+  }
+
+  @media (prefers-reduced-motion: reduce) {
+    .status-panel-overlay,
+    .status-panel-overlay-halo,
+    .status-panel-overlay-traces .trace,
+    .status-panel-overlay-icon,
+    .status-panel-overlay-bar span { animation: none; }
+    .status-panel-overlay-traces .trace { stroke-dashoffset: 0; opacity: 0.72; }
+  }
+</style>

src/lib/components/UpdateToast.svelte

@@ -44,7 +44,7 @@
   );
   const description = $derived(
     state === "installed"
-      ? "Restart GitLite to use the new version."
+      ? "Restart Gitty to use the new version."
       : state === "downloading"
         ? "Download and installation are running in the background."
         : state === "error"

src/main.ts

@@ -9,4 +9,6 @@ if (!target) {
   throw new Error("App target element was not found.");
 }
 
-export default mount(App, { target });
+const app = mount(App, { target });
+
+export default app;