chore(deps): update lockfile metadata

chore(release): publish 2026.07.22
feat(ai-commit): improve split dialog validation and apply flow
2026-07-28 20:59:42 +02:00 · 2026-07-28 20:59:40 +02:00 · 2026-07-28 16:11:24 +02:00 · 2026-07-28 16:11:21 +02:00 · 2026-07-28 15:01:32 +02:00 · 2026-07-26 23:13:26 +02:00
34 changed files with 3895 additions and 271 deletions
@@ -118,7 +118,22 @@
      "Bash(node -e \"const fs=require\\('fs'\\); const version='2026.8.1'; const pkgbuild=fs.readFileSync\\('PKGBUILD','utf8'\\).replace\\(/^pkgver=.*\\\\$/m, 'pkgver='+version\\).replace\\(/^pkgrel=.*\\\\$/m, 'pkgrel=1'\\); fs.writeFileSync\\('PKGBUILD', pkgbuild\\);\")",
      "Bash(rm PKGBUILD)",
      "Bash(git -C /mnt/data/Development/GitLite stash)",
-      "Bash(git -C /mnt/data/Development/GitLite stash pop)"
+      "Bash(git -C /mnt/data/Development/GitLite stash pop)",
+      "Bash(command -v docker)",
+      "Read(//home/christoph/.docker/**)",
+      "Bash(docker info *)",
+      "Bash(sudo -n test -f /root/.docker/config.json)",
+      "Bash(systemctl list-units *)",
+      "Bash(find / -maxdepth 4 -iname \"act_runner*\")",
+      "Bash(find / -maxdepth 6 -iname \"config.yaml\" -path \"*runner*\")",
+      "Read(//home/**)",
+      "Bash(getent passwd *)",
+      "Bash(docker context *)",
+      "Bash(git -C /mnt/data/Development/GitLite log --oneline -1 -- PKGBUILD)",
+      "Bash(git -C /mnt/data/Development/GitLite show --stat HEAD -- PKGBUILD)",
+      "Bash(git -C /mnt/data/Development/GitLite log --oneline -10)",
+      "Bash(git -C /mnt/data/Development/GitLite status)",
+      "Bash(git *)"
    ]
  }
 }
@@ -155,3 +155,77 @@ jobs:
        run: |
          uv sync
          uv run main.py
+
+  publish-arch:
+    name: Build and publish Arch package
+    runs-on: archlinux
+    environment: production
+    env:
+      MINIO_ENDPOINT: ${{ vars.MINIO_ENDPOINT }}
+      S3_BUCKET: ${{ vars.S3_BUCKET }}
+      S3_ACCESS_KEY: ${{ secrets.S3_ACCESS_KEY }}
+      S3_SECRET_KEY: ${{ secrets.S3_SECRET_KEY }}
+
+    defaults:
+      run:
+        working-directory: GitLite
+
+    steps:
+      - name: Prepare Arch job container
+        working-directory: /
+        run: |
+          pacman -Syu --noconfirm
+          pacman -S --needed --noconfirm nodejs npm git
+
+      - uses: actions/checkout@v5
+        with:
+          path: GitLite
+
+      - name: Set release version
+        env:
+          RELEASE_VERSION: ${{ github.ref_name }}
+        run: |
+          npm version "$RELEASE_VERSION" --no-git-tag-version --allow-same-version
+          node -e "const fs=require('fs'); const version=require('./package.json').version; const path='src-tauri/tauri.conf.json'; const config=JSON.parse(fs.readFileSync(path,'utf8')); config.version=version; fs.writeFileSync(path,JSON.stringify(config,null,2)+'\n');"
+          PACKAGE_VERSION="$(node -p "require('./package.json').version")"
+          sed -i "s/^pkgver=.*/pkgver=$PACKAGE_VERSION/; s/^pkgrel=.*/pkgrel=1/" PKGBUILD
+
+      - name: Install uv
+        uses: astral-sh/setup-uv@08807647e7069bb48b6ef5acd8ec9567f424441b
+
+      - name: Restore pacman repository database
+        working-directory: GitLite/cicd_tool
+        run: |
+          uv sync
+          uv run arch_repo.py download-db --output ../arch-repo/gitty.db.tar.gz
+
+      - name: Build pkg.tar.zst with PKGBUILD
+        run: |
+          pacman -S --needed --noconfirm \
+            base-devel git nodejs npm rust \
+            webkit2gtk-4.1 gtk3 hicolor-icon-theme \
+            libappindicator-gtk3 librsvg xdotool
+
+          mkdir -p arch-output
+
+          BUILD_ROOT="$(mktemp -d)"
+          cp -a . "$BUILD_ROOT/source"
+          mkdir -p "$BUILD_ROOT/makepkg"
+
+          useradd --create-home builder
+          chown -R builder:builder "$BUILD_ROOT"
+
+          runuser -u builder -- \
+            bash -lc "cd '$BUILD_ROOT/source' && BUILDDIR='$BUILD_ROOT/makepkg' makepkg --cleanbuild --noconfirm"
+
+          cp "$BUILD_ROOT"/source/*.pkg.tar.zst arch-output/
+          chmod 0644 arch-output/*.pkg.tar.zst
+
+      - name: Update pacman repository database
+        run: |
+          mkdir -p arch-repo
+          repo-add arch-repo/gitty.db.tar.gz arch-output/*.pkg.tar.zst
+
+      - name: Upload package and repository database to CDN
+        working-directory: GitLite/cicd_tool
+        run: uv run arch_repo.py publish --packages-dir ../arch-output --repo-dir ../arch-repo
@@ -0,0 +1,90 @@
+# Changelog
+
+All notable user-facing changes to Gitty are documented in this file.
+
+The project uses calendar versions. Displayed release names use `YYYY.MM.DD`;
+package metadata uses the equivalent numeric form without leading zeroes where
+required by the package manager.
+
+## [2026.07.22] - 2026-07-22
+
+### Added
+
+- AI-assisted commit splitting for staged changes:
+  - analyze the staged diff and propose an ordered set of logical commits;
+  - generate an editable Conventional Commit message for every group;
+  - move files between proposed commits before applying the plan;
+  - create all accepted commits sequentially with **Commit all**.
+- Support for commit-splitting suggestions through OpenAI, Anthropic, and
+  custom OpenAI-compatible endpoints.
+
+### Changed
+
+- The commit-splitting dialog now explains why a plan cannot be applied and
+  clearly marks AI-generated commit messages as editable.
+- Safety checks prevent applying a stale plan after the staged files change
+  and reject files that contain both staged and unstaged changes.
+
+### Fixed
+
+- **Commit all** now passes a plain state snapshot to the commit workflow
+  instead of failing silently when cloning a reactive UI proxy.
+- Closing the active repository tab no longer allows an in-flight status or
+  fetch response to reopen and reactivate the closed repository.
+
+## [2026.07.21] - 2026-07-21
+
+### Added
+
+- Full Git worktree management:
+  - create a worktree from an existing branch;
+  - create a new branch and worktree together;
+  - create a detached worktree at a commit;
+  - open a worktree as a repository tab;
+  - move, lock, unlock, repair, remove, and prune worktrees.
+- A dedicated **Worktrees** entry below **Tags** in the branch panel.
+- An **Open in new worktree** action in the local branch context menu.
+- Line-level patch selection with Shift-click range selection.
+- Stage, unstage, and discard actions for selected lines while retaining the
+  existing whole-file and whole-hunk workflows.
+- Arch Linux package automation that builds from `PKGBUILD`, publishes the
+  `.pkg.tar.zst` artifact, and updates the Pacman repository database on the
+  CDN.
+- Detailed German and English help for worktrees, line-level staging, Pacman
+  installation, and release changes.
+
+### Changed
+
+- Branch deletion now uses a clearer confirmation dialog with more explicit
+  branch and upstream information.
+- Dialog backdrops blur the application instead of covering it with a nearly
+  black background.
+- Remote operations and authentication errors provide more actionable
+  feedback.
+- Build diagnostics and resource handling for the Arch package pipeline are
+  more robust.
+
+### Infrastructure
+
+- Added centralized error notifications.
+- Added structured, privacy-conscious telemetry.
+- Stabilized the Arch Linux container build and `makepkg` workflow.
+
+## [2026.7.20] - 2026-07-13
+
+### Added
+
+- AI-assisted review of staged changes before committing.
+- Optional automatic repository refresh.
+- Comprehensive German Git documentation in the built-in help.
+- Initial `PKGBUILD` and automated package version synchronization.
+
+### Changed
+
+- Redesigned the repository action toolbar and workspace status presentation.
+- Improved repository tabs, diff styling, spacing, and panel structure.
+- Improved file-history state handling.
+
+[2026.07.22]: https://git.cbsk-tech.de/Christoph/GitLite/releases/tag/2026.7.22
+[2026.07.21]: https://git.cbsk-tech.de/Christoph/GitLite/releases/tag/2026.7.21
+[2026.7.20]: https://git.cbsk-tech.de/Christoph/GitLite/releases/tag/2026.7.20
@@ -5,15 +5,15 @@
 # binary + desktop entry. Run `makepkg -si` from the repo root.

 pkgname=gitty
-pkgver=2026.7.20
+pkgver=2026.7.22
 pkgrel=1
 pkgdesc="A lightweight, modern Git client built with Tauri"
 arch=('x86_64')
 url="https://git.cbsk-tech.de/Christoph/GitLite"
 license=('MIT')
-depends=('webkit2gtk-4.1' 'gtk3' 'git' 'hicolor-icon-theme')
+depends=('webkit2gtk-4.1' 'gtk3' 'git' 'hicolor-icon-theme' 'libappindicator-gtk3' 'librsvg' 'xdotool')
 makedepends=('rust' 'nodejs' 'npm')
-options=('!lto')
+options=('!lto' '!debug')

 source=()
 sha256sums=()
@@ -26,6 +26,16 @@ pkgver() {

 build() {
  cd "$startdir"
+
+  # mistralrs-core is large enough that the regular release profile (thin LTO,
+  # one codegen unit and Arch debug flags) can exhaust memory in the LXC build
+  # runner. Keep the package optimized while bounding peak compiler memory.
+  export CARGO_BUILD_JOBS=1
+  export CARGO_PROFILE_RELEASE_OPT_LEVEL=2
+  export CARGO_PROFILE_RELEASE_LTO=false
+  export CARGO_PROFILE_RELEASE_CODEGEN_UNITS=8
+  export CARGO_PROFILE_RELEASE_DEBUG=0
+
  npm ci
  # Build through the Tauri CLI (not a raw `cargo build --release`): it enables
  # the `custom-protocol` cargo feature that makes the binary load the embedded
@@ -49,3 +49,35 @@ Contributions, feedback and feature requests are always welcome!
 ## 📄 License

 MIT License
+
+---
+
+## Arch Linux
+
+Release builds are published as an `x86_64` pacman repository. Add this block to
+`/etc/pacman.conf` once:
+
+```ini
+[gitty]
+SigLevel = Optional TrustAll
+Server = https://cdn.cbsk-tech.de/gitty/arch/$arch
+```
+
+Then install Gitty and receive future releases through the normal system update:
+
+```bash
+sudo pacman -Syu gitty
+```
+
+The repository is currently distributed over HTTPS but is not GPG-signed. A
+repository signing key should be added before recommending it to third parties.
+
+---
+
+## SigNoz telemetry
+
+After the user opts in, Gitty sends privacy-filtered product events and technical errors as OTLP/HTTP JSON logs. Every Git/Tauri command is also captured as a trace span with its command name, duration and success state, but without command arguments or results. CPU utilization and resident memory usage of the Gitty process are sampled every 30 seconds and exported as OpenTelemetry gauges. The default endpoints are `https://telemetry.cbsk-tech.de/v1/logs`, `https://telemetry.cbsk-tech.de/v1/traces`, and `https://telemetry.cbsk-tech.de/v1/metrics`.
+
+The SigNoz reverse proxy must forward all three paths to the Collector's OTLP/HTTP receiver (normally port `4318`). For development or a separate collector hostname, set `GITTY_OTLP_LOGS_ENDPOINT`, `GITTY_OTLP_TRACES_ENDPOINT`, and `GITTY_OTLP_METRICS_ENDPOINT` to the full signal URLs before starting Gitty.
+
+Telemetry is non-blocking, bounded, disabled until consent is stored, and never includes repository paths, remote URLs, branch names, commit messages, diffs, file names, credentials, source code, URLs, or email addresses.
@@ -0,0 +1,86 @@
+import argparse
+import os
+from pathlib import Path
+
+from minio import Minio
+from minio.error import S3Error
+
+from main import (
+    ConfigurationError,
+    _create_minio_client,
+    _ensure_bucket,
+    _parse_publish_targets,
+)
+
+
+REPO_PREFIX = "arch/x86_64"
+DATABASE_NAME = "gitty.db.tar.gz"
+
+
+def _targets():
+    bucket_name = (os.environ.get("S3_BUCKET") or "gitty").lower()
+    app_dir = (os.environ.get("APP_DIR") or "gitty").strip("/")
+    return _parse_publish_targets(bucket_name, app_dir)
+
+
+def download_database(client: Minio, output: Path) -> None:
+    target = _targets()[0]
+    object_name = f"{REPO_PREFIX}/{DATABASE_NAME}"
+    output.parent.mkdir(parents=True, exist_ok=True)
+
+    try:
+        client.fget_object(target.bucket_name, object_name, str(output))
+        print(f"Downloaded s3://{target.bucket_name}/{object_name} -> {output}")
+    except S3Error as exc:
+        if exc.code in {"NoSuchKey", "NoSuchObject"}:
+            print("No existing Arch repository database found; creating a new one.")
+            return
+        raise
+
+
+def publish_repository(client: Minio, packages_dir: Path, repo_dir: Path) -> None:
+    packages = sorted(packages_dir.glob("*.pkg.tar.zst"))
+    if not packages:
+        raise FileNotFoundError(f"No .pkg.tar.zst package found in {packages_dir}")
+
+    repository_files = [
+        path
+        for path in repo_dir.iterdir()
+        if path.is_file() and path.name.startswith("gitty.")
+    ]
+    if not any(path.name == DATABASE_NAME for path in repository_files):
+        raise FileNotFoundError(f"Missing repository database: {repo_dir / DATABASE_NAME}")
+
+    for target in _targets():
+        _ensure_bucket(client, target.bucket_name)
+        for path in [*packages, *repository_files]:
+            object_name = f"{REPO_PREFIX}/{path.name}"
+            client.fput_object(target.bucket_name, object_name, str(path))
+            print(f"Uploaded {path.name} -> s3://{target.bucket_name}/{object_name}")
+
+
+def main() -> None:
+    parser = argparse.ArgumentParser(description="Manage the Gitty pacman repository on MinIO.")
+    subparsers = parser.add_subparsers(dest="command", required=True)
+
+    download_parser = subparsers.add_parser("download-db")
+    download_parser.add_argument("--output", type=Path, required=True)
+
+    publish_parser = subparsers.add_parser("publish")
+    publish_parser.add_argument("--packages-dir", type=Path, required=True)
+    publish_parser.add_argument("--repo-dir", type=Path, required=True)
+
+    args = parser.parse_args()
+    client = _create_minio_client()
+
+    if args.command == "download-db":
+        download_database(client, args.output)
+    else:
+        publish_repository(client, args.packages_dir, args.repo_dir)
+
+
+if __name__ == "__main__":
+    try:
+        main()
+    except (ConfigurationError, FileNotFoundError, S3Error) as exc:
+        raise SystemExit(f"Arch repository operation failed: {exc}") from exc
@@ -33,6 +33,24 @@ interface GitBranch {
  remote: boolean;
 }

+interface GitWorktree {
+  path: string;
+  head: string | null;
+  short_head: string | null;
+  branch: string | null;
+  bare: boolean;
+  detached: boolean;
+  locked: boolean;
+  lock_reason: string | null;
+  prunable: boolean;
+  prune_reason: string | null;
+  missing: boolean;
+  is_main: boolean;
+  is_current: boolean;
+  clean: boolean;
+  changed_files: number;
+}
+
 interface GitCommit {
  hash: string;
  short_hash: string;
@@ -73,6 +91,14 @@ The command list below includes the repository-management and synchronization AP
 - `set_branch_upstream(path: string, branch: string, upstream?: string): Promise<GitStatus>`
 - `delete_remote_branch(path: string, remote: string, branch: string): Promise<GitStatus>`
 - `checkout_branch(path: string, branch: string): Promise<GitStatus>`
+- `list_worktrees(path: string): Promise<GitWorktree[]>`
+- `add_worktree(path: string, worktreePath: string, ...): Promise<GitWorktree[]>`
+- `remove_worktree(path: string, worktreePath: string, force?: boolean): Promise<GitWorktree[]>`
+- `move_worktree(path: string, worktreePath: string, destination: string): Promise<GitWorktree[]>`
+- `lock_worktree(path: string, worktreePath: string, reason?: string): Promise<GitWorktree[]>`
+- `unlock_worktree(path: string, worktreePath: string): Promise<GitWorktree[]>`
+- `prune_worktrees(path: string): Promise<GitWorktree[]>`
+- `repair_worktree(path: string, worktreePath: string): Promise<GitWorktree[]>`
 - `stage_files(path: string, files: string[]): Promise<GitStatus>`
 - `unstage_files(path: string, files: string[]): Promise<GitStatus>`
 - `restore_files(path: string, files: string[], staged: boolean): Promise<GitStatus>`
@@ -1,12 +1,12 @@
 {
  "name": "gitty",
-  "version": "2026.7.20",
+  "version": "2026.7.22",
  "lockfileVersion": 3,
  "requires": true,
  "packages": {
    "": {
      "name": "gitty",
-      "version": "2026.7.20",
+      "version": "2026.7.22",
      "dependencies": {
        "@lucide/svelte": "^1.21.0",
        "@tailwindcss/vite": "^4.3.1",
@@ -1,6 +1,6 @@
 {
  "name": "gitty",
-  "version": "2026.7.20",
+  "version": "2026.7.22",
  "private": true,
  "type": "module",
  "scripts": {
@@ -574,13 +574,22 @@ dependencies = [
 "generic-array",
 ]

+[[package]]
+name = "block2"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c132eebf10f5cad5289222520a4a058514204aed6d791f1cf4fe8088b82d15f"
+dependencies = [
+ "objc2 0.5.2",
+]
+
 [[package]]
 name = "block2"
 version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cdeb9d870516001442e364c5220d3574d2da8dc765554b4a617230d33fa58ef5"
 dependencies = [
- "objc2",
+ "objc2 0.6.4",
 ]

 [[package]]
@@ -1119,6 +1128,19 @@ version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"

+[[package]]
+name = "core-graphics"
+version = "0.24.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa95a34622365fa5bbf40b20b75dba8dfa8c94c734aea8ac9a5ca38af14316f1"
+dependencies = [
+ "bitflags 2.13.0",
+ "core-foundation 0.10.1",
+ "core-graphics-types",
+ "foreign-types 0.5.0",
+ "libc",
+]
+
 [[package]]
 name = "core-graphics"
 version = "0.25.0"
@@ -1592,9 +1614,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e0e367e4e7da84520dedcac1901e4da967309406d1e51017ae1abfb97adbd38"
 dependencies = [
 "bitflags 2.13.0",
- "block2",
+ "block2 0.6.2",
 "libc",
- "objc2",
+ "objc2 0.6.4",
 ]

 [[package]]
@@ -2538,8 +2560,10 @@ dependencies = [
 "commit_ai",
 "keyring",
 "log",
+ "reqwest 0.12.28",
 "serde",
 "serde_json",
+ "sysinfo 0.38.3",
 "tauri",
 "tauri-build",
 "tauri-plugin-aptabase",
@@ -3884,7 +3908,7 @@ dependencies = [
 "statrs",
 "strum 0.27.2",
 "symphonia",
- "sysinfo",
+ "sysinfo 0.36.1",
 "thiserror 2.0.18",
 "tokenizers 0.21.4",
 "tokio",
@@ -4014,10 +4038,10 @@ dependencies = [
 "dpi",
 "gtk",
 "keyboard-types",
- "objc2",
+ "objc2 0.6.4",
 "objc2-app-kit",
 "objc2-core-foundation",
- "objc2-foundation",
+ "objc2-foundation 0.3.1",
 "once_cell",
 "png 0.18.1",
 "serde",
@@ -4311,6 +4335,22 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "830b246a0e5f20af87141b25c173cd1b609bd7779a4617d6ec582abaf90870f3"

+[[package]]
+name = "objc-sys"
+version = "0.3.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cdb91bdd390c7ce1a8607f35f3ca7151b65afc0ff5ff3b34fa350f7d7c7e4310"
+
+[[package]]
+name = "objc2"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "46a785d4eeff09c14c487497c162e92766fbb3e4059a71840cecc03d9a50b804"
+dependencies = [
+ "objc-sys",
+ "objc2-encode",
+]
+
 [[package]]
 name = "objc2"
 version = "0.6.4"
@@ -4323,92 +4363,80 @@ dependencies = [

 [[package]]
 name = "objc2-app-kit"
-version = "0.3.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d49e936b501e5c5bf01fda3a9452ff86dc3ea98ad5f283e1455153142d97518c"
+checksum = "e6f29f568bec459b0ddff777cec4fe3fd8666d82d5a40ebd0ff7e66134f89bcc"
 dependencies = [
 "bitflags 2.13.0",
- "block2",
- "objc2",
+ "block2 0.6.2",
+ "objc2 0.6.4",
 "objc2-core-foundation",
- "objc2-foundation",
+ "objc2-foundation 0.3.1",
 ]

 [[package]]
 name = "objc2-cloud-kit"
-version = "0.3.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73ad74d880bb43877038da939b7427bba67e9dd42004a18b809ba7d87cee241c"
+checksum = "17614fdcd9b411e6ff1117dfb1d0150f908ba83a7df81b1f118005fe0a8ea15d"
 dependencies = [
 "bitflags 2.13.0",
- "objc2",
- "objc2-foundation",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.1",
 ]

 [[package]]
 name = "objc2-core-data"
-version = "0.3.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b402a653efbb5e82ce4df10683b6b28027616a2715e90009947d50b8dd298fa"
+checksum = "291fbbf7d29287518e8686417cf7239c74700fd4b607623140a7d4a3c834329d"
 dependencies = [
- "objc2",
- "objc2-foundation",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.1",
 ]

 [[package]]
 name = "objc2-core-foundation"
-version = "0.3.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a180dd8642fa45cdb7dd721cd4c11b1cadd4929ce112ebd8b9f5803cc79d536"
+checksum = "1c10c2894a6fed806ade6027bcd50662746363a9589d3ec9d9bef30a4e4bc166"
 dependencies = [
 "bitflags 2.13.0",
 "dispatch2",
- "objc2",
+ "objc2 0.6.4",
 ]

 [[package]]
 name = "objc2-core-graphics"
-version = "0.3.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e022c9d066895efa1345f8e33e584b9f958da2fd4cd116792e15e07e4720a807"
+checksum = "989c6c68c13021b5c2d6b71456ebb0f9dc78d752e86a98da7c716f4f9470f5a4"
 dependencies = [
 "bitflags 2.13.0",
 "dispatch2",
- "objc2",
+ "objc2 0.6.4",
 "objc2-core-foundation",
 "objc2-io-surface",
 ]

 [[package]]
 name = "objc2-core-image"
-version = "0.3.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5d563b38d2b97209f8e861173de434bd0214cf020e3423a52624cd1d989f006"
+checksum = "79b3dc0cc4386b6ccf21c157591b34a7f44c8e75b064f85502901ab2188c007e"
 dependencies = [
- "objc2",
- "objc2-foundation",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.1",
 ]

 [[package]]
 name = "objc2-core-location"
-version = "0.3.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca347214e24bc973fc025fd0d36ebb179ff30536ed1f80252706db19ee452009"
+checksum = "ac0f75792558aa9d618443bbb5db7426a7a0b6fddf96903f86ef9ad02e135740"
 dependencies = [
- "objc2",
- "objc2-foundation",
-]
-
-[[package]]
-name = "objc2-core-text"
-version = "0.3.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0cde0dfb48d25d2b4862161a4d5fcc0e3c24367869ad306b0c9ec0073bfed92d"
-dependencies = [
- "bitflags 2.13.0",
- "objc2",
- "objc2-core-foundation",
- "objc2-core-graphics",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.1",
 ]

 [[package]]
@@ -4428,22 +4456,34 @@ dependencies = [

 [[package]]
 name = "objc2-foundation"
-version = "0.3.2"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e3e0adef53c21f888deb4fa59fc59f7eb17404926ee8a6f59f5df0fd7f9f3272"
+checksum = "0ee638a5da3799329310ad4cfa62fbf045d5f56e3ef5ba4149e7452dcf89d5a8"
 dependencies = [
 "bitflags 2.13.0",
- "block2",
+ "block2 0.5.1",
 "libc",
- "objc2",
+ "objc2 0.5.2",
+]
+
+[[package]]
+name = "objc2-foundation"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "900831247d2fe1a09a683278e5384cfb8c80c79fe6b166f9d14bfdde0ea1b03c"
+dependencies = [
+ "bitflags 2.13.0",
+ "block2 0.6.2",
+ "libc",
+ "objc2 0.6.4",
 "objc2-core-foundation",
 ]

 [[package]]
 name = "objc2-io-kit"
-version = "0.3.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "33fafba39597d6dc1fb709123dfa8289d39406734be322956a69f0931c73bb15"
+checksum = "71c1c64d6120e51cd86033f67176b1cb66780c2efe34dec55176f77befd93c0a"
 dependencies = [
 "libc",
 "objc2-core-foundation",
@@ -4451,82 +4491,106 @@ dependencies = [

 [[package]]
 name = "objc2-io-surface"
-version = "0.3.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180788110936d59bab6bd83b6060ffdfffb3b922ba1396b312ae795e1de9d81d"
+checksum = "7282e9ac92529fa3457ce90ebb15f4ecbc383e8338060960760fa2cf75420c3c"
 dependencies = [
 "bitflags 2.13.0",
- "objc2",
+ "objc2 0.6.4",
 "objc2-core-foundation",
 ]

+[[package]]
+name = "objc2-metal"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd0cba1276f6023976a406a14ffa85e1fdd19df6b0f737b063b95f6c8c7aadd6"
+dependencies = [
+ "bitflags 2.13.0",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+]
+
 [[package]]
 name = "objc2-osa-kit"
-version = "0.3.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f112d1746737b0da274ef79a23aac283376f335f4095a083a267a082f21db0c0"
+checksum = "26bb88504b5a050dbba515d2414607bf5e57dd56b107bc5f0351197a3e7bdc5d"
 dependencies = [
 "bitflags 2.13.0",
- "objc2",
+ "objc2 0.6.4",
 "objc2-app-kit",
- "objc2-foundation",
+ "objc2-foundation 0.3.1",
 ]

 [[package]]
 name = "objc2-quartz-core"
-version = "0.3.2"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c1358452b371bf9f104e21ec536d37a650eb10f7ee379fff67d2e08d537f1f"
+checksum = "e42bee7bff906b14b167da2bac5efe6b6a07e6f7c0a21a7308d40c960242dc7a"
 dependencies = [
 "bitflags 2.13.0",
- "objc2",
+ "block2 0.5.1",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+ "objc2-metal",
+]
+
+[[package]]
+name = "objc2-quartz-core"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "90ffb6a0cd5f182dc964334388560b12a57f7b74b3e2dec5e2722aa2dfb2ccd5"
+dependencies = [
+ "bitflags 2.13.0",
+ "objc2 0.6.4",
 "objc2-core-foundation",
- "objc2-foundation",
+ "objc2-foundation 0.3.1",
 ]

 [[package]]
 name = "objc2-ui-kit"
-version = "0.3.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d87d638e33c06f577498cbcc50491496a3ed4246998a7fbba7ccb98b1e7eab22"
+checksum = "25b1312ad7bc8a0e92adae17aa10f90aae1fb618832f9b993b022b591027daed"
 dependencies = [
 "bitflags 2.13.0",
- "block2",
- "objc2",
+ "block2 0.6.2",
+ "objc2 0.6.4",
 "objc2-cloud-kit",
 "objc2-core-data",
 "objc2-core-foundation",
 "objc2-core-graphics",
 "objc2-core-image",
 "objc2-core-location",
- "objc2-core-text",
- "objc2-foundation",
- "objc2-quartz-core",
+ "objc2-foundation 0.3.1",
+ "objc2-quartz-core 0.3.1",
 "objc2-user-notifications",
 ]

 [[package]]
 name = "objc2-user-notifications"
-version = "0.3.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9df9128cbbfef73cda168416ccf7f837b62737d748333bfe9ab71c245d76613e"
+checksum = "2a3f5ec77a81d9e0c5a0b32159b0cb143d7086165e79708351e02bf37dfc65cd"
 dependencies = [
- "objc2",
- "objc2-foundation",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.1",
 ]

 [[package]]
 name = "objc2-web-kit"
-version = "0.3.2"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b2e5aaab980c433cf470df9d7af96a7b46a9d892d521a2cbbb2f8a4c16751e7f"
+checksum = "91672909de8b1ce1c2252e95bbee8c1649c9ad9d14b9248b3d7b4c47903c47ad"
 dependencies = [
 "bitflags 2.13.0",
- "block2",
- "objc2",
+ "block2 0.6.2",
+ "objc2 0.6.4",
 "objc2-app-kit",
 "objc2-core-foundation",
- "objc2-foundation",
+ "objc2-foundation 0.3.1",
 ]

 [[package]]
@@ -4664,8 +4728,8 @@ dependencies = [
 "android_system_properties",
 "log",
 "nix 0.31.3",
- "objc2",
- "objc2-foundation",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.1",
 "objc2-ui-kit",
 "serde",
 "windows-sys 0.61.2",
@@ -4677,8 +4741,8 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "732c71caeaa72c065bb69d7ea08717bd3f4863a4f451402fc9513e29dbd5261b"
 dependencies = [
- "objc2",
- "objc2-foundation",
+ "objc2 0.6.4",
+ "objc2-foundation 0.3.1",
 "objc2-osa-kit",
 "serde",
 "serde_json",
@@ -5540,17 +5604,17 @@ version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a15ad77d9e70a92437d8f74c35d99b4e4691128df018833e99f90bcd36152672"
 dependencies = [
- "block2",
+ "block2 0.6.2",
 "dispatch2",
 "glib-sys",
 "gobject-sys",
 "gtk-sys",
 "js-sys",
 "log",
- "objc2",
+ "objc2 0.6.4",
 "objc2-app-kit",
 "objc2-core-foundation",
- "objc2-foundation",
+ "objc2-foundation 0.3.1",
 "raw-window-handle",
 "wasm-bindgen",
 "wasm-bindgen-futures",
@@ -6358,24 +6422,24 @@ dependencies = [

 [[package]]
 name = "softbuffer"
-version = "0.4.8"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aac18da81ebbf05109ab275b157c22a653bb3c12cf884450179942f81bcbf6c3"
+checksum = "18051cdd562e792cad055119e0cdb2cfc137e44e3987532e0f9659a77931bb08"
 dependencies = [
 "bytemuck",
+ "cfg_aliases",
+ "core-graphics 0.24.0",
+ "foreign-types 0.5.0",
 "js-sys",
- "ndk",
- "objc2",
- "objc2-core-foundation",
- "objc2-core-graphics",
- "objc2-foundation",
- "objc2-quartz-core",
+ "log",
+ "objc2 0.5.2",
+ "objc2-foundation 0.2.2",
+ "objc2-quartz-core 0.2.2",
 "raw-window-handle",
 "redox_syscall",
- "tracing",
 "wasm-bindgen",
 "web-sys",
- "windows-sys 0.61.2",
+ "windows-sys 0.59.0",
 ]

 [[package]]
@@ -6772,7 +6836,21 @@ dependencies = [
 "ntapi",
 "objc2-core-foundation",
 "objc2-io-kit",
- "windows",
+ "windows 0.61.3",
+]
+
+[[package]]
+name = "sysinfo"
+version = "0.38.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d03c61d2a49c649a15c407338afe7accafde9dac869995dccb73e5f7ef7d9034"
+dependencies = [
+ "libc",
+ "memchr",
+ "ntapi",
+ "objc2-core-foundation",
+ "objc2-io-kit",
+ "windows 0.62.2",
 ]

 [[package]]
@@ -6816,9 +6894,9 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d1c93047acf68669466a34690ac58cca7010bd1b201e1ec86f1fd0a75d3dd4a9"
 dependencies = [
 "bitflags 2.13.0",
- "block2",
+ "block2 0.6.2",
 "core-foundation 0.10.1",
- "core-graphics",
+ "core-graphics 0.25.0",
 "crossbeam-channel",
 "dbus",
 "dispatch2",
@@ -6832,9 +6910,9 @@ dependencies = [
 "log",
 "ndk",
 "ndk-sys",
- "objc2",
+ "objc2 0.6.4",
 "objc2-app-kit",
- "objc2-foundation",
+ "objc2-foundation 0.3.1",
 "objc2-ui-kit",
 "once_cell",
 "parking_lot",
@@ -6843,7 +6921,7 @@ dependencies = [
 "tao-macros",
 "unicode-segmentation",
 "url",
- "windows",
+ "windows 0.61.3",
 "windows-core 0.61.2",
 "windows-version",
 "x11-dl",
@@ -6899,9 +6977,9 @@ dependencies = [
 "log",
 "mime",
 "muda",
- "objc2",
+ "objc2 0.6.4",
 "objc2-app-kit",
- "objc2-foundation",
+ "objc2-foundation 0.3.1",
 "objc2-ui-kit",
 "objc2-web-kit",
 "percent-encoding",
@@ -6925,7 +7003,7 @@ dependencies = [
 "webkit2gtk",
 "webview2-com",
 "window-vibrancy",
- "windows",
+ "windows 0.61.3",
 ]

 [[package]]
@@ -7054,7 +7132,7 @@ dependencies = [
 "dunce",
 "glob",
 "log",
- "objc2-foundation",
+ "objc2-foundation 0.3.1",
 "percent-encoding",
 "schemars 0.8.22",
 "serde",
@@ -7127,7 +7205,7 @@ dependencies = [
 "gtk",
 "http",
 "jni 0.21.1",
- "objc2",
+ "objc2 0.6.4",
 "objc2-ui-kit",
 "objc2-web-kit",
 "raw-window-handle",
@@ -7138,7 +7216,7 @@ dependencies = [
 "url",
 "webkit2gtk",
 "webview2-com",
- "windows",
+ "windows 0.61.3",
 ]

 [[package]]
@@ -7151,7 +7229,7 @@ dependencies = [
 "http",
 "jni 0.21.1",
 "log",
- "objc2",
+ "objc2 0.6.4",
 "objc2-app-kit",
 "once_cell",
 "percent-encoding",
@@ -7163,7 +7241,7 @@ dependencies = [
 "url",
 "webkit2gtk",
 "webview2-com",
- "windows",
+ "windows 0.61.3",
 "wry",
 ]

@@ -7811,11 +7889,11 @@ dependencies = [
 "dirs",
 "libappindicator",
 "muda",
- "objc2",
+ "objc2 0.6.4",
 "objc2-app-kit",
 "objc2-core-foundation",
 "objc2-core-graphics",
- "objc2-foundation",
+ "objc2-foundation 0.3.1",
 "once_cell",
 "png 0.18.1",
 "serde",
@@ -8389,7 +8467,7 @@ checksum = "7130243a7a5b33c54a444e54842e6a9e133de08b5ad7b5861cd8ed9a6a5bc96a"
 dependencies = [
 "webview2-com-macros",
 "webview2-com-sys",
- "windows",
+ "windows 0.61.3",
 "windows-core 0.61.2",
 "windows-implement",
 "windows-interface",
@@ -8413,7 +8491,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "381336cfffd772377d291702245447a5251a2ffa5bad679c99e61bc48bacbf9c"
 dependencies = [
 "thiserror 2.0.18",
- "windows",
+ "windows 0.61.3",
 "windows-core 0.61.2",
 ]

@@ -8476,10 +8554,10 @@ version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9bec5a31f3f9362f2258fd0e9c9dd61a9ca432e7306cc78c444258f0dce9a9c"
 dependencies = [
- "objc2",
+ "objc2 0.6.4",
 "objc2-app-kit",
 "objc2-core-foundation",
- "objc2-foundation",
+ "objc2-foundation 0.3.1",
 "raw-window-handle",
 "windows-sys 0.59.0",
 "windows-version",
@@ -8491,11 +8569,23 @@ version = "0.61.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9babd3a767a4c1aef6900409f85f5d53ce2544ccdfaa86dad48c91782c6d6893"
 dependencies = [
- "windows-collections",
+ "windows-collections 0.2.0",
 "windows-core 0.61.2",
- "windows-future",
+ "windows-future 0.2.1",
 "windows-link 0.1.3",
- "windows-numerics",
+ "windows-numerics 0.2.0",
+]
+
+[[package]]
+name = "windows"
+version = "0.62.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "527fadee13e0c05939a6a05d5bd6eec6cd2e3dbd648b9f8e447c6518133d8580"
+dependencies = [
+ "windows-collections 0.3.2",
+ "windows-core 0.62.2",
+ "windows-future 0.3.2",
+ "windows-numerics 0.3.1",
 ]

 [[package]]
@@ -8507,6 +8597,15 @@ dependencies = [
 "windows-core 0.61.2",
 ]

+[[package]]
+name = "windows-collections"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23b2d95af1a8a14a3c7367e1ed4fc9c20e0a26e79551b1454d72583c97cc6610"
+dependencies = [
+ "windows-core 0.62.2",
+]
+
 [[package]]
 name = "windows-core"
 version = "0.61.2"
@@ -8541,7 +8640,18 @@ checksum = "fc6a41e98427b19fe4b73c550f060b59fa592d7d686537eebf9385621bfbad8e"
 dependencies = [
 "windows-core 0.61.2",
 "windows-link 0.1.3",
- "windows-threading",
+ "windows-threading 0.1.0",
+]
+
+[[package]]
+name = "windows-future"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e1d6f90251fe18a279739e78025bd6ddc52a7e22f921070ccdc67dde84c605cb"
+dependencies = [
+ "windows-core 0.62.2",
+ "windows-link 0.2.1",
+ "windows-threading 0.2.1",
 ]

 [[package]]
@@ -8588,6 +8698,16 @@ dependencies = [
 "windows-link 0.1.3",
 ]

+[[package]]
+name = "windows-numerics"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6e2e40844ac143cdb44aead537bbf727de9b044e107a0f1220392177d15b0f26"
+dependencies = [
+ "windows-core 0.62.2",
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows-registry"
 version = "0.6.1"
@@ -8761,6 +8881,15 @@ dependencies = [
 "windows-link 0.1.3",
 ]

+[[package]]
+name = "windows-threading"
+version = "0.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3949bd5b99cafdf1c7ca86b43ca564028dfe27d66958f2470940f73d86d75b37"
+dependencies = [
+ "windows-link 0.2.1",
+]
+
 [[package]]
 name = "windows-version"
 version = "0.1.7"
@@ -9003,7 +9132,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "186f9871daa55fd9c016578b810d149de58367113db7fb72b462d2323ce19514"
 dependencies = [
 "base64 0.22.1",
- "block2",
+ "block2 0.6.2",
 "cookie",
 "crossbeam-channel",
 "dirs",
@@ -9017,10 +9146,10 @@ dependencies = [
 "jni 0.21.1",
 "libc",
 "ndk",
- "objc2",
+ "objc2 0.6.4",
 "objc2-app-kit",
 "objc2-core-foundation",
- "objc2-foundation",
+ "objc2-foundation 0.3.1",
 "objc2-ui-kit",
 "objc2-web-kit",
 "once_cell",
@@ -9034,7 +9163,7 @@ dependencies = [
 "webkit2gtk",
 "webkit2gtk-sys",
 "webview2-com",
- "windows",
+ "windows 0.61.3",
 "windows-core 0.61.2",
 "windows-version",
 "x11-dl",
@@ -22,6 +22,8 @@ keyring = { version = "3", features = ["apple-native", "windows-native", "async-
 commit_ai = { path = "crates/commit_ai" }
 tokio = "1.52.3"
 log = "0.4"
+reqwest = { version = "0.12", default-features = false, features = ["blocking", "json", "rustls-tls"] }
+sysinfo = { version = "=0.38.3", default-features = false, features = ["system"] }

 [build-dependencies]
 tauri-build = { version = "2", features = [] }
@@ -215,6 +215,89 @@ pub async fn review_custom(
    openai_compatible_review_request(url, api_key, model, diff).await
 }

+async fn openai_compatible_split_request(
+    url: String,
+    bearer: Option<&str>,
+    model: &str,
+    diff: &str,
+) -> Result<String, String> {
+    let system = "You split staged Git changes into small, logical commits. Return only JSON in this exact shape: {\"summary\":\"...\",\"groups\":[{\"message\":\"type(scope): subject\",\"reason\":\"...\",\"files\":[\"path\"]}]}. Every staged file must appear exactly once. Use only paths from the supplied staged file list. Keep messages in English and use Conventional Commits. Do not use markdown.";
+    let user =
+        format!("Analyze these staged changes and propose an ordered commit plan:\n\n{diff}");
+    let body = OpenAiRequest {
+        model: model.to_string(),
+        messages: vec![
+            OpenAiMessage {
+                role: "system",
+                content: system.to_string(),
+            },
+            OpenAiMessage {
+                role: "user",
+                content: user,
+            },
+        ],
+        temperature: 0.1,
+    };
+    let client = http_client()?;
+    let mut request = client.post(url).json(&body);
+    if let Some(key) = bearer.filter(|key| !key.trim().is_empty()) {
+        request = request.bearer_auth(key);
+    }
+    let response = request
+        .send()
+        .await
+        .map_err(|err| format!("Request to the AI model failed: {err}"))?;
+    let status = response.status();
+    let text = response
+        .text()
+        .await
+        .map_err(|err| format!("Could not read response: {err}"))?;
+    if !status.is_success() {
+        return Err(format!("API error ({status}): {text}"));
+    }
+    let parsed: OpenAiResponse =
+        serde_json::from_str(&text).map_err(|err| format!("Could not process response: {err}"))?;
+    parsed
+        .choices
+        .into_iter()
+        .next()
+        .and_then(|choice| choice.message.content)
+        .map(|content| sanitize_message(&content))
+        .filter(|content| !content.is_empty())
+        .ok_or_else(|| "The model did not return a commit plan.".to_string())
+}
+
+pub async fn split_openai(api_key: &str, model: &str, diff: &str) -> Result<String, String> {
+    if api_key.trim().is_empty() {
+        return Err("OpenAI API key is missing.".to_string());
+    }
+    openai_compatible_split_request(
+        "https://api.openai.com/v1/chat/completions".to_string(),
+        Some(api_key),
+        model,
+        diff,
+    )
+    .await
+}
+
+pub async fn split_custom(
+    base_url: &str,
+    api_key: Option<&str>,
+    model: &str,
+    diff: &str,
+) -> Result<String, String> {
+    if base_url.trim().is_empty() {
+        return Err("Endpoint URL is missing.".to_string());
+    }
+    openai_compatible_split_request(
+        format!("{}/chat/completions", base_url.trim_end_matches('/')),
+        api_key,
+        model,
+        diff,
+    )
+    .await
+}
+
 #[derive(Serialize)]
 struct AnthropicMessage {
    role: &'static str,
@@ -338,3 +421,47 @@ pub async fn review_anthropic(api_key: &str, model: &str, diff: &str) -> Result<
        .filter(|text| !text.is_empty())
        .ok_or_else(|| "The model did not return a review.".to_string())
 }
+
+pub async fn split_anthropic(api_key: &str, model: &str, diff: &str) -> Result<String, String> {
+    if api_key.trim().is_empty() {
+        return Err("Anthropic API key is missing.".to_string());
+    }
+    let system = "You split staged Git changes into small, logical commits. Return only JSON in this exact shape: {\"summary\":\"...\",\"groups\":[{\"message\":\"type(scope): subject\",\"reason\":\"...\",\"files\":[\"path\"]}]}. Every staged file must appear exactly once. Use only paths from the supplied staged file list. Keep messages in English and use Conventional Commits. Do not use markdown.".to_string();
+    let body = AnthropicRequest {
+        model: model.to_string(),
+        max_tokens: 2400,
+        system,
+        messages: vec![AnthropicMessage {
+            role: "user",
+            content: format!(
+                "Analyze these staged changes and propose an ordered commit plan:\n\n{diff}"
+            ),
+        }],
+    };
+    let client = http_client()?;
+    let response = client
+        .post("https://api.anthropic.com/v1/messages")
+        .header("x-api-key", api_key)
+        .header("anthropic-version", "2023-06-01")
+        .json(&body)
+        .send()
+        .await
+        .map_err(|err| format!("Request to Anthropic failed: {err}"))?;
+    let status = response.status();
+    let text = response
+        .text()
+        .await
+        .map_err(|err| format!("Could not read response: {err}"))?;
+    if !status.is_success() {
+        return Err(format!("API error ({status}): {text}"));
+    }
+    let parsed: AnthropicResponse =
+        serde_json::from_str(&text).map_err(|err| format!("Could not process response: {err}"))?;
+    parsed
+        .content
+        .into_iter()
+        .find_map(|block| block.text)
+        .map(|text| sanitize_message(&text))
+        .filter(|text| !text.is_empty())
+        .ok_or_else(|| "The model did not return a commit plan.".to_string())
+}
@@ -2,7 +2,7 @@ mod cloud;

 pub use cloud::{
    generate_anthropic, generate_custom, generate_openai, review_anthropic, review_custom,
-    review_openai,
+    review_openai, split_anthropic, split_custom, split_openai,
 };

 use std::{
@@ -68,6 +68,25 @@ pub struct GitBranch {
    pub remote: bool,
 }

+#[derive(Debug, Clone, PartialEq, Eq, Serialize)]
+pub struct GitWorktree {
+    pub path: String,
+    pub head: Option<String>,
+    pub short_head: Option<String>,
+    pub branch: Option<String>,
+    pub bare: bool,
+    pub detached: bool,
+    pub locked: bool,
+    pub lock_reason: Option<String>,
+    pub prunable: bool,
+    pub prune_reason: Option<String>,
+    pub missing: bool,
+    pub is_main: bool,
+    pub is_current: bool,
+    pub clean: bool,
+    pub changed_files: u32,
+}
+
 #[derive(Debug, Clone, PartialEq, Eq, Serialize)]
 pub struct GitTag {
    pub name: String,
@@ -927,6 +946,291 @@ pub fn delete_branch(
    status_for_repo(&repo)
 }

+fn worktree_path_matches(left: &Path, right: &Path) -> bool {
+    match (fs::canonicalize(left), fs::canonicalize(right)) {
+        (Ok(left), Ok(right)) => left == right,
+        _ => left == right,
+    }
+}
+
+fn parse_worktree_porcelain(output: &[u8], current_repo: &Path) -> Vec<GitWorktree> {
+    #[derive(Default)]
+    struct Record {
+        path: Option<String>,
+        head: Option<String>,
+        branch: Option<String>,
+        bare: bool,
+        detached: bool,
+        locked: bool,
+        lock_reason: Option<String>,
+        prunable: bool,
+        prune_reason: Option<String>,
+    }
+
+    fn finish_record(rows: &mut Vec<GitWorktree>, record: &mut Record, current_repo: &Path) {
+        let Some(path) = record.path.take() else {
+            *record = Record::default();
+            return;
+        };
+        let path_buf = PathBuf::from(&path);
+        let missing = !path_buf.exists();
+        let is_current = worktree_path_matches(&path_buf, current_repo);
+        let head = record.head.take();
+        let short_head = head
+            .as_ref()
+            .map(|value| value.chars().take(8).collect::<String>());
+        rows.push(GitWorktree {
+            path,
+            head,
+            short_head,
+            branch: record.branch.take(),
+            bare: record.bare,
+            detached: record.detached,
+            locked: record.locked,
+            lock_reason: record.lock_reason.take(),
+            prunable: record.prunable,
+            prune_reason: record.prune_reason.take(),
+            missing,
+            is_main: rows.is_empty(),
+            is_current,
+            clean: true,
+            changed_files: 0,
+        });
+        *record = Record::default();
+    }
+
+    let mut rows = Vec::new();
+    let mut record = Record::default();
+    for field in output.split(|byte| *byte == 0) {
+        if field.is_empty() {
+            finish_record(&mut rows, &mut record, current_repo);
+            continue;
+        }
+        let value = String::from_utf8_lossy(field);
+        let (key, detail) = value
+            .split_once(' ')
+            .map_or((value.as_ref(), None), |(key, detail)| (key, Some(detail)));
+        match key {
+            "worktree" => record.path = detail.map(str::to_string),
+            "HEAD" => record.head = detail.map(str::to_string),
+            "branch" => {
+                record.branch = detail.map(|branch| {
+                    branch
+                        .strip_prefix("refs/heads/")
+                        .unwrap_or(branch)
+                        .to_string()
+                })
+            }
+            "bare" => record.bare = true,
+            "detached" => record.detached = true,
+            "locked" => {
+                record.locked = true;
+                record.lock_reason = detail.map(str::to_string).filter(|value| !value.is_empty());
+            }
+            "prunable" => {
+                record.prunable = true;
+                record.prune_reason = detail.map(str::to_string).filter(|value| !value.is_empty());
+            }
+            _ => {}
+        }
+    }
+    finish_record(&mut rows, &mut record, current_repo);
+    rows
+}
+
+fn worktrees_for_repo(repo: &Path) -> Result<Vec<GitWorktree>, String> {
+    let output = run_git(repo, ["worktree", "list", "--porcelain", "-z"])?;
+    let mut worktrees = parse_worktree_porcelain(&output, repo);
+    for worktree in &mut worktrees {
+        if worktree.missing {
+            worktree.clean = false;
+            continue;
+        }
+        if worktree.bare {
+            continue;
+        }
+        match run_git_at(
+            Path::new(&worktree.path),
+            ["status", "--porcelain=v1", "-z", "--untracked-files=normal"],
+            "Could not inspect worktree status",
+        ) {
+            Ok(status) => {
+                worktree.changed_files = status
+                    .split(|byte| *byte == 0)
+                    .filter(|entry| entry.len() >= 3 && entry[2] == b' ')
+                    .count() as u32;
+                worktree.clean = worktree.changed_files == 0;
+            }
+            Err(_) => {
+                worktree.clean = false;
+            }
+        }
+    }
+    Ok(worktrees)
+}
+
+#[tauri::command]
+pub fn list_worktrees(path: String) -> Result<Vec<GitWorktree>, String> {
+    let repo = resolve_repo(&path)?;
+    worktrees_for_repo(&repo)
+}
+
+#[tauri::command]
+pub fn add_worktree(
+    path: String,
+    worktree_path: String,
+    branch: Option<String>,
+    new_branch: Option<String>,
+    start_point: Option<String>,
+    detached: Option<bool>,
+    lock: Option<bool>,
+) -> Result<Vec<GitWorktree>, String> {
+    let repo = resolve_repo(&path)?;
+    let destination = worktree_path.trim();
+    if destination.is_empty() {
+        return Err("Choose a folder for the new worktree.".to_string());
+    }
+    let branch = branch
+        .map(|value| value.trim().to_string())
+        .filter(|value| !value.is_empty());
+    let new_branch = new_branch
+        .map(|value| value.trim().to_string())
+        .filter(|value| !value.is_empty());
+    if branch.is_some() && new_branch.is_some() {
+        return Err("Choose either an existing branch or a new branch.".to_string());
+    }
+
+    let mut args = vec![OsString::from("worktree"), OsString::from("add")];
+    if lock.unwrap_or(false) {
+        args.push(OsString::from("--lock"));
+    }
+    if detached.unwrap_or(false) {
+        args.push(OsString::from("--detach"));
+    }
+
+    let target = if let Some(new_branch) = new_branch {
+        let new_branch = validate_new_branch_name(&repo, &new_branch)?;
+        args.push(OsString::from("-b"));
+        args.push(OsString::from(new_branch));
+        start_point
+            .as_deref()
+            .filter(|value| !value.trim().is_empty())
+            .map(|value| verify_commit(&repo, value))
+            .transpose()?
+    } else if let Some(branch) = branch {
+        Some(validate_existing_local_branch_name(&repo, &branch)?)
+    } else {
+        start_point
+            .as_deref()
+            .filter(|value| !value.trim().is_empty())
+            .map(|value| verify_commit(&repo, value))
+            .transpose()?
+    };
+
+    args.push(OsString::from(destination));
+    if let Some(target) = target {
+        args.push(OsString::from(target));
+    }
+    run_git(&repo, args)?;
+    worktrees_for_repo(&repo)
+}
+
+#[tauri::command]
+pub fn remove_worktree(
+    path: String,
+    worktree_path: String,
+    force: Option<bool>,
+) -> Result<Vec<GitWorktree>, String> {
+    let repo = resolve_repo(&path)?;
+    let worktrees = worktrees_for_repo(&repo)?;
+    let target = worktrees
+        .iter()
+        .find(|worktree| {
+            worktree_path_matches(Path::new(&worktree.path), Path::new(&worktree_path))
+        })
+        .ok_or_else(|| "The selected worktree is no longer registered.".to_string())?;
+    if target.is_main {
+        return Err("The main worktree cannot be removed.".to_string());
+    }
+    if target.is_current {
+        return Err("The currently open worktree cannot be removed.".to_string());
+    }
+    if target.locked {
+        return Err("Unlock this worktree before removing it.".to_string());
+    }
+    let mut args = vec![OsString::from("worktree"), OsString::from("remove")];
+    if force.unwrap_or(false) {
+        args.push(OsString::from("--force"));
+    }
+    args.push(OsString::from(worktree_path));
+    run_git(&repo, args)?;
+    worktrees_for_repo(&repo)
+}
+
+#[tauri::command]
+pub fn move_worktree(
+    path: String,
+    worktree_path: String,
+    destination: String,
+) -> Result<Vec<GitWorktree>, String> {
+    let repo = resolve_repo(&path)?;
+    let destination = destination.trim();
+    if destination.is_empty() {
+        return Err("Choose a new location for the worktree.".to_string());
+    }
+    run_git(
+        &repo,
+        [
+            OsString::from("worktree"),
+            OsString::from("move"),
+            OsString::from(worktree_path),
+            OsString::from(destination),
+        ],
+    )?;
+    worktrees_for_repo(&repo)
+}
+
+#[tauri::command]
+pub fn lock_worktree(
+    path: String,
+    worktree_path: String,
+    reason: Option<String>,
+) -> Result<Vec<GitWorktree>, String> {
+    let repo = resolve_repo(&path)?;
+    let mut args = vec![OsString::from("worktree"), OsString::from("lock")];
+    if let Some(reason) = reason
+        .map(|value| value.trim().to_string())
+        .filter(|value| !value.is_empty())
+    {
+        args.push(OsString::from("--reason"));
+        args.push(OsString::from(reason));
+    }
+    args.push(OsString::from(worktree_path));
+    run_git(&repo, args)?;
+    worktrees_for_repo(&repo)
+}
+
+#[tauri::command]
+pub fn unlock_worktree(path: String, worktree_path: String) -> Result<Vec<GitWorktree>, String> {
+    let repo = resolve_repo(&path)?;
+    run_git(&repo, ["worktree", "unlock", "--", worktree_path.as_str()])?;
+    worktrees_for_repo(&repo)
+}
+
+#[tauri::command]
+pub fn prune_worktrees(path: String) -> Result<Vec<GitWorktree>, String> {
+    let repo = resolve_repo(&path)?;
+    run_git(&repo, ["worktree", "prune"])?;
+    worktrees_for_repo(&repo)
+}
+
+#[tauri::command]
+pub fn repair_worktree(path: String, worktree_path: String) -> Result<Vec<GitWorktree>, String> {
+    let repo = resolve_repo(&path)?;
+    run_git(&repo, ["worktree", "repair", "--", worktree_path.as_str()])?;
+    worktrees_for_repo(&repo)
+}
+
 #[tauri::command]
 pub fn create_tag(
    path: String,
@@ -1339,6 +1643,127 @@ pub struct AiReviewResult {
    pub findings: Vec<AiReviewFinding>,
 }

+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AiCommitGroup {
+    pub message: String,
+    pub reason: String,
+    pub files: Vec<String>,
+}
+
+#[derive(Debug, Clone, PartialEq, Eq, Serialize, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct AiCommitPlan {
+    pub summary: String,
+    pub groups: Vec<AiCommitGroup>,
+}
+
+fn parse_ai_commit_plan(raw: &str, staged_files: &[String]) -> Result<AiCommitPlan, String> {
+    use std::collections::HashSet;
+    let trimmed = raw.trim().trim_matches('`').trim();
+    let json = match (trimmed.find('{'), trimmed.rfind('}')) {
+        (Some(start), Some(end)) if start <= end => &trimmed[start..=end],
+        _ => return Err("The AI response did not contain a valid commit plan.".to_string()),
+    };
+    let mut plan: AiCommitPlan = serde_json::from_str(json)
+        .map_err(|error| format!("Could not process the commit plan: {error}"))?;
+    plan.groups
+        .retain(|group| !group.message.trim().is_empty() && !group.files.is_empty());
+    if plan.groups.len() < 2 {
+        return Err("The staged changes do not appear to benefit from splitting.".to_string());
+    }
+    if plan.groups.len() > 12 {
+        return Err("The AI proposed too many commit groups.".to_string());
+    }
+    let expected = staged_files.iter().cloned().collect::<HashSet<_>>();
+    let mut seen = HashSet::new();
+    for group in &mut plan.groups {
+        group.message = group.message.trim().to_string();
+        group.reason = group.reason.trim().to_string();
+        group
+            .files
+            .retain(|file| expected.contains(file) && seen.insert(file.clone()));
+        if group.files.is_empty() {
+            return Err("The AI returned an empty or duplicate commit group.".to_string());
+        }
+    }
+    if seen != expected {
+        return Err("The AI plan did not assign every staged file exactly once.".to_string());
+    }
+    plan.summary = plan.summary.trim().to_string();
+    Ok(plan)
+}
+
+#[tauri::command]
+pub async fn commit_ai_split(
+    path: String,
+    provider: String,
+    model: Option<String>,
+    api_key: Option<String>,
+    base_url: Option<String>,
+) -> Result<AiCommitPlan, String> {
+    let repo = resolve_repo(&path)?;
+    let status = status_for_repo(&repo)?;
+    let staged_files = status
+        .files
+        .iter()
+        .filter(|file| file.staged.is_some())
+        .map(|file| file.path.clone())
+        .collect::<Vec<_>>();
+    if staged_files.len() < 2 {
+        return Err("Stage at least two files before creating a split plan.".to_string());
+    }
+    if status
+        .files
+        .iter()
+        .any(|file| file.staged.is_some() && file.unstaged.is_some())
+    {
+        return Err("Files with both staged and unstaged changes cannot be split safely. Stage or discard the remaining changes first.".to_string());
+    }
+    let diff = staged_diff(&repo)?;
+    let model = model.filter(|value| !value.trim().is_empty());
+    let api_key = api_key.filter(|value| !value.trim().is_empty());
+    let base_url = base_url.filter(|value| !value.trim().is_empty());
+    let raw = match provider.as_str() {
+        "openai" => {
+            commit_ai::split_openai(
+                api_key
+                    .as_deref()
+                    .ok_or_else(|| "OpenAI API key is missing.".to_string())?,
+                model.as_deref().unwrap_or("gpt-4o-mini"),
+                &diff,
+            )
+            .await?
+        }
+        "anthropic" => {
+            commit_ai::split_anthropic(
+                api_key
+                    .as_deref()
+                    .ok_or_else(|| "Anthropic API key is missing.".to_string())?,
+                model.as_deref().unwrap_or("claude-3-5-haiku-latest"),
+                &diff,
+            )
+            .await?
+        }
+        "custom" => {
+            commit_ai::split_custom(
+                base_url
+                    .as_deref()
+                    .ok_or_else(|| "Endpoint URL is missing.".to_string())?,
+                api_key.as_deref(),
+                model
+                    .as_deref()
+                    .ok_or_else(|| "Model name is missing.".to_string())?,
+                &diff,
+            )
+            .await?
+        }
+        "local" => return Err("Commit splitting currently requires an API provider.".to_string()),
+        other => return Err(format!("Unknown AI provider: {other}")),
+    };
+    parse_ai_commit_plan(&raw, &staged_files)
+}
+
 #[derive(Deserialize)]
 struct AiReviewWireFinding {
    severity: String,
@@ -6409,6 +6834,36 @@ mod tests {
            "one\nTWO\nthree\nfour\n"
        );

+        let staged_patch = get_file_patch(
+            repo.path.to_string_lossy().to_string(),
+            "old.txt".to_string(),
+            true,
+        )
+        .expect("staged patch should load");
+        let status = apply_file_patch(
+            repo.path.to_string_lossy().to_string(),
+            "old.txt".to_string(),
+            staged_patch,
+            "unstage".to_string(),
+        )
+        .expect("selected staged lines should unstage");
+
+        assert_eq!(status.files[0].staged, None);
+        assert_eq!(status.files[0].unstaged, Some(FileStatusKind::Modified));
+        assert_eq!(
+            git_output_test(&repo.path, ["show", ":old.txt"]),
+            "one\ntwo\nthree"
+        );
+
+        let selected_patch = "diff --git a/old.txt b/old.txt\n--- a/old.txt\n+++ b/old.txt\n@@ -1,3 +1,3 @@\n one\n-two\n+TWO\n three\n";
+        apply_file_patch(
+            repo.path.to_string_lossy().to_string(),
+            "old.txt".to_string(),
+            selected_patch.to_string(),
+            "stage".to_string(),
+        )
+        .expect("selected line should stage again");
+
        let unstaged_patch = get_file_patch(
            repo.path.to_string_lossy().to_string(),
            "old.txt".to_string(),
@@ -6687,6 +7142,76 @@ mod tests {
        assert!(result.lines[0].is_uncommitted);
    }

+    #[test]
+    fn parse_worktree_porcelain_preserves_flags_and_reasons() {
+        let current = Path::new("/repos/main");
+        let output = b"worktree /repos/main\0HEAD 1234567890abcdef\0branch refs/heads/main\0\0worktree /repos/feature\0HEAD abcdef1234567890\0detached\0locked external drive\0prunable gitdir file points to non-existent location\0\0";
+
+        let rows = parse_worktree_porcelain(output, current);
+
+        assert_eq!(rows.len(), 2);
+        assert!(rows[0].is_main);
+        assert_eq!(rows[0].branch.as_deref(), Some("main"));
+        assert_eq!(rows[0].short_head.as_deref(), Some("12345678"));
+        assert!(rows[1].detached);
+        assert!(rows[1].locked);
+        assert_eq!(rows[1].lock_reason.as_deref(), Some("external drive"));
+        assert!(rows[1].prunable);
+    }
+
+    #[test]
+    fn worktree_add_list_and_remove_round_trip() {
+        let repo = init_temp_repo("worktree_round_trip");
+        let destination = temp_dir("worktree_round_trip_destination");
+        commit_initial_file(&repo.path);
+        run_git_test(&repo.path, ["branch", "feature"]);
+
+        let rows = add_worktree(
+            repo.path.to_string_lossy().to_string(),
+            destination.path.to_string_lossy().to_string(),
+            Some("feature".to_string()),
+            None,
+            None,
+            Some(false),
+            Some(false),
+        )
+        .expect("worktree should be created");
+
+        let linked = rows
+            .iter()
+            .find(|row| row.branch.as_deref() == Some("feature"))
+            .expect("linked worktree should be listed");
+        assert!(!linked.is_main);
+        assert!(linked.clean);
+
+        let rows = lock_worktree(
+            repo.path.to_string_lossy().to_string(),
+            destination.path.to_string_lossy().to_string(),
+            Some("test lock".to_string()),
+        )
+        .expect("worktree should lock");
+        let linked = rows
+            .iter()
+            .find(|row| row.branch.as_deref() == Some("feature"))
+            .expect("linked worktree should remain listed");
+        assert!(linked.locked);
+        assert_eq!(linked.lock_reason.as_deref(), Some("test lock"));
+
+        unlock_worktree(
+            repo.path.to_string_lossy().to_string(),
+            destination.path.to_string_lossy().to_string(),
+        )
+        .expect("worktree should unlock");
+
+        let rows = remove_worktree(
+            repo.path.to_string_lossy().to_string(),
+            destination.path.to_string_lossy().to_string(),
+            Some(false),
+        )
+        .expect("worktree should be removed");
+        assert_eq!(rows.len(), 1);
+    }
+
    #[test]
    fn parse_ai_review_accepts_fenced_json_and_normalizes_findings() {
        let raw = r#"```json
@@ -6701,4 +7226,15 @@ mod tests {
        assert_eq!(review.findings[0].file.as_deref(), Some("src/main.rs"));
        assert_eq!(review.findings[0].line, Some(42));
    }
+
+    #[test]
+    fn parse_ai_commit_plan_requires_each_staged_file_exactly_once() {
+        let files = vec!["src/app.ts".to_string(), "tests/app.test.ts".to_string()];
+        let raw = r#"{"summary":"Separate behavior and coverage","groups":[{"message":"feat(app): add behavior","reason":"Production code","files":["src/app.ts"]},{"message":"test(app): cover behavior","reason":"Tests","files":["tests/app.test.ts"]}]}"#;
+        let plan = parse_ai_commit_plan(raw, &files).expect("complete plan should parse");
+        assert_eq!(plan.groups.len(), 2);
+
+        let duplicate = r#"{"summary":"Bad plan","groups":[{"message":"feat: one","reason":"","files":["src/app.ts"]},{"message":"test: two","reason":"","files":["src/app.ts"]}]}"#;
+        assert!(parse_ai_commit_plan(duplicate, &files).is_err());
+    }
 }
@@ -2,28 +2,31 @@

 mod badge;
 mod git;
+mod telemetry;

 use badge::set_sync_badge;
 use git::{
-    SearchCancellationState, add_remote, amend_commit, apply_file_patch, cancel_code_search,
-    cancel_file_history, checkout_branch, cherry_pick_abort, cherry_pick_commit,
-    cherry_pick_continue, clone_repository, commit, commit_ai_generate, commit_ai_load,
-    commit_ai_local_models, commit_ai_review, commit_ai_status, compare_commits,
-    compare_file_to_head, compare_file_to_parent, create_branch, create_tag, cred_delete,
-    cred_load, cred_save, delete_branch, delete_remote_branch, delete_tag,
+    SearchCancellationState, add_remote, add_worktree, amend_commit, apply_file_patch,
+    cancel_code_search, cancel_file_history, checkout_branch, cherry_pick_abort,
+    cherry_pick_commit, cherry_pick_continue, clone_repository, commit, commit_ai_generate,
+    commit_ai_load, commit_ai_local_models, commit_ai_review, commit_ai_split, commit_ai_status,
+    compare_commits, compare_file_to_head, compare_file_to_parent, create_branch, create_tag,
+    cred_delete, cred_load, cred_save, delete_branch, delete_remote_branch, delete_tag,
    diff_file_against_working_tree, fetch, get_file_blame, get_file_patch, get_remote_url,
    get_status, init_repository, last_commit_message, list_branches, list_commits,
    list_file_history, list_interactive_rebase_commits, list_reflog, list_remotes,
-    list_repository_files, list_stashes, list_tags, merge_abort, merge_branch, merge_continue,
-    open_repo_in_explorer, open_repository, open_repository_bundle, open_repository_file, pull,
-    push, push_tag, read_conflict, rebase_abort, rebase_branch, rebase_continue, remove_remote,
-    rename_branch, resolve_conflict, resolve_conflict_side, restore_file_from_commit,
-    restore_files, restore_reflog_entry, restore_to_commit, revert_commit,
-    run_sequence_editor_if_requested, search_code_introductions, set_branch_upstream, stage_files,
-    start_interactive_rebase, stash_apply, stash_drop, stash_pop, stash_push, undo_last_commit,
-    unstage_files, update_remote,
+    list_repository_files, list_stashes, list_tags, list_worktrees, lock_worktree, merge_abort,
+    merge_branch, merge_continue, move_worktree, open_repo_in_explorer, open_repository,
+    open_repository_bundle, open_repository_file, prune_worktrees, pull, push, push_tag,
+    read_conflict, rebase_abort, rebase_branch, rebase_continue, remove_remote, remove_worktree,
+    rename_branch, repair_worktree, resolve_conflict, resolve_conflict_side,
+    restore_file_from_commit, restore_files, restore_reflog_entry, restore_to_commit,
+    revert_commit, run_sequence_editor_if_requested, search_code_introductions,
+    set_branch_upstream, stage_files, start_interactive_rebase, stash_apply, stash_drop, stash_pop,
+    stash_push, undo_last_commit, unlock_worktree, unstage_files, update_remote,
 };
 use tauri::Manager;
+use telemetry::{emit_frontend_log, emit_frontend_span, set_telemetry_enabled};

 struct ConsoleLogger;

@@ -78,6 +81,7 @@ fn close_splashscreen(app: tauri::AppHandle) -> Result<(), String> {
 #[tokio::main]
 async fn main() {
    init_console_logging();
+    telemetry::init();
    if let Some(result) = run_sequence_editor_if_requested() {
        if let Err(error) = result {
            eprintln!("{error}");
@@ -132,6 +136,14 @@ async fn main() {
            create_branch,
            rename_branch,
            delete_branch,
+            list_worktrees,
+            add_worktree,
+            remove_worktree,
+            move_worktree,
+            lock_worktree,
+            unlock_worktree,
+            prune_worktrees,
+            repair_worktree,
            list_tags,
            create_tag,
            delete_tag,
@@ -157,6 +169,7 @@ async fn main() {
            commit_ai_local_models,
            commit_ai_generate,
            commit_ai_review,
+            commit_ai_split,
            pull,
            push,
            fetch,
@@ -193,7 +206,10 @@ async fn main() {
            cred_save,
            cred_delete,
            set_sync_badge,
-            close_splashscreen
+            close_splashscreen,
+            set_telemetry_enabled,
+            emit_frontend_log,
+            emit_frontend_span
        ])
        .run(tauri::generate_context!())
        .expect("error while running tauri application");
@@ -0,0 +1,363 @@
+use std::{
+    sync::{
+        OnceLock,
+        atomic::{AtomicBool, Ordering},
+        mpsc::{SyncSender, sync_channel},
+    },
+    time::{Duration, SystemTime, UNIX_EPOCH},
+};
+
+use serde::Deserialize;
+use serde_json::json;
+
+const DEFAULT_OTLP_LOGS_ENDPOINT: &str = "https://telemetry.cbsk-tech.de/v1/logs";
+const DEFAULT_OTLP_TRACES_ENDPOINT: &str = "https://telemetry.cbsk-tech.de/v1/traces";
+const DEFAULT_OTLP_METRICS_ENDPOINT: &str = "https://telemetry.cbsk-tech.de/v1/metrics";
+const METRICS_INTERVAL: Duration = Duration::from_secs(30);
+const MAX_BODY_BYTES: usize = 2_048;
+
+static ENABLED: AtomicBool = AtomicBool::new(false);
+static SENDER: OnceLock<SyncSender<TelemetrySignal>> = OnceLock::new();
+
+#[derive(Debug)]
+enum TelemetrySignal {
+    Log(TelemetryRecord),
+    Span(FrontendSpan),
+    Metrics(ProcessMetrics),
+}
+
+#[derive(Debug)]
+struct ProcessMetrics {
+    cpu_utilization: f64,
+    memory_bytes: u64,
+}
+
+#[derive(Debug)]
+struct TelemetryRecord {
+    severity: &'static str,
+    severity_number: u8,
+    body: String,
+    event_name: Option<String>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct FrontendLog {
+    level: String,
+    message: String,
+    event_name: Option<String>,
+}
+
+#[derive(Debug, Deserialize)]
+#[serde(rename_all = "camelCase")]
+pub struct FrontendSpan {
+    name: String,
+    trace_id: String,
+    span_id: String,
+    started_at_ms: u64,
+    duration_ms: f64,
+    success: bool,
+}
+
+pub fn init() {
+    let endpoint = std::env::var("GITTY_OTLP_LOGS_ENDPOINT")
+        .unwrap_or_else(|_| DEFAULT_OTLP_LOGS_ENDPOINT.to_string());
+    let traces_endpoint = std::env::var("GITTY_OTLP_TRACES_ENDPOINT")
+        .unwrap_or_else(|_| DEFAULT_OTLP_TRACES_ENDPOINT.to_string());
+    let metrics_endpoint = std::env::var("GITTY_OTLP_METRICS_ENDPOINT")
+        .unwrap_or_else(|_| DEFAULT_OTLP_METRICS_ENDPOINT.to_string());
+    let (sender, receiver) = sync_channel::<TelemetrySignal>(256);
+    if SENDER.set(sender.clone()).is_err() {
+        return;
+    }
+
+    start_process_metrics(sender);
+
+    std::thread::Builder::new()
+        .name("gitty-telemetry".into())
+        .spawn(move || {
+            let client = match reqwest::blocking::Client::builder()
+                .timeout(Duration::from_secs(5))
+                .build()
+            {
+                Ok(client) => client,
+                Err(error) => {
+                    eprintln!("[WARN] [gitty::telemetry] could not create OTLP client: {error}");
+                    return;
+                }
+            };
+
+            let mut export_warning_shown = false;
+            while let Ok(signal) = receiver.recv() {
+                let (target_endpoint, payload) = match signal {
+                    TelemetrySignal::Log(record) => (&endpoint, log_payload(record)),
+                    TelemetrySignal::Span(span) => (&traces_endpoint, span_payload(span)),
+                    TelemetrySignal::Metrics(metrics) => {
+                        (&metrics_endpoint, metrics_payload(metrics))
+                    }
+                };
+                export(
+                    &client,
+                    target_endpoint,
+                    &payload,
+                    &mut export_warning_shown,
+                );
+            }
+        })
+        .expect("failed to start telemetry worker");
+}
+
+fn start_process_metrics(sender: SyncSender<TelemetrySignal>) {
+    std::thread::Builder::new()
+        .name("gitty-process-metrics".into())
+        .spawn(move || {
+            use sysinfo::{ProcessRefreshKind, ProcessesToUpdate, System};
+
+            let Ok(pid) = sysinfo::get_current_pid() else {
+                return;
+            };
+            let refresh_kind = ProcessRefreshKind::nothing().with_cpu().with_memory();
+            let cpu_count = std::thread::available_parallelism()
+                .map(|count| count.get())
+                .unwrap_or(1) as f64;
+            let mut system = System::new();
+            let mut primed = false;
+
+            loop {
+                std::thread::sleep(METRICS_INTERVAL);
+                if !ENABLED.load(Ordering::Relaxed) {
+                    primed = false;
+                    continue;
+                }
+                system.refresh_processes_specifics(
+                    ProcessesToUpdate::Some(&[pid]),
+                    true,
+                    refresh_kind,
+                );
+                let Some(process) = system.process(pid) else {
+                    continue;
+                };
+                if !primed {
+                    primed = true;
+                    continue;
+                }
+                let metrics = ProcessMetrics {
+                    cpu_utilization: (f64::from(process.cpu_usage()) / (100.0 * cpu_count))
+                        .clamp(0.0, 1.0),
+                    memory_bytes: process.memory(),
+                };
+                let _ = sender.try_send(TelemetrySignal::Metrics(metrics));
+            }
+        })
+        .expect("failed to start process metrics worker");
+}
+
+fn resource_attributes() -> serde_json::Value {
+    json!([
+        { "key": "service.name", "value": { "stringValue": "gitty-desktop" } },
+        { "key": "service.version", "value": { "stringValue": env!("CARGO_PKG_VERSION") } },
+        { "key": "deployment.environment.name", "value": { "stringValue": if cfg!(debug_assertions) { "development" } else { "production" } } },
+        { "key": "os.type", "value": { "stringValue": std::env::consts::OS } },
+        { "key": "host.arch", "value": { "stringValue": std::env::consts::ARCH } }
+    ])
+}
+
+fn log_payload(record: TelemetryRecord) -> serde_json::Value {
+    let timestamp = SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .unwrap_or_default()
+        .as_nanos()
+        .to_string();
+    let mut attributes = vec![json!({
+        "key": "telemetry.sdk.language",
+        "value": { "stringValue": "rust" }
+    })];
+    if let Some(event_name) = record.event_name {
+        attributes.push(json!({
+            "key": "event.name",
+            "value": { "stringValue": event_name }
+        }));
+    }
+    let payload = json!({
+        "resourceLogs": [{
+            "resource": { "attributes": resource_attributes() },
+            "scopeLogs": [{
+                "scope": { "name": "gitty.telemetry" },
+                "logRecords": [{
+                    "timeUnixNano": timestamp,
+                    "observedTimeUnixNano": timestamp,
+                    "severityNumber": record.severity_number,
+                    "severityText": record.severity,
+                    "body": { "stringValue": record.body },
+                    "attributes": attributes
+                }]
+            }]
+        }]
+    });
+    payload
+}
+
+fn span_payload(mut span: FrontendSpan) -> serde_json::Value {
+    if span.name.len() > 128 {
+        span.name.truncate(128);
+    }
+    let start = u128::from(span.started_at_ms) * 1_000_000;
+    let duration = (span.duration_ms.max(0.0) * 1_000_000.0) as u128;
+    let attributes = vec![
+        json!({ "key": "rpc.system", "value": { "stringValue": "tauri" } }),
+        json!({ "key": "rpc.method", "value": { "stringValue": span.name } }),
+    ];
+    json!({
+        "resourceSpans": [{
+            "resource": { "attributes": resource_attributes() },
+            "scopeSpans": [{
+                "scope": { "name": "gitty.tauri", "version": env!("CARGO_PKG_VERSION") },
+                "spans": [{
+                    "traceId": span.trace_id,
+                    "spanId": span.span_id,
+                    "name": format!("tauri.{}", span.name),
+                    "kind": 1,
+                    "startTimeUnixNano": start.to_string(),
+                    "endTimeUnixNano": (start + duration).to_string(),
+                    "attributes": attributes,
+                    "status": {
+                        "code": if span.success { 1 } else { 2 },
+                        "message": if span.success { "" } else { "Tauri command failed" }
+                    }
+                }]
+            }]
+        }]
+    })
+}
+
+fn metrics_payload(metrics: ProcessMetrics) -> serde_json::Value {
+    let timestamp = SystemTime::now()
+        .duration_since(UNIX_EPOCH)
+        .unwrap_or_default()
+        .as_nanos()
+        .to_string();
+    json!({
+        "resourceMetrics": [{
+            "resource": { "attributes": resource_attributes() },
+            "scopeMetrics": [{
+                "scope": { "name": "gitty.process", "version": env!("CARGO_PKG_VERSION") },
+                "metrics": [
+                    {
+                        "name": "process.cpu.utilization",
+                        "description": "Normalized CPU utilization of the Gitty process",
+                        "unit": "1",
+                        "gauge": { "dataPoints": [{
+                            "timeUnixNano": timestamp,
+                            "asDouble": metrics.cpu_utilization,
+                            "attributes": []
+                        }] }
+                    },
+                    {
+                        "name": "process.memory.usage",
+                        "description": "Resident memory used by the Gitty process",
+                        "unit": "By",
+                        "gauge": { "dataPoints": [{
+                            "timeUnixNano": timestamp,
+                            "asInt": metrics.memory_bytes.to_string(),
+                            "attributes": []
+                        }] }
+                    }
+                ]
+            }]
+        }]
+    })
+}
+
+fn export(
+    client: &reqwest::blocking::Client,
+    endpoint: &str,
+    payload: &serde_json::Value,
+    export_warning_shown: &mut bool,
+) {
+    match client.post(endpoint).json(payload).send() {
+        Ok(response) if response.status().is_success() => {
+            if response
+                .headers()
+                .get(reqwest::header::CONTENT_TYPE)
+                .and_then(|value| value.to_str().ok())
+                .is_some_and(|value| value.starts_with("text/html"))
+                && !*export_warning_shown
+            {
+                eprintln!(
+                    "[WARN] [gitty::telemetry] OTLP endpoint returned HTML; configure the collector endpoint with GITTY_OTLP_LOGS_ENDPOINT"
+                );
+                *export_warning_shown = true;
+            }
+        }
+        Ok(response) if !*export_warning_shown => {
+            eprintln!(
+                "[WARN] [gitty::telemetry] OTLP export failed with status {}",
+                response.status()
+            );
+            *export_warning_shown = true;
+        }
+        Err(error) if !*export_warning_shown => {
+            eprintln!("[WARN] [gitty::telemetry] OTLP export failed: {error}");
+            *export_warning_shown = true;
+        }
+        _ => {}
+    }
+}
+
+fn emit(record: TelemetryRecord) {
+    if !ENABLED.load(Ordering::Relaxed) {
+        return;
+    }
+    if let Some(sender) = SENDER.get() {
+        let _ = sender.try_send(TelemetrySignal::Log(record));
+    }
+}
+
+#[tauri::command]
+pub fn set_telemetry_enabled(enabled: bool) {
+    ENABLED.store(enabled, Ordering::Relaxed);
+    if enabled {
+        emit(TelemetryRecord {
+            severity: "INFO",
+            severity_number: 9,
+            body: "Telemetry enabled".into(),
+            event_name: Some("telemetry.enabled".into()),
+        });
+    }
+}
+
+#[tauri::command]
+pub fn emit_frontend_log(log: FrontendLog) {
+    let (severity, severity_number) = match log.level.as_str() {
+        "error" => ("ERROR", 17),
+        "warn" => ("WARN", 13),
+        _ => ("INFO", 9),
+    };
+    let mut body = log.message;
+    if body.len() > MAX_BODY_BYTES {
+        body.truncate(MAX_BODY_BYTES);
+    }
+    emit(TelemetryRecord {
+        severity,
+        severity_number,
+        body,
+        event_name: log.event_name,
+    });
+}
+
+#[tauri::command]
+pub fn emit_frontend_span(span: FrontendSpan) {
+    if !ENABLED.load(Ordering::Relaxed) {
+        return;
+    }
+    if span.trace_id.len() != 32
+        || span.span_id.len() != 16
+        || !span.trace_id.bytes().all(|byte| byte.is_ascii_hexdigit())
+        || !span.span_id.bytes().all(|byte| byte.is_ascii_hexdigit())
+    {
+        return;
+    }
+    if let Some(sender) = SENDER.get() {
+        let _ = sender.try_send(TelemetrySignal::Span(span));
+    }
+}
@@ -1,7 +1,7 @@
 {
  "$schema": "https://schema.tauri.app/config/2",
  "productName": "Gitty",
-  "version": "2026.7.20",
+  "version": "2026.7.22",
  "identifier": "com.gitty",
  "build": {
    "beforeDevCommand": "npm run dev",
@@ -1,7 +1,6 @@
 <script lang="ts">
  import { onDestroy, onMount, tick } from "svelte";
  import { getVersion } from "@tauri-apps/api/app";
-  import { invoke } from "@tauri-apps/api/core";
  import { open as openDialog } from "@tauri-apps/plugin-dialog";
  import { check, type DownloadEvent, type Update } from "@tauri-apps/plugin-updater";
  import { AlertCircle, Cherry, Download, FolderOpen, GitBranch, GitMerge, LoaderCircle, Plus, Search, Star, X } from "@lucide/svelte";
@@ -11,6 +10,7 @@
  import RepoTabs from "./lib/RepoTabs.svelte";
  import AiSettingsDialog from "./lib/components/AiSettingsDialog.svelte";
  import AiReviewDialog from "./lib/components/AiReviewDialog.svelte";
+  import AiCommitSplitDialog from "./lib/components/AiCommitSplitDialog.svelte";
  import AnalyticsNoticeDialog from "./lib/components/AnalyticsNoticeDialog.svelte";
  import AppSettingsDialog from "./lib/components/AppSettingsDialog.svelte";
  import BranchDeleteConfirmDialog from "./lib/components/BranchDeleteConfirmDialog.svelte";
@@ -38,10 +38,12 @@
  import StatusPanel from "./lib/components/StatusPanel.svelte";
  import SyncSettingsDialog from "./lib/components/SyncSettingsDialog.svelte";
  import UpdateToast from "./lib/components/UpdateToast.svelte";
+  import WorktreeDialog from "./lib/components/WorktreeDialog.svelte";

  import {
    amendCommit,
    addRemote,
+    addWorktree,
    checkoutBranch,
    cherryPickAbort,
    cherryPickCommit,
@@ -50,6 +52,7 @@
    commit,
    commitAiGenerate,
    commitAiReview,
+    commitAiSplit,
    commitAiLoad,
    commitAiLocalModels,
    commitAiStatus,
@@ -73,6 +76,7 @@
    listRemotes,
    listStashes,
    listTags,
+    listWorktrees,
    listCommits,
    listFileHistory,
    listInteractiveRebaseCommits,
@@ -84,10 +88,15 @@
    openRepoInExplorer,
    openRepositoryFile,
    openRepositoryBundle,
+    lockWorktree,
+    moveWorktree,
+    pruneWorktrees,
    pull,
    push,
    pushTag,
    removeRemote,
+    removeWorktree,
+    repairWorktree,
    revertCommit,
    setBranchUpstream,
    updateRemote,
@@ -116,11 +125,13 @@
    stashPop,
    stashPush,
    undoLastCommit,
+    unlockWorktree,
    unstageFiles,
  } from "./lib/git";

  import type {
    AiReviewResult,
+    AiCommitPlan,
    AiSettings,
    AppLanguage,
    AppTheme,
@@ -143,6 +154,7 @@
    GitStash,
    GitStatus,
    GitTag,
+    GitWorktree,
    LocalModelOption,
    PatchApplyAction,
    PreparedResolution,
@@ -160,6 +172,7 @@
    summarizeGitError,
  } from "./lib/credentials";
  import { trackAnalyticsEvent, type AnalyticsEventProperties } from "./lib/analytics";
+  import { setTelemetryEnabled, tracedInvoke } from "./lib/telemetry";

  type UpdateToastState = "available" | "downloading" | "installed" | "error";
  type AppView = "management" | "repository";
@@ -167,7 +180,7 @@
  type PendingDiscard =
    | { kind: "file"; files: GitFileStatus[]; staged: boolean }
    | { kind: "all-changes"; files: GitFileStatus[] }
-    | { kind: "hunk"; file: GitFileStatus; staged: boolean; action: PatchApplyAction; patch: string };
+    | { kind: "patch"; file: GitFileStatus; staged: boolean; action: PatchApplyAction; patch: string; scope: "hunk" | "lines" };

  interface RepoTab {
    path: string;
@@ -191,6 +204,14 @@
    directoryName: string;
  }

+  interface ErrorAutoHideState {
+    timer?: ReturnType<typeof setTimeout>;
+    message: string;
+    remaining: number;
+    startedAt: number;
+    clearIfCurrent: (message: string) => void;
+  }
+
  const OPEN_REPOS_KEY = "gitlite.openRepos.v1";
  const RECENT_REPOS_KEY = "gitlite.recentRepos.v1";
  const FAVORITE_REPOS_KEY = "gitlite.favoriteRepos.v1";
@@ -267,6 +288,7 @@
  let fileHistoryLoading = false;
  let fileHistoryRequestId = 0;
  let activeFileHistoryRequestId = "";
+  let repoOpenRequestId = 0;
  let lastFileHistoryHeadHash = "";
  let commitMessage = "";
  let amendMode = false;
@@ -275,6 +297,9 @@
  let commitAiPhase: CommitAiPhase = "idle";
  let commitAiGenerating = false;
  let commitAiReviewing = false;
+  let commitAiSplitting = false;
+  let aiCommitPlan: AiCommitPlan | null = null;
+  let aiCommitSplitOpen = false;
  let aiReviewResult: AiReviewResult | null = null;
  let aiReviewOpen = false;
  let commitAiPollTimer: ReturnType<typeof setInterval> | undefined;
@@ -296,6 +321,11 @@
  let renameBranchTarget: GitBranchInfo | null = null;
  let deleteBranchTarget: GitBranchInfo | null = null;
  let deleteBranchForce = false;
+  let worktreeDialogOpen = false;
+  let worktreeInitialBranch = "";
+  let worktrees: GitWorktree[] = [];
+  let worktreesLoading = false;
+  let worktreeError = "";
  let compareSelectOpen = false;
  let compareDialogOpen = false;
  let interactiveRebaseOpen = false;
@@ -364,7 +394,7 @@
  let updateCheckInFlight = false;
  let updateDownloadTotal = 0;
  let updateDownloadedBytes = 0;
-  let errorAutoHideTimers: Partial<Record<string, ReturnType<typeof setTimeout>>> = {};
+  let errorAutoHideStates: Partial<Record<string, ErrorAutoHideState>> = {};
  let commitPanelHeight = loadCommitPanelHeight();
  let resizingCommitPanel = false;
  let resizeStartY = 0;
@@ -467,8 +497,8 @@
    if (backgroundFetchTimer) clearInterval(backgroundFetchTimer);
    if (commitAiPollTimer) clearInterval(commitAiPollTimer);
    if (cloneDialogErrorTimer) clearTimeout(cloneDialogErrorTimer);
-    Object.values(errorAutoHideTimers).forEach((timer) => {
-      if (timer) clearTimeout(timer);
+    Object.values(errorAutoHideStates).forEach((state) => {
+      if (state?.timer) clearTimeout(state.timer);
    });
    if (activeFileHistoryRequestId) void cancelFileHistory(activeFileHistoryRequestId);
  });
@@ -503,7 +533,7 @@

  async function closeStartupSplashscreen() {
    try {
-      await invoke("close_splashscreen");
+      await tracedInvoke("close_splashscreen");
    } catch {
      // Browser preview and failed startup paths should keep working without Tauri.
    }
@@ -711,7 +741,7 @@
  }

  async function autoRefreshTick() {
-    if (!autoRefreshEnabled || activeView !== "repository" || !activeRepoPath || isBusy || autoRefreshInFlight || resolveDialogOpen || compareDialogOpen || compareSelectOpen || interactiveRebaseOpen || reflogOpen || newBranchCommit || globalSearchOpen || helpOpen) return;
+    if (!autoRefreshEnabled || activeView !== "repository" || !activeRepoPath || isBusy || autoRefreshInFlight || resolveDialogOpen || compareDialogOpen || compareSelectOpen || interactiveRebaseOpen || reflogOpen || worktreeDialogOpen || newBranchCommit || globalSearchOpen || helpOpen) return;
    const path = activeRepoPath;
    autoRefreshInFlight = true;
    try {
@@ -815,6 +845,7 @@

  function initAnalytics() {
    analyticsSettings = loadAnalyticsSettings();
+    setTelemetryEnabled(analyticsSettings.noticeSeen && analyticsSettings.enabled);
    if (!analyticsSettings.noticeSeen) {
      analyticsNoticeOpen = true;
      return;
@@ -831,6 +862,7 @@
    analyticsSettings = { enabled, noticeSeen: true };
    persistAnalyticsSettings(analyticsSettings);
    analyticsNoticeOpen = false;
+    setTelemetryEnabled(enabled);
    trackEvent("app_started", { first_run: 1 });
  }

@@ -900,6 +932,7 @@
    persistThemePreference(nextTheme);
    persistLanguagePreference(nextLanguage);
    persistStoredBoolean(AUTO_REFRESH_ENABLED_KEY, nextAutoRefresh);
+    setTelemetryEnabled(next.enabled);
    appSettingsOpen = false;
    if (nextAutoRefresh && !autoRefreshWasEnabled) void autoRefreshTick();
    if (next.enabled) trackEvent("settings_saved", { analytics_enabled: 1, theme: nextTheme, language: nextLanguage, auto_refresh: nextAutoRefresh ? 1 : 0 });
@@ -1008,6 +1041,75 @@
    }
  }

+  async function splitStagedWithAi() {
+    if (!activeRepoPath || commitAiSplitting || stagedCount < 2) return;
+    if (aiSettings.provider === "local") {
+      errorMessage = "Commit splitting currently requires OpenAI, Anthropic, or a custom endpoint.";
+      return;
+    }
+    commitAiSplitting = true;
+    errorMessage = "";
+    try {
+      if (aiSettings.provider === "openai") {
+        const cred = await credLoad("ai:openai");
+        aiCommitPlan = await commitAiSplit(activeRepoPath, { provider: "openai", model: aiSettings.openaiModel, apiKey: cred?.password });
+      } else if (aiSettings.provider === "anthropic") {
+        const cred = await credLoad("ai:anthropic");
+        aiCommitPlan = await commitAiSplit(activeRepoPath, { provider: "anthropic", model: aiSettings.anthropicModel, apiKey: cred?.password });
+      } else {
+        const cred = await credLoad("ai:custom");
+        aiCommitPlan = await commitAiSplit(activeRepoPath, {
+          provider: "custom", model: aiSettings.customModel, baseUrl: aiSettings.customBaseUrl, apiKey: cred?.password,
+        });
+      }
+      aiCommitSplitOpen = true;
+      trackEvent("ai_commit_split_planned", { provider: aiSettings.provider, groups: aiCommitPlan.groups.length });
+    } catch (error) {
+      errorMessage = errorToMessage(error);
+    } finally {
+      commitAiSplitting = false;
+    }
+  }
+
+  async function applyAiCommitPlan(plan: AiCommitPlan) {
+    if (!activeRepoPath || isBusy || commitAiSplitting) return;
+    const allFiles = plan.groups.flatMap((group) => group.files);
+    if (plan.groups.length < 2 || plan.groups.some((group) => !group.message.trim() || group.files.length === 0)) return;
+    const currentStaged = changedFiles.filter((file) => file.staged !== null).map((file) => file.path).sort();
+    if (currentStaged.join("\n") !== [...allFiles].sort().join("\n")) {
+      errorMessage = "The staged files changed after the plan was created. Generate a new split plan.";
+      return;
+    }
+    if (changedFiles.some((file) => file.staged !== null && file.unstaged !== null)) {
+      errorMessage = "A file now has both staged and unstaged changes. Stage or discard the remaining changes first.";
+      return;
+    }
+
+    commitAiSplitting = true;
+    await runOperation("Creating split commits", async () => {
+      applyStatus(await unstageFiles(activeRepoPath, currentStaged));
+      let completed = 0;
+      try {
+        for (const group of plan.groups) {
+          applyStatus(await stageFiles(activeRepoPath, group.files));
+          applyStatus(await commit(activeRepoPath, group.message.trim()));
+          completed += 1;
+        }
+      } catch (error) {
+        throw new Error(`${completed} of ${plan.groups.length} commits were created. Remaining changes are preserved and can be staged again. ${errorToMessage(error)}`);
+      }
+      aiCommitSplitOpen = false;
+      aiCommitPlan = null;
+      commitMessage = "";
+      await refreshBranchList(activeRepoPath);
+      await refreshCommitHistory(activeRepoPath);
+      await refreshExplorerFiles(activeRepoPath);
+      await refreshFileHistory(activeRepoPath);
+      trackEvent("ai_commit_split_applied", { groups: plan.groups.length, files: allFiles.length });
+    });
+    commitAiSplitting = false;
+  }
+
  // ── Updates ────────────────────────────────────────────────────────────────

  async function checkForUpdates() {
@@ -1107,18 +1209,39 @@
    message: string,
    clearIfCurrent: (message: string) => void,
  ) {
-    const existing = errorAutoHideTimers[key];
-    if (existing) {
-      clearTimeout(existing);
-      delete errorAutoHideTimers[key];
+    const existing = errorAutoHideStates[key];
+    if (existing?.timer) {
+      clearTimeout(existing.timer);
    }
+    delete errorAutoHideStates[key];

    if (!message) return;

-    errorAutoHideTimers[key] = setTimeout(() => {
-      clearIfCurrent(message);
-      delete errorAutoHideTimers[key];
-    }, ERROR_AUTO_HIDE_MS);
+    errorAutoHideStates[key] = {
+      message,
+      remaining: ERROR_AUTO_HIDE_MS,
+      startedAt: Date.now(),
+      clearIfCurrent,
+    };
+    resumeAutoHideError(key);
+  }
+
+  function pauseAutoHideError(key: string) {
+    const state = errorAutoHideStates[key];
+    if (!state?.timer) return;
+    clearTimeout(state.timer);
+    state.timer = undefined;
+    state.remaining = Math.max(0, state.remaining - (Date.now() - state.startedAt));
+  }
+
+  function resumeAutoHideError(key: string) {
+    const state = errorAutoHideStates[key];
+    if (!state || state.timer) return;
+    state.startedAt = Date.now();
+    state.timer = setTimeout(() => {
+      state.clearIfCurrent(state.message);
+      delete errorAutoHideStates[key];
+    }, state.remaining);
  }

  function repoKey(path: string): string {
@@ -1728,6 +1851,10 @@
    globalSearchResults = [];
    deleteBranchTarget = null;
    deleteBranchForce = false;
+    worktreeDialogOpen = false;
+    worktreeInitialBranch = "";
+    worktrees = [];
+    worktreeError = "";
    globalSearchOpen = false;
    globalSearchError = "";
    resolveDialogOpen = false;
@@ -1746,9 +1873,11 @@
  }

  function errorToMessage(error: unknown): string {
-    if (error instanceof Error) return error.message;
-    if (typeof error === "string") return error;
-    try { return JSON.stringify(error) ?? "Unknown error"; } catch { return "Unknown error"; }
+    let message: string;
+    if (error instanceof Error) message = error.message;
+    else if (typeof error === "string") message = error;
+    else try { message = JSON.stringify(error) ?? "Unknown error"; } catch { message = "Unknown error"; }
+    return message;
  }

  function isNonFastForwardPushError(message: string): boolean {
@@ -1903,6 +2032,7 @@
  async function openRepo(pathOverride?: string) {
    const path = (pathOverride ?? repoPath).trim();
    if (!path) { errorMessage = "Enter a repository path."; return; }
+    const requestId = ++repoOpenRequestId;
    repoPath = path;

    await runOperation("Opening repository", async () => {
@@ -1914,6 +2044,7 @@
      // Single backend round-trip: resolves the repo and reads status, branches,
      // commits and files in one pass instead of four sequential git calls.
      const bundle = await openRepositoryBundle(path, 100);
+      if (requestId !== repoOpenRequestId) return;
      resetRepositoryState(false);
      applyStatus(bundle.status);
      if (globalSearchBusy) void cancelGlobalSearch();
@@ -2107,8 +2238,18 @@

    if (!wasActive) return;
    if (next) {
+      // Switch identity immediately. Otherwise a status/fetch request for the
+      // just-closed repository can still finish while it remains active and
+      // reinsert its tab through applyStatus().
+      repoOpenRequestId += 1;
+      activeRepoPath = next.path;
+      repoPath = next.path;
+      status = null;
+      lastStatusFingerprint = "";
+      resetRepositoryState(false);
      await openRepo(next.path);
    } else {
+      repoOpenRequestId += 1;
      resetRepositoryState(true);
      activeView = "management";
    }
@@ -2335,6 +2476,146 @@
    deleteBranchForce = false;
  }

+  async function openWorktreeDialog(branch = "") {
+    if (!activeRepoPath || isBusy) return;
+    worktreeInitialBranch = branch;
+    worktreeDialogOpen = true;
+    worktreeError = "";
+    worktreesLoading = true;
+    try {
+      worktrees = await listWorktrees(activeRepoPath);
+      trackEvent("worktree_dialog_opened", { linked_worktrees: Math.max(0, worktrees.length - 1) });
+    } catch (error) {
+      worktreeError = errorToMessage(error);
+    } finally {
+      worktreesLoading = false;
+    }
+  }
+
+  function openBranchInWorktree(branch: GitBranchInfo) {
+    if (branch.remote) return;
+    void openWorktreeDialog(branch.name);
+  }
+
+  async function refreshWorktrees() {
+    if (!activeRepoPath || worktreesLoading) return;
+    worktreesLoading = true;
+    worktreeError = "";
+    try {
+      worktrees = await listWorktrees(activeRepoPath);
+    } catch (error) {
+      worktreeError = errorToMessage(error);
+    } finally {
+      worktreesLoading = false;
+    }
+  }
+
+  async function runWorktreeOperation(
+    label: string,
+    task: () => Promise<GitWorktree[]>,
+    eventName: string,
+  ): Promise<boolean> {
+    if (!activeRepoPath || isBusy) return false;
+    operation = label;
+    worktreeError = "";
+    try {
+      worktrees = await task();
+      await refreshBranchList(activeRepoPath);
+      trackEvent(eventName, { linked_worktrees: Math.max(0, worktrees.length - 1) });
+      return true;
+    } catch (error) {
+      worktreeError = errorToMessage(error);
+      return false;
+    } finally {
+      operation = "";
+    }
+  }
+
+  async function createWorktree(request: {
+    worktreePath: string;
+    branch?: string;
+    newBranch?: string;
+    startPoint?: string;
+    detached?: boolean;
+    lock?: boolean;
+  }): Promise<boolean> {
+    return runWorktreeOperation(
+      "Creating worktree",
+      () => addWorktree(activeRepoPath, request.worktreePath, request),
+      "worktree_created",
+    );
+  }
+
+  async function openWorktreeTab(worktree: GitWorktree) {
+    if (worktree.missing || worktree.bare || isBusy) return;
+    worktreeDialogOpen = false;
+    worktreeInitialBranch = "";
+    await openRepo(worktree.path);
+  }
+
+  async function removeSelectedWorktree(worktree: GitWorktree, force: boolean): Promise<boolean> {
+    if (repoTabs.some((tab) => sameRepoPath(tab.path, worktree.path))) {
+      worktreeError = "Close this worktree's repository tab before removing it.";
+      return false;
+    }
+    return runWorktreeOperation(
+      `Removing ${worktree.branch || "worktree"}`,
+      () => removeWorktree(activeRepoPath, worktree.path, force),
+      "worktree_removed",
+    );
+  }
+
+  async function moveSelectedWorktree(worktree: GitWorktree, destination: string) {
+    if (repoTabs.some((tab) => sameRepoPath(tab.path, worktree.path))) {
+      worktreeError = "Close this worktree's repository tab before moving it.";
+      return;
+    }
+    await runWorktreeOperation(
+      `Moving ${worktree.branch || "worktree"}`,
+      () => moveWorktree(activeRepoPath, worktree.path, destination),
+      "worktree_moved",
+    );
+  }
+
+  function lockSelectedWorktree(worktree: GitWorktree, reason: string): Promise<boolean> {
+    return runWorktreeOperation(
+      `Locking ${worktree.branch || "worktree"}`,
+      () => lockWorktree(activeRepoPath, worktree.path, reason),
+      "worktree_locked",
+    );
+  }
+
+  async function unlockSelectedWorktree(worktree: GitWorktree) {
+    await runWorktreeOperation(
+      `Unlocking ${worktree.branch || "worktree"}`,
+      () => unlockWorktree(activeRepoPath, worktree.path),
+      "worktree_unlocked",
+    );
+  }
+
+  async function pruneStaleWorktrees() {
+    await runWorktreeOperation(
+      "Pruning stale worktrees",
+      () => pruneWorktrees(activeRepoPath),
+      "worktrees_pruned",
+    );
+  }
+
+  async function repairSelectedWorktree(worktree: GitWorktree, location: string) {
+    await runWorktreeOperation(
+      `Repairing ${worktree.branch || "worktree"}`,
+      () => repairWorktree(activeRepoPath, location),
+      "worktree_repaired",
+    );
+  }
+
+  function closeWorktreeDialog() {
+    if (isBusy) return;
+    worktreeDialogOpen = false;
+    worktreeInitialBranch = "";
+    worktreeError = "";
+  }
+
  function openNewBranchDialog(commit: GitCommit) {
    if (!activeRepoPath || isBusy) return;
    newBranchCommit = commit;
@@ -3110,14 +3391,15 @@
    blameError = "";
  }

-  function patchOperationLabel(action: PatchApplyAction, file: GitFileStatus): string {
+  function patchOperationLabel(action: PatchApplyAction, file: GitFileStatus, scope: "hunk" | "lines"): string {
+    const target = scope === "lines" ? "selected lines" : "hunk";
    switch (action) {
      case "stage":
-        return `Staging hunk in ${file.path}`;
+        return `Staging ${target} in ${file.path}`;
      case "unstage":
-        return `Unstaging hunk in ${file.path}`;
+        return `Unstaging ${target} in ${file.path}`;
      default:
-        return `Discarding hunk in ${file.path}`;
+        return `Discarding ${target} in ${file.path}`;
    }
  }

@@ -3130,9 +3412,10 @@
    patch: string,
    file: GitFileStatus,
    staged: boolean,
+    scope: "hunk" | "lines",
  ) {
    if (!activeRepoPath || isBusy) return;
-    operation = patchOperationLabel(action, file);
+    operation = patchOperationLabel(action, file, scope);
    errorMessage = "";
    linePatchError = "";

@@ -3160,21 +3443,21 @@
    }
  }

-  async function applyLinePatch(action: PatchApplyAction, patch: string) {
+  async function applyLinePatch(action: PatchApplyAction, patch: string, scope: "hunk" | "lines") {
    if (!activeRepoPath || !linePatchFile || isBusy) return;
    const file = linePatchFile;
    const staged = linePatchStaged;

    if (isDiscardPatchAction(action)) {
-      pendingDiscard = { kind: "hunk", file, staged, action, patch };
+      pendingDiscard = { kind: "patch", file, staged, action, patch, scope };
      trackEvent("discard_confirm_opened", {
-        kind: "hunk",
+        kind: scope,
        staged: staged ? 1 : 0,
      });
      return;
    }

-    await runLinePatchAction(action, patch, file, staged);
+    await runLinePatchAction(action, patch, file, staged, scope);
  }

  async function confirmDiscard() {
@@ -3186,7 +3469,7 @@
    } else if (discard.kind === "all-changes") {
      await runDiscardAllChanges(discard.files);
    } else {
-      await runLinePatchAction(discard.action, discard.patch, discard.file, discard.staged);
+      await runLinePatchAction(discard.action, discard.patch, discard.file, discard.staged, discard.scope);
    }

    pendingDiscard = null;
@@ -3696,6 +3979,7 @@
    else if (event.key === "Escape" && newBranchCommit) newBranchCommit = null;
    else if (event.key === "Escape" && renameBranchTarget) renameBranchTarget = null;
    else if (event.key === "Escape" && deleteBranchTarget) closeDeleteBranchDialog();
+    else if (event.key === "Escape" && worktreeDialogOpen) closeWorktreeDialog();
    else if (event.key === "Escape" && interactiveRebaseOpen && !isBusy) interactiveRebaseOpen = false;
    else if (event.key === "Escape" && reflogOpen && !isBusy) reflogOpen = false;
    else if (event.key === "Escape" && compareSelectOpen) compareSelectOpen = false;
@@ -3793,14 +4077,39 @@
      {/if}
    {/if}

-    <!-- Status notices -->
+    <!-- Global error toast -->
    {#if errorMessage}
-      <section class="notice error" role="alert">
-        <AlertCircle size={17} aria-hidden="true" />
-        <span>{errorMessage}</span>
-      </section>
+      {#key errorMessage}
+        <div class="error-toast-region" aria-live="assertive" aria-atomic="true">
+          <section
+            class="error-toast"
+            role="alert"
+            onmouseenter={() => pauseAutoHideError("errorMessage")}
+            onmouseleave={() => resumeAutoHideError("errorMessage")}
+          >
+            <div class="error-toast-icon">
+              <AlertCircle size={20} aria-hidden="true" />
+            </div>
+            <div class="error-toast-content">
+              <strong>{appLanguage === "de" ? "Etwas ist schiefgelaufen" : "Something went wrong"}</strong>
+              <span>{errorMessage}</span>
+            </div>
+            <button
+              class="error-toast-close"
+              type="button"
+              onclick={() => { errorMessage = ""; }}
+              title={appLanguage === "de" ? "Schließen" : "Close"}
+              aria-label={appLanguage === "de" ? "Fehlermeldung schließen" : "Dismiss error"}
+            >
+              <X size={15} aria-hidden="true" />
+            </button>
+            <div class="error-toast-timeout" aria-hidden="true"></div>
+          </section>
+        </div>
+      {/key}
    {/if}

+    <!-- Status notices -->
    {#if operation && operation !== "Opening repository" && !hasRepository}
      <section class="notice busy" aria-live="polite">
        <LoaderCircle class="spin" size={17} aria-hidden="true" />
@@ -4056,6 +4365,8 @@
          onCreateTag={createNewTag}
          onDeleteTag={deleteLocalTag}
          onPushTag={pushLocalTag}
+          onManageWorktrees={() => { void openWorktreeDialog(); }}
+          onCreateWorktree={openBranchInWorktree}
          collapsed={branchPanelCollapsed}
          onToggleCollapsed={toggleBranchPanelCollapsed}
        />
@@ -4217,12 +4528,14 @@
            {commitAiPhase}
            {commitAiGenerating}
            {commitAiReviewing}
+            {commitAiSplitting}
            {canAmend}
            {amendMode}
            onCommit={commitChanges}
            onCommitMessageChange={updateCommitMessage}
            onGenerateCommitMessage={generateCommitMessageWithAi}
            onReviewStaged={reviewStagedWithAi}
+            onSplitStaged={splitStagedWithAi}
            onOpenAiSettings={() => { aiSettingsOpen = true; }}
            onToggleAmend={toggleAmendMode}
            onUndoLastCommit={undoLastCommitChange}
@@ -4365,6 +4678,15 @@
  />
 {/if}

+{#if aiCommitSplitOpen && aiCommitPlan}
+  <AiCommitSplitDialog
+    plan={aiCommitPlan}
+    isApplying={commitAiSplitting}
+    onApply={applyAiCommitPlan}
+    onClose={() => { if (!commitAiSplitting) aiCommitSplitOpen = false; }}
+  />
+{/if}
+
 {#if linePatchOpen && linePatchFile}
  <LinePatchDialog
    file={linePatchFile}
@@ -4392,9 +4714,9 @@

 {#if pendingDiscard}
  <DiscardConfirmDialog
-    files={pendingDiscard.kind === "hunk" ? [pendingDiscard.file] : pendingDiscard.files}
+    files={pendingDiscard.kind === "patch" ? [pendingDiscard.file] : pendingDiscard.files}
    staged={pendingDiscard.kind === "all-changes" ? null : pendingDiscard.staged}
-    scope={pendingDiscard.kind === "hunk" ? "hunk" : "file"}
+    scope={pendingDiscard.kind === "patch" ? pendingDiscard.scope : "file"}
    {isBusy}
    onConfirm={confirmDiscard}
    onClose={closeDiscardConfirm}
@@ -4421,6 +4743,27 @@
  />
 {/if}

+{#if worktreeDialogOpen}
+  <WorktreeDialog
+    {worktrees}
+    {branches}
+    initialBranch={worktreeInitialBranch}
+    isLoading={worktreesLoading}
+    {isBusy}
+    error={worktreeError}
+    onRefresh={refreshWorktrees}
+    onOpen={openWorktreeTab}
+    onAdd={createWorktree}
+    onRemove={removeSelectedWorktree}
+    onMove={moveSelectedWorktree}
+    onLock={lockSelectedWorktree}
+    onUnlock={unlockSelectedWorktree}
+    onPrune={pruneStaleWorktrees}
+    onRepair={repairSelectedWorktree}
+    onClose={closeWorktreeDialog}
+  />
+{/if}
+
 <!-- Create a branch from a specific commit in the history -->
 {#if newBranchCommit}
  <NewBranchDialog
@@ -37,7 +37,7 @@
  --app-select-option-bg: #171d2b;
  --app-panel-highlight: linear-gradient(180deg, rgba(255,255,255,0.038), transparent 70%);
  --app-panel-shadow: 0 18px 48px rgba(0,0,0,0.28), inset 0 1px 0 rgba(255,255,255,0.045);
-  --app-dialog-backdrop: #070a10;
+  --app-dialog-backdrop: rgba(4, 7, 12, 0.58);
  --app-dialog-bg: #101622;
  --app-dialog-chrome: #141b29;
  --app-dialog-shadow: 0 24px 68px rgba(0, 0, 0, 0.54), 0 2px 12px rgba(0,0,0,0.32);
@@ -103,7 +103,7 @@
  --app-select-option-bg: #ffffff;
  --app-panel-highlight: linear-gradient(180deg, rgba(255,255,255,0.72), transparent 70%);
  --app-panel-shadow: 0 18px 48px rgba(28, 44, 74, 0.12), inset 0 1px 0 rgba(255,255,255,0.86);
-  --app-dialog-backdrop: rgba(232, 238, 248, 0.96);
+  --app-dialog-backdrop: rgba(222, 229, 241, 0.56);
  --app-dialog-bg: #ffffff;
  --app-dialog-chrome: #f4f7fc;
  --app-dialog-shadow: 0 24px 72px rgba(28, 44, 74, 0.2), 0 2px 12px rgba(28,44,74,0.1);
@@ -1222,6 +1222,113 @@
    color: #eadfff;
  }

+  /* --- Global error toast --- */
+
+  .error-toast-region {
+    position: fixed;
+    top: calc(var(--app-titlebar-height, 40px) + 14px);
+    left: 50%;
+    z-index: 90;
+    width: min(560px, calc(100vw - 32px));
+    pointer-events: none;
+    transform: translateX(-50%);
+  }
+
+  .error-toast {
+    position: relative;
+    display: grid;
+    grid-template-columns: auto minmax(0, 1fr) auto;
+    align-items: start;
+    gap: 11px;
+    width: 100%;
+    padding: 13px 13px 14px;
+    overflow: hidden;
+    border: 1px solid rgba(232,96,96,0.46);
+    border-radius: 13px;
+    color: var(--color-ink);
+    background:
+      linear-gradient(135deg, rgba(232,96,96,0.18), rgba(100,108,255,0.08)),
+      rgba(12,13,24,0.96);
+    box-shadow: 0 18px 54px rgba(0,0,0,0.46), 0 0 0 1px rgba(255,255,255,0.035) inset;
+    backdrop-filter: blur(18px);
+    pointer-events: auto;
+    animation: error-toast-in 180ms cubic-bezier(.2,.8,.2,1) both;
+  }
+
+  .error-toast-icon {
+    display: grid;
+    place-items: center;
+    width: 34px;
+    height: 34px;
+    border: 1px solid rgba(232,96,96,0.28);
+    border-radius: 10px;
+    color: #ff9b9b;
+    background: rgba(232,96,96,0.12);
+  }
+
+  .error-toast-content {
+    display: grid;
+    gap: 3px;
+    min-width: 0;
+    padding-top: 1px;
+  }
+
+  .error-toast-content strong {
+    color: #fff;
+    font-size: 13px;
+    font-weight: 800;
+    line-height: 1.25;
+  }
+
+  .error-toast-content span {
+    color: var(--color-ink-muted);
+    font-size: 12.5px;
+    line-height: 1.45;
+    overflow-wrap: anywhere;
+  }
+
+  .error-toast-close {
+    width: 28px;
+    min-width: 28px;
+    min-height: 28px;
+    padding: 0;
+    border-color: rgba(255,255,255,0.1);
+    border-radius: 8px;
+    color: var(--color-ink-dim);
+    background: rgba(255,255,255,0.04);
+  }
+
+  .error-toast-close:hover:not(:disabled) {
+    border-color: rgba(255,255,255,0.2);
+    color: #fff;
+    background: rgba(255,255,255,0.1);
+  }
+
+  .error-toast-timeout {
+    position: absolute;
+    right: 0;
+    bottom: 0;
+    left: 0;
+    height: 2px;
+    background: linear-gradient(90deg, #ff7878, #ef9a9a);
+    transform-origin: left;
+    animation: error-toast-timeout 6s linear both;
+  }
+
+  .error-toast:hover .error-toast-timeout {
+    animation-play-state: paused;
+  }
+
+  @keyframes error-toast-in {
+    from { opacity: 0; transform: translateY(-10px) scale(.985); }
+    to { opacity: 1; transform: translateY(0) scale(1); }
+  }
+
+  @keyframes error-toast-timeout {
+    from { transform: scaleX(1); }
+    to { transform: scaleX(0); }
+  }
+
  /* --- Update toast --- */

  .update-toast {
@@ -1957,6 +2064,20 @@
  .tag-group-head { display: flex; align-items: center; gap: 6px; }
  .tag-group-head .branch-group-toggle { flex: 1; min-width: 0; }
  .tag-group-head .branch-create-toggle { flex-shrink: 0; }
+  .worktree-group-toggle {
+    border-color: rgba(77, 182, 214, 0.12);
+    background: linear-gradient(90deg, rgba(77, 182, 214, 0.055), transparent 72%);
+  }
+  .worktree-group-toggle:hover:not(:disabled) {
+    border-color: rgba(77, 182, 214, 0.25);
+    background: linear-gradient(90deg, rgba(77, 182, 214, 0.1), rgba(77, 182, 214, 0.025));
+    color: var(--color-ink);
+  }
+  .worktree-group-toggle svg { color: #76cde7; }
+  .worktree-group-toggle .branch-group-count {
+    color: #9edced;
+    background: rgba(77, 182, 214, 0.11);
+  }

  .tag-create-form { grid-template-columns: auto minmax(0, 1fr) minmax(0, 1fr) auto auto; }

@@ -2950,6 +3071,8 @@
    padding: 24px;
    background-color: var(--app-dialog-backdrop);
    background-image: none;
+    -webkit-backdrop-filter: blur(10px) saturate(0.78);
+    backdrop-filter: blur(10px) saturate(0.78);
  }

  .app-chrome-backdrop {
@@ -3142,6 +3265,29 @@
    max-height: calc(100vh - 32px);
    overflow: auto;
  }
+  .branch-delete-dialog {
+    display: grid;
+    grid-template-rows: auto auto auto;
+    width: min(500px, calc(100vw - 32px));
+    height: auto;
+    max-height: calc(100vh - 32px);
+    border-color: rgba(255, 90, 103, 0.22);
+    box-shadow: var(--app-dialog-shadow), 0 0 0 1px rgba(255, 90, 103, 0.04);
+    overflow: auto;
+  }
+  .worktree-dialog {
+    grid-template-rows: auto auto auto minmax(0, 1fr) auto;
+    width: min(920px, calc(100vw - 32px));
+    height: min(820px, calc(100vh - 32px));
+    border-color: rgba(77, 182, 214, 0.24);
+  }
+  .worktree-confirm-dialog {
+    grid-template-rows: auto auto auto;
+    width: min(520px, calc(100vw - 32px));
+    height: auto;
+    max-height: calc(100vh - 32px);
+  }
+  .worktree-nested-backdrop { z-index: 70; }
  .ai-settings-dialog {
    display: block;
    width: min(560px, calc(100vw - 32px));
@@ -3646,7 +3792,30 @@
    display: grid;
    grid-template-columns: auto minmax(0, 1fr);
    gap: 14px;
-    padding: 18px 16px 16px;
+    padding: 20px 18px 18px;
+  }
+  .branch-delete-header {
+    padding: 15px 16px;
+    background:
+      linear-gradient(90deg, rgba(255, 90, 103, 0.08), transparent 42%),
+      var(--app-dialog-chrome);
+  }
+  .branch-delete-heading { display: flex; align-items: center; gap: 11px; }
+  .branch-delete-heading-icon {
+    display: grid;
+    place-items: center;
+    width: 32px;
+    height: 32px;
+    flex: 0 0 auto;
+    border: 1px solid rgba(255, 90, 103, 0.28);
+    border-radius: 8px;
+    color: #ff9aa4;
+    background: rgba(255, 90, 103, 0.09);
+  }
+  .branch-delete-heading-icon.force {
+    border-color: rgba(255, 174, 92, 0.34);
+    color: #ffc07a;
+    background: rgba(255, 151, 61, 0.1);
  }
  .discard-warning-icon {
    display: grid;
@@ -3687,6 +3856,299 @@
    align-items: center;
    gap: 6px;
  }
+  .branch-delete-lead { color: var(--color-ink); font-weight: 600; }
+  .branch-delete-target {
+    display: flex;
+    align-items: center;
+    gap: 10px;
+    min-width: 0;
+    padding: 10px 11px;
+    border: 1px solid var(--color-border-subtle);
+    border-radius: 8px;
+    background: rgba(0, 0, 0, 0.16);
+    box-shadow: inset 3px 0 0 rgba(255, 90, 103, 0.48);
+  }
+  .branch-delete-target-icon {
+    display: grid;
+    place-items: center;
+    width: 28px;
+    height: 28px;
+    flex: 0 0 auto;
+    border-radius: 7px;
+    color: var(--color-accent);
+    background: rgba(77, 182, 214, 0.1);
+  }
+  .branch-delete-target-copy { display: grid; gap: 2px; min-width: 0; flex: 1; }
+  .branch-delete-target-copy code {
+    overflow: hidden;
+    color: var(--color-ink);
+    font-family: var(--font-mono);
+    font-size: 12px;
+    font-weight: 700;
+    text-overflow: ellipsis;
+    white-space: nowrap;
+  }
+  .branch-delete-target-copy > span { color: var(--color-ink-faint); font-size: 10.5px; }
+  .branch-delete-scope {
+    flex: 0 0 auto;
+    padding: 3px 7px;
+    border: 1px solid rgba(77, 182, 214, 0.22);
+    border-radius: 999px;
+    color: #8ed8ee;
+    background: rgba(77, 182, 214, 0.08);
+    font-size: 9.5px;
+    font-weight: 800;
+    letter-spacing: 0.05em;
+    text-transform: uppercase;
+  }
+  .branch-delete-scope.remote { border-color: rgba(167, 126, 255, 0.25); color: #c2a9ff; background: rgba(132, 88, 232, 0.1); }
+  .branch-delete-body .discard-warning-text {
+    padding: 9px 10px;
+    border-left: 2px solid rgba(255, 90, 103, 0.55);
+    color: #f2aeb5;
+    background: rgba(255, 90, 103, 0.055);
+    font-size: 11.5px;
+    font-weight: 600;
+  }
+  .branch-delete-confirm { min-width: 116px; }
+  .worktree-dialog-header {
+    background:
+      linear-gradient(90deg, rgba(77, 182, 214, 0.09), transparent 40%),
+      var(--app-dialog-chrome);
+  }
+  .worktree-dialog-heading { display: flex; align-items: center; gap: 11px; }
+  .worktree-dialog-mark {
+    display: grid;
+    place-items: center;
+    width: 34px;
+    height: 34px;
+    border: 1px solid rgba(77, 182, 214, 0.3);
+    border-radius: 9px;
+    color: #8ed8ee;
+    background: rgba(77, 182, 214, 0.1);
+    box-shadow: inset 0 1px 0 rgba(255,255,255,0.05);
+  }
+  .worktree-summary {
+    display: grid;
+    grid-template-columns: repeat(3, minmax(0, 1fr)) auto;
+    align-items: stretch;
+    gap: 1px;
+    padding: 1px 0;
+    border-bottom: 1px solid var(--color-border-subtle);
+    background: var(--color-border-subtle);
+  }
+  .worktree-summary > div {
+    display: flex;
+    align-items: baseline;
+    gap: 7px;
+    min-width: 0;
+    padding: 11px 14px;
+    background: var(--app-dialog-bg);
+  }
+  .worktree-summary > div strong { color: var(--color-ink); font-family: var(--font-mono); font-size: 14px; }
+  .worktree-summary > div span { overflow: hidden; color: var(--color-ink-faint); font-size: 10.5px; font-weight: 700; text-overflow: ellipsis; white-space: nowrap; }
+  .worktree-summary > div.attention strong { color: #ffc07a; }
+  .worktree-summary > .btn-primary { align-self: center; margin: 0 14px; white-space: nowrap; }
+  .worktree-error {
+    display: flex;
+    align-items: center;
+    gap: 8px;
+    padding: 9px 16px;
+    border-bottom: 1px solid rgba(255, 90, 103, 0.2);
+    color: #ffb8bf;
+    background: rgba(255, 90, 103, 0.08);
+    font-size: 11.5px;
+    font-weight: 650;
+  }
+  .worktree-content {
+    min-height: 0;
+    overflow: auto;
+    padding: 14px;
+    background:
+      radial-gradient(circle at 92% 0%, rgba(77, 182, 214, 0.055), transparent 28%),
+      var(--app-dialog-bg);
+  }
+  .worktree-create-card {
+    display: grid;
+    gap: 14px;
+    margin-bottom: 14px;
+    padding: 14px;
+    border: 1px solid rgba(77, 182, 214, 0.26);
+    border-radius: 10px;
+    background: var(--color-surface-raised);
+    box-shadow: inset 0 1px 0 rgba(255,255,255,0.035);
+  }
+  .worktree-create-card > header { display: flex; align-items: center; justify-content: space-between; gap: 12px; }
+  .worktree-create-card h3 { margin: 3px 0 0; color: var(--color-ink); font-size: 13px; font-weight: 700; }
+  .worktree-mode-tabs {
+    display: grid;
+    grid-template-columns: repeat(3, 1fr);
+    gap: 3px;
+    padding: 3px;
+    border: 1px solid var(--color-border-subtle);
+    border-radius: 8px;
+    background: rgba(0, 0, 0, 0.14);
+  }
+  .worktree-mode-tabs button {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    gap: 6px;
+    min-height: 32px;
+    border-color: transparent;
+    color: var(--color-ink-faint);
+    background: transparent;
+    font-size: 10.5px;
+    font-weight: 750;
+  }
+  .worktree-mode-tabs button.active {
+    border-color: rgba(77, 182, 214, 0.27);
+    color: #b8e7f6;
+    background: rgba(77, 182, 214, 0.11);
+    box-shadow: 0 3px 12px rgba(0,0,0,0.14);
+  }
+  .worktree-create-fields { display: grid; grid-template-columns: repeat(2, minmax(0, 1fr)); gap: 10px; }
+  .worktree-create-fields label,
+  .worktree-lock-body label { display: grid; gap: 5px; color: var(--color-ink-dim); font-size: 10.5px; font-weight: 750; }
+  .worktree-create-fields input,
+  .worktree-create-fields select,
+  .worktree-lock-body input { width: 100%; min-width: 0; }
+  .worktree-create-fields .worktree-path-field { grid-column: 1 / -1; }
+  .worktree-path-field > div { display: grid; grid-template-columns: minmax(0, 1fr) auto; gap: 7px; }
+  .worktree-create-card > footer { display: flex; align-items: center; justify-content: space-between; gap: 14px; }
+  .worktree-check { display: flex; align-items: flex-start; gap: 8px; color: var(--color-ink-muted); font-size: 11px; cursor: pointer; }
+  .worktree-check input { width: auto; margin-top: 2px; }
+  .worktree-check span { display: grid; gap: 1px; }
+  .worktree-check strong { color: var(--color-ink); font-size: 11px; }
+  .worktree-check small { color: var(--color-ink-faint); font-size: 10px; font-weight: 500; }
+  .worktree-check.danger strong,
+  .worktree-check.danger small { color: #ffb8bf; }
+  .worktree-list { display: grid; gap: 8px; }
+  .worktree-card {
+    position: relative;
+    display: grid;
+    grid-template-columns: 28px minmax(0, 1fr);
+    min-width: 0;
+    border: 1px solid var(--color-border-subtle);
+    border-radius: 9px;
+    background: var(--color-surface-raised);
+    overflow: hidden;
+  }
+  .worktree-card.current { border-color: rgba(77, 182, 214, 0.34); box-shadow: inset 0 0 0 1px rgba(77, 182, 214, 0.06); }
+  .worktree-card.stale { border-color: rgba(255, 151, 61, 0.28); }
+  .worktree-rail {
+    position: relative;
+    display: grid;
+    place-items: start center;
+    padding-top: 18px;
+    background: rgba(0,0,0,0.1);
+  }
+  .worktree-rail::before {
+    content: "";
+    position: absolute;
+    top: 0;
+    bottom: 0;
+    left: 50%;
+    width: 1px;
+    background: rgba(77, 182, 214, 0.22);
+  }
+  .worktree-rail span {
+    position: relative;
+    z-index: 1;
+    width: 9px;
+    height: 9px;
+    border: 2px solid #76cde7;
+    border-radius: 50%;
+    background: var(--color-surface-solid);
+    box-shadow: 0 0 0 3px rgba(77, 182, 214, 0.08);
+  }
+  .worktree-rail i {
+    position: absolute;
+    top: 31px;
+    left: 50%;
+    width: 7px;
+    height: 14px;
+    border-bottom: 1px solid rgba(77, 182, 214, 0.26);
+    border-left: 1px solid rgba(77, 182, 214, 0.26);
+  }
+  .worktree-card-main { display: grid; gap: 9px; min-width: 0; padding: 12px; }
+  .worktree-card-main > header { display: flex; align-items: flex-start; justify-content: space-between; gap: 10px; }
+  .worktree-name { display: flex; align-items: center; gap: 8px; min-width: 0; color: var(--color-accent); }
+  .worktree-name > div { display: grid; gap: 1px; min-width: 0; }
+  .worktree-name strong { overflow: hidden; color: var(--color-ink); font-size: 12.5px; text-overflow: ellipsis; white-space: nowrap; }
+  .worktree-name span { color: var(--color-ink-faint); font-size: 10px; }
+  .worktree-badges { display: flex; align-items: center; justify-content: flex-end; flex-wrap: wrap; gap: 4px; }
+  .worktree-badges span {
+    display: inline-flex;
+    align-items: center;
+    gap: 3px;
+    padding: 2px 6px;
+    border: 1px solid var(--color-border-subtle);
+    border-radius: 999px;
+    color: var(--color-ink-faint);
+    background: rgba(255,255,255,0.025);
+    font-size: 8.5px;
+    font-weight: 800;
+    letter-spacing: 0.04em;
+    text-transform: uppercase;
+  }
+  .worktree-badges span.active { border-color: rgba(78, 202, 118, 0.25); color: #77d99a; background: rgba(78, 202, 118, 0.08); }
+  .worktree-badges span.locked { border-color: rgba(111, 140, 255, 0.26); color: #aebcff; background: rgba(111, 140, 255, 0.08); }
+  .worktree-badges span.danger { border-color: rgba(255, 151, 61, 0.3); color: #ffc07a; background: rgba(255, 151, 61, 0.08); }
+  .worktree-path { display: flex; align-items: center; gap: 5px; min-width: 0; color: var(--color-ink-faint); }
+  .worktree-path code { overflow: hidden; font-family: var(--font-mono); font-size: 10.5px; text-overflow: ellipsis; white-space: nowrap; }
+  .worktree-meta { display: flex; align-items: center; flex-wrap: wrap; gap: 6px 12px; color: var(--color-ink-faint); font-size: 9.5px; }
+  .worktree-meta span { display: inline-flex; align-items: center; gap: 4px; }
+  .worktree-meta span.dirty,
+  .worktree-meta span.danger { color: #ffc07a; }
+  .worktree-card-main > footer { display: flex; align-items: center; justify-content: space-between; gap: 10px; padding-top: 2px; }
+  .worktree-card-actions { display: flex; align-items: center; justify-content: flex-end; flex-wrap: wrap; gap: 5px; }
+  .worktree-card-actions .danger { border-color: rgba(255, 90, 103, 0.2); color: #ff9aa4; background: rgba(255, 90, 103, 0.06); }
+  .worktree-dialog-footer {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 12px;
+    padding: 10px 14px;
+    border-top: 1px solid var(--color-border-subtle);
+    background: var(--app-dialog-chrome);
+  }
+  .worktree-dialog-footer > div { display: flex; align-items: center; gap: 6px; color: var(--color-ink-faint); font-size: 10px; }
+  .worktree-loading,
+  .worktree-empty {
+    display: grid;
+    place-items: center;
+    align-content: center;
+    gap: 7px;
+    min-height: 240px;
+    color: var(--color-ink-faint);
+    text-align: center;
+    font-size: 11px;
+  }
+  .worktree-empty strong { color: var(--color-ink); font-size: 13px; }
+  .worktree-confirm-body {
+    display: grid;
+    grid-template-columns: auto minmax(0, 1fr);
+    gap: 13px;
+    padding: 17px 16px;
+  }
+  .worktree-confirm-body > div { display: grid; gap: 10px; min-width: 0; }
+  .worktree-confirm-body p { margin: 0; color: var(--color-ink-muted); font-size: 12px; line-height: 1.45; }
+  .worktree-confirm-body code { overflow: auto; padding: 8px; border: 1px solid var(--color-border-subtle); border-radius: 6px; color: var(--color-ink); background: rgba(0,0,0,0.16); font-size: 10.5px; }
+  .worktree-lock-body { padding: 18px 16px; }
+  .worktree-lock-body label > span { display: flex; align-items: baseline; justify-content: space-between; }
+  .worktree-lock-body small { color: var(--color-ink-faint); font-size: 9.5px; font-weight: 500; }
+  @media (max-width: 700px) {
+    .worktree-summary { grid-template-columns: repeat(3, 1fr); }
+    .worktree-summary > div { display: grid; gap: 2px; }
+    .worktree-summary > .btn-primary { grid-column: 1 / -1; margin: 9px 14px; }
+    .worktree-create-fields { grid-template-columns: 1fr; }
+    .worktree-create-fields .worktree-path-field { grid-column: auto; }
+    .worktree-create-card > footer,
+    .worktree-card-main > footer { align-items: stretch; flex-direction: column; }
+    .worktree-card-actions { justify-content: flex-start; }
+    .worktree-dialog-footer > div { display: none; }
+  }
  .discard-target-list {
    display: grid;
    gap: 4px;
@@ -3719,11 +4181,37 @@

  .line-patch-body {
    display: grid;
-    grid-template-rows: minmax(0, 1fr);
+    grid-template-rows: auto minmax(0, 1fr);
    min-height: 0;
    overflow: hidden;
  }

+  .line-patch-selection-bar {
+    display: flex;
+    align-items: center;
+    justify-content: space-between;
+    gap: 14px;
+    min-height: 46px;
+    padding: 7px 12px;
+    border-bottom: 1px solid var(--color-border-subtle);
+    background: var(--app-dialog-chrome);
+  }
+  .line-patch-selection-bar.active {
+    background:
+      linear-gradient(90deg, rgba(77, 182, 214, 0.1), transparent 44%),
+      var(--app-dialog-chrome);
+  }
+  .line-patch-selection-bar > div:first-child {
+    display: flex;
+    align-items: center;
+    gap: 7px;
+    min-width: 0;
+    color: var(--color-accent);
+  }
+  .line-patch-selection-bar strong { color: var(--color-ink); font-size: 11.5px; }
+  .line-patch-selection-bar span { color: var(--color-ink-faint); font-size: 10px; }
+  .line-patch-selected-actions { display: flex; align-items: center; justify-content: flex-end; gap: 6px; }
+
  .line-patch-scroll {
    min-height: 0;
    overflow: auto;
@@ -3749,6 +4237,33 @@
    border-bottom: 1px solid var(--color-border-subtle);
    background: color-mix(in srgb, var(--code-surface-raised) 96%, transparent);
  }
+  .line-patch-select-hunk,
+  .line-patch-line-select {
+    display: grid;
+    place-items: center;
+    width: 16px;
+    min-width: 16px;
+    height: 16px;
+    min-height: 16px;
+    padding: 0;
+    border: 1px solid var(--color-border);
+    border-radius: 4px;
+    color: #ffffff;
+    background: var(--code-surface);
+    box-shadow: none;
+  }
+  .line-patch-select-hunk:hover:not(:disabled),
+  .line-patch-line-select:hover:not(:disabled) {
+    border-color: rgba(77, 182, 214, 0.65);
+    background: rgba(77, 182, 214, 0.1);
+  }
+  .line-patch-select-hunk.all,
+  .line-patch-select-hunk.some,
+  .line-patch-line-select[aria-pressed="true"] {
+    border-color: rgba(77, 182, 214, 0.78);
+    background: #238eb4;
+  }
+  .line-patch-select-hunk.some { background: rgba(35, 142, 180, 0.55); }
  .line-patch-hunk-head code {
    color: var(--color-accent);
    font-family: var(--font-mono);
@@ -3794,12 +4309,17 @@

  .line-patch-row {
    display: grid;
-    grid-template-columns: 22px minmax(max-content, 1fr);
+    grid-template-columns: 18px 38px 38px 22px minmax(max-content, 1fr);
    align-items: start;
    min-height: 22px;
-    padding: 1px 10px 1px 28px;
+    padding: 1px 10px 1px 8px;
    color: var(--color-ink-muted);
  }
+  .line-patch-row.selectable { cursor: default; }
+  .line-patch-row.selected {
+    box-shadow: inset 3px 0 0 rgba(77, 182, 214, 0.86);
+    filter: saturate(1.12) brightness(1.06);
+  }
  .line-patch-row.add {
    background: var(--code-add-bg);
    color: var(--code-add-text);
@@ -3816,12 +4336,26 @@
    text-align: center;
    user-select: none;
  }
+  .line-patch-line-select { align-self: center; }
+  .line-patch-line-select-placeholder { width: 16px; }
+  .line-patch-line-number {
+    padding-right: 7px;
+    color: var(--color-ink-faint);
+    font-size: 10px;
+    line-height: 20px;
+    text-align: right;
+    user-select: none;
+  }
  .line-patch-row.add .line-patch-prefix { color: var(--code-add-strong); }
  .line-patch-row.delete .line-patch-prefix { color: var(--code-delete-strong); }
  .line-patch-row code {
    white-space: pre;
    font-family: var(--font-mono);
  }
+  @media (max-width: 760px) {
+    .line-patch-selection-bar { align-items: stretch; flex-direction: column; }
+    .line-patch-selected-actions { justify-content: flex-start; flex-wrap: wrap; }
+  }

  .blame-body {
    min-height: 0;
@@ -5212,10 +5746,13 @@ input:focus, textarea:focus, select:focus { box-shadow: 0 0 0 3px color-mix(in s
 .history-panel, .file-history-panel { min-height: 0; }
 .graph-list { background: var(--color-surface-solid); }
 .graph-gutter { background: var(--color-surface-dim); }
-.commit-body { border-radius: var(--ui-radius-sm); background: transparent; box-shadow: none; }
+.commit-body {
+  border-radius: var(--ui-radius-sm);
+  background: color-mix(in srgb, var(--color-primary) 7%, var(--color-surface-solid));
+  box-shadow: none;
+}
 .graph-row + .graph-row .commit-body { border-top: 1px solid var(--color-border-subtle); }
 .graph-row:hover .commit-body { background: var(--color-surface-hover); }
-.graph-row.tip-row .commit-body { background: color-mix(in srgb, var(--color-primary) 7%, var(--color-surface-solid)); }
 .commit-avatar { border-radius: 50%; }
 .commit-kind, .commit-branch-chip, .ref-chip { border-radius: 4px !important; }
 .file-history-row { margin: 0; border: 0; border-bottom: 1px solid var(--color-border-subtle); border-radius: 0; background: transparent; }
@@ -5306,6 +5843,23 @@ input:focus, textarea:focus, select:focus { box-shadow: 0 0 0 3px color-mix(in s
  background: rgba(210, 55, 75, 0.08);
 }

+:root[data-theme="light"] .error-toast {
+  border-color: rgba(190,48,66,0.28);
+  background:
+    linear-gradient(135deg, rgba(210,55,75,0.11), rgba(49,95,214,0.05)),
+    rgba(255,255,255,0.96);
+  box-shadow: 0 18px 48px rgba(28,44,74,0.18), 0 0 0 1px rgba(255,255,255,0.8) inset;
+}
+
+:root[data-theme="light"] .error-toast-icon {
+  color: #b33445;
+  background: rgba(210,55,75,0.09);
+}
+
+:root[data-theme="light"] .error-toast-content strong {
+  color: #24314a;
+}
+
 :root[data-theme="light"] .notice.busy {
  color: #315fd6;
 }
@@ -1,8 +1,11 @@
 import { invoke } from "@tauri-apps/api/core";
+import { telemetryLog } from "./telemetry";

 export type AnalyticsEventProperties = Record<string, string | number>;

 export function trackAnalyticsEvent(name: string, props?: AnalyticsEventProperties) {
+  const details = props && Object.keys(props).length > 0 ? ` ${JSON.stringify(props)}` : "";
+  telemetryLog("info", `${name}${details}`, `product.${name}`);
  void invoke("plugin:aptabase|track_event", {
    name,
    props: props && Object.keys(props).length > 0 ? props : undefined,
@@ -0,0 +1,103 @@
+<script lang="ts">
+  import { GitCommitHorizontal, LoaderCircle, Sparkles, X } from "@lucide/svelte";
+  import type { AiCommitPlan } from "../types";
+
+  interface Props {
+    plan: AiCommitPlan;
+    isApplying: boolean;
+    onApply: (plan: AiCommitPlan) => void;
+    onClose: () => void;
+  }
+
+  let { plan, isApplying = false, onApply, onClose }: Props = $props();
+  let draft = $state<AiCommitPlan>({ summary: "", groups: [] });
+  $effect.pre(() => {
+    if (draft.groups.length === 0) draft = structuredClone(plan);
+  });
+  let valid = $derived(draft.groups.length > 1 && draft.groups.every((group) => group.message.trim() && group.files.length));
+  let validationIssue = $derived(
+    draft.groups.findIndex((group) => group.files.length === 0) >= 0
+      ? "Every commit needs at least one file."
+      : draft.groups.findIndex((group) => !group.message.trim()) >= 0
+        ? "Every commit needs a message."
+        : "",
+  );
+
+  function setMessage(index: number, message: string) {
+    draft.groups[index].message = message;
+  }
+
+  function moveFile(file: string, from: number, to: number) {
+    if (from === to) return;
+    draft.groups[from].files = draft.groups[from].files.filter((path) => path !== file);
+    draft.groups[to].files = [...draft.groups[to].files, file];
+  }
+
+  function applyDraft() {
+    // `draft` is a deeply reactive Svelte proxy. `structuredClone(draft)`
+    // throws a DataCloneError before the callback runs, which made the button
+    // appear to do nothing. A state snapshot is a plain, cloneable object.
+    onApply($state.snapshot(draft));
+  }
+</script>
+
+<svelte:window onkeydown={(event) => { if (event.key === "Escape" && !isApplying) onClose(); }} />
+
+<div class="dialog-backdrop" role="presentation">
+  <div class="dialog split-dialog" role="dialog" aria-modal="true" aria-label="AI commit split">
+    <header class="dialog-header">
+      <div><span class="eyebrow">Staged changes</span><h2>Split into logical commits</h2></div>
+      <button class="dialog-close" type="button" onclick={onClose} disabled={isApplying} aria-label="Close"><X size={18} /></button>
+    </header>
+    <div class="split-intro"><Sparkles size={18} /><p>{draft.summary}</p></div>
+    <div class="split-groups">
+      {#each draft.groups as group, groupIndex}
+        <article class:empty={group.files.length === 0}>
+          <header><GitCommitHorizontal size={17} /><strong>Commit {groupIndex + 1}</strong><span>{group.files.length} files</span></header>
+          <label>
+            <span>Commit message <em>AI-generated · editable</em></span>
+            <input value={group.message} oninput={(event) => setMessage(groupIndex, event.currentTarget.value)} disabled={isApplying} />
+          </label>
+          {#if group.reason}<p>{group.reason}</p>{/if}
+          <div class="split-files">
+            {#each group.files as file}
+              <div><code>{file}</code>
+                <select value={groupIndex} onchange={(event) => moveFile(file, groupIndex, Number(event.currentTarget.value))} disabled={isApplying}>
+                  {#each draft.groups as _, target}<option value={target}>Commit {target + 1}</option>{/each}
+                </select>
+              </div>
+            {/each}
+          </div>
+        </article>
+      {/each}
+    </div>
+    <footer class="dialog-footer">
+      <p class:invalid={!!validationIssue}>{validationIssue || "Messages are generated automatically. All commits are created in this order."}</p>
+      <div><button class="btn-secondary" type="button" onclick={onClose} disabled={isApplying}>Cancel</button>
+        <button class="btn-primary" type="button" onclick={applyDraft} disabled={!valid || isApplying}>
+          {#if isApplying}<LoaderCircle class="spin" size={14} />{/if}Commit all ({draft.groups.length})
+        </button></div>
+    </footer>
+  </div>
+</div>
+
+<style>
+  .split-dialog{width:min(820px,calc(100vw - 32px));max-height:min(820px,calc(100vh - 32px));display:flex;flex-direction:column}
+  .split-intro{display:flex;gap:10px;align-items:flex-start;padding:14px 18px;border-bottom:1px solid var(--color-border-subtle);color:var(--color-ink-muted)}
+  .split-intro p{margin:0;line-height:1.5}
+  .split-groups{display:grid;gap:10px;padding:14px 18px;overflow:auto}
+  article{display:grid;gap:10px;padding:13px;border:1px solid var(--color-border-subtle);border-radius:9px;background:var(--color-surface-raised)}
+  article.empty{border-color:#d88a45}
+  article>header{display:flex;align-items:center;gap:8px;color:var(--color-ink)}
+  article>header span{margin-left:auto;color:var(--color-ink-faint);font-size:11px}
+  label{display:grid;gap:5px;color:var(--color-ink-faint);font-size:10px;font-weight:800;text-transform:uppercase}
+  label span{display:flex;align-items:center;justify-content:space-between;gap:8px}
+  label em{color:var(--color-accent);font-size:9px;font-style:normal;font-weight:700;text-transform:none}
+  input{height:34px;padding:0 10px;border:1px solid var(--color-border);border-radius:6px;background:var(--color-surface);color:var(--color-ink);font-family:var(--font-mono)}
+  article>p{margin:0;color:var(--color-ink-muted);font-size:12px;line-height:1.45}
+  .split-files{display:grid;gap:5px}
+  .split-files>div{display:flex;align-items:center;gap:10px;padding:6px 8px;border-radius:6px;background:var(--color-surface)}
+  code{min-width:0;flex:1;overflow:hidden;text-overflow:ellipsis;color:var(--color-ink-muted);font-size:11px;white-space:nowrap}
+  select{height:28px;border:1px solid var(--color-border-subtle);border-radius:5px;background:var(--color-surface-raised);color:var(--color-ink);font-size:11px}
+  .dialog-footer p.invalid{color:#e0a040}
+</style>
@@ -30,10 +30,10 @@
      </div>
      <div class="analytics-notice-copy">
        <p>
-          Gitty 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 and technical error logs to Aptabase and the self-hosted SigNoz service 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.
+          Telemetry does not include repository paths, remote URLs, branch names, commit messages, diffs, file names, credentials, or source code.
        </p>
      </div>

@@ -47,7 +47,7 @@
    </div>

    <footer class="dialog-footer analytics-notice-footer">
-      <span class="dialog-footer-info">Privacy-friendly, optional, and limited to product usage events.</span>
+      <span class="dialog-footer-info">Privacy-friendly, optional, and limited to product usage and technical errors.</span>
      <button class="btn-primary" type="button" onclick={() => onContinue(allowAnalytics)}>
        <Check size={16} aria-hidden="true" />
        Continue
@@ -124,7 +124,7 @@
        <label class="settings-toggle-row">
          <input type="checkbox" bind:checked={analyticsEnabled} />
          <span>
-            <strong>{isGerman ? "Anonyme Aptabase-Ereignisse erlauben" : "Allow anonymous Aptabase events"}</strong>
+            <strong>{isGerman ? "Anonyme Analytics und Fehlerberichte erlauben" : "Allow anonymous analytics and error reports"}</strong>
            <small>{isGerman ? "Es werden keine Repository-Pfade, Remotes, Branches, Commit-Nachrichten, Dateinamen, Diffs, Zugangsdaten oder Code übertragen." : "No repository paths, remotes, branches, commit messages, file names, diffs, credentials, or code are sent."}</small>
          </span>
        </label>
@@ -20,15 +20,22 @@

  let title = $derived(branch.remote ? "Delete remote branch?" : force ? "Force delete branch?" : "Delete branch?");
  let remoteParts = $derived(branch.remote ? branch.name.split(/\/(.+)/) : []);
+  let branchName = $derived(branch.remote ? remoteParts[1] || branch.name : branch.name);
+  let branchLocation = $derived(branch.remote ? remoteParts[0] || "Remote" : "Local repository");

 </script>

 <div class="dialog-backdrop" role="presentation">
-  <div class="dialog branch-delete-dialog" role="dialog" aria-modal="true" aria-label={title}>
-    <header class="dialog-header">
-      <div>
+  <div class="dialog branch-delete-dialog" role="dialog" aria-modal="true" aria-labelledby="branch-delete-title">
+    <header class="dialog-header branch-delete-header">
+      <div class="branch-delete-heading">
+        <span class:force class="branch-delete-heading-icon" aria-hidden="true">
+          <Trash2 size={16} />
+        </span>
+        <div>
        <span class="eyebrow">{branch.remote ? "Remote branch" : force ? "Force delete" : "Delete branch"}</span>
-        <p class="dialog-title">{title}</p>
+          <p class="dialog-title" id="branch-delete-title">{title}</p>
+        </div>
      </div>
      <button class="btn-sm dialog-close" type="button" onclick={onClose} disabled={isBusy} aria-label="Close">
        <X size={16} aria-hidden="true" />
@@ -36,31 +43,35 @@
    </header>

    <div class="branch-delete-body">
-      <div class="discard-warning-icon" aria-hidden="true">
+      <div class:force class="discard-warning-icon branch-delete-warning-icon" aria-hidden="true">
        <AlertTriangle size={22} />
      </div>

      <div class="discard-confirm-copy">
-        <p>
+        <p class="branch-delete-lead">
          {#if branch.remote}
-            Delete this branch from the remote server?
+            This branch will be removed from the shared remote repository.
          {:else if force}
-            This branch is not fully merged. Force deleting removes the branch pointer even if some commits are only reachable from this branch.
+            This branch is not fully merged. Some commits may only exist here.
          {:else}
-            Delete this local branch from the repository?
+            This branch will be removed from your local repository.
          {/if}
        </p>
-        <code class="discard-target" title={branch.name}>
-          <GitBranch size={13} aria-hidden="true" />
-          {branch.name}
-        </code>
+        <div class="branch-delete-target" title={branch.name}>
+          <span class="branch-delete-target-icon" aria-hidden="true"><GitBranch size={16} /></span>
+          <span class="branch-delete-target-copy">
+            <code>{branchName}</code>
+            <span>{branchLocation}</span>
+          </span>
+          <span class:remote={branch.remote} class="branch-delete-scope">{branch.remote ? "Remote" : "Local"}</span>
+        </div>
        <p class="discard-warning-text">
          {#if branch.remote}
-            This affects everyone using <strong>{remoteParts[0] || "the remote"}</strong>. Your local commits and local branches are kept.
+            This affects everyone using <strong>{remoteParts[0] || "the remote"}</strong>. Your local branch is kept.
          {:else if force}
-            Make sure you no longer need the unique commits on this branch.
+            Force deletion can make unmerged commits difficult to recover.
          {:else}
-            Git will refuse if the branch is not fully merged.
+            Git will stop the deletion if the branch contains unmerged commits.
          {/if}
        </p>
      </div>
@@ -68,7 +79,7 @@

    <footer class="discard-confirm-actions">
      <button class="btn-secondary" type="button" onclick={onClose} disabled={isBusy}>Cancel</button>
-      <button class="btn-danger" type="button" onclick={onConfirm} disabled={isBusy}>
+      <button class="btn-danger branch-delete-confirm" type="button" onclick={onConfirm} disabled={isBusy}>
        {#if isBusy}
          <LoaderCircle class="spin" size={15} aria-hidden="true" />
        {:else}
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { Check, ChevronDown, ChevronRight, Folder, FolderOpen, GitBranch, GitMerge, Pencil, Plus, Tag as TagIcon, Trash2, Upload, X } from "@lucide/svelte";
+  import { Check, ChevronDown, ChevronRight, Folder, FolderOpen, GitBranch, GitMerge, HardDrive, Pencil, Plus, Tag as TagIcon, Trash2, Upload, X } from "@lucide/svelte";
  import type { GitBranch as GitBranchInfo, GitTag } from "../types";

  type BranchTreeNode = BranchFolderNode | BranchLeafNode;
@@ -58,6 +58,8 @@
    onCreateTag: (name: string, message: string) => void | Promise<void>;
    onDeleteTag: (tag: GitTag) => void | Promise<void>;
    onPushTag: (tag: GitTag) => void | Promise<void>;
+    onManageWorktrees: () => void;
+    onCreateWorktree: (branch: GitBranchInfo) => void | Promise<void>;
    collapsed?: boolean;
    onToggleCollapsed?: () => void;
  }
@@ -79,6 +81,8 @@
    onCreateTag = () => {},
    onDeleteTag = () => {},
    onPushTag = () => {},
+    onManageWorktrees = () => {},
+    onCreateWorktree = () => {},
    collapsed = false,
    onToggleCollapsed = () => {},
  }: Props = $props();
@@ -271,6 +275,13 @@
    if (branch.remote) await onDeleteRemoteBranch(branch); else await onDeleteBranch(branch);
  }

+  async function createContextWorktree() {
+    const branch = contextBranch;
+    closeBranchContextMenu();
+    if (!branch) return;
+    await onCreateWorktree(branch);
+  }
+
  async function checkoutContextBranch() {
    const branch = contextBranch;
    if (!branch || branch.current || isBusy) return;
@@ -400,8 +411,6 @@
    <!-- 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>
  {:else}
    <div class="branch-list overflow-auto p-2 flex flex-col gap-0">
      {#if createOpen}
@@ -638,6 +647,21 @@
          {/if}
        {/if}
      </div>
+
+      <div class="branch-group">
+        <button
+          class="branch-group-toggle worktree-group-toggle"
+          type="button"
+          onclick={onManageWorktrees}
+          disabled={isBusy}
+          aria-haspopup="dialog"
+          title="Manage repository worktrees"
+        >
+          <HardDrive size={14} aria-hidden="true" />
+          <span>Worktrees</span>
+          <span class="branch-group-count">Manage</span>
+        </button>
+      </div>
    </div>
  {/if}

@@ -661,6 +685,10 @@
        <GitBranch size={14} aria-hidden="true" />
        Rebase current onto this
      </button>
+      <button type="button" role="menuitem" onclick={createContextWorktree} disabled={isBusy || contextBranch.remote || contextBranch.current}>
+        <HardDrive size={14} aria-hidden="true" />
+        Open in new worktree
+      </button>
      <div class="menu-separator" role="separator"></div>
      <button type="button" role="menuitem" onclick={renameContextBranch} disabled={isBusy || contextBranch.remote}>
        <Pencil size={14} aria-hidden="true" />
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { Check, LoaderCircle, RotateCcw, Settings, ShieldCheck, Sparkles } from "@lucide/svelte";
+  import { Check, GitCommitHorizontal, LoaderCircle, RotateCcw, Settings, ShieldCheck, Sparkles } from "@lucide/svelte";
  import type { CommitAiPhase, CommitAiProvider } from "../types";

  interface Props {
@@ -14,12 +14,14 @@
    commitAiPhase: CommitAiPhase;
    commitAiGenerating: boolean;
    commitAiReviewing: boolean;
+    commitAiSplitting: boolean;
    canAmend: boolean;
    amendMode: boolean;
    onCommit: () => void;
    onCommitMessageChange: (msg: string) => void;
    onGenerateCommitMessage: () => void;
    onReviewStaged: () => void;
+    onSplitStaged: () => void;
    onOpenAiSettings: () => void;
    onToggleAmend: (checked: boolean) => void;
    onUndoLastCommit: () => void;
@@ -37,12 +39,14 @@
    commitAiPhase = "idle",
    commitAiGenerating = false,
    commitAiReviewing = false,
+    commitAiSplitting = false,
    canAmend = false,
    amendMode = false,
    onCommit = () => {},
    onCommitMessageChange = () => {},
    onGenerateCommitMessage = () => {},
    onReviewStaged = () => {},
+    onSplitStaged = () => {},
    onOpenAiSettings = () => {},
    onToggleAmend = () => {},
    onUndoLastCommit = () => {},
@@ -70,6 +74,7 @@
    (commitAiProvider !== "local" || commitAiPhase === "ready"),
  );
  let canReview = $derived(canGenerate && commitAiProvider !== "local");
+  let canSplit = $derived(canReview && stagedCount > 1 && !commitAiSplitting);
 </script>

 <section class="panel commit-panel" aria-label="Commit">
@@ -80,6 +85,16 @@
    </div>
    <div class="commit-head-actions">
      <span class="pill pill-count">{stagedCount} staged</span>
+      <button
+        class="commit-review-button"
+        type="button"
+        onclick={onSplitStaged}
+        disabled={!canSplit}
+        title={commitAiProvider === "local" ? "Commit splitting currently requires an API provider" : "Suggest logical commits for the staged files"}
+      >
+        {#if commitAiSplitting}<LoaderCircle class="spin" size={14} aria-hidden="true" />{:else}<GitCommitHorizontal size={14} aria-hidden="true" />{/if}
+        Split
+      </button>
      <button
        class="commit-review-button"
        type="button"
@@ -5,7 +5,7 @@
  interface Props {
    files: GitFileStatus[];
    staged: boolean | null;
-    scope: "file" | "hunk";
+    scope: "file" | "hunk" | "lines";
    isBusy: boolean;
    onConfirm: () => void | Promise<void>;
    onClose: () => void;
@@ -26,9 +26,9 @@

  let count = $derived(files.length);
  let title = $derived(
-    scope === "hunk" ? "Discard hunk?" : count > 1 ? `Discard changes in ${count} files?` : "Discard file changes?"
+    scope === "hunk" ? "Discard hunk?" : scope === "lines" ? "Discard selected lines?" : count > 1 ? `Discard changes in ${count} files?` : "Discard file changes?"
  );
-  let scopeLabel = $derived(scope === "hunk" ? "selected hunk" : count > 1 ? `${count} files` : "file");
+  let scopeLabel = $derived(scope === "hunk" ? "selected hunk" : scope === "lines" ? "selected lines" : count > 1 ? `${count} files` : "file");
  let sourceLabel = $derived(staged === null ? "staged and unstaged changes" : staged ? "staged changes" : "unstaged changes");

 </script>
@@ -17,6 +17,7 @@
    Lightbulb,
    ListChecks,
    Search,
+    Sparkles,
    Wrench,
    X,
  } from "@lucide/svelte";
@@ -617,6 +618,87 @@
    },
  );

+  deCategories.find((category) => category.id === "app")?.sections.push(
+    {
+      id: "app-line-staging",
+      title: "Änderungen zeilenweise stagen",
+      summary: "Im Patch-Dialog kannst du nicht nur vollständige Dateien oder Hunks, sondern einzelne hinzugefügte und entfernte Zeilen für den nächsten Commit auswählen.",
+      steps: [
+        "Öffne im Bereich Unstaged den Patch einer geänderten Textdatei.",
+        "Klicke auf die Auswahlfläche vor einer grünen oder roten Zeile. Mit Shift-Klick markierst du einen zusammenhängenden Bereich.",
+        "Die Auswahlleiste zeigt die Anzahl der gewählten Zeilen. Stage selected übernimmt nur diese Auswahl in den Staging-Bereich.",
+        "Öffne denselben Dialog unter Staged und nutze Unstage selected, wenn einzelne Zeilen wieder zurück ins Arbeitsverzeichnis sollen.",
+        "Prüfe danach den Staged-Diff. Er ist die verbindliche Vorschau des nächsten Commits.",
+      ],
+      note: "Bei einer geänderten Zeile stellt Git intern meist eine entfernte und eine hinzugefügte Zeile dar. Wähle beide Seiten, wenn die vollständige Ersetzung in denselben Commit gehört.",
+    },
+    {
+      id: "app-line-discard",
+      title: "Hunks und einzelne Zeilen verwerfen",
+      summary: "Discard selected verwirft nur die markierten Zeilen; Discard Hunk verwirft den vollständigen Abschnitt. Gitty zeigt vor dem Löschen eine Sicherheitsabfrage.",
+      steps: [
+        "Kontrolliere, ob der Dialog Staged changes oder Unstaged changes anzeigt.",
+        "Markiere exakt die Zeilen, die nicht behalten werden sollen.",
+        "Lies in der Sicherheitsabfrage Pfad und Umfang und bestätige erst danach.",
+        "Aktualisiere den Patch, falls Dateien während des geöffneten Dialogs extern verändert wurden.",
+      ],
+      note: "Vorsicht: Verwerfen kann nicht zuverlässig rückgängig gemacht werden. Erstelle bei wichtigen Zwischenständen zuerst einen Commit oder Stash.",
+    },
+    {
+      id: "app-package-updates",
+      title: "Gitty unter Arch Linux installieren und aktualisieren",
+      summary: "Ein Pacman-Repository auf der CDN-Seite ermöglicht signierte, versionierte Updates. Alternativ lässt sich eine heruntergeladene .pkg.tar.zst-Datei direkt installieren.",
+      commands: [
+        { command: "sudo pacman --config /pfad/gitty-pacman.conf -Syu gitty", description: "Repository-Konfiguration für genau diesen Aufruf verwenden und Gitty aktualisieren" },
+        { command: "sudo pacman -U /pfad/gitty-<version>-x86_64.pkg.tar.zst", description: "Ein einzelnes lokales oder heruntergeladenes Paket installieren" },
+        { command: "pacman -Qi gitty", description: "Installierte Version und Paketinformationen anzeigen" },
+        { command: "pacman -Si gitty", description: "Im konfigurierten Repository verfügbare Version anzeigen" },
+      ],
+      steps: [
+        "Für normale Systemupdates trägst du das Gitty-Repository einmal dauerhaft in /etc/pacman.conf ein.",
+        "Wenn du die Systemdatei nicht ändern möchtest, gib --config bei jedem Pacman-Aufruf erneut an oder verwende ein eigenes Wrapper-Skript.",
+        "Die Build-Pipeline erzeugt das Paket aus dem PKGBUILD, aktualisiert die Repository-Datenbank und veröffentlicht beides auf dem CDN.",
+        "Pacman installiert nur dann eine neue Version, wenn Paketversion und Repository-Datenbank entsprechend aktualisiert wurden.",
+      ],
+      note: "--config gilt nur für den aktuellen Pacman-Prozess. Ein späteres sudo pacman -Syu erinnert sich nicht automatisch an den zuvor angegebenen Pfad.",
+    },
+  );
+
+  deCategories.find((category) => category.id === "branches")?.sections.push(
+    {
+      id: "branches-worktrees-concept",
+      title: "Was ein Worktree ist",
+      summary: "Ein Repository besitzt eine gemeinsame Git-Datenbank, kann aber mehrere Arbeitsordner haben. Jeder Worktree hat eigene ausgecheckte Dateien und normalerweise einen eigenen Branch; Commits und Referenzen sind sofort in allen Worktrees sichtbar.",
+      steps: [
+        "Das Haupt-Worktree ist der Ordner, den du ursprünglich als Repository geöffnet hast.",
+        "Ein zusätzlicher Worktree ist kein vollständiger Clone: Git-Objekte und Historie werden gemeinsam genutzt, nur Arbeitsordner und Index sind getrennt.",
+        "Änderungen in Dateien bleiben im jeweiligen Worktree. Ein dort erstellter Commit ist dagegen sofort Teil desselben Repositorys.",
+        "Worktrees eignen sich besonders für parallele Features, dringende Hotfixes, Reviews oder längere Builds auf einem zweiten Branch.",
+        "Für vollständig unabhängige Remotes, Konfigurationen oder Experimente ist ein eigener Clone weiterhin die passendere Wahl.",
+      ],
+      note: "Ein Branch kann normalerweise nicht gleichzeitig in zwei Worktrees ausgecheckt werden. Das verhindert, dass zwei Ordner denselben Branch widersprüchlich verändern.",
+    },
+    {
+      id: "branches-worktrees",
+      title: "Mehrere Branches mit Worktrees parallel öffnen",
+      summary: "Ein Worktree checkt einen weiteren Branch in einen eigenen Ordner aus. So kannst du an mehreren Aufgaben arbeiten, ohne Branches im Hauptordner umzuschalten oder lokale Änderungen zu stashen.",
+      steps: [
+        "Öffne im Branch-Panel unter Tags den Reiter Worktrees.",
+        "Wähle Existing branch für einen vorhandenen lokalen Branch, New branch für einen neuen Branch oder Detached für einen festen Commit ohne Branch.",
+        "Lege einen leeren Zielordner fest und erstelle den Worktree. Open tab öffnet ihn anschließend als eigenen Repository-Tab.",
+        "Move verschiebt einen nicht aktiven Worktree. Lock schützt ihn vor versehentlichem Prune oder Entfernen, etwa auf einem externen Laufwerk.",
+        "Remove löscht den Worktree-Ordner und seine Registrierung, behält aber den Branch. Prune entfernt nur veraltete Registrierungen nicht mehr vorhandener Ordner.",
+      ],
+      commands: [
+        { command: "git worktree list", description: "Alle registrierten Worktrees anzeigen" },
+        { command: "git worktree add ../projekt-fix fix/login", description: "Vorhandenen Branch in neuem Ordner auschecken" },
+        { command: "git worktree add -b feature/name ../projekt-feature main", description: "Neuen Branch und Worktree von main erstellen" },
+        { command: "git worktree prune --dry-run", description: "Veraltete Registrierungen vor dem Aufräumen prüfen" },
+      ],
+      note: "Ein Branch kann normalerweise nur in einem Worktree gleichzeitig ausgecheckt sein. Ein Worktree mit lokalen Änderungen sollte vor Remove committed, gestasht oder bewusst erzwungen entfernt werden.",
+    },
+  );
+
  deCategories.find((category) => category.id === "branches")?.sections.push(
    {
      id: "branches-strategy",
@@ -979,6 +1061,87 @@
    },
  );

+  enCategories.find((category) => category.id === "app")?.sections.push(
+    {
+      id: "app-line-staging",
+      title: "Stage changes line by line",
+      summary: "The patch dialog lets you prepare individual added and deleted lines instead of staging an entire file or hunk.",
+      steps: [
+        "Open the patch of a changed text file in Unstaged.",
+        "Click the selector in front of a green or red line. Shift-click selects a continuous range.",
+        "The selection bar shows the number of selected lines. Stage selected moves only that selection into Staged.",
+        "Open the same dialog under Staged and use Unstage selected to return individual lines to the working tree.",
+        "Review the Staged diff afterward. It is the authoritative preview of the next commit.",
+      ],
+      note: "Git usually represents one edited line as one deletion plus one addition. Select both sides when the complete replacement belongs in the same commit.",
+    },
+    {
+      id: "app-line-discard",
+      title: "Discard hunks or individual lines",
+      summary: "Discard selected removes only selected lines; Discard Hunk removes the complete section. Gitty shows a confirmation before deleting changes.",
+      steps: [
+        "Check whether the dialog currently shows Staged changes or Unstaged changes.",
+        "Select exactly the lines that should not be kept.",
+        "Review the file path and scope in the confirmation, then confirm.",
+        "Refresh the patch if another application changed the file while the dialog was open.",
+      ],
+      note: "Caution: discarded work cannot always be recovered. Commit or stash important intermediate work first.",
+    },
+    {
+      id: "app-package-updates",
+      title: "Install and update Gitty on Arch Linux",
+      summary: "A Pacman repository hosted on the CDN provides versioned updates. Alternatively, install a downloaded .pkg.tar.zst package directly.",
+      commands: [
+        { command: "sudo pacman --config /path/gitty-pacman.conf -Syu gitty", description: "Use the custom repository configuration for this invocation and update Gitty" },
+        { command: "sudo pacman -U /path/gitty-<version>-x86_64.pkg.tar.zst", description: "Install one local or downloaded package file" },
+        { command: "pacman -Qi gitty", description: "Show the installed version and package information" },
+        { command: "pacman -Si gitty", description: "Show the version available from configured repositories" },
+      ],
+      steps: [
+        "For regular system upgrades, add the Gitty repository to /etc/pacman.conf once.",
+        "If you do not want to change the system file, pass --config on every Pacman invocation or create a dedicated wrapper script.",
+        "The build pipeline creates the package from PKGBUILD, updates the repository database, and publishes both to the CDN.",
+        "Pacman offers an update only after both the package version and repository database have been updated.",
+      ],
+      note: "--config applies only to the current Pacman process. A later sudo pacman -Syu does not remember a previously supplied configuration path.",
+    },
+  );
+
+  enCategories.find((category) => category.id === "branches")?.sections.push(
+    {
+      id: "branches-worktrees-concept",
+      title: "What a worktree is",
+      summary: "One repository has a shared Git database but can have multiple working folders. Each worktree has its own checked-out files and usually its own branch; commits and references are immediately visible from every worktree.",
+      steps: [
+        "The main worktree is the folder you originally opened as the repository.",
+        "An additional worktree is not a full clone: Git objects and history are shared while the working folder and index remain separate.",
+        "File changes stay inside their worktree. A commit created there immediately becomes part of the shared repository.",
+        "Worktrees are useful for parallel features, urgent hotfixes, reviews, or long-running builds on another branch.",
+        "Use a separate clone when you need independent remotes, configuration, or isolated experiments.",
+      ],
+      note: "A branch normally cannot be checked out in two worktrees at once. This prevents two folders from changing the same branch inconsistently.",
+    },
+    {
+      id: "branches-worktrees",
+      title: "Open multiple branches in parallel with worktrees",
+      summary: "A worktree checks out another branch into a separate folder. This lets you work on multiple tasks without switching the main folder or stashing local changes.",
+      steps: [
+        "Open Worktrees below Tags in the Branch panel.",
+        "Choose Existing branch for a local branch, New branch to create one, or Detached for a fixed commit without a branch.",
+        "Choose an empty destination folder and create the worktree. Open tab then opens it as a separate repository tab.",
+        "Move relocates an inactive worktree. Lock protects it from accidental pruning or removal, for example while stored on an external drive.",
+        "Remove deletes the worktree folder and registration but keeps its branch. Prune removes only stale registrations for missing folders.",
+      ],
+      commands: [
+        { command: "git worktree list", description: "Show all registered worktrees" },
+        { command: "git worktree add ../project-fix fix/login", description: "Check out an existing branch in a new folder" },
+        { command: "git worktree add -b feature/name ../project-feature main", description: "Create a branch and worktree from main" },
+        { command: "git worktree prune --dry-run", description: "Preview stale registrations before pruning" },
+      ],
+      note: "A branch can normally be checked out in only one worktree at a time. Commit, stash, or deliberately force removal of local changes before removing a worktree.",
+    },
+  );
+
  enCategories.find((category) => category.id === "branches")?.sections.push(
    {
      id: "branches-strategy",
@@ -1193,6 +1356,106 @@
    },
  );

+  deCategories.splice(1, 0, {
+    id: "changelog",
+    label: "Neu in Gitty",
+    description: "Änderungen seit der letzten veröffentlichten Version und wichtige Neuerungen früherer Releases.",
+    sections: [
+      {
+        id: "changelog-2026-07-22",
+        title: "Version 2026.07.22",
+        summary: "Dieses Release erweitert Gitty um eine AI-gestützte Aufteilung gestagter Änderungen in logisch getrennte Commits.",
+        steps: [
+          "AI-Commit-Aufteilung: Der gestagte Diff wird analysiert und als geordneter Plan aus mehreren logisch zusammengehörenden Commits vorgeschlagen.",
+          "Für jede Gruppe wird automatisch eine editierbare Conventional-Commit-Nachricht erzeugt.",
+          "Dateien können vor dem Commit zwischen den vorgeschlagenen Gruppen verschoben werden.",
+          "Mit „Commit all“ werden alle bestätigten Gruppen sicher und der Reihe nach committed.",
+          "Der Dialog erklärt leere Gruppen oder fehlende Nachrichten und schützt vor einem zwischenzeitlich veränderten Staging-Bereich.",
+          "„Commit all“ reagiert wieder zuverlässig und bricht nicht mehr beim Kopieren des reaktiven Dialogzustands ab.",
+          "Ein geschlossenes aktives Repository kann nicht mehr durch einen verspäteten Status- oder Fetch-Request erneut geöffnet werden.",
+        ],
+        note: "Die AI-Commit-Aufteilung unterstützt OpenAI, Anthropic und eigene OpenAI-kompatible Endpunkte. In Paketdateien erscheint diese Version als 2026.7.22.",
+      },
+      {
+        id: "changelog-2026-07-21",
+        title: "Version 2026.07.21",
+        summary: "Dieses Release bündelt paralleles Arbeiten mit Worktrees, präzisere Commits und die neue Arch-Linux-Verteilung.",
+        steps: [
+          "Worktree-Verwaltung: zusätzliche Arbeitsordner erstellen, öffnen, verschieben, sperren, entsperren, reparieren, entfernen und veraltete Registrierungen aufräumen.",
+          "Worktrees sind direkt über den neuen Reiter unter Tags erreichbar; Branches lassen sich außerdem aus ihrem Kontextmenü in einem Worktree öffnen.",
+          "Zeilenweises Staging: einzelne Ergänzungen und Löschungen auswählen, per Shift-Klick Bereiche markieren sowie ausgewählte Zeilen stagen, unstagen oder verwerfen.",
+          "Sicherere Dialoge: verständlichere Branch-Löschabfrage und weichgezeichneter Hintergrund bei geöffneten Dialogen.",
+          "Arch-Linux-Pakete: automatisierter Build aus dem PKGBUILD, Veröffentlichung von .pkg.tar.zst und Repository-Datenbank für Pacman auf dem CDN.",
+          "Robustere Remote-Aktionen, zentrale Fehlermeldungen und strukturierte, datensparsame Telemetrie.",
+          "Erweiterte zweisprachige Hilfe mit Worktree-, Pacman- und Line-Staging-Anleitungen.",
+        ],
+        note: "In Paketdateien kann dieselbe Version als 2026.7.21 erscheinen, weil Paketmanager numerische Versionssegmente ohne führende Null verwenden.",
+      },
+      {
+        id: "changelog-2026-7-20",
+        title: "Version 2026.7.20",
+        summary: "Der letzte veröffentlichte Stand konzentrierte sich auf produktiveres Arbeiten, bessere Orientierung und einen stabileren Paket-Build.",
+        steps: [
+          "Vor dem Commit kann eine AI-gestützte Codeprüfung den Staged-Diff analysieren.",
+          "Automatische Aktualisierung hält Repository-Status und Arbeitsbereich auf Wunsch aktuell.",
+          "Repository-Aktionsleiste, Statusdarstellung, Tabs und Diff-Ansicht wurden übersichtlicher gestaltet.",
+          "Die integrierte Hilfe wurde um ausführliche deutsche Git-Dokumentation ergänzt.",
+          "PKGBUILD und Build-Skripte wurden für die Arch-Linux-Verteilung vorbereitet.",
+        ],
+      },
+    ],
+  });
+
+  enCategories.splice(1, 0, {
+    id: "changelog",
+    label: "What's new",
+    description: "Changes since the latest published version and notable additions from earlier releases.",
+    sections: [
+      {
+        id: "changelog-2026-07-22",
+        title: "Version 2026.07.22",
+        summary: "This release adds AI-assisted splitting of staged changes into separate logical commits.",
+        steps: [
+          "AI commit splitting analyzes the staged diff and proposes an ordered plan of logically related commits.",
+          "Every group receives an automatically generated, editable Conventional Commit message.",
+          "Files can be moved between proposed groups before committing.",
+          "Commit all safely creates every accepted group in sequence.",
+          "The dialog explains empty groups or missing messages and protects against a staging area that changed after planning.",
+          "Commit all now responds reliably instead of failing while copying reactive dialog state.",
+          "Closing the active repository no longer lets a delayed status or fetch request reopen the closed tab.",
+        ],
+        note: "AI commit splitting supports OpenAI, Anthropic, and custom OpenAI-compatible endpoints. Package metadata represents this version as 2026.7.22.",
+      },
+      {
+        id: "changelog-2026-07-21",
+        title: "Version 2026.07.21",
+        summary: "This release combines parallel worktree workflows, more precise commits, and the new Arch Linux distribution.",
+        steps: [
+          "Worktree management: create, open, move, lock, unlock, repair, remove, and prune additional working folders.",
+          "Worktrees are available from the new entry below Tags; branches can also be opened in a worktree from their context menu.",
+          "Line-level staging: select additions and deletions, Shift-click ranges, and stage, unstage, or discard selected lines.",
+          "Safer dialogs: a clearer branch deletion confirmation and a blurred background while dialogs are open.",
+          "Arch Linux packages: automated PKGBUILD builds plus publication of .pkg.tar.zst and the Pacman repository database to the CDN.",
+          "More robust remote operations, centralized error messages, and structured privacy-conscious telemetry.",
+          "Expanded bilingual help for worktrees, Pacman installation, and line-level staging.",
+        ],
+        note: "Package metadata may represent the same release as 2026.7.21 because package managers use numeric version segments without leading zeroes.",
+      },
+      {
+        id: "changelog-2026-7-20",
+        title: "Version 2026.7.20",
+        summary: "The latest published version focused on productivity, clearer navigation, and a more stable package build.",
+        steps: [
+          "AI-assisted pre-commit review can analyze the staged diff before committing.",
+          "Optional automatic refresh keeps repository status and the workspace current.",
+          "The repository action bar, status presentation, tabs, and diff view became easier to scan.",
+          "The built-in help gained comprehensive German Git documentation.",
+          "PKGBUILD and build scripts prepared the Arch Linux distribution workflow.",
+        ],
+      },
+    ],
+  });
+
  let { language = "en", onClose = () => {} }: Props = $props();
  const isGerman = $derived(language === "de");
  const categories = $derived(isGerman ? deCategories : enCategories);
@@ -1297,6 +1560,7 @@
          >
            <span class="help-nav-icon">
              {#if category.id === "start"}<Home size={17} aria-hidden="true" />
+              {:else if category.id === "changelog"}<Sparkles size={17} aria-hidden="true" />
              {:else if category.id === "app"}<BookOpen size={17} aria-hidden="true" />
              {:else if category.id === "basics"}<GitCommitHorizontal size={17} aria-hidden="true" />
              {:else if category.id === "branches"}<GitBranch size={17} aria-hidden="true" />
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { LoaderCircle, X } from "@lucide/svelte";
+  import { Check, LoaderCircle, MousePointer2, X } from "@lucide/svelte";
  import type { GitFileStatus, PatchApplyAction } from "../types";

  type PatchLineKind = "context" | "add" | "delete" | "meta";
@@ -8,12 +8,17 @@
    id: string;
    text: string;
    kind: PatchLineKind;
+    oldLine: number | null;
+    newLine: number | null;
  }

  interface PatchHunk {
    id: string;
    header: string;
    lines: PatchLine[];
+    oldStart: number;
+    newStart: number;
+    suffix: string;
  }

  interface ParsedPatch {
@@ -31,7 +36,7 @@
    error: string;
    onClose: () => void;
    onRefresh: () => void | Promise<void>;
-    onApply: (action: PatchApplyAction, patch: string) => void | Promise<void>;
+    onApply: (action: PatchApplyAction, patch: string, scope: "hunk" | "lines") => void | Promise<void>;
  }

  let {
@@ -48,12 +53,20 @@

  let parsed = $state<ParsedPatch>({ headerLines: [], hunks: [], binary: false });
  let patchScroll = $state<HTMLDivElement | null>(null);
+  let selectedLineIds = $state<Set<string>>(new Set());
+  let lastSelectedLineId = $state("");

  let scopeLabel = $derived(staged ? "Staged changes" : "Unstaged changes");
  let displayPath = $derived(file.old_path ? `${file.old_path} -> ${file.path}` : file.path);
+  let selectableLines = $derived(
+    parsed.hunks.flatMap((hunk) => hunk.lines.filter((line) => line.kind === "add" || line.kind === "delete")),
+  );
+  let selectedCount = $derived(selectableLines.filter((line) => selectedLineIds.has(line.id)).length);

  $effect(() => {
    parsed = parsePatch(patch);
+    selectedLineIds = new Set();
+    lastSelectedLineId = "";
  });

  function parsePatch(input: string): ParsedPatch {
@@ -64,10 +77,22 @@
    const headerLines: string[] = [];
    const hunks: PatchHunk[] = [];
    let current: PatchHunk | null = null;
+    let oldCursor = 0;
+    let newCursor = 0;

    for (const line of lines) {
      if (line.startsWith("@@ ")) {
-        current = { id: `hunk-${hunks.length}`, header: line, lines: [] };
+        const range = parseHunkHeader(line);
+        current = {
+          id: `hunk-${hunks.length}`,
+          header: line,
+          lines: [],
+          oldStart: range.oldStart,
+          newStart: range.newStart,
+          suffix: range.suffix,
+        };
+        oldCursor = range.oldStart;
+        newCursor = range.newStart;
        hunks.push(current);
        continue;
      }
@@ -78,11 +103,17 @@
      }

      const kind = patchLineKind(line);
+      const oldLine = kind === "context" || kind === "delete" ? oldCursor : null;
+      const newLine = kind === "context" || kind === "add" ? newCursor : null;
      current.lines.push({
        id: `${current.id}-line-${current.lines.length}`,
        text: line,
        kind,
+        oldLine,
+        newLine,
      });
+      if (oldLine !== null) oldCursor += 1;
+      if (newLine !== null) newCursor += 1;
    }

    return {
@@ -92,6 +123,15 @@
    };
  }

+  function parseHunkHeader(header: string): { oldStart: number; newStart: number; suffix: string } {
+    const match = header.match(/^@@ -(\d+)(?:,\d+)? \+(\d+)(?:,\d+)? @@(.*)$/);
+    return {
+      oldStart: Number(match?.[1] ?? 0),
+      newStart: Number(match?.[2] ?? 0),
+      suffix: match?.[3] ?? "",
+    };
+  }
+
  function patchLineKind(line: string): PatchLineKind {
    if (line.startsWith("+") && !line.startsWith("+++")) return "add";
    if (line.startsWith("-") && !line.startsWith("---")) return "delete";
@@ -117,7 +157,91 @@

  async function applyHunkAction(action: PatchApplyAction, hunk: PatchHunk) {
    if (isBusy || isLoading) return;
-    await onApply(action, buildHunkPatch(hunk));
+    await onApply(action, buildHunkPatch(hunk), "hunk");
+  }
+
+  function toggleLine(event: MouseEvent, line: PatchLine) {
+    if (isBusy || isLoading || (line.kind !== "add" && line.kind !== "delete")) return;
+    const next = new Set(selectedLineIds);
+    const selecting = !next.has(line.id);
+    if (event.shiftKey && lastSelectedLineId) {
+      const start = selectableLines.findIndex((candidate) => candidate.id === lastSelectedLineId);
+      const end = selectableLines.findIndex((candidate) => candidate.id === line.id);
+      if (start >= 0 && end >= 0) {
+        for (const candidate of selectableLines.slice(Math.min(start, end), Math.max(start, end) + 1)) {
+          if (selecting) next.add(candidate.id);
+          else next.delete(candidate.id);
+        }
+      }
+    } else if (selecting) {
+      next.add(line.id);
+    } else {
+      next.delete(line.id);
+    }
+    selectedLineIds = next;
+    lastSelectedLineId = line.id;
+  }
+
+  function toggleHunkSelection(hunk: PatchHunk) {
+    const changed = hunk.lines.filter((line) => line.kind === "add" || line.kind === "delete");
+    const allSelected = changed.length > 0 && changed.every((line) => selectedLineIds.has(line.id));
+    const next = new Set(selectedLineIds);
+    for (const line of changed) {
+      if (allSelected) next.delete(line.id);
+      else next.add(line.id);
+    }
+    selectedLineIds = next;
+    lastSelectedLineId = changed[changed.length - 1]?.id ?? "";
+  }
+
+  function hunkSelectionState(hunk: PatchHunk): "none" | "some" | "all" {
+    const changed = hunk.lines.filter((line) => line.kind === "add" || line.kind === "delete");
+    const count = changed.filter((line) => selectedLineIds.has(line.id)).length;
+    return count === 0 ? "none" : count === changed.length ? "all" : "some";
+  }
+
+  function rangePart(start: number, count: number): string {
+    return count === 1 ? `${start}` : `${start},${count}`;
+  }
+
+  function buildSelectedHunk(hunk: PatchHunk): string | null {
+    if (!hunk.lines.some((line) => selectedLineIds.has(line.id))) return null;
+    const output: string[] = [];
+    let previousIncluded = false;
+
+    for (const line of hunk.lines) {
+      if (line.kind === "context") {
+        output.push(line.text);
+        previousIncluded = true;
+      } else if (line.kind === "delete") {
+        output.push(selectedLineIds.has(line.id) ? line.text : ` ${line.text.slice(1)}`);
+        previousIncluded = true;
+      } else if (line.kind === "add") {
+        if (selectedLineIds.has(line.id)) {
+          output.push(line.text);
+          previousIncluded = true;
+        } else {
+          previousIncluded = false;
+        }
+      } else if (previousIncluded) {
+        output.push(line.text);
+      }
+    }
+
+    const oldCount = output.filter((line) => line.startsWith(" ") || line.startsWith("-")).length;
+    const newCount = output.filter((line) => line.startsWith(" ") || line.startsWith("+")).length;
+    const header = `@@ -${rangePart(hunk.oldStart, oldCount)} +${rangePart(hunk.newStart, newCount)} @@${hunk.suffix}`;
+    return [header, ...output].join("\n");
+  }
+
+  function buildSelectedPatch(): string {
+    const hunks = parsed.hunks.map(buildSelectedHunk).filter((hunk): hunk is string => Boolean(hunk));
+    return `${[...parsed.headerLines, ...hunks].join("\n")}\n`;
+  }
+
+  async function applySelected(action: PatchApplyAction) {
+    if (isBusy || isLoading || selectedCount === 0) return;
+    await onApply(action, buildSelectedPatch(), "lines");
  }

  function hunkPosition(index: number): number {
@@ -166,54 +290,106 @@
      {:else if parsed.binary || parsed.hunks.length === 0}
        <div class="blank-state">This change cannot be split into text lines.</div>
      {:else}
-        <div class="line-patch-workspace">
-        <div class="line-patch-scroll" bind:this={patchScroll}>
-          {#each parsed.hunks as hunk (hunk.id)}
-            <section class="line-patch-hunk" data-hunk-id={hunk.id}>
-              <div class="line-patch-hunk-head">
-                <code>{hunk.header}</code>
-                <div class="line-patch-hunk-actions">
-                  {#if staged}
-                    <button class="line-patch-hunk-button discard" type="button" onclick={() => applyHunkAction("discard-staged", hunk)} disabled={isBusy}>
-                      Discard Hunk
-                    </button>
-                    <button class="line-patch-hunk-button unstage" type="button" onclick={() => applyHunkAction("unstage", hunk)} disabled={isBusy}>
-                      Unstage Hunk
-                    </button>
-                  {:else}
-                    <button class="line-patch-hunk-button discard" type="button" onclick={() => applyHunkAction("discard-unstaged", hunk)} disabled={isBusy}>
-                      Discard Hunk
-                    </button>
-                    <button class="line-patch-hunk-button stage" type="button" onclick={() => applyHunkAction("stage", hunk)} disabled={isBusy}>
-                      Stage Hunk
-                    </button>
-                  {/if}
-                </div>
-              </div>
-
-              <div class="line-patch-lines">
-                {#each hunk.lines as line (line.id)}
-                  <div class={`line-patch-row ${line.kind}`}>
-                    <span class="line-patch-prefix">{linePrefix(line)}</span>
-                    <code>{lineBody(line)}</code>
-                  </div>
-                {/each}
-              </div>
-            </section>
-          {/each}
+        <div class:active={selectedCount > 0} class="line-patch-selection-bar">
+          <div>
+            <MousePointer2 size={14} aria-hidden="true" />
+            {#if selectedCount > 0}
+              <strong>{selectedCount} {selectedCount === 1 ? "line" : "lines"} selected</strong>
+              <span>Shift-click to select a range.</span>
+            {:else}
+              <strong>Select changed lines</strong>
+              <span>Choose individual additions or deletions below.</span>
+            {/if}
+          </div>
+          {#if selectedCount > 0}
+            <div class="line-patch-selected-actions">
+              <button class="line-patch-hunk-button discard" type="button" onclick={() => applySelected(staged ? "discard-staged" : "discard-unstaged")} disabled={isBusy}>
+                Discard selected
+              </button>
+              <button class="line-patch-hunk-button {staged ? "unstage" : "stage"}" type="button" onclick={() => applySelected(staged ? "unstage" : "stage")} disabled={isBusy}>
+                {staged ? "Unstage selected" : "Stage selected"}
+              </button>
+              <button class="btn-sm" type="button" onclick={() => { selectedLineIds = new Set(); }} disabled={isBusy}>Clear</button>
+            </div>
+          {/if}
        </div>
-        <nav class="diff-overview line-patch-overview" aria-label="Change overview">
-          {#each parsed.hunks as hunk, index (hunk.id)}
-            <button
-              class="diff-overview-marker {hunkKind(hunk)}"
-              type="button"
-              style={`--marker-position: ${hunkPosition(index)}%`}
-              onclick={() => scrollToHunk(hunk.id)}
-              title={`Jump to hunk ${index + 1} of ${parsed.hunks.length}`}
-              aria-label={`Jump to hunk ${index + 1} of ${parsed.hunks.length}`}
-            ></button>
-          {/each}
-        </nav>
+
+        <div class="line-patch-workspace">
+          <div class="line-patch-scroll" bind:this={patchScroll}>
+            {#each parsed.hunks as hunk (hunk.id)}
+              <section class="line-patch-hunk" data-hunk-id={hunk.id}>
+                <div class="line-patch-hunk-head">
+                  <button
+                    class:all={hunkSelectionState(hunk) === "all"}
+                    class:some={hunkSelectionState(hunk) === "some"}
+                    class="line-patch-select-hunk"
+                    type="button"
+                    onclick={() => toggleHunkSelection(hunk)}
+                    aria-label={`Select changed lines in ${hunk.header}`}
+                    aria-pressed={hunkSelectionState(hunk) === "all"}
+                    title="Select all changed lines in this hunk"
+                  >
+                    {#if hunkSelectionState(hunk) !== "none"}<Check size={12} aria-hidden="true" />{/if}
+                  </button>
+                  <code>{hunk.header}</code>
+                  <div class="line-patch-hunk-actions">
+                    {#if staged}
+                      <button class="line-patch-hunk-button discard" type="button" onclick={() => applyHunkAction("discard-staged", hunk)} disabled={isBusy}>
+                        Discard Hunk
+                      </button>
+                      <button class="line-patch-hunk-button unstage" type="button" onclick={() => applyHunkAction("unstage", hunk)} disabled={isBusy}>
+                        Unstage Hunk
+                      </button>
+                    {:else}
+                      <button class="line-patch-hunk-button discard" type="button" onclick={() => applyHunkAction("discard-unstaged", hunk)} disabled={isBusy}>
+                        Discard Hunk
+                      </button>
+                      <button class="line-patch-hunk-button stage" type="button" onclick={() => applyHunkAction("stage", hunk)} disabled={isBusy}>
+                        Stage Hunk
+                      </button>
+                    {/if}
+                  </div>
+                </div>
+
+                <div class="line-patch-lines">
+                  {#each hunk.lines as line (line.id)}
+                    <div class:selected={selectedLineIds.has(line.id)} class:selectable={line.kind === "add" || line.kind === "delete"} class={`line-patch-row ${line.kind}`}>
+                      {#if line.kind === "add" || line.kind === "delete"}
+                        <button
+                          class="line-patch-line-select"
+                          type="button"
+                          onclick={(event) => toggleLine(event, line)}
+                          aria-label={`${selectedLineIds.has(line.id) ? "Deselect" : "Select"} ${line.kind === "add" ? "added" : "deleted"} line ${line.newLine ?? line.oldLine ?? ""}`}
+                          aria-pressed={selectedLineIds.has(line.id)}
+                          title="Select line (Shift-click for range)"
+                        >
+                          {#if selectedLineIds.has(line.id)}<Check size={11} aria-hidden="true" />{/if}
+                        </button>
+                      {:else}
+                        <span class="line-patch-line-select-placeholder"></span>
+                      {/if}
+                      <span class="line-patch-line-number">{line.oldLine ?? ""}</span>
+                      <span class="line-patch-line-number">{line.newLine ?? ""}</span>
+                      <span class="line-patch-prefix">{linePrefix(line)}</span>
+                      <code>{lineBody(line)}</code>
+                    </div>
+                  {/each}
+                </div>
+              </section>
+            {/each}
+          </div>
+          <nav class="diff-overview line-patch-overview" aria-label="Change overview">
+            {#each parsed.hunks as hunk, index (hunk.id)}
+              <button
+                class="diff-overview-marker {hunkKind(hunk)}"
+                type="button"
+                style={`--marker-position: ${hunkPosition(index)}%`}
+                onclick={() => scrollToHunk(hunk.id)}
+                title={`Jump to hunk ${index + 1} of ${parsed.hunks.length}`}
+                aria-label={`Jump to hunk ${index + 1} of ${parsed.hunks.length}`}
+              ></button>
+            {/each}
+          </nav>
        </div>
      {/if}
    </div>
@@ -0,0 +1,455 @@
+<script lang="ts">
+  import { open as openDialog } from "@tauri-apps/plugin-dialog";
+  import {
+    AlertTriangle,
+    Check,
+    CircleDot,
+    ExternalLink,
+    FolderInput,
+    FolderOpen,
+    GitBranch,
+    HardDrive,
+    LoaderCircle,
+    Lock,
+    MapPin,
+    Plus,
+    RefreshCw,
+    ShieldCheck,
+    Trash2,
+    Unlock,
+    Wrench,
+    X,
+  } from "@lucide/svelte";
+  import type { GitBranch as GitBranchInfo, GitWorktree } from "../types";
+
+  type CreateMode = "existing" | "new" | "detached";
+
+  interface AddRequest {
+    worktreePath: string;
+    branch?: string;
+    newBranch?: string;
+    startPoint?: string;
+    detached?: boolean;
+    lock?: boolean;
+  }
+
+  interface Props {
+    worktrees: GitWorktree[];
+    branches: GitBranchInfo[];
+    initialBranch?: string;
+    isLoading: boolean;
+    isBusy: boolean;
+    error?: string;
+    onRefresh: () => void | Promise<void>;
+    onOpen: (worktree: GitWorktree) => void | Promise<void>;
+    onAdd: (request: AddRequest) => boolean | Promise<boolean>;
+    onRemove: (worktree: GitWorktree, force: boolean) => boolean | Promise<boolean>;
+    onMove: (worktree: GitWorktree, destination: string) => void | Promise<void>;
+    onLock: (worktree: GitWorktree, reason: string) => boolean | Promise<boolean>;
+    onUnlock: (worktree: GitWorktree) => void | Promise<void>;
+    onPrune: () => void | Promise<void>;
+    onRepair: (worktree: GitWorktree, location: string) => void | Promise<void>;
+    onClose: () => void;
+  }
+
+  let {
+    worktrees = [],
+    branches = [],
+    initialBranch = "",
+    isLoading = false,
+    isBusy = false,
+    error = "",
+    onRefresh = () => {},
+    onOpen = () => {},
+    onAdd = () => false,
+    onRemove = () => false,
+    onMove = () => {},
+    onLock = () => false,
+    onUnlock = () => {},
+    onPrune = () => {},
+    onRepair = () => {},
+    onClose = () => {},
+  }: Props = $props();
+
+  let createOpen = $state(false);
+  let createMode = $state<CreateMode>("new");
+  let selectedBranch = $state("");
+  let newBranch = $state("");
+  let startPoint = $state("HEAD");
+  let destination = $state("");
+  let lockAfterCreate = $state(false);
+  let pendingRemoval = $state<GitWorktree | null>(null);
+  let forceRemoval = $state(false);
+  let pendingLock = $state<GitWorktree | null>(null);
+  let lockReason = $state("");
+  let initialized = false;
+
+  $effect(() => {
+    if (initialized) return;
+    createOpen = initialBranch.length > 0;
+    createMode = initialBranch ? "existing" : "new";
+    selectedBranch = initialBranch;
+    initialized = true;
+  });
+
+  let localBranches = $derived(branches.filter((branch) => !branch.remote));
+  let prunableCount = $derived(worktrees.filter((worktree) => worktree.prunable).length);
+  let linkedCount = $derived(Math.max(0, worktrees.length - 1));
+  let checkedOutBranches = $derived(new Set(worktrees.map((worktree) => worktree.branch).filter((branch): branch is string => Boolean(branch))));
+
+  function displayName(worktree: GitWorktree): string {
+    return worktree.branch || (worktree.detached ? `Detached at ${worktree.short_head || "HEAD"}` : "Bare worktree");
+  }
+
+  function pathName(path: string): string {
+    return path.split(/[\\/]/).filter(Boolean).pop() || path;
+  }
+
+  function branchAvailable(branch: string): boolean {
+    return !checkedOutBranches.has(branch);
+  }
+
+  function joinPath(parent: string, name: string): string {
+    const separator = parent.includes("\\") ? "\\" : "/";
+    return `${parent.replace(/[\\/]+$/, "")}${separator}${name}`;
+  }
+
+  async function chooseDestination(current = "") {
+    const selected = await openDialog({
+      title: current ? "Choose new worktree location" : "Choose worktree folder",
+      directory: true,
+      multiple: false,
+      defaultPath: current || undefined,
+    });
+    if (typeof selected === "string") destination = selected;
+  }
+
+  async function submitCreate(event: SubmitEvent) {
+    event.preventDefault();
+    if (!destination.trim()) return;
+    const request: AddRequest = {
+      worktreePath: destination.trim(),
+      lock: lockAfterCreate,
+    };
+    if (createMode === "existing") request.branch = selectedBranch;
+    if (createMode === "new") {
+      request.newBranch = newBranch.trim();
+      request.startPoint = startPoint.trim() || "HEAD";
+    }
+    if (createMode === "detached") {
+      request.detached = true;
+      request.startPoint = startPoint.trim() || "HEAD";
+    }
+    if (await onAdd(request)) {
+      createOpen = false;
+      destination = "";
+      newBranch = "";
+    }
+  }
+
+  async function chooseMoveDestination(worktree: GitWorktree) {
+    const selected = await openDialog({
+      title: `Choose parent folder for ${displayName(worktree)}`,
+      directory: true,
+      multiple: false,
+      defaultPath: worktree.path,
+    });
+    if (typeof selected === "string") {
+      const target = joinPath(selected, pathName(worktree.path));
+      if (target !== worktree.path) await onMove(worktree, target);
+    }
+  }
+
+  async function chooseRepairLocation(worktree: GitWorktree) {
+    const selected = await openDialog({
+      title: `Locate ${displayName(worktree)}`,
+      directory: true,
+      multiple: false,
+    });
+    if (typeof selected === "string") await onRepair(worktree, selected);
+  }
+
+  function requestRemoval(worktree: GitWorktree) {
+    pendingRemoval = worktree;
+    forceRemoval = false;
+  }
+
+  async function confirmRemoval() {
+    if (!pendingRemoval) return;
+    if (await onRemove(pendingRemoval, forceRemoval)) {
+      pendingRemoval = null;
+      forceRemoval = false;
+    }
+  }
+
+  function requestLock(worktree: GitWorktree) {
+    pendingLock = worktree;
+    lockReason = "";
+  }
+
+  async function confirmLock() {
+    if (!pendingLock) return;
+    if (await onLock(pendingLock, lockReason)) {
+      pendingLock = null;
+      lockReason = "";
+    }
+  }
+</script>
+
+<div class="dialog-backdrop" role="presentation">
+  <div class="dialog worktree-dialog" role="dialog" aria-modal="true" aria-labelledby="worktree-dialog-title">
+    <header class="dialog-header worktree-dialog-header">
+      <div class="worktree-dialog-heading">
+        <span class="worktree-dialog-mark" aria-hidden="true"><HardDrive size={18} /></span>
+        <div>
+          <span class="eyebrow">Parallel workspaces</span>
+          <p class="dialog-title" id="worktree-dialog-title">Worktrees</p>
+        </div>
+      </div>
+      <div class="dialog-header-actions">
+        <button class="btn-sm" type="button" onclick={onRefresh} disabled={isBusy || isLoading} title="Refresh worktrees">
+          <RefreshCw class={isLoading ? "spin" : undefined} size={15} aria-hidden="true" />
+          Refresh
+        </button>
+        <button class="btn-sm dialog-close" type="button" onclick={onClose} disabled={isBusy} aria-label="Close">
+          <X size={16} aria-hidden="true" />
+        </button>
+      </div>
+    </header>
+
+    <div class="worktree-summary">
+      <div><strong>{linkedCount}</strong><span>linked worktrees</span></div>
+      <div><strong>{worktrees.filter((worktree) => !worktree.clean).length}</strong><span>with changes</span></div>
+      <div class:attention={prunableCount > 0}><strong>{prunableCount}</strong><span>stale entries</span></div>
+      <button class="btn-primary" type="button" onclick={() => { createOpen = !createOpen; }} disabled={isBusy}>
+        <Plus size={15} aria-hidden="true" />
+        New worktree
+      </button>
+    </div>
+
+    {#if error}
+      <div class="worktree-error" role="alert"><AlertTriangle size={15} aria-hidden="true" />{error}</div>
+    {/if}
+
+    <div class="worktree-content">
+      {#if createOpen}
+        <form class="worktree-create-card" onsubmit={submitCreate}>
+          <header>
+            <div>
+              <span class="eyebrow">Create</span>
+              <h3>Choose what this workspace should track</h3>
+            </div>
+            <button class="btn-sm dialog-close" type="button" onclick={() => { createOpen = false; }} disabled={isBusy} aria-label="Close create form">
+              <X size={15} aria-hidden="true" />
+            </button>
+          </header>
+
+          <div class="worktree-mode-tabs" role="tablist" aria-label="Worktree type">
+            <button class:active={createMode === "existing"} type="button" role="tab" aria-selected={createMode === "existing"} onclick={() => { createMode = "existing"; }}>
+              <GitBranch size={14} aria-hidden="true" />Existing branch
+            </button>
+            <button class:active={createMode === "new"} type="button" role="tab" aria-selected={createMode === "new"} onclick={() => { createMode = "new"; }}>
+              <Plus size={14} aria-hidden="true" />New branch
+            </button>
+            <button class:active={createMode === "detached"} type="button" role="tab" aria-selected={createMode === "detached"} onclick={() => { createMode = "detached"; }}>
+              <CircleDot size={14} aria-hidden="true" />Detached
+            </button>
+          </div>
+
+          <div class="worktree-create-fields">
+            {#if createMode === "existing"}
+              <label>
+                <span>Branch</span>
+                <select bind:value={selectedBranch} disabled={isBusy}>
+                  <option value="" disabled>Select a local branch</option>
+                  {#each localBranches as branch (branch.name)}
+                    <option value={branch.name} disabled={!branchAvailable(branch.name)}>{branch.name}{!branchAvailable(branch.name) ? " (already checked out)" : ""}</option>
+                  {/each}
+                </select>
+              </label>
+            {:else if createMode === "new"}
+              <label>
+                <span>New branch name</span>
+                <input bind:value={newBranch} disabled={isBusy} autocomplete="off" spellcheck="false" placeholder="feature/my-change" />
+              </label>
+              <label>
+                <span>Start point</span>
+                <input bind:value={startPoint} disabled={isBusy} autocomplete="off" spellcheck="false" placeholder="HEAD, branch or commit" />
+              </label>
+            {:else}
+              <label>
+                <span>Commit or ref</span>
+                <input bind:value={startPoint} disabled={isBusy} autocomplete="off" spellcheck="false" placeholder="HEAD" />
+              </label>
+            {/if}
+
+            <label class="worktree-path-field">
+              <span>Folder</span>
+              <div>
+                <input bind:value={destination} disabled={isBusy} autocomplete="off" spellcheck="false" placeholder="Choose an empty folder" />
+                <button class="btn-secondary" type="button" onclick={() => chooseDestination()} disabled={isBusy}>
+                  <FolderOpen size={15} aria-hidden="true" />Browse
+                </button>
+              </div>
+            </label>
+          </div>
+
+          <footer>
+            <label class="worktree-check">
+              <input type="checkbox" bind:checked={lockAfterCreate} disabled={isBusy} />
+              <span><strong>Lock after creation</strong><small>Protects removable or temporary locations from pruning.</small></span>
+            </label>
+            <button
+              class="btn-primary"
+              type="submit"
+              disabled={isBusy || !destination.trim() || (createMode === "existing" && (!selectedBranch || !branchAvailable(selectedBranch))) || (createMode === "new" && !newBranch.trim())}
+            >
+              {#if isBusy}<LoaderCircle class="spin" size={15} aria-hidden="true" />{:else}<Plus size={15} aria-hidden="true" />{/if}
+              Create worktree
+            </button>
+          </footer>
+        </form>
+      {/if}
+
+      {#if isLoading && worktrees.length === 0}
+        <div class="worktree-loading"><LoaderCircle class="spin" size={22} aria-hidden="true" /><span>Reading worktrees…</span></div>
+      {:else if worktrees.length === 0}
+        <div class="worktree-empty"><HardDrive size={24} aria-hidden="true" /><strong>No worktrees found</strong><span>Create one to work on another branch without switching this workspace.</span></div>
+      {:else}
+        <div class="worktree-list">
+          {#each worktrees as worktree (worktree.path)}
+            <article class:current={worktree.is_current} class:stale={worktree.prunable || worktree.missing} class="worktree-card">
+              <div class="worktree-rail" aria-hidden="true">
+                <span></span>
+                {#if !worktree.is_main}<i></i>{/if}
+              </div>
+              <div class="worktree-card-main">
+                <header>
+                  <div class="worktree-name">
+                    <GitBranch size={16} aria-hidden="true" />
+                    <div>
+                      <strong>{displayName(worktree)}</strong>
+                      <span>{pathName(worktree.path)}</span>
+                    </div>
+                  </div>
+                  <div class="worktree-badges">
+                    {#if worktree.is_main}<span>Main</span>{/if}
+                    {#if worktree.is_current}<span class="active">Open</span>{/if}
+                    {#if worktree.detached}<span>Detached</span>{/if}
+                    {#if worktree.locked}<span class="locked"><Lock size={10} aria-hidden="true" />Locked</span>{/if}
+                    {#if worktree.prunable || worktree.missing}<span class="danger">Stale</span>{/if}
+                  </div>
+                </header>
+
+                <div class="worktree-path" title={worktree.path}><MapPin size={13} aria-hidden="true" /><code>{worktree.path}</code></div>
+
+                <div class="worktree-meta">
+                  <span class:dirty={!worktree.clean}>
+                    {#if worktree.clean}<Check size={12} aria-hidden="true" />Clean{:else}<CircleDot size={12} aria-hidden="true" />{worktree.changed_files} changed{/if}
+                  </span>
+                  {#if worktree.short_head}<span><code>{worktree.short_head}</code></span>{/if}
+                  {#if worktree.lock_reason}<span><Lock size={12} aria-hidden="true" />{worktree.lock_reason}</span>{/if}
+                  {#if worktree.prune_reason}<span class="danger"><AlertTriangle size={12} aria-hidden="true" />{worktree.prune_reason}</span>{/if}
+                </div>
+
+                <footer>
+                  <button class="btn-secondary" type="button" onclick={() => onOpen(worktree)} disabled={isBusy || worktree.missing || worktree.bare}>
+                    <ExternalLink size={14} aria-hidden="true" />{worktree.is_current ? "Refresh tab" : "Open tab"}
+                  </button>
+                  <div class="worktree-card-actions">
+                    {#if worktree.prunable}
+                      <button class="btn-sm" type="button" onclick={() => chooseRepairLocation(worktree)} disabled={isBusy} title="Locate and repair worktree">
+                        <Wrench size={14} aria-hidden="true" />Repair
+                      </button>
+                    {/if}
+                    {#if !worktree.is_main && !worktree.missing}
+                      <button class="btn-sm" type="button" onclick={() => chooseMoveDestination(worktree)} disabled={isBusy || worktree.locked || worktree.is_current} title="Move worktree">
+                        <FolderInput size={14} aria-hidden="true" />Move
+                      </button>
+                    {/if}
+                    {#if worktree.locked}
+                      <button class="btn-sm" type="button" onclick={() => onUnlock(worktree)} disabled={isBusy} title="Unlock worktree">
+                        <Unlock size={14} aria-hidden="true" />Unlock
+                      </button>
+                    {:else if !worktree.is_main}
+                      <button class="btn-sm" type="button" onclick={() => requestLock(worktree)} disabled={isBusy} title="Lock worktree">
+                        <Lock size={14} aria-hidden="true" />Lock
+                      </button>
+                    {/if}
+                    {#if !worktree.is_main}
+                      <button class="btn-sm danger" type="button" onclick={() => requestRemoval(worktree)} disabled={isBusy || worktree.is_current || worktree.locked || worktree.missing} title={worktree.missing ? "Use Prune to remove stale metadata" : "Remove worktree"}>
+                        <Trash2 size={14} aria-hidden="true" />Remove
+                      </button>
+                    {/if}
+                  </div>
+                </footer>
+              </div>
+            </article>
+          {/each}
+        </div>
+      {/if}
+    </div>
+
+    <footer class="worktree-dialog-footer">
+      <div><ShieldCheck size={14} aria-hidden="true" /><span>Dirty, active and locked worktrees are protected.</span></div>
+      <button class="btn-secondary" type="button" onclick={onPrune} disabled={isBusy || prunableCount === 0}>
+        <Wrench size={14} aria-hidden="true" />Prune {prunableCount || ""}
+      </button>
+    </footer>
+  </div>
+</div>
+
+{#if pendingRemoval}
+  <div class="dialog-backdrop worktree-nested-backdrop" role="presentation">
+    <div class="dialog worktree-confirm-dialog" role="alertdialog" aria-modal="true" aria-labelledby="worktree-remove-title">
+      <header class="dialog-header">
+        <div>
+          <span class="eyebrow">Remove worktree</span>
+          <p class="dialog-title" id="worktree-remove-title">Remove {displayName(pendingRemoval)}?</p>
+        </div>
+      </header>
+      <div class="worktree-confirm-body">
+        <span class="discard-warning-icon" aria-hidden="true"><AlertTriangle size={21} /></span>
+        <div>
+          <p>This removes the worktree folder and its Git registration. The branch itself is kept.</p>
+          <code>{pendingRemoval.path}</code>
+          {#if !pendingRemoval.clean}
+            <label class="worktree-check danger">
+              <input type="checkbox" bind:checked={forceRemoval} disabled={isBusy} />
+              <span><strong>Remove despite local changes</strong><small>{pendingRemoval.changed_files} changed files may be permanently deleted.</small></span>
+            </label>
+          {/if}
+        </div>
+      </div>
+      <footer class="discard-confirm-actions">
+        <button class="btn-secondary" type="button" onclick={() => { pendingRemoval = null; }} disabled={isBusy}>Cancel</button>
+        <button class="btn-danger" type="button" onclick={confirmRemoval} disabled={isBusy || (!pendingRemoval.clean && !forceRemoval)}>
+          <Trash2 size={15} aria-hidden="true" />Remove worktree
+        </button>
+      </footer>
+    </div>
+  </div>
+{/if}
+
+{#if pendingLock}
+  <div class="dialog-backdrop worktree-nested-backdrop" role="presentation">
+    <div class="dialog worktree-confirm-dialog" role="dialog" aria-modal="true" aria-labelledby="worktree-lock-title">
+      <header class="dialog-header">
+        <div>
+          <span class="eyebrow">Protect worktree</span>
+          <p class="dialog-title" id="worktree-lock-title">Lock {displayName(pendingLock)}</p>
+        </div>
+      </header>
+      <div class="worktree-lock-body">
+        <label>
+          <span>Reason <small>optional</small></span>
+          <input bind:value={lockReason} disabled={isBusy} autocomplete="off" placeholder="External drive, long-running work…" />
+        </label>
+      </div>
+      <footer class="discard-confirm-actions">
+        <button class="btn-secondary" type="button" onclick={() => { pendingLock = null; }} disabled={isBusy}>Cancel</button>
+        <button class="btn-primary" type="button" onclick={confirmLock} disabled={isBusy}><Lock size={15} aria-hidden="true" />Lock</button>
+      </footer>
+    </div>
+  </div>
+{/if}
@@ -1,7 +1,8 @@
-import { invoke } from "@tauri-apps/api/core";
+import { tracedInvoke as invoke } from "./telemetry";

 import type {
  AiReviewResult,
+  AiCommitPlan,
  CommitAiLocalProfile,
  CommitAiProvider,
  CommitAiStatus,
@@ -21,6 +22,7 @@ import type {
  GitStash,
  GitStatus,
  GitTag,
+  GitWorktree,
  LocalModelOption,
  PatchApplyAction,
  RepositoryBundle,
@@ -116,6 +118,56 @@ export function deleteBranch(path: string, branch: string, force = false): Promi
  return invoke<GitStatus>("delete_branch", { path, branch, force });
 }

+export function listWorktrees(path: string): Promise<GitWorktree[]> {
+  return invoke<GitWorktree[]>("list_worktrees", { path });
+}
+
+export function addWorktree(
+  path: string,
+  worktreePath: string,
+  options: {
+    branch?: string;
+    newBranch?: string;
+    startPoint?: string;
+    detached?: boolean;
+    lock?: boolean;
+  } = {},
+): Promise<GitWorktree[]> {
+  return invoke<GitWorktree[]>("add_worktree", {
+    path,
+    worktreePath,
+    branch: options.branch ?? null,
+    newBranch: options.newBranch ?? null,
+    startPoint: options.startPoint ?? null,
+    detached: options.detached ?? false,
+    lock: options.lock ?? false,
+  });
+}
+
+export function removeWorktree(path: string, worktreePath: string, force = false): Promise<GitWorktree[]> {
+  return invoke<GitWorktree[]>("remove_worktree", { path, worktreePath, force });
+}
+
+export function moveWorktree(path: string, worktreePath: string, destination: string): Promise<GitWorktree[]> {
+  return invoke<GitWorktree[]>("move_worktree", { path, worktreePath, destination });
+}
+
+export function lockWorktree(path: string, worktreePath: string, reason?: string): Promise<GitWorktree[]> {
+  return invoke<GitWorktree[]>("lock_worktree", { path, worktreePath, reason: reason?.trim() || null });
+}
+
+export function unlockWorktree(path: string, worktreePath: string): Promise<GitWorktree[]> {
+  return invoke<GitWorktree[]>("unlock_worktree", { path, worktreePath });
+}
+
+export function pruneWorktrees(path: string): Promise<GitWorktree[]> {
+  return invoke<GitWorktree[]>("prune_worktrees", { path });
+}
+
+export function repairWorktree(path: string, worktreePath: string): Promise<GitWorktree[]> {
+  return invoke<GitWorktree[]>("repair_worktree", { path, worktreePath });
+}
+
 export function listTags(path: string): Promise<GitTag[]> {
  return invoke<GitTag[]>("list_tags", { path });
 }
@@ -271,6 +323,16 @@ export function commitAiReview(path: string, options: CommitAiGenerateOptions):
  });
 }

+export function commitAiSplit(path: string, options: CommitAiGenerateOptions): Promise<AiCommitPlan> {
+  return invoke<AiCommitPlan>("commit_ai_split", {
+    path,
+    provider: options.provider,
+    model: options.model,
+    apiKey: options.apiKey,
+    baseUrl: options.baseUrl,
+  });
+}
+
 export function pull(path: string, username?: string, password?: string, strategy: PullStrategy = "merge", remote?: string, branch?: string): Promise<GitStatus> {
  return invoke<GitStatus>("pull", { path, username: username ?? null, password: password ?? null, strategy, remote: remote || null, branch: branch || null });
 }
@@ -0,0 +1,72 @@
+import { invoke } from "@tauri-apps/api/core";
+
+type TelemetryLevel = "info" | "warn" | "error";
+
+const MAX_MESSAGE_LENGTH = 2_048;
+let telemetryEnabled = false;
+let configuration: Promise<unknown> = Promise.resolve();
+
+// Telemetry must never contain repository contents or identifying local data.
+function sanitize(message: string): string {
+  return message
+    .replace(/https?:\/\/\S+/gi, "[url]")
+    .replace(/(?:[A-Za-z]:\\|\/)(?:[^\s<>:"|?*]+[\\/])*[^\s<>:"|?*]*/g, "[path]")
+    .replace(/(token|password|secret|authorization|credential)\s*[:=]\s*\S+/gi, "$1=[redacted]")
+    .replace(/[\w.+-]+@[\w.-]+\.[A-Za-z]{2,}/g, "[email]")
+    .slice(0, MAX_MESSAGE_LENGTH);
+}
+
+export function setTelemetryEnabled(enabled: boolean) {
+  telemetryEnabled = enabled;
+  configuration = invoke("set_telemetry_enabled", { enabled }).catch(() => {});
+}
+
+export function telemetryLog(level: TelemetryLevel, message: string, eventName?: string) {
+  if (!telemetryEnabled) return;
+  void configuration.then(() => invoke("emit_frontend_log", {
+      log: {
+        level,
+        message: sanitize(message),
+        eventName,
+      },
+    }))
+    .catch(() => {
+      // Observability must never interrupt the Git workflow.
+    });
+}
+
+function randomHex(bytes: number): string {
+  const values = new Uint8Array(bytes);
+  crypto.getRandomValues(values);
+  return Array.from(values, (value) => value.toString(16).padStart(2, "0")).join("");
+}
+
+export async function tracedInvoke<T>(command: string, args?: Record<string, unknown>): Promise<T> {
+  if (!telemetryEnabled) return invoke<T>(command, args);
+  const startedAtMs = Date.now();
+  const started = performance.now();
+  const traceId = randomHex(16);
+  const spanId = randomHex(8);
+  try {
+    const result = await invoke<T>(command, args);
+    void configuration.then(() => invoke("emit_frontend_span", {
+      span: { name: command, traceId, spanId, startedAtMs, durationMs: performance.now() - started, success: true },
+    })).catch(() => {});
+    return result;
+  } catch (error) {
+    void configuration.then(() => invoke("emit_frontend_span", {
+      span: { name: command, traceId, spanId, startedAtMs, durationMs: performance.now() - started, success: false },
+    })).catch(() => {});
+    throw error;
+  }
+}
+
+export function installGlobalErrorTelemetry() {
+  window.addEventListener("error", (event) => {
+    telemetryLog("error", event.message || "Unhandled frontend error", "frontend.unhandled_error");
+  });
+  window.addEventListener("unhandledrejection", (event) => {
+    const message = event.reason instanceof Error ? event.reason.message : String(event.reason ?? "Unhandled promise rejection");
+    telemetryLog("error", message, "frontend.unhandled_rejection");
+  });
+}
@@ -37,6 +37,17 @@ export interface AiReviewResult {
  findings: AiReviewFinding[];
 }

+export interface AiCommitGroup {
+  message: string;
+  reason: string;
+  files: string[];
+}
+
+export interface AiCommitPlan {
+  summary: string;
+  groups: AiCommitGroup[];
+}
+
 export interface LocalModelOption {
  id: string;
  label: string;
@@ -90,6 +101,24 @@ export interface GitBranch {
  remote: boolean;
 }

+export interface GitWorktree {
+  path: string;
+  head: string | null;
+  short_head: string | null;
+  branch: string | null;
+  bare: boolean;
+  detached: boolean;
+  locked: boolean;
+  lock_reason: string | null;
+  prunable: boolean;
+  prune_reason: string | null;
+  missing: boolean;
+  is_main: boolean;
+  is_current: boolean;
+  clean: boolean;
+  changed_files: number;
+}
+
 export interface GitTag {
  name: string;
  hash: string;
@@ -2,10 +2,13 @@ import { mount } from "svelte";

 import App from "./App.svelte";
 import "./app.css";
+import { installGlobalErrorTelemetry } from "./lib/telemetry";

 const THEME_KEY = "gitlite.theme.v1";
 const target = document.getElementById("app");

+installGlobalErrorTelemetry();
+
 if (!target) {
  throw new Error("App target element was not found.");
 }
Author	SHA1	Message	Date
Christoph Brandau	8079ac5f64	chore(deps): update lockfile metadata publish / publish-tauri (nsis, , windows-latest, windows-x86_64) (release) Canceled after 0s Details publish / publish-tauri (appimage, 1, ubuntu-22.04, linux-x86_64) (release) Canceled after 4m59s Details publish / Build and publish Arch package (release) Canceled after 4m58s Details	2026-07-28 20:59:42 +02:00
Christoph Brandau	df26ecf9fb	chore(release): publish 2026.07.22	2026-07-28 20:59:40 +02:00
Christoph Brandau	af7b993550	feat(ai-commit): improve split dialog validation and apply flow	2026-07-28 16:11:24 +02:00
Christoph Brandau	e07bc96127	fix(app): ignore stale repository open responses	2026-07-28 16:11:21 +02:00
Christoph Brandau	f0e87d67d5	feat(ai): add AI-assisted commit splitting flow Introduce a split-planning path for staged changes that asks supported AI providers to group files into ordered Conventional Commit messages. The plan is validated before execution so every staged file is assigned once and unsafe states are rejected. A new dialog lets users review and adjust the proposed groups before creating the commits in sequence, with safeguards to preserve remaining changes if something fails.	2026-07-28 15:01:32 +02:00
Christoph	3246dfdcfd	Update version to 2026.7.21	2026-07-26 23:13:26 +02:00
Christoph Brandau	bc3d3e88e0	feat(changelog): Add comprehensive changelog and help documentation publish / publish-tauri (appimage, 1, ubuntu-22.04, linux-x86_64) (release) Successful in 22m46s Details publish / publish-tauri (nsis, , windows-latest, windows-x86_64) (release) Successful in 24m51s Details publish / Build and publish Arch package (release) Successful in 53m27s Details A new Changelog file has been introduced, documenting major user-facing changes across recent releases. Additionally, the HelpOverlay component was updated to include detailed sections on advanced Git workflows, including worktree management, line-level staging, and Arch Linux package automation instructions in both German and English. - Added full changelog documentation - Enhanced help with worktrees and line-staging guides - Implemented Arch Linux package build steps	2026-07-26 22:59:07 +02:00
Christoph	1721341e62	Merge pull request 'Worktrees' (#25 ) from worktrees into main Reviewed-on: #25	2026-07-26 20:20:24 +00:00
Christoph Brandau	eb99165931	feat(ui): add worktree management toggle to branch panel Introduces a dedicated section and interactive button for managing repository worktrees within the branch list view. This improves visibility into the overall state of local repositories by grouping related controls. - Adds visual styling and structure for the new worktree group toggle in CSS. - Replaces the old "Manage worktrees" button with a more descriptive, styled component in BranchPanel.svelte.	2026-07-26 22:16:35 +02:00
Christoph Brandau	24201c1302	feat(diff): enable line-level patch selection and actions Introduces granular control over diff operations by enabling users to select individual lines within a hunk. This refactors the core logic across multiple components, allowing for precise staging, unstaging, or discarding of specific changes rather than operating on entire hunks. The UI now features dedicated controls and visual feedback for line-level selection. - Refactored patch parsing to track selected line IDs and calculate range information. - Updated the diff view CSS and component structure to display interactive line selection bars. - Extended action dialogs to support confirming operations on selected lines.	2026-07-26 22:10:33 +02:00
Christoph Brandau	38b7f1a536	feat(git): Add comprehensive worktree management capabilities This update introduces full support for Git worktrees, allowing users to manage multiple isolated working copies within a single repository. This includes new functionality to list, add, remove, move, lock, and repair worktrees, significantly enhancing the repository's capability to handle parallel development streams. - Added `GitWorktree` structure definition across API contracts and Rust backend - Implemented full CRUD operations for worktrees in Tauri commands - Updated UI components (App.svelte, BranchPanel.svelte) to expose worktree management dialog	2026-07-26 21:47:35 +02:00
Christoph	afa85b97aa	chore(packaging): stabilize build process and resource usage publish / publish-tauri (appimage, 1, ubuntu-22.04, linux-x86_64) (release) Successful in 21m57s Details publish / Build and publish Arch package (release) Successful in 49m42s Details publish / publish-tauri (nsis, , windows-latest, windows-x86_64) (release) Canceled after 0s Details Updates the PKGBUILD to improve stability and manage memory consumption during the compilation of large Rust dependencies. This involves adding specific environment variables within the build function to constrain compiler resources, alongside refining package options. - Restrict parallel jobs and set explicit optimization levels for cargo builds - Disable debug symbols in package options	2026-07-23 18:39:29 +02:00
Christoph	7869efeab5	ci(builder): pass build directory to makepkg command publish / publish-tauri (appimage, 1, ubuntu-22.04, linux-x86_64) (release) Successful in 28m52s Details publish / Build and publish Arch package (release) Failing after 1h3m16s Details publish / publish-tauri (nsis, , windows-latest, windows-x86_64) (release) Canceled after 0s Details The CI workflow for building applications has been updated to correctly manage the build environment. Previously, makepkg was run without explicitly defining where its output should go, which could lead to unpredictable file placement or conflicts. This change ensures that a dedicated temporary directory is used as the build output location. - Explicitly create and use a makepkg directory - Pass BUILDDIR variable to makepkg command	2026-07-23 17:17:33 +02:00
Christoph	2b88e5a189	chore(ci): update build root ownership permissions publish / Build and publish Arch package (release) Failing after 1m25s Details publish / publish-tauri (nsis, , windows-latest, windows-x86_64) (release) Canceled after 0s Details publish / publish-tauri (appimage, 1, ubuntu-22.04, linux-x86_64) (release) Canceled after 7m5s Details The workflow script responsible for application building is updated to adjust file ownership. Previously, ownership was restricted only to the source directory. By changing the scope to the entire build root, we ensure that all generated files and intermediate artifacts are correctly owned by the builder user before running makepkg.	2026-07-23 17:10:08 +02:00
Christoph	f7793bc908	refactor(ci): Streamline package building workflow publish / Build and publish Arch package (release) Failing after 1m23s Details publish / publish-tauri (nsis, , windows-latest, windows-x86_64) (release) Canceled after 0s Details publish / publish-tauri (appimage, 1, ubuntu-22.04, linux-x86_64) (release) Canceled after 6m6s Details The CI/CD pipeline has been significantly refactored to improve efficiency and reduce dependency on Docker containers during the build process. The core logic now uses temporary directories and direct execution commands, streamlining both the packaging of tarballs and the generation of the repository database. This change results in a faster and more robust build environment within the runner. - Removed reliance on docker run for package building - Simplified the mechanism for updating the pacman repository database - Added necessary dependencies to base system installation steps	2026-07-23 17:03:57 +02:00
Christoph	a1325d85e8	chore(ci): prepare arch container dependencies for building publish / Build and publish Arch package (release) Failing after 2m17s Details publish / publish-tauri (appimage, 1, ubuntu-22.04, linux-x86_64) (release) Successful in 19m45s Details publish / publish-tauri (nsis, , windows-latest, windows-x86_64) (release) Canceled after 0s Details Added initial setup steps to the GitLite job within the continuous integration workflow. This ensures that the underlying Arch Linux environment is fully updated and contains all necessary system packages (like nodejs, git, and docker) before the main build process begins, improving overall build reliability.	2026-07-23 15:33:45 +02:00
Christoph	e7e313b7d7	chore(config): Update git commands and CI runner platform publish / publish-tauri (appimage, 1, ubuntu-22.04, linux-x86_64) (release) Successful in 20m7s Details publish / Build and publish Arch package (release) Failing after 3s Details publish / publish-tauri (nsis, , windows-latest, windows-x86_64) (release) Canceled after 0s Details Updated local development settings to include comprehensive Git status checks, improving developer workflow visibility. Additionally, the Arch package building job in the CI pipeline now targets archlinux runners for better environment parity during builds. - Added multiple bash commands for detailed git logging and status retrieval - Switched app builder workflow runner to archlinux	2026-07-23 13:57:28 +02:00
Christoph	482d7857b5	chore(ci): enhance build diagnostics and update runner platform publish / publish-tauri (appimage, 1, ubuntu-22.04, linux-x86_64) (release) Successful in 20m54s Details publish / Build and publish Arch package (release) Failing after 1m25s Details publish / publish-tauri (nsis, , windows-latest, windows-x86_64) (release) Canceled after 0s Details This commit updates local configuration settings with additional diagnostic steps to improve visibility into the build environment during execution. Furthermore, the primary application builder workflow has been migrated from running on Arch Linux to Ubuntu 22.04. This change ensures broader compatibility for the CI/CD pipeline while maintaining core publishing functionality. - Added extensive system and context checks in local settings - Migrated app builder job runner platform to ubuntu-22.04	2026-07-23 13:22:12 +02:00
Christoph Brandau	8220e36629	feat(ci): automate arch package build and distribution publish / Build and publish Arch package (release) Failing after 1s Details publish / publish-tauri (nsis, , windows-latest, windows-x86_64) (release) Canceled after 0s Details publish / publish-tauri (appimage, 1, ubuntu-22.04, linux-x86_64) (release) Canceled after 1m59s Details The continuous integration pipeline is significantly enhanced to fully automate the process of building, packaging, and publishing Gitty as an Arch Linux repository. A new dedicated workflow job handles version setting, dependency resolution, and package creation using makepkg within a Docker container environment. This ensures that every release is properly packaged and uploaded to the configured MinIO/S3 location for system-wide distribution. - Added `publish-arch` job to CI pipeline - Implemented repository management logic in arch_repo.py - Updated PKGBUILD with necessary desktop dependencies	2026-07-23 00:58:32 +02:00
Christoph Brandau	27c8b40dc6	feat(ui): enhance branch delete confirmation flow This update introduces a comprehensive and visually refined dialog component for confirming the deletion of branches. The logic now correctly distinguishes between deleting local and remote branches, providing tailored warnings and context to the user. Corresponding global styles were updated to implement the new layout and visual fidelity for this specific dialog type. - Implements structured display for branch name and location - Improves distinction between local and remote delete contexts - Updates backdrop filter CSS properties for better compatibility	2026-07-23 00:33:17 +02:00
Christoph Brandau	6aed0b933e	feat(ui): new background for commit cards	2026-07-22 00:06:43 +02:00
Christoph	94083a7106	Merge pull request 'Telemetry' (#24 ) from telemetry into main Reviewed-on: #24	2026-07-21 21:51:09 +00:00
Christoph Brandau	647f2b2076	feat(ui): implement global error toast and state management Introduces a persistent, styled error toast notification system for displaying critical application errors. This required refactoring the local error handling logic in App.svelte to manage complex state objects instead of simple timers, allowing for better control over visibility and interaction (e.g., pausing on hover). - Adds global CSS styling and animations for the visible error toast component - Updates error auto-hide mechanism to use structured state management - Implements interactive features like pause/resume timing on mouse events	2026-07-21 23:45:05 +02:00
Christoph Brandau	cae8390b54	feat(telemetry): Implement structured telemetry logging and reporting Adds comprehensive client-side telemetry capabilities for usage, errors, and performance metrics. This includes integrating OpenTelemetry standards into both the frontend (Svelte) and backend (Tauri/Rust) layers to capture events, spans, and system resource utilization. The implementation ensures that all collected data is privacy-filtered by design, explicitly excluding sensitive information like repository paths, credentials, source code, or email addresses from being logged. - Updates README with detailed SigNoz telemetry guide - Adds process metrics collection (CPU/Memory) in Rust backend - Exposes `setTelemetryEnabled` state management to the frontend	2026-07-21 23:40:39 +02:00