feat(tests): add unit tests for shared utilities

fix: catch FileNotFoundError in get_current_branch when component dir is missing (#813 )
Error when opening KIUAH fix get_current_branch only catches CalledProcessError, not FileNotFoundError. When crowsnest isn't installed, the missing dir propagates the exception. Fix
2026-08-03 04:47:56 +05:00 · 2026-07-04 12:58:20 +02:00 · 2026-06-29 22:43:10 +02:00 · 2026-06-29 22:20:55 +02:00 · 2026-06-29 21:36:58 +02:00 · 2026-06-29 21:31:55 +02:00
24 changed files with 2771 additions and 144 deletions
@@ -1,68 +0,0 @@
-# AGENTS.md - KIAUH Development Guide
-
-## Project Overview
-
-KIAUH (Klipper Installation And Update Helper) is a Python-based installation script for Klipper 3D printer firmware and related components written in Python 3.8+.
-
-## Running KIAUH
-
-```bash
-./kiauh.sh
-```
-
-**Important:** Must NOT run as root. The script will exit if EUID is 0.
-
-## Development Commands
-
-```bash
-# Install dev dependencies
-pip install -r requirements-dev.txt
-
-# Lint (ruff)
-ruff check .
-
-# Format
-ruff format .
-
-# Typecheck
-mypy kiauh
-
-# Run tests
-pytest
-
-# Run specific test file
-pytest kiauh/core/simple_config_parser/tests/public_api/test_options_api.py
-```
-
-## Testing
-
- New tests should be placed near their corresponding components/modules (e.g., `kiauh/components/klipper/*/test_*.py`)
- Always use a `tests/` subdirectory
- Existing pytest setup in `kiauh/core/simple_config_parser/tests/` serves as reference
-
-## Project Structure
-
- `kiauh.sh` - Bash entry point, sets PYTHONPATH and calls main.py
- `kiauh/main.py` - Python entry point
- `kiauh/core/` - Core functionality (menus, services, settings, types)
- `kiauh/components/` - Klipper components (klipper, moonraker, webui_client, etc.)
- `kiauh/extensions/` - Extension system for optional addons (obico, octoprint, spoolman, etc.)
- `kiauh/core/simple_config_parser/` - Custom INI-style config parser for Klipper configs
- `kiauh/core/simple_config_parser/src/simple_config_parser/` - Submodule (git subtree)
-
-## Key Quirks
-
-1. **Python version:** Requires Python 3.8+ (checked in kiauh.sh)
-2. **Config files:** KIAUH uses `kiauh.cfg` in project root (not .ini format - it's parsed by simple_config_parser)
-3. **Submodule:** `kiauh/core/simple_config_parser/` is a git subtree, not a submodule
-4. **Branch check:** KIAUH only checks for updates on master branch (not develop)
-5. **Target:** Designed to run on Raspberry Pi OS / Debian-based distros
-
-## Code Style
-
- 4-space indentation
- 88 character line length
- Double quotes
- LF line endings
- Type hints required (mypy checks)
- Ruff with I (isort) enabled
@@ -122,9 +122,9 @@ changes!**

 <hr>

-<h2 align="center">🌐 Sources & Further Information</h2>
+<h2 align="center">⚙️ Core Components ⚙️</h2>

-<table align="center">
+<table align="center" style="text-align: center;">
 <tr>
    <th><h3><a href="https://github.com/Klipper3d/klipper">Klipper</a></h3></th>
    <th><h3><a href="https://github.com/Arksine/moonraker">Moonraker</a></h3></th>
@@ -140,67 +140,88 @@ changes!**
    <th>by <a href="https://github.com/Arksine">Arksine</a></th>
    <th>by <a href="https://github.com/mainsail-crew">mainsail-crew</a></th>
 </tr>
-
 <tr>
    <th><h3><a href="https://github.com/fluidd-core/fluidd">Fluidd</a></h3></th>
    <th><h3><a href="https://github.com/KlipperScreen/KlipperScreen">KlipperScreen</a></h3></th>
-    <th><h3><a href="https://github.com/OctoPrint/OctoPrint">OctoPrint</a></h3></th>
+    <th></th>
 </tr>
 <tr>
-    <th><img src="https://raw.githubusercontent.com/fluidd-core/fluidd/master/docs/assets/images/logo.svg" alt="Fluidd Logo" height="64"></th>
-    <th><img src="https://avatars.githubusercontent.com/u/31575189?v=4" alt="jordanruthe avatar" height="64"></th>
-    <th><img src="https://raw.githubusercontent.com/OctoPrint/OctoPrint/master/docs/images/octoprint-logo.png" alt="OctoPrint Logo" height="64"></th>
+    <th><img src="https://raw.githubusercontent.com/fluidd-core/fluidd/master/docs/docs/assets/images/logo.svg" alt="Fluidd Logo" height="64"></th>
+    <th><img src="https://avatars.githubusercontent.com/KlipperScreen?v=4" alt="KlipperScreen Logo" height="64"></th>
+    <th></th>
 </tr>
 <tr>
    <th>by <a href="https://github.com/fluidd-core">fluidd-core</a></th>
    <th>by <a href="https://github.com/alfrix">alfrix</a></th>
-    <th>by <a href="https://github.com/OctoPrint">OctoPrint</a></th>
+    <th></th>
 </tr>
+</table>

+<hr>
+
+<h2 align="center">🧩 Community Extensions 🧩</h2>
+
+<table align="center" style="text-align: center;">
 <tr>
+    <th><h3><a href="https://github.com/OctoPrint/OctoPrint">OctoPrint</a></h3></th>
    <th><h3><a href="https://github.com/nlef/moonraker-telegram-bot">Moonraker-Telegram-Bot</a></h3></th>
    <th><h3><a href="https://github.com/Kragrathea/pgcode">PrettyGCode for Klipper</a></h3></th>
-    <th><h3><a href="https://github.com/TheSpaghettiDetective/moonraker-obico">Obico for Klipper</a></h3></th>
 </tr>
 <tr>
-    <th><img src="https://avatars.githubusercontent.com/u/52351624?v=4" alt="nlef avatar" height="64"></th>
-    <th><img src="https://avatars.githubusercontent.com/u/5917231?v=4" alt="Kragrathea avatar" height="64"></th>
-    <th><img src="https://avatars.githubusercontent.com/u/46323662?s=200&v=4" alt="Obico logo" height="64"></th>
+    <th><a href="https://github.com/OctoPrint/OctoPrint"><img src="https://raw.githubusercontent.com/OctoPrint/OctoPrint/master/docs/images/octoprint-logo.png" alt="OctoPrint Logo" height="64"></a></th>
+    <th><a href="https://github.com/nlef/moonraker-telegram-bot"><img src="https://avatars.githubusercontent.com/u/52351624?v=4" alt="nlef avatar" height="64"></a></th>
+    <th><a href="https://github.com/Kragrathea/pgcode"><img src="https://avatars.githubusercontent.com/u/5917231?v=4" alt="Kragrathea avatar" height="64"></a></th>
 </tr>
 <tr>
+    <th>by <a href="https://github.com/OctoPrint">OctoPrint</a></th>
    <th>by <a href="https://github.com/nlef">nlef</a></th>
    <th>by <a href="https://github.com/Kragrathea">Kragrathea</a></th>
-    <th>by <a href="https://github.com/TheSpaghettiDetective">Obico</a></th>
 </tr>
-
 <tr>
+    <th><h3><a href="https://github.com/TheSpaghettiDetective/moonraker-obico">Obico for Klipper</a></h3></th>
    <th><h3><a href="https://github.com/Clon1998/mobileraker_companion">Mobileraker's Companion</a></h3></th>
    <th><h3><a href="https://octoeverywhere.com/?source=kiauh_readme">OctoEverywhere For Klipper</a></h3></th>
-    <th><h3><a href="https://github.com/crysxd/OctoApp-Plugin">OctoApp For Klipper</a></h3></th>
 </tr>
 <tr>
+    <th><a href="https://github.com/TheSpaghettiDetective/moonraker-obico"><img src="https://avatars.githubusercontent.com/u/46323662?s=200&v=4" alt="Obico logo" height="64"></a></th>
    <th><a href="https://github.com/Clon1998/mobileraker_companion"><img src="https://raw.githubusercontent.com/Clon1998/mobileraker/master/assets/icon/mr_appicon.png" alt="Mobileraker Logo" height="64"></a></th>
    <th><a href="https://octoeverywhere.com/?source=kiauh_readme"><img src="https://octoeverywhere.com/img/logo.svg" alt="OctoEverywhere Logo" height="64"></a></th>
-    <th><a href="https://octoapp.eu/?source=kiauh_readme"><img src="https://octoapp.eu/octoapp.webp" alt="OctoApp Logo" height="64"></a></th>
 </tr>
 <tr>
+    <th>by <a href="https://github.com/TheSpaghettiDetective">Obico</a></th>
    <th>by <a href="https://github.com/Clon1998">Patrick Schmidt</a></th>
    <th>by <a href="https://github.com/QuinnDamerell">Quinn Damerell</a></th>
-    <th>by <a href="https://github.com/crysxd">Christian Würthner</a></th>
 </tr>
-
 <tr>
+    <th><h3><a href="https://github.com/crysxd/OctoApp-Plugin">OctoApp For Klipper</a></h3></th>
    <th><h3><a href="https://github.com/staubgeborener/klipper-backup">Klipper-Backup</a></h3></th>
    <th><h3><a href="https://simplyprint.io/">SimplyPrint for Klipper</a></h3></th>
 </tr>
 <tr>
+    <th><a href="https://octoapp.eu/?source=kiauh_readme"><img src="https://octoapp.eu/octoapp.webp" alt="OctoApp Logo" height="64"></a></th>
    <th><a href="https://github.com/staubgeborener/klipper-backup"><img src="https://avatars.githubusercontent.com/u/28908603?v=4" alt="Staubgeroner Avatar" height="64"></a></th>
-    <th><a href="https://github.com/SimplyPrint"><img src="https://avatars.githubusercontent.com/u/64896552?s=200&v=4" alt="" height="64"></a></th>
+    <th><a href="https://github.com/SimplyPrint"><img src="https://avatars.githubusercontent.com/u/64896552?s=200&v=4" alt="SimplyPrint Logo" height="64"></a></th>
 </tr>
 <tr>
+    <th>by <a href="https://github.com/crysxd">Christian Würthner</a></th>
    <th>by <a href="https://github.com/Staubgeborener">Staubgeborener</a></th>
    <th>by <a href="https://github.com/SimplyPrint">SimplyPrint</a></th>
 </tr>
+<tr>
+    <th><h3><a href="https://github.com/CodeMasterCody3D/DroidKlipp">DroidKlipp</a></h3></th>
+    <th><h3><a href="https://github.com/PEEKYPAUL/Moongate">Moongate</a></h3></th>
+    <th></th>
+</tr>
+<tr>
+    <th><a href="https://github.com/CodeMasterCody3D/DroidKlipp"><img src="https://raw.githubusercontent.com/CodeMasterCody3D/DroidKlipp/main/logo.png" alt="DroidKlipp Logo" height="64"></a></th>
+    <th><a href="https://github.com/PEEKYPAUL/Moongate"><img src="https://raw.githubusercontent.com/PEEKYPAUL/Moongate/master/docs/moongate-icon.png" alt="Moongate Logo" height="64"></a></th>
+    <th></th>
+</tr>
+<tr>
+    <th>by <a href="https://github.com/CodeMasterCody3D">CodeMasterCody3D</a></th>
+    <th>by <a href="https://github.com/PEEKYPAUL">PEEKYPAUL</a></th>
+    <th></th>
+</tr>
 </table>

 <hr>
@@ -229,13 +250,3 @@ changes!**
  a [Ko-fi](https://ko-fi.com/dw__0) !
 * Last but not least: Thank you to all contributors and members of the Klipper
  Community who like and share this project!
-
-<hr>
-
-<h4 align="center">A special thank you to JetBrains for sponsoring this project
-with their incredible software!</h4>
-<p align="center">
-  <a href="https://www.jetbrains.com/community/opensource/#support" target="_blank">
-    <img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png" alt="JetBrains Logo (Main) logo." height="128">
-  </a>
-</p>
@@ -2,7 +2,7 @@

 <p align="center">
  <a>
-    <img src="https://raw.githubusercontent.com/dw-0/kiauh/master/resources/screenshots/kiauh.png" alt="KIAUH logo" height="181">
+    <img src="docs/assets/logo-large.png" alt="KIAUH logo" height="181">
    <h1 align="center">Klipper Installation And Update Helper</h1>
  </a>
 </p>
@@ -34,13 +34,13 @@ KIAUH 是一个帮助您在 Linux 系统上安装 Klipper 的脚本工具，
 选择 `Choose OS -> Raspberry Pi OS (other)`:

 <p align="center">
-  <img src="https://raw.githubusercontent.com/dw-0/kiauh/master/resources/screenshots/rpi_imager1.png" alt="KIAUH logo" height="350">
+  <img src="docs/assets/rpi_imager1.png" alt="KIAUH logo" height="350">
 </p>

 * 然后选择 `Raspberry Pi OS Lite (32位)` (或如果您想使用64位版本):

 <p align="center">
-  <img src="https://raw.githubusercontent.com/dw-0/kiauh/master/resources/screenshots/rpi_imager2.png" alt="KIAUH logo" height="350">
+  <img src="docs/assets/rpi_imager2.png" alt="KIAUH logo" height="350">
 </p>

 * 返回 Raspberry Pi Imager 主界面，选择对应的 SD 卡作为写入目标。
@@ -99,9 +99,9 @@ cd ~ && git clone https://github.com/dw-0/kiauh.git
 您会被要求输入 sudo 密码。
 因为有几个功能需要 sudo 权限。

-## 🌐 相关资源与更多信息
+<h2 align="center">⚙️ 核心组件 ⚙️</h2>

-<table align="center">
+<table align="center" style="text-align: center;">
 <tr>
    <th><h3><a href="https://github.com/Klipper3d/klipper">Klipper</a></h3></th>
    <th><h3><a href="https://github.com/Arksine/moonraker">Moonraker</a></h3></th>
@@ -117,70 +117,93 @@ cd ~ && git clone https://github.com/dw-0/kiauh.git
    <th>由 <a href="https://github.com/Arksine">Arksine</a></th>
    <th>由 <a href="https://github.com/mainsail-crew">mainsail-crew</a></th>
 </tr>
-
 <tr>
    <th><h3><a href="https://github.com/fluidd-core/fluidd">Fluidd</a></h3></th>
-    <th><h3><a href="https://github.com/jordanruthe/KlipperScreen">KlipperScreen</a></h3></th>
-    <th><h3><a href="https://github.com/OctoPrint/OctoPrint">OctoPrint</a></h3></th>
+    <th><h3><a href="https://github.com/KlipperScreen/KlipperScreen">KlipperScreen</a></h3></th>
+    <th></th>
 </tr>
 <tr>
-    <th><img src="https://raw.githubusercontent.com/fluidd-core/fluidd/master/docs/assets/images/logo.svg" alt="Fluidd Logo" height="64"></th>
-    <th><img src="https://avatars.githubusercontent.com/u/31575189?v=4" alt="jordanruthe avatar" height="64"></th>
-    <th><img src="https://raw.githubusercontent.com/OctoPrint/OctoPrint/master/docs/images/octoprint-logo.png" alt="OctoPrint Logo" height="64"></th>
+    <th><img src="https://raw.githubusercontent.com/fluidd-core/fluidd/master/docs/docs/assets/images/logo.svg" alt="Fluidd Logo" height="64"></th>
+    <th><img src="https://avatars.githubusercontent.com/KlipperScreen?v=4" alt="KlipperScreen Logo" height="64"></th>
+    <th></th>
 </tr>
 <tr>
    <th>由 <a href="https://github.com/fluidd-core">fluidd-core</a></th>
-    <th>由 <a href="https://github.com/jordanruthe">jordanruthe</a></th>
-    <th>由 <a href="https://github.com/OctoPrint">OctoPrint</a></th>
+    <th>由 <a href="https://github.com/alfrix">alfrix</a></th>
+    <th></th>
 </tr>
+</table>

+<hr>
+
+<h2 align="center">🧩 社区扩展 🧩</h2>
+
+<table align="center" style="text-align: center;">
 <tr>
+    <th><h3><a href="https://github.com/OctoPrint/OctoPrint">OctoPrint</a></h3></th>
    <th><h3><a href="https://github.com/nlef/moonraker-telegram-bot">Moonraker-Telegram-Bot</a></h3></th>
    <th><h3><a href="https://github.com/Kragrathea/pgcode">PrettyGCode for Klipper</a></h3></th>
-    <th><h3><a href="https://github.com/TheSpaghettiDetective/moonraker-obico">Obico for Klipper</a></h3></th>
 </tr>
 <tr>
-    <th><img src="https://avatars.githubusercontent.com/u/52351624?v=4" alt="nlef avatar" height="64"></th>
-    <th><img src="https://avatars.githubusercontent.com/u/5917231?v=4" alt="Kragrathea avatar" height="64"></th>
-    <th><img src="https://avatars.githubusercontent.com/u/46323662?s=200&v=4" alt="Obico logo" height="64"></th>
+    <th><a href="https://github.com/OctoPrint/OctoPrint"><img src="https://raw.githubusercontent.com/OctoPrint/OctoPrint/master/docs/images/octoprint-logo.png" alt="OctoPrint Logo" height="64"></a></th>
+    <th><a href="https://github.com/nlef/moonraker-telegram-bot"><img src="https://avatars.githubusercontent.com/u/52351624?v=4" alt="nlef avatar" height="64"></a></th>
+    <th><a href="https://github.com/Kragrathea/pgcode"><img src="https://avatars.githubusercontent.com/u/5917231?v=4" alt="Kragrathea avatar" height="64"></a></th>
 </tr>
 <tr>
+    <th>由 <a href="https://github.com/OctoPrint">OctoPrint</a></th>
    <th>由 <a href="https://github.com/nlef">nlef</a></th>
    <th>由 <a href="https://github.com/Kragrathea">Kragrathea</a></th>
-    <th>由 <a href="https://github.com/TheSpaghettiDetective">Obico</a></th>
 </tr>
-
 <tr>
+    <th><h3><a href="https://github.com/TheSpaghettiDetective/moonraker-obico">Obico for Klipper</a></h3></th>
    <th><h3><a href="https://github.com/Clon1998/mobileraker_companion">Mobileraker's Companion</a></h3></th>
    <th><h3><a href="https://octoeverywhere.com/?source=kiauh_readme">OctoEverywhere For Klipper</a></h3></th>
-    <th><h3><a href="https://github.com/crysxd/OctoApp-Plugin">OctoApp For Klipper</a></h3></th>
 </tr>
 <tr>
+    <th><a href="https://github.com/TheSpaghettiDetective/moonraker-obico"><img src="https://avatars.githubusercontent.com/u/46323662?s=200&v=4" alt="Obico logo" height="64"></a></th>
    <th><a href="https://github.com/Clon1998/mobileraker_companion"><img src="https://raw.githubusercontent.com/Clon1998/mobileraker/master/assets/icon/mr_appicon.png" alt="Mobileraker Logo" height="64"></a></th>
    <th><a href="https://octoeverywhere.com/?source=kiauh_readme"><img src="https://octoeverywhere.com/img/logo.svg" alt="OctoEverywhere Logo" height="64"></a></th>
-    <th><a href="https://octoapp.eu/?source=kiauh_readme"><img src="https://octoapp.eu/octoapp.webp" alt="OctoApp Logo" height="64"></a></th>
 </tr>
 <tr>
+    <th>由 <a href="https://github.com/TheSpaghettiDetective">Obico</a></th>
    <th>由 <a href="https://github.com/Clon1998">Patrick Schmidt</a></th>
    <th>由 <a href="https://github.com/QuinnDamerell">Quinn Damerell</a></th>
-    <th>由 <a href="https://github.com/crysxd">Christian Würthner</a></th>
 </tr>
-
 <tr>
+    <th><h3><a href="https://github.com/crysxd/OctoApp-Plugin">OctoApp For Klipper</a></h3></th>
    <th><h3><a href="https://github.com/staubgeborener/klipper-backup">Klipper-Backup</a></h3></th>
    <th><h3><a href="https://simplyprint.io/">SimplyPrint for Klipper</a></h3></th>
 </tr>
 <tr>
+    <th><a href="https://octoapp.eu/?source=kiauh_readme"><img src="https://octoapp.eu/octoapp.webp" alt="OctoApp Logo" height="64"></a></th>
    <th><a href="https://github.com/staubgeborener/klipper-backup"><img src="https://avatars.githubusercontent.com/u/28908603?v=4" alt="Staubgeroner Avatar" height="64"></a></th>
-    <th><a href="https://github.com/SimplyPrint"><img src="https://avatars.githubusercontent.com/u/64896552?s=200&v=4" alt="" height="64"></a></th>
+    <th><a href="https://github.com/SimplyPrint"><img src="https://avatars.githubusercontent.com/u/64896552?s=200&v=4" alt="SimplyPrint Logo" height="64"></a></th>
 </tr>
 <tr>
+    <th>由 <a href="https://github.com/crysxd">Christian Würthner</a></th>
    <th>由 <a href="https://github.com/Staubgeborener">Staubgeborener</a></th>
    <th>由 <a href="https://github.com/SimplyPrint">SimplyPrint</a></th>
 </tr>
+<tr>
+    <th><h3><a href="https://github.com/CodeMasterCody3D/DroidKlipp">DroidKlipp</a></h3></th>
+    <th><h3><a href="https://github.com/PEEKYPAUL/Moongate">Moongate</a></h3></th>
+    <th></th>
+</tr>
+<tr>
+    <th><a href="https://github.com/CodeMasterCody3D/DroidKlipp"><img src="https://raw.githubusercontent.com/CodeMasterCody3D/DroidKlipp/main/logo.png" alt="DroidKlipp Logo" height="64"></a></th>
+    <th><a href="https://github.com/PEEKYPAUL/Moongate"><img src="https://raw.githubusercontent.com/PEEKYPAUL/Moongate/master/docs/moongate-icon.png" alt="Moongate Logo" height="64"></a></th>
+    <th></th>
+</tr>
+<tr>
+    <th>由 <a href="https://github.com/CodeMasterCody3D">CodeMasterCody3D</a></th>
+    <th>由 <a href="https://github.com/PEEKYPAUL">PEEKYPAUL</a></th>
+    <th></th>
+</tr>
 </table>

-## 🎖️ 贡献者
+<hr>
+
+<h2 align="center">🎖️ 贡献者 🎖️</h2>

 <div align="center">
  <a href="https://github.com/dw-0/kiauh/graphs/contributors">
@@ -192,15 +215,10 @@ cd ~ && git clone https://github.com/dw-0/kiauh.git
    <img src="https://repobeats.axiom.co/api/embed/a1afbda9190c04a90cf4bd3061e5573bc836cb05.svg" alt="Repobeats analytics image"/>
 </div>

-## ✨ 特别感谢
+<hr>
+
+<h2 align="center">✨ 特别感谢 ✨</h2>

 * 非常感谢 [lixxbox](https://github.com/lixxbox) 设计了如此出色的 KIAUH 标志！
 * 同时，非常感谢所有通过 [Ko-fi](https://ko-fi.com/dw__0) 支持我的工作的人！
 * 最后但同样重要的是：感谢所有为 Klipper 社区做出贡献的成员，以及喜欢和分享这个项目的朋友们！
-
-<h4 align="center">特别感谢 JetBrains 为本项目提供其出色的软件赞助！</h4>
-<p align="center">
-  <a href="https://www.jetbrains.com/community/opensource/#support" target="_blank">
-    <img src="https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.png" alt="JetBrains Logo (Main) logo." height="128">
-  </a>
-</p>
@@ -19,10 +19,12 @@ CROWSNEST_SERVICE_NAME = "crowsnest.service"

 # directories
 CROWSNEST_DIR = Path.home().joinpath("crowsnest")
+CROWSNEST_ENV_DIR = Path.home().joinpath("crowsnest-env")

 # files
 CROWSNEST_MULTI_CONFIG = CROWSNEST_DIR.joinpath("tools/.config")
 CROWSNEST_INSTALL_SCRIPT = CROWSNEST_DIR.joinpath("tools/install.sh")
+CROWSNEST_DEPS_JSON_FILE = CROWSNEST_DIR.joinpath("system-dependencies.json")
 CROWSNEST_BIN_FILE = Path("/usr/local/bin/crowsnest")
 CROWSNEST_LOGROTATE_FILE = Path("/etc/logrotate.d/crowsnest")
 CROWSNEST_SERVICE_FILE = SYSTEMD.joinpath(CROWSNEST_SERVICE_NAME)
@@ -16,7 +16,9 @@ from typing import List

 from components.crowsnest import (
    CROWSNEST_BIN_FILE,
+    CROWSNEST_DEPS_JSON_FILE,
    CROWSNEST_DIR,
+    CROWSNEST_ENV_DIR,
    CROWSNEST_INSTALL_SCRIPT,
    CROWSNEST_LOGROTATE_FILE,
    CROWSNEST_MULTI_CONFIG,
@@ -25,6 +27,8 @@ from components.crowsnest import (
    CROWSNEST_SERVICE_NAME,
 )
 from components.klipper.klipper import Klipper
+from components.moonraker.utils.sysdeps_parser import SysDepsParser
+from components.moonraker.utils.utils import load_sysdeps_json
 from core.logger import DialogType, Logger
 from core.services.backup_service import BackupService
 from core.settings.kiauh_settings import KiauhSettings
@@ -34,6 +38,7 @@ from utils.common import (
    get_install_status,
 )
 from utils.git_utils import (
+    get_current_branch,
    git_clone_wrapper,
    git_pull_wrapper,
 )
@@ -135,8 +140,7 @@ def update_crowsnest() -> None:

            git_pull_wrapper(CROWSNEST_DIR)

-            deps = parse_packages_from_file(CROWSNEST_INSTALL_SCRIPT)
-            check_install_dependencies({*deps})
+            install_crowsnest_packages()

        cmd_sysctl_service(CROWSNEST_SERVICE_NAME, "restart")

@@ -147,12 +151,68 @@ def update_crowsnest() -> None:


 def get_crowsnest_status() -> ComponentStatus:
-    files = [
-        CROWSNEST_BIN_FILE,
-        CROWSNEST_LOGROTATE_FILE,
-        CROWSNEST_SERVICE_FILE,
-    ]
-    return get_install_status(CROWSNEST_DIR, files=files)
+    """
+    Get the current install status of Crowsnest. Depending on the version the installed
+    files are different. If a version is not yet specified, it will search for a
+    non_existant file resulting in 'Incomplete' status.
+    :return: Installation status
+    """
+    files_dict = {
+        4: [
+            CROWSNEST_BIN_FILE,
+            CROWSNEST_LOGROTATE_FILE,
+            CROWSNEST_SERVICE_FILE,
+        ],
+        5: [CROWSNEST_SERVICE_FILE],
+    }
+    version = get_crowsnest_version()
+
+    non_existant = CROWSNEST_DIR.joinpath("non_existant")
+    files = files_dict.get(version, [non_existant])
+
+    env_dir = None
+    if version >= 5:
+        env_dir = CROWSNEST_ENV_DIR
+    return get_install_status(CROWSNEST_DIR, files=files, env_dir=env_dir)
+
+
+def get_crowsnest_version() -> int:
+    """
+    Get the current major version. Starting with v5 the default branch will be named
+    after the major version.
+    :return: Current major version
+    """
+    version = get_current_branch(CROWSNEST_DIR)
+    if version is None:
+        return 0
+    if version == "master":
+        return 4
+    return int(version.removeprefix("v"))
+
+
+def install_crowsnest_packages() -> None:
+    Logger.print_status("Parsing Crowsnest system dependencies  ...")
+
+    crowsnest_deps = []
+    crowsnest_version = get_crowsnest_version()
+    if crowsnest_version >= 5 and CROWSNEST_DEPS_JSON_FILE.exists():
+        Logger.print_info(
+            f"Parsing system dependencies from {CROWSNEST_DEPS_JSON_FILE.name} ..."
+        )
+        parser = SysDepsParser()
+        sysdeps = load_sysdeps_json(CROWSNEST_DEPS_JSON_FILE)
+        crowsnest_deps.extend(parser.parse_dependencies(sysdeps))
+
+    elif crowsnest_version <= 4 and CROWSNEST_INSTALL_SCRIPT.exists():
+        Logger.print_info(
+            f"Parsing system dependencies from {CROWSNEST_INSTALL_SCRIPT.name} ..."
+        )
+        crowsnest_deps = parse_packages_from_file(CROWSNEST_INSTALL_SCRIPT)
+
+    if not crowsnest_deps:
+        raise ValueError("Error parsing crowsnest dependencies!")
+
+    check_install_dependencies({*crowsnest_deps})


 def remove_crowsnest() -> None:
@@ -0,0 +1,28 @@
+# ======================================================================= #
+#  Copyright (C) 2026 Cody Dixon                                         #
+#                                                                         #
+#  This file is part of KIAUH - Klipper Installation And Update Helper    #
+#  https://github.com/dw-0/kiauh                                          #
+#                                                                         #
+#  This file may be distributed under the terms of the GNU GPLv3 license  #
+# ======================================================================= #
+from pathlib import Path
+
+# repo
+DROIDKLIPP_REPO = "https://github.com/CodeMasterCody3D/DroidKlipp"
+DROIDKLIPP_APK_URL = "https://github.com/CodeMasterCody3D/DroidKlipp-Android-APK/releases/latest/download/DroidKlipp.apk"
+
+# directories
+DROIDKLIPP_DIR = Path.home().joinpath("DroidKlipp")
+
+# files
+DROIDKLIPP_INSTALL_SCRIPT = DROIDKLIPP_DIR.joinpath("install_droidklipp.sh")
+DROIDKLIPP_UNINSTALL_SCRIPT = DROIDKLIPP_DIR.joinpath("uninstall_droidklipp.sh")
+DROIDKLIPP_MONITOR_FILE = DROIDKLIPP_DIR.joinpath("droidklipp_monitor.py")
+DROIDKLIPP_DEPLOYED_MONITOR = Path.home().joinpath("droidklipp_monitor.py")
+
+# service
+DROIDKLIPP_SERVICE_NAME = "adb_monitor"
+
+# packages
+DROIDKLIPP_REQUIRED_PACKAGES = {"adb", "tmux", "x11-utils"}
@@ -0,0 +1,155 @@
+# ======================================================================= #
+#  Copyright (C) 2026 Cody Dixon                                         #
+#                                                                         #
+#  This file is part of KIAUH - Klipper Installation And Update Helper    #
+#  https://github.com/dw-0/kiauh                                          #
+#                                                                         #
+#  This file may be distributed under the terms of the GNU GPLv3 license  #
+# ======================================================================= #
+from subprocess import CalledProcessError, run
+
+from components.klipperscreen import KLIPPERSCREEN_DIR, KLIPPERSCREEN_ENV_DIR
+from core.logger import DialogType, Logger
+from extensions.base_extension import BaseExtension
+from extensions.droidklipp import (
+    DROIDKLIPP_APK_URL,
+    DROIDKLIPP_DEPLOYED_MONITOR,
+    DROIDKLIPP_DIR,
+    DROIDKLIPP_INSTALL_SCRIPT,
+    DROIDKLIPP_MONITOR_FILE,
+    DROIDKLIPP_REPO,
+    DROIDKLIPP_REQUIRED_PACKAGES,
+    DROIDKLIPP_SERVICE_NAME,
+    DROIDKLIPP_UNINSTALL_SCRIPT,
+)
+from utils.common import check_install_dependencies
+from utils.fs_utils import check_file_exist, run_remove_routines
+from utils.git_utils import git_clone_wrapper, git_pull_wrapper
+from utils.input_utils import get_confirm
+from utils.sys_utils import cmd_sysctl_service
+
+
+# noinspection PyMethodMayBeStatic
+class DroidKlippExtension(BaseExtension):
+    def install_extension(self, **kwargs) -> None:
+        Logger.print_status("Installing DroidKlipp ...")
+
+        if not self._klipperscreen_exists():
+            Logger.print_dialog(
+                DialogType.WARNING,
+                [
+                    "No KIAUH v6 KlipperScreen installation found!",
+                    "DroidKlipp expects KlipperScreen at:",
+                    f"● {KLIPPERSCREEN_DIR.joinpath('screen.py')}",
+                    f"● {KLIPPERSCREEN_ENV_DIR.joinpath('bin/python')}",
+                    "Install KlipperScreen first, then run this installer again.",
+                ],
+            )
+            return
+
+        Logger.print_dialog(
+            DialogType.INFO,
+            [
+                "DroidKlipp requires the Android APK to be installed on your Android device:",
+                DROIDKLIPP_APK_URL,
+                "\n\n",
+                "The installer will configure ADB forwarding, udev rules, the DroidKlipp monitor, and WiFi fallback.",
+            ],
+        )
+
+        if not get_confirm(
+            "Continue DroidKlipp installation?",
+            default_choice=True,
+            allow_go_back=True,
+        ):
+            Logger.print_info("Exiting DroidKlipp installation ...")
+            return
+
+        try:
+            check_install_dependencies(DROIDKLIPP_REQUIRED_PACKAGES)
+            git_clone_wrapper(DROIDKLIPP_REPO, DROIDKLIPP_DIR)
+            run(["chmod", "+x", DROIDKLIPP_INSTALL_SCRIPT], check=True)
+            run([DROIDKLIPP_INSTALL_SCRIPT], check=True)
+            Logger.print_dialog(
+                DialogType.SUCCESS,
+                ["DroidKlipp successfully installed!"],
+                center_content=True,
+            )
+        except CalledProcessError as e:
+            Logger.print_error(f"Error during DroidKlipp installation:\n{e}")
+        except Exception as e:
+            Logger.print_error(f"Error during DroidKlipp installation:\n{e}")
+
+    def update_extension(self, **kwargs) -> None:
+        Logger.print_status("Updating DroidKlipp ...")
+
+        if not check_file_exist(DROIDKLIPP_DIR):
+            Logger.print_info("Extension does not seem to be installed! Skipping ...")
+            return
+
+        try:
+            cmd_sysctl_service(DROIDKLIPP_SERVICE_NAME, "stop")
+
+            git_pull_wrapper(DROIDKLIPP_DIR)
+
+            if check_file_exist(DROIDKLIPP_MONITOR_FILE):
+                run(
+                    [
+                        "install",
+                        "-m",
+                        "755",
+                        str(DROIDKLIPP_MONITOR_FILE),
+                        str(DROIDKLIPP_DEPLOYED_MONITOR),
+                    ],
+                    check=True,
+                )
+
+            cmd_sysctl_service(DROIDKLIPP_SERVICE_NAME, "start")
+
+            Logger.print_dialog(
+                DialogType.SUCCESS,
+                ["DroidKlipp successfully updated!"],
+                center_content=True,
+            )
+        except CalledProcessError as e:
+            Logger.print_error(f"Error during DroidKlipp update:\n{e}")
+            cmd_sysctl_service(DROIDKLIPP_SERVICE_NAME, "start")
+        except Exception as e:
+            Logger.print_error(f"Error during DroidKlipp update:\n{e}")
+            cmd_sysctl_service(DROIDKLIPP_SERVICE_NAME, "start")
+
+    def remove_extension(self, **kwargs) -> None:
+        Logger.print_status("Removing DroidKlipp ...")
+
+        if not check_file_exist(DROIDKLIPP_DIR):
+            Logger.print_info("Extension does not seem to be installed! Skipping ...")
+            return
+
+        if not get_confirm(
+            "Do you really want to uninstall DroidKlipp?",
+            default_choice=True,
+            allow_go_back=True,
+        ):
+            Logger.print_info("Exiting DroidKlipp uninstallation ...")
+            return
+
+        try:
+            if check_file_exist(DROIDKLIPP_UNINSTALL_SCRIPT):
+                run(["chmod", "+x", DROIDKLIPP_UNINSTALL_SCRIPT], check=True)
+                run([DROIDKLIPP_UNINSTALL_SCRIPT], check=True)
+            run_remove_routines(DROIDKLIPP_DIR)
+            Logger.print_dialog(
+                DialogType.SUCCESS,
+                ["DroidKlipp successfully removed!"],
+                center_content=True,
+            )
+        except CalledProcessError as e:
+            Logger.print_error(f"Error during DroidKlipp removal:\n{e}")
+        except Exception as e:
+            Logger.print_error(f"Error during DroidKlipp removal:\n{e}")
+
+    def _klipperscreen_exists(self) -> bool:
+        return bool(
+            check_file_exist(KLIPPERSCREEN_DIR.joinpath("screen.py"))
+            and check_file_exist(KLIPPERSCREEN_ENV_DIR.joinpath("bin/python"))
+        )
@@ -0,0 +1,17 @@
+{
+  "metadata": {
+    "index": 15,
+    "module": "droidklipp_extension",
+    "maintained_by": "CodeMasterCody3D",
+    "display_name": "DroidKlipp",
+    "description": [
+      "Use an Android device as a KlipperScreen display via ADB and DroidKlipp APK / XServer XSDL integration",
+      "- Automatic USB ADB forwarding",
+      "- Optional WiFi fallback",
+      "- Starts and monitors KlipperScreen on the Android X server"
+    ],
+    "website": "https://github.com/CodeMasterCody3D/DroidKlipp-Android-APK/releases",
+    "repo": "https://github.com/CodeMasterCody3D/DroidKlipp",
+    "updates": true
+  }
+}
@@ -0,0 +1,34 @@
+# ======================================================================= #
+#  Copyright (C) 2020 - 2026 Dominik Willner <th33xitus@gmail.com>        #
+#  Copyright (C) 2026 Paul Sharman <github.com/PEEKYPAUL>                 #
+#                                                                         #
+#  This file is part of KIAUH - Klipper Installation And Update Helper    #
+#  https://github.com/dw-0/kiauh                                          #
+#                                                                         #
+#  It integrates Moongate for Klipper:                                    #
+#  https://github.com/PEEKYPAUL/Moongate                                  #
+#                                                                         #
+#  This file may be distributed under the terms of the GNU GPLv3 license  #
+# ======================================================================= #
+from pathlib import Path
+
+# repository
+MOONGATE_REPO = "https://github.com/PEEKYPAUL/moongate.git"
+MOONGATE_REPO_URL = "https://github.com/PEEKYPAUL/Moongate"
+
+# directories
+MODULE_PATH = Path(__file__).resolve().parent
+MOONGATE_DIR = Path.home().joinpath("moongate")
+MOONGATE_PLUGIN_DIR = MOONGATE_DIR.joinpath("klipper-plugin")
+
+# installer scripts shipped inside the cloned repo
+MOONGATE_INSTALL_SCRIPT = MOONGATE_PLUGIN_DIR.joinpath("install.sh")
+MOONGATE_UPDATE_SCRIPT = MOONGATE_PLUGIN_DIR.joinpath("update.sh")
+MOONGATE_UNINSTALL_SCRIPT = MOONGATE_PLUGIN_DIR.joinpath("uninstall.sh")
+
+# moonraker.conf sections the installer manages
+MOONGATE_UPDATER_NAME = "update_manager moongate"
+MOONGATE_CONFIG_SECTION = "moongate"
+
+# default HTTP port the Mainsail/Fluidd UI is served on
+MOONGATE_DEFAULT_PORT = 80
@@ -0,0 +1,15 @@
+{
+  "metadata": {
+    "index": 16,
+    "module": "moongate_extension",
+    "maintained_by": "PEEKYPAUL",
+    "display_name": "Moongate for Klipper",
+    "description": [
+      "Pair this printer with the Moongate Android app for secure remote",
+      "access and print monitoring. Installs cloudflared, a Cloudflare",
+      "quick-tunnel and an EdDSA auth gate in front of Moonraker."
+    ],
+    "repo": "https://github.com/PEEKYPAUL/Moongate",
+    "updates": true
+  }
+}
@@ -0,0 +1,249 @@
+# ======================================================================= #
+#  Copyright (C) 2020 - 2026 Dominik Willner <th33xitus@gmail.com>        #
+#  Copyright (C) 2026 Paul Sharman <github.com/PEEKYPAUL>                 #
+#                                                                         #
+#  This file is part of KIAUH - Klipper Installation And Update Helper    #
+#  https://github.com/dw-0/kiauh                                          #
+#                                                                         #
+#  It integrates Moongate for Klipper:                                    #
+#  https://github.com/PEEKYPAUL/Moongate                                  #
+#                                                                         #
+#  This file may be distributed under the terms of the GNU GPLv3 license  #
+# ======================================================================= #
+from __future__ import annotations
+
+import os
+from pathlib import Path
+from subprocess import CalledProcessError, run
+from typing import Dict, List
+
+from components.moonraker.moonraker import Moonraker
+from core.instance_manager.instance_manager import InstanceManager
+from core.logger import DialogType, Logger
+from core.services.backup_service import BackupService
+from extensions.base_extension import BaseExtension
+from extensions.moongate import (
+    MOONGATE_CONFIG_SECTION,
+    MOONGATE_DEFAULT_PORT,
+    MOONGATE_DIR,
+    MOONGATE_INSTALL_SCRIPT,
+    MOONGATE_REPO,
+    MOONGATE_REPO_URL,
+    MOONGATE_UNINSTALL_SCRIPT,
+    MOONGATE_UPDATE_SCRIPT,
+    MOONGATE_UPDATER_NAME,
+)
+from utils.config_utils import remove_config_section
+from utils.fs_utils import check_file_exist
+from utils.git_utils import GitException, git_clone_wrapper, git_pull_wrapper
+from utils.input_utils import get_confirm, get_number_input
+from utils.instance_utils import get_instances
+
+
+# noinspection PyMethodMayBeStatic
+class MoongateExtension(BaseExtension):
+    """
+    Moongate ships a substantial, security-sensitive and idempotent installer
+    (cloudflared, two systemd services, an EdDSA auth proxy, a Moonraker host
+    rebind and a tightly-scoped Avahi sudoers entry). Rather than mirror all
+    of that in Python — where it would drift out of sync with upstream — this
+    extension does the KIAUH-idiomatic parts natively (instance discovery,
+    confirmation, moonraker.conf backup, the repo clone wired to the update
+    manager) and delegates the heavy lifting to Moongate's own scripts.
+    """
+
+    def install_extension(self, **kwargs) -> None:
+        Logger.print_status("Installing Moongate for Klipper ...")
+
+        mr_instances: List[Moonraker] = get_instances(Moonraker)
+        if not mr_instances:
+            Logger.print_dialog(
+                DialogType.WARNING,
+                [
+                    "No Moonraker instances found!",
+                    "Moongate is a Moonraker component and needs Moonraker to be "
+                    "installed first. Please install Moonraker, then try again.",
+                ],
+            )
+            return
+
+        # Moongate is a single-printer integration. On a multi-instance host we
+        # target the first Moonraker instance and say so.
+        moonraker = mr_instances[0]
+        if len(mr_instances) > 1:
+            Logger.print_dialog(
+                DialogType.WARNING,
+                [
+                    "Multiple Moonraker instances detected.",
+                    "Moongate currently supports a single-printer setup. The "
+                    f"instance '{moonraker.data_dir.name}' will be used.",
+                ],
+            )
+
+        if not self._confirm_install():
+            Logger.print_info("Installation aborted.")
+            return
+
+        port = get_number_input(
+            "HTTP port your Mainsail/Fluidd UI is served on",
+            min_value=1,
+            max_value=65535,
+            default=MOONGATE_DEFAULT_PORT,
+        )
+        if port is None:
+            return
+
+        try:
+            self._clone_or_update_repo()
+
+            BackupService().backup_moonraker_conf()
+
+            # Hand off to Moongate's own installer. It is idempotent,
+            # non-interactive and env-driven: it installs cloudflared, adds the
+            # two systemd services, patches moonraker.conf and restarts
+            # Moonraker + Klipper itself.
+            self._run_script(
+                MOONGATE_INSTALL_SCRIPT,
+                moonraker,
+                extra_env={"MOONGATE_PORT": str(port)},
+            )
+        except (GitException, CalledProcessError, OSError) as e:
+            Logger.print_error(f"Error during Moongate installation:\n{e}")
+            return
+
+        Logger.print_dialog(
+            DialogType.SUCCESS,
+            [
+                "Moongate installed successfully!",
+                "\n\n",
+                "Next steps:",
+                "● Install the Moongate app on your Android device.",
+                "● Run MOONGATE_PAIR in the Klipper console (or open the pair "
+                "page printed above) and scan the QR code.",
+                "● Updates from now on: Mainsail/Fluidd > Software Updates > Moongate.",
+            ],
+            margin_bottom=1,
+        )
+
+    def update_extension(self, **kwargs) -> None:
+        Logger.print_status("Updating Moongate for Klipper ...")
+
+        if not check_file_exist(MOONGATE_DIR.joinpath(".git")):
+            Logger.print_info("Moongate does not seem to be installed. Skipping ...")
+            return
+
+        mr_instances: List[Moonraker] = get_instances(Moonraker)
+        if not mr_instances:
+            Logger.print_warn("No Moonraker instance found. Skipping ...")
+            return
+
+        try:
+            git_pull_wrapper(MOONGATE_DIR)
+            self._run_script(MOONGATE_UPDATE_SCRIPT, mr_instances[0])
+            InstanceManager.restart_all(mr_instances)
+        except (GitException, CalledProcessError, OSError) as e:
+            Logger.print_error(f"Error during Moongate update:\n{e}")
+            return
+
+        Logger.print_ok("Moongate updated successfully.", end="\n\n")
+
+    def remove_extension(self, **kwargs) -> None:
+        Logger.print_status("Removing Moongate for Klipper ...")
+
+        mr_instances: List[Moonraker] = get_instances(Moonraker)
+
+        if not get_confirm(
+            "This removes Moongate, cloudflared, both systemd services and all "
+            "Moongate config. Continue?",
+            default_choice=True,
+            allow_go_back=True,
+        ):
+            Logger.print_info("Removal aborted.")
+            return
+
+        # Preferred path: delegate to Moongate's own uninstaller, which stops
+        # and removes the services, cleans moonraker.conf, restores its backup
+        # and restarts Moonraker. MOONGATE_YES=1 makes it non-interactive
+        # (KIAUH already collected the confirmation above).
+        if check_file_exist(MOONGATE_UNINSTALL_SCRIPT):
+            try:
+                BackupService().backup_moonraker_conf()
+                target = mr_instances[0] if mr_instances else None
+                self._run_script(
+                    MOONGATE_UNINSTALL_SCRIPT,
+                    target,
+                    extra_env={"MOONGATE_YES": "1"},
+                )
+                Logger.print_ok("Moongate removed successfully.")
+                return
+            except (CalledProcessError, OSError) as e:
+                Logger.print_error(f"Error during Moongate removal:\n{e}")
+                # fall through to a best-effort native cleanup
+
+        # Fallback: the upstream uninstaller is gone (repo already deleted).
+        # Do a best-effort native cleanup so moonraker.conf is left consistent.
+        Logger.print_warn(
+            "Moongate uninstaller not found — doing a best-effort cleanup. You "
+            "may need to remove cloudflared and the moongate-* systemd services "
+            "manually."
+        )
+        if mr_instances:
+            BackupService().backup_moonraker_conf()
+            remove_config_section(MOONGATE_UPDATER_NAME, mr_instances)
+            remove_config_section(MOONGATE_CONFIG_SECTION, mr_instances)
+            InstanceManager.restart_all(mr_instances)
+        Logger.print_ok("Moongate configuration removed.")
+
+    # ------------------------------------------------------------------ #
+    #  helpers                                                            #
+    # ------------------------------------------------------------------ #
+    def _confirm_install(self) -> bool:
+        Logger.print_dialog(
+            DialogType.ATTENTION,
+            [
+                "Moongate pairs this printer with the Moongate Android app for "
+                "secure remote access and print monitoring.",
+                "\n\n",
+                "This is a heavier install than most extensions. It will:",
+                "● clone the Moongate repo to ~/moongate",
+                "● add the Moongate component to Moonraker and register it with "
+                "the update manager",
+                "● install cloudflared and open a Cloudflare quick-tunnel",
+                "● add two systemd services: moongate-authproxy + moongate-tunnel",
+                "● bind Moonraker to 127.0.0.1 (the auth proxy fronts the tunnel)",
+                "● add a tightly-scoped Avahi sudoers entry for LAN discovery",
+                "\n\n",
+                "Remote access relies on cloud infrastructure operated by the "
+                "Moongate author. Moongate is licensed under PolyForm "
+                "Noncommercial 1.0.0 (non-commercial use only).",
+                MOONGATE_REPO_URL,
+            ],
+            margin_bottom=1,
+        )
+        return bool(
+            get_confirm(
+                "Continue Moongate installation?",
+                default_choice=True,
+                allow_go_back=True,
+            )
+        )
+
+    def _clone_or_update_repo(self) -> None:
+        if check_file_exist(MOONGATE_DIR.joinpath(".git")):
+            git_pull_wrapper(MOONGATE_DIR)
+        else:
+            git_clone_wrapper(MOONGATE_REPO, MOONGATE_DIR)
+
+    def _run_script(
+        self,
+        script: Path,
+        moonraker: Moonraker | None,
+        extra_env: Dict[str, str] | None = None,
+    ) -> None:
+        env = os.environ.copy()
+        if moonraker is not None:
+            env["MOONRAKER_DIR"] = moonraker.moonraker_dir.as_posix()
+            env["PRINTER_DATA"] = moonraker.data_dir.as_posix()
+        if extra_env:
+            env.update(extra_env)
+        run(["bash", script.as_posix()], env=env, check=True)
@@ -31,6 +31,7 @@ from components.moonraker.services.moonraker_setup_service import (
 from core.instance_manager.instance_manager import InstanceManager
 from core.logger import Logger
 from core.services.backup_service import BackupService
+from core.settings.kiauh_settings import KiauhSettings
 from utils.git_utils import GitException, git_clone_wrapper
 from utils.instance_utils import get_instances
 from utils.sys_utils import (
@@ -47,6 +48,11 @@ class RepoSwitchFailedException(Exception):
 def run_switch_repo_routine(
    name: Literal["klipper", "moonraker"], repo_url: str, branch: str
 ) -> None:
+    if name not in ("klipper", "moonraker"):
+        raise ValueError(
+            f"Invalid name: {name!r}. Must be 'klipper' or 'moonraker'."
+        )
+        
    repo_dir: Path = KLIPPER_DIR if name == "klipper" else MOONRAKER_DIR
    env_dir: Path = KLIPPER_ENV_DIR if name == "klipper" else MOONRAKER_ENV_DIR
    req_file = KLIPPER_REQ_FILE if name == "klipper" else MOONRAKER_REQ_FILE
@@ -89,7 +95,16 @@ def run_switch_repo_routine(

        # step 6: recreate python virtualenv
        Logger.print_status(f"Recreating {_type.__name__} virtualenv ...")
-        if not create_python_venv(env_dir, force=True):
+
+        settings = KiauhSettings()
+        if name == "klipper":
+            use_python_binary = settings.klipper.use_python_binary
+        elif name == "moonraker":
+            use_python_binary = settings.moonraker.use_python_binary
+            
+        if not create_python_venv(
+            env_dir, force=True, use_python_binary=use_python_binary
+        ):
            raise GitException(f"Failed to recreate virtualenv for {_type.__name__}")
        else:
            install_python_requirements(env_dir, req_file)
@@ -36,13 +36,15 @@ from utils.sys_utils import (
    update_system_package_lists,
 )

+from kiauh import PROJECT_ROOT
+

 def get_kiauh_version() -> str:
    """
    Helper method to get the current KIAUH version by reading the latest tag
    :return: string of the latest tag or a default value if no tags exist
    """
-    tags: List[str] = get_local_tags(Path(__file__).parent.parent)
+    tags: List[str] = get_local_tags(PROJECT_ROOT)
    if tags:
        return tags[-1]
    else:
@@ -67,7 +67,7 @@ def git_pull_wrapper(target_dir: Path) -> None:
    Logger.print_status("Updating repository ...")
    try:
        git_cmd_pull(target_dir)
-    except CalledProcessError:
+    except (CalledProcessError, GitException):
        log = "An unexpected error occured during updating the repository."
        Logger.print_error(log)
        return
@@ -102,6 +102,9 @@ def get_current_branch(repo: Path) -> str | None:
    :param repo: Path to the local Git repository
    :return: Current branch or None if not determinable
    """
+    if not repo.exists() or not repo.joinpath(".git").exists():
+        return None
+
    try:
        cmd = ["git", "branch", "--show-current"]
        result: str = check_output(cmd, stderr=DEVNULL, cwd=repo).decode(
@@ -109,7 +112,7 @@ def get_current_branch(repo: Path) -> str | None:
        )
        return result.strip() if result else None

-    except CalledProcessError:
+    except (CalledProcessError, FileNotFoundError):
        return None


@@ -120,6 +123,8 @@ def get_local_tags(repo_path: Path, _filter: str | None = None) -> List[str]:
    :param _filter: Optional filter to filter the tags by
    :return: List of tags
    """
+    if not repo_path.exists() or not repo_path.joinpath(".git").is_dir():
+        return []

    def parse_version(version: str) -> tuple:
        # Remove 'v' prefix if present
@@ -337,6 +342,11 @@ def git_cmd_checkout(branch: str | None, target_dir: Path) -> None:
    if branch is None:
        return

+    if not target_dir.exists() or not target_dir.joinpath(".git").exists():
+        log = f"'{target_dir}' is not a valid git repository."
+        Logger.print_error(log)
+        raise GitException(log)
+
    try:
        command = ["git", "checkout", f"{branch}"]
        run(command, cwd=target_dir, check=True)
@@ -349,6 +359,11 @@ def git_cmd_checkout(branch: str | None, target_dir: Path) -> None:


 def git_cmd_pull(target_dir: Path) -> None:
+    if not target_dir.exists() or not target_dir.joinpath(".git").exists():
+        log = f"'{target_dir}' is not a valid git repository."
+        Logger.print_error(log)
+        raise GitException(log)
+
    try:
        command = ["git", "pull"]
        run(command, cwd=target_dir, check=True)
@@ -359,6 +374,11 @@ def git_cmd_pull(target_dir: Path) -> None:


 def rollback_repository(repo_dir: Path, instance: Type[InstanceType]) -> None:
+    if not repo_dir.exists() or not repo_dir.joinpath(".git").exists():
+        log = f"'{repo_dir}' is not a valid git repository."
+        Logger.print_error(log)
+        raise GitException(log)
+
    q1 = "How many commits do you want to roll back"
    amount = get_number_input(q1, 1, allow_go_back=True)

@@ -394,7 +414,7 @@ def get_repo_url(repo_dir: Path) -> str | None:
    :param repo_dir: Path to the git repository
    :return: URL of the remote repository or None if not found
    """
-    if not repo_dir.exists():
+    if not repo_dir.exists() or not repo_dir.joinpath(".git").exists():
        return None

    try:
@@ -0,0 +1,21 @@
+import sys
+from pathlib import Path
+
+import pytest
+
+PROJECT_ROOT = Path(__file__).resolve().parents[3]
+if str(PROJECT_ROOT) not in sys.path:
+    sys.path.insert(0, str(PROJECT_ROOT))
+
+
+@pytest.fixture(autouse=True)
+def silence_logger(monkeypatch: pytest.MonkeyPatch) -> None:
+    for name in (
+        "print_info",
+        "print_ok",
+        "print_warn",
+        "print_error",
+        "print_status",
+        "print_dialog",
+    ):
+        monkeypatch.setattr(f"core.logger.Logger.{name}", lambda *a, **k: None)
@@ -0,0 +1,206 @@
+from __future__ import annotations
+
+from datetime import datetime
+from pathlib import Path
+from typing import List, Set
+
+import pytest
+from core.constants import GLOBAL_DEPS
+from utils.common import (
+    check_install_dependencies,
+    convert_camelcase_to_kebabcase,
+    get_current_date,
+    get_install_status,
+    get_kiauh_version,
+    moonraker_exists,
+    trunc_string,
+)
+
+
+class TestGetKiauhVersion:
+    def test_uses_project_root(self, monkeypatch) -> None:
+        expected_root = Path(__file__).parent.parent.parent.parent
+        captured: List[Path] = []
+
+        def fake_get_local_tags(path: Path, _filter: str | None = None) -> List[str]:
+            captured.append(path)
+            return ["v6.3.0", "v6.3.1"]
+
+        monkeypatch.setattr("utils.common.get_local_tags", fake_get_local_tags)
+        result = get_kiauh_version()
+
+        assert captured == [expected_root]
+        assert result == "v6.3.1"
+
+    def test_fallback_when_no_tags(self, monkeypatch) -> None:
+        monkeypatch.setattr("utils.common.get_local_tags", lambda *_a, **_k: [])
+        assert get_kiauh_version() == "v?.?.?"
+
+
+class TestConvertCamelcaseToKebabcase:
+    @pytest.mark.parametrize(
+        "name,expected",
+        [
+            ("Klipper", "klipper"),
+            ("Moonraker", "moonraker"),
+            ("MoonrakerObico", "moonraker-obico"),
+            ("HTTPResponse", "h-t-t-p-response"),
+            ("already", "already"),
+        ],
+    )
+    def test_converts(self, name: str, expected: str) -> None:
+        assert convert_camelcase_to_kebabcase(name) == expected
+
+
+class TestGetCurrentDate:
+    def test_returns_formatted_values(self) -> None:
+        result = get_current_date()
+        now = datetime.today()
+
+        assert set(result.keys()) == {"date", "time"}
+        assert result["date"] == now.strftime("%Y%m%d")
+        assert result["time"] == now.strftime("%H%M%S")
+
+
+class TestCheckInstallDependencies:
+    def test_with_global_and_custom(self, monkeypatch) -> None:
+        checked: Set[str] = set()
+        updated: List[bool] = []
+        installed_pkgs: List[List[str]] = []
+
+        def fake_check_package_install(deps: Set[str]) -> List[str]:
+            checked.update(deps)
+            return ["extra-pkg"]
+
+        monkeypatch.setattr(
+            "utils.common.check_package_install", fake_check_package_install
+        )
+        monkeypatch.setattr(
+            "utils.common.update_system_package_lists",
+            lambda silent: updated.append(silent),
+        )
+        monkeypatch.setattr(
+            "utils.common.install_system_packages",
+            lambda pkgs: installed_pkgs.append(pkgs),
+        )
+
+        check_install_dependencies({"custom-pkg"}, include_global=True)
+
+        assert "custom-pkg" in checked
+        assert all(dep in checked for dep in GLOBAL_DEPS)
+        assert updated == [False]
+        assert installed_pkgs == [["extra-pkg"]]
+
+    def test_no_requirements(self, monkeypatch) -> None:
+        monkeypatch.setattr("utils.common.check_package_install", lambda *_a, **_k: [])
+        monkeypatch.setattr(
+            "utils.common.update_system_package_lists",
+            lambda *a, **k: pytest.fail("should not update when nothing to install"),
+        )
+        monkeypatch.setattr(
+            "utils.common.install_system_packages",
+            lambda *a, **k: pytest.fail("should not install when nothing to install"),
+        )
+
+        check_install_dependencies({"pkg"})
+
+
+class _FakeInstanceType:
+    def __init__(self, suffix: str):
+        self.suffix = suffix
+
+    def __eq__(self, other):
+        return isinstance(other, _FakeInstanceType) and self.suffix == other.suffix
+
+
+class TestGetInstallStatus:
+    def test_not_installed(self, tmp_path: Path, monkeypatch) -> None:
+        repo = tmp_path / "repo"
+        env = tmp_path / "env"
+
+        monkeypatch.setattr("utils.common.get_current_branch", lambda *_a, **_k: None)
+        monkeypatch.setattr("utils.common.get_repo_name", lambda *_a, **_k: (None, None))
+        monkeypatch.setattr("utils.common.get_repo_url", lambda *_a, **_k: None)
+        monkeypatch.setattr("utils.common.get_local_commit", lambda *_a, **_k: None)
+        monkeypatch.setattr("utils.common.get_remote_commit", lambda *_a, **_k: None)
+        monkeypatch.setattr("utils.instance_utils.get_instances", lambda *_a, **_k: [])
+
+        status = get_install_status(repo, env, _FakeInstanceType)
+
+        assert status.status == 0
+        assert status.instances == 0
+
+    def test_fully_installed(self, tmp_path: Path, monkeypatch) -> None:
+        repo = tmp_path / "repo"
+        env = tmp_path / "env"
+        repo.mkdir()
+        env.mkdir()
+        (repo / ".git").mkdir()
+        extra_file = tmp_path / "extra"
+        extra_file.write_text("x")
+
+        monkeypatch.setattr(
+            "utils.instance_utils.get_instances", lambda *_a, **_k: [_FakeInstanceType("")]
+        )
+        monkeypatch.setattr("utils.common.get_current_branch", lambda *_a, **_k: "main")
+        monkeypatch.setattr(
+            "utils.common.get_repo_name", lambda *_a, **_k: ("dw-0", "kiauh")
+        )
+        monkeypatch.setattr(
+            "utils.common.get_repo_url", lambda *_a, **_k: "https://github.com/dw-0/kiauh"
+        )
+        monkeypatch.setattr("utils.common.get_local_commit", lambda *_a, **_k: "abc")
+        monkeypatch.setattr("utils.common.get_remote_commit", lambda *_a, **_k: "def")
+
+        status = get_install_status(repo, env, _FakeInstanceType, files=[extra_file])
+
+        assert status.status == 2
+        assert status.instances == 1
+        assert status.owner == "dw-0"
+        assert status.repo == "kiauh"
+        assert status.branch == "main"
+        assert status.local == "abc"
+        assert status.remote == "def"
+
+    def test_incomplete(self, tmp_path: Path, monkeypatch) -> None:
+        repo = tmp_path / "repo"
+        env = tmp_path / "env"
+        repo.mkdir()
+
+        monkeypatch.setattr(
+            "utils.instance_utils.get_instances", lambda *_a, **_k: [_FakeInstanceType("")]
+        )
+        monkeypatch.setattr("utils.common.get_current_branch", lambda *_a, **_k: "main")
+        monkeypatch.setattr("utils.common.get_repo_name", lambda *_a, **_k: (None, None))
+        monkeypatch.setattr("utils.common.get_repo_url", lambda *_a, **_k: None)
+        monkeypatch.setattr("utils.common.get_local_commit", lambda *_a, **_k: None)
+        monkeypatch.setattr("utils.common.get_remote_commit", lambda *_a, **_k: None)
+
+        status = get_install_status(repo, env, _FakeInstanceType)
+
+        assert status.status == 1
+
+
+class TestMoonrakerExists:
+    def test_returns_instances(self, monkeypatch) -> None:
+        fake = object()
+        monkeypatch.setattr("utils.common.get_instances", lambda *_a, **_k: [fake])
+        assert moonraker_exists() == [fake]
+
+    def test_warns_when_none(self, monkeypatch) -> None:
+        monkeypatch.setattr("utils.common.get_instances", lambda *_a, **_k: [])
+        assert moonraker_exists("SomeInstaller") == []
+
+
+class TestTruncString:
+    @pytest.mark.parametrize(
+        "value,length,expected",
+        [
+            ("short", 10, "short"),
+            ("exactly seven", 20, "exactly seven"),
+            ("much longer string", 10, "much lo..."),
+            ("abcdef", 5, "ab..."),
+        ],
+    )
+    def test_truncates(self, value: str, length: int, expected: str) -> None:
+        assert trunc_string(value, length) == expected
@@ -0,0 +1,103 @@
+from __future__ import annotations
+
+from pathlib import Path
+
+from utils.config_utils import (
+    add_config_section,
+    add_config_section_at_top,
+    remove_config_section,
+)
+
+
+class _FakeInstance:
+    def __init__(self, cfg_file: Path):
+        self.cfg_file = cfg_file
+
+
+def _write_cfg(path: Path, content: str) -> None:
+    path.write_text(content, encoding="utf-8")
+
+
+class TestAddConfigSection:
+    def test_creates_section_and_options(self, tmp_path: Path) -> None:
+        cfg = tmp_path / "printer.cfg"
+        _write_cfg(cfg, "[existing]\noption: value\n")
+        instance = _FakeInstance(cfg)
+
+        add_config_section(
+            "new_section",
+            [instance],
+            options=[("opt1", "val1"), ("opt2", ["line1", "line2"])],
+        )
+
+        text = cfg.read_text(encoding="utf-8")
+        assert "[new_section]" in text
+        assert "opt1: val1" in text
+        assert "    line1" in text
+        assert "    line2" in text
+
+    def test_skips_existing_section(self, tmp_path: Path) -> None:
+        cfg = tmp_path / "printer.cfg"
+        _write_cfg(cfg, "[section]\noption: value\n")
+        instance = _FakeInstance(cfg)
+
+        add_config_section("section", [instance])
+
+        text = cfg.read_text(encoding="utf-8")
+        assert text.count("[section]") == 1
+
+    def test_warns_when_file_missing(self, tmp_path: Path) -> None:
+        cfg = tmp_path / "missing.cfg"
+        instance = _FakeInstance(cfg)
+
+        add_config_section("section", [instance])
+
+        assert not cfg.exists()
+
+
+class TestAddConfigSectionAtTop:
+    def test_prepends_section(self, tmp_path: Path) -> None:
+        cfg = tmp_path / "printer.cfg"
+        original = "[old]\noption: value\n"
+        _write_cfg(cfg, original)
+        instance = _FakeInstance(cfg)
+
+        add_config_section_at_top("top_section", [instance])
+
+        text = cfg.read_text(encoding="utf-8")
+        lines = text.splitlines()
+        assert lines[0] == "[top_section]"
+        assert "[old]" in text
+        assert text.endswith("\n")
+
+
+class TestRemoveConfigSection:
+    def test_removes_existing(self, tmp_path: Path) -> None:
+        cfg = tmp_path / "printer.cfg"
+        _write_cfg(cfg, "[keep]\noption: 1\n[drop]\noption: 2\n")
+        instance = _FakeInstance(cfg)
+
+        removed = remove_config_section("drop", [instance])
+
+        assert removed == [instance]
+        text = cfg.read_text(encoding="utf-8")
+        assert "[drop]" not in text
+        assert "[keep]" in text
+
+    def test_skips_missing_section(self, tmp_path: Path) -> None:
+        cfg = tmp_path / "printer.cfg"
+        _write_cfg(cfg, "[keep]\noption: 1\n")
+        instance = _FakeInstance(cfg)
+
+        removed = remove_config_section("missing", [instance])
+
+        assert removed == []
+        assert cfg.read_text(encoding="utf-8") == "[keep]\noption: 1\n"
+
+    def test_warns_when_file_missing(self, tmp_path: Path) -> None:
+        cfg = tmp_path / "missing.cfg"
+        instance = _FakeInstance(cfg)
+
+        removed = remove_config_section("section", [instance])
+
+        assert removed == []
@@ -0,0 +1,245 @@
+from __future__ import annotations
+
+from pathlib import Path
+from subprocess import CalledProcessError
+from typing import Any, List
+from zipfile import ZipFile
+
+import pytest
+from utils.fs_utils import (
+    check_file_exist,
+    create_folders,
+    create_symlink,
+    get_data_dir,
+    remove_file,
+    remove_with_sudo,
+    run_remove_routines,
+    unzip,
+)
+
+
+class TestCheckFileExist:
+    def test_returns_true_for_existing_file(self, tmp_path: Path) -> None:
+        file = tmp_path / "file.txt"
+        file.write_text("x")
+        assert check_file_exist(file) is True
+
+    def test_returns_false_for_missing_file(self, tmp_path: Path) -> None:
+        assert check_file_exist(tmp_path / "missing") is False
+
+    def test_returns_false_for_broken_symlink(self, tmp_path: Path) -> None:
+        link = tmp_path / "link"
+        link.symlink_to(tmp_path / "target")
+        assert check_file_exist(link) is False
+
+    def test_with_sudo_uses_subprocess(self, monkeypatch) -> None:
+        calls: List[List[str]] = []
+
+        def fake_check_output(cmd: List[str], **kwargs: Any) -> bytes:
+            calls.append(cmd)
+            return b""
+
+        monkeypatch.setattr("utils.fs_utils.check_output", fake_check_output)
+        path = Path("/some/path")
+        assert check_file_exist(path, sudo=True) is True
+        assert calls[0] == ["sudo", "find", "-L", "/some/path", "-maxdepth", "0"]
+
+    def test_with_sudo_returns_false_on_error(self, monkeypatch) -> None:
+        monkeypatch.setattr(
+            "utils.fs_utils.check_output",
+            lambda *a, **k: (_ for _ in ()).throw(CalledProcessError(1, "find")),
+        )
+        assert check_file_exist(Path("/some/path"), sudo=True) is False
+
+
+class TestCreateSymlink:
+    def test_calls_ln_with_correct_args(self, monkeypatch) -> None:
+        runs: List[List[str]] = []
+
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            runs.append(cmd)
+            return None
+
+        monkeypatch.setattr("utils.fs_utils.run", fake_run)
+        create_symlink(Path("/src"), Path("/dst"))
+        assert runs == [["ln", "-sf", "/src", "/dst"]]
+
+    def test_uses_sudo(self, monkeypatch) -> None:
+        runs: List[List[str]] = []
+
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            runs.append(cmd)
+            return None
+
+        monkeypatch.setattr("utils.fs_utils.run", fake_run)
+        create_symlink(Path("/src"), Path("/dst"), sudo=True)
+        assert runs == [["sudo", "ln", "-sf", "/src", "/dst"]]
+
+    def test_raises_on_failure(self, monkeypatch) -> None:
+        monkeypatch.setattr(
+            "utils.fs_utils.run",
+            lambda *a, **k: (_ for _ in ()).throw(CalledProcessError(1, "ln")),
+        )
+        with pytest.raises(CalledProcessError):
+            create_symlink(Path("/src"), Path("/dst"))
+
+
+class TestRemoveWithSudo:
+    def test_removes_existing_files(self, monkeypatch) -> None:
+        calls: List[tuple] = []
+
+        def fake_call(cmd: List[str], **kwargs: Any) -> int:
+            calls.append(("call", cmd))
+            return 0
+
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            calls.append(("run", cmd))
+            return None
+
+        monkeypatch.setattr("utils.fs_utils.call", fake_call)
+        monkeypatch.setattr("utils.fs_utils.run", fake_run)
+
+        result = remove_with_sudo(Path("/some/file"))
+
+        assert result is True
+        assert ("call", ["sudo", "find", "/some/file"]) in calls
+        assert ("run", ["sudo", "rm", "-rf", "/some/file"]) in calls
+
+    def test_skips_missing_files(self, monkeypatch) -> None:
+        def fake_call(cmd: List[str], **kwargs: Any) -> int:
+            return 1
+
+        monkeypatch.setattr("utils.fs_utils.call", fake_call)
+        monkeypatch.setattr(
+            "utils.fs_utils.run",
+            lambda *a, **k: pytest.fail("should not run rm for missing file"),
+        )
+
+        assert remove_with_sudo(Path("/some/file")) is False
+
+    def test_accepts_list(self, monkeypatch) -> None:
+        runs: List[List[str]] = []
+
+        def fake_call(cmd: List[str], **kwargs: Any) -> int:
+            return 0
+
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            runs.append(cmd)
+            return None
+
+        monkeypatch.setattr("utils.fs_utils.call", fake_call)
+        monkeypatch.setattr("utils.fs_utils.run", fake_run)
+
+        remove_with_sudo([Path("/a"), Path("/b")])
+
+        assert runs == [
+            ["sudo", "rm", "-rf", "/a"],
+            ["sudo", "rm", "-rf", "/b"],
+        ]
+
+
+class TestRemoveFile:
+    def test_calls_shell_rm(self, monkeypatch) -> None:
+        runs: List[Any] = []
+
+        def fake_run(cmd: str, **kwargs: Any) -> Any:
+            runs.append((cmd, kwargs.get("shell")))
+            return None
+
+        monkeypatch.setattr("utils.fs_utils.run", fake_run)
+
+        with pytest.warns(DeprecationWarning):
+            remove_file(Path("/some/file"), sudo=True)
+
+        assert runs == [("sudo rm -f /some/file", True)]
+
+
+class TestRunRemoveRoutines:
+    def test_returns_false_for_missing(self, tmp_path: Path) -> None:
+        assert run_remove_routines(tmp_path / "missing") is False
+
+    def test_removes_file(self, tmp_path: Path) -> None:
+        file = tmp_path / "file.txt"
+        file.write_text("x")
+        assert run_remove_routines(file) is True
+        assert not file.exists()
+
+    def test_removes_directory(self, tmp_path: Path) -> None:
+        directory = tmp_path / "dir"
+        directory.mkdir()
+        (directory / "child").write_text("x")
+        assert run_remove_routines(directory) is True
+        assert not directory.exists()
+
+    def test_removes_symlink(self, tmp_path: Path) -> None:
+        target = tmp_path / "target"
+        target.write_text("x")
+        link = tmp_path / "link"
+        link.symlink_to(target)
+        assert run_remove_routines(link) is True
+        assert not link.exists()
+        assert target.exists()
+
+
+class TestUnzip:
+    def test_extracts_contents(self, tmp_path: Path) -> None:
+        archive = tmp_path / "archive.zip"
+        target = tmp_path / "out"
+        target.mkdir()
+
+        with ZipFile(archive, "w") as zf:
+            zf.writestr("hello.txt", "world")
+
+        unzip(archive, target)
+
+        assert (target / "hello.txt").read_text() == "world"
+
+
+class TestCreateFolders:
+    def test_creates_missing_directories(self, tmp_path: Path) -> None:
+        dirs = [tmp_path / "a", tmp_path / "b"]
+        create_folders(dirs)
+        assert all(d.exists() for d in dirs)
+
+    def test_skips_existing(self, tmp_path: Path) -> None:
+        existing = tmp_path / "exists"
+        existing.mkdir()
+        create_folders([existing])
+        assert existing.exists()
+
+
+class TestGetDataDir:
+    def test_reads_from_service_file(self, tmp_path: Path, monkeypatch) -> None:
+        service = tmp_path / "klipper.service"
+        service.write_text(
+            "EnvironmentFile=/home/user/printer_data/systemd/klipper.env\n"
+        )
+
+        def fake_service_path(instance_type: type, suffix: str) -> Path:
+            return service
+
+        monkeypatch.setattr("utils.sys_utils.get_service_file_path", fake_service_path)
+        monkeypatch.setattr("utils.fs_utils.Path.home", lambda: tmp_path / "home")
+
+        result = get_data_dir(object, "")
+        assert result == Path("/home/user/printer_data")
+
+    def test_falls_back_to_suffixed_data_dir(self, tmp_path: Path, monkeypatch) -> None:
+        def fake_service_path(instance_type: type, suffix: str) -> Path:
+            return tmp_path / "no-such.service"
+
+        monkeypatch.setattr("utils.sys_utils.get_service_file_path", fake_service_path)
+        home = tmp_path / "home"
+        monkeypatch.setattr("utils.fs_utils.Path.home", lambda: home)
+
+        assert get_data_dir(object, "1") == home / "printer_1_data"
+
+    def test_falls_back_to_default_data_dir(self, tmp_path: Path, monkeypatch) -> None:
+        def fake_service_path(instance_type: type, suffix: str) -> Path:
+            return tmp_path / "no-such.service"
+
+        monkeypatch.setattr("utils.sys_utils.get_service_file_path", fake_service_path)
+        home = tmp_path / "home"
+        monkeypatch.setattr("utils.fs_utils.Path.home", lambda: home)
+
+        assert get_data_dir(object, "") == home / "printer_data"
@@ -0,0 +1,535 @@
+from __future__ import annotations
+
+from pathlib import Path
+from subprocess import CalledProcessError
+from typing import Any, List
+
+import pytest
+from utils.git_utils import (
+    GitException,
+    compare_semver_tags,
+    get_current_branch,
+    get_latest_remote_tag,
+    get_latest_unstable_tag,
+    get_local_commit,
+    get_local_tags,
+    get_remote_commit,
+    get_remote_tags,
+    get_repo_name,
+    get_repo_url,
+    git_clone_wrapper,
+    git_cmd_checkout,
+    git_cmd_clone,
+    git_cmd_pull,
+    git_pull_wrapper,
+    rollback_repository,
+)
+from utils.instance_type import InstanceType
+
+
+class TestGitCmdPull:
+    def test_missing_dir_raises(self, tmp_path: Path) -> None:
+        missing = tmp_path / "does-not-exist"
+        with pytest.raises(GitException):
+            git_cmd_pull(missing)
+
+    def test_dir_without_git_raises(self, tmp_path: Path) -> None:
+        empty = tmp_path / "no-git"
+        empty.mkdir()
+        with pytest.raises(GitException):
+            git_cmd_pull(empty)
+
+    def test_success_runs_git_pull(self, monkeypatch) -> None:
+        repo = Path("/fake/repo")
+        runs: List[List[str]] = []
+
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            runs.append(cmd)
+            return None
+
+        monkeypatch.setattr("utils.git_utils.Path.exists", lambda self: True)
+        monkeypatch.setattr(
+            "utils.git_utils.Path.joinpath", lambda self, name: repo / name
+        )
+        monkeypatch.setattr("utils.git_utils.run", fake_run)
+
+        git_cmd_pull(repo)
+        assert runs == [["git", "pull"]]
+
+
+class TestGitCmdCheckout:
+    def test_missing_dir_raises(self, tmp_path: Path) -> None:
+        missing = tmp_path / "does-not-exist"
+        with pytest.raises(GitException):
+            git_cmd_checkout("main", missing)
+
+    def test_dir_without_git_raises(self, tmp_path: Path) -> None:
+        empty = tmp_path / "no-git"
+        empty.mkdir()
+        with pytest.raises(GitException):
+            git_cmd_checkout("main", empty)
+
+    def test_none_branch_returns(self, monkeypatch) -> None:
+        monkeypatch.setattr(
+            "utils.git_utils.run",
+            lambda *a, **k: pytest.fail("should not run checkout for None branch"),
+        )
+        git_cmd_checkout(None, Path("/repo"))
+
+
+class TestGitPullWrapper:
+    def test_missing_dir_does_not_raise(self, tmp_path: Path) -> None:
+        missing = tmp_path / "does-not-exist"
+        git_pull_wrapper(missing)
+
+    def test_dir_without_git_does_not_raise(self, tmp_path: Path) -> None:
+        empty = tmp_path / "no-git"
+        empty.mkdir()
+        git_pull_wrapper(empty)
+
+    def test_success_calls_git_pull(self, monkeypatch) -> None:
+        repo = Path("/fake/repo")
+        called: List[Path] = []
+
+        def fake_git_cmd_pull(path: Path) -> None:
+            called.append(path)
+
+        monkeypatch.setattr("utils.git_utils.git_cmd_pull", fake_git_cmd_pull)
+        git_pull_wrapper(repo)
+        assert called == [repo]
+
+
+class TestRollbackRepository:
+    def test_missing_dir_raises(
+        self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        missing = tmp_path / "does-not-exist"
+        called: list[bool] = []
+        monkeypatch.setattr(
+            "utils.git_utils.get_number_input",
+            lambda *_a, **_k: called.append(True) or 1,
+        )
+        with pytest.raises(GitException):
+            rollback_repository(missing, InstanceType)
+        assert not called
+
+    def test_dir_without_git_raises(
+        self, tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+    ) -> None:
+        empty = tmp_path / "no-git"
+        empty.mkdir()
+        called: list[bool] = []
+        monkeypatch.setattr(
+            "utils.git_utils.get_number_input",
+            lambda *_a, **_k: called.append(True) or 1,
+        )
+        with pytest.raises(GitException):
+            rollback_repository(empty, InstanceType)
+        assert not called
+
+    def test_aborts_when_not_confirmed(self, tmp_path: Path, monkeypatch) -> None:
+        repo = tmp_path / "repo"
+        repo.mkdir()
+        (repo / ".git").mkdir()
+
+        monkeypatch.setattr("utils.git_utils.get_number_input", lambda *a, **k: 2)
+        monkeypatch.setattr("utils.git_utils.get_confirm", lambda *a, **k: False)
+        monkeypatch.setattr(
+            "utils.git_utils.get_instances", lambda *a, **k: ["instance"]
+        )
+        monkeypatch.setattr(
+            "utils.git_utils.InstanceManager.stop_all",
+            lambda *a, **k: pytest.fail("should not stop when aborted"),
+        )
+        monkeypatch.setattr(
+            "utils.git_utils.run",
+            lambda *a, **k: pytest.fail("should not reset when aborted"),
+        )
+        monkeypatch.setattr(
+            "utils.git_utils.InstanceManager.start_all",
+            lambda *a, **k: pytest.fail("should not start when aborted"),
+        )
+
+        rollback_repository(repo, InstanceType)
+
+    def test_resets_and_restarts_when_confirmed(self, tmp_path: Path, monkeypatch) -> None:
+        repo = tmp_path / "repo"
+        repo.mkdir()
+        (repo / ".git").mkdir()
+
+        stops: List[List[Any]] = []
+        starts: List[List[Any]] = []
+        resets: List[List[str]] = []
+
+        monkeypatch.setattr("utils.git_utils.get_number_input", lambda *a, **k: 3)
+        monkeypatch.setattr("utils.git_utils.get_confirm", lambda *a, **k: True)
+        monkeypatch.setattr(
+            "utils.git_utils.get_instances", lambda *a, **k: ["instance"]
+        )
+        monkeypatch.setattr(
+            "utils.git_utils.InstanceManager.stop_all",
+            lambda instances: stops.append(instances),
+        )
+        monkeypatch.setattr(
+            "utils.git_utils.InstanceManager.start_all",
+            lambda instances: starts.append(instances),
+        )
+
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            resets.append(cmd)
+            return None
+
+        monkeypatch.setattr("utils.git_utils.run", fake_run)
+
+        rollback_repository(repo, InstanceType)
+
+        assert stops == [["instance"]]
+        assert resets == [["git", "reset", "--hard", "HEAD~3"]]
+        assert starts == [["instance"]]
+
+
+class TestGetRepoName:
+    def test_extracts_org_and_repo(self, monkeypatch, tmp_path: Path) -> None:
+        repo = tmp_path / "repo"
+        repo.mkdir()
+        (repo / ".git").mkdir()
+
+        monkeypatch.setattr(
+            "utils.git_utils.check_output",
+            lambda *a, **k: b"https://github.com/dw-0/kiauh.git\n",
+        )
+        assert get_repo_name(repo) == ("dw-0", "kiauh")
+
+    def test_returns_none_for_missing_repo(self, tmp_path: Path) -> None:
+        assert get_repo_name(tmp_path / "missing") == (None, None)
+
+    def test_returns_none_on_git_error(self, monkeypatch, tmp_path: Path) -> None:
+        repo = tmp_path / "repo"
+        repo.mkdir()
+        (repo / ".git").mkdir()
+
+        monkeypatch.setattr(
+            "utils.git_utils.check_output",
+            lambda *a, **k: (_ for _ in ()).throw(CalledProcessError(1, "git")),
+        )
+        assert get_repo_name(repo) == (None, None)
+
+
+class TestGetCurrentBranch:
+    def test_returns_branch(self, monkeypatch, tmp_path: Path) -> None:
+        repo = tmp_path / "repo"
+        repo.mkdir()
+        (repo / ".git").mkdir()
+
+        monkeypatch.setattr(
+            "utils.git_utils.check_output", lambda *a, **k: b"feature-x\n"
+        )
+        assert get_current_branch(repo) == "feature-x"
+
+    def test_returns_none_for_missing_repo(self, tmp_path: Path) -> None:
+        assert get_current_branch(tmp_path / "missing") is None
+
+
+class TestGetLocalTags:
+    def test_sorts_semver(self, monkeypatch, tmp_path: Path) -> None:
+        repo = tmp_path / "repo"
+        repo.mkdir()
+        (repo / ".git").mkdir()
+
+        monkeypatch.setattr(
+            "utils.git_utils.check_output",
+            lambda *a, **k: b"v1.0.0\nv1.0.1\nv1.0.10\nv1.0.2\nv2.0.0-beta.1\n",
+        )
+        assert get_local_tags(repo) == [
+            "v1.0.0",
+            "v1.0.1",
+            "v1.0.2",
+            "v1.0.10",
+            "v2.0.0-beta.1",
+        ]
+
+    def test_returns_empty_for_missing_repo(self, tmp_path: Path) -> None:
+        assert get_local_tags(tmp_path / "missing") == []
+
+
+class _FakeResponse:
+    def __init__(self, code: int, body: bytes = b""):
+        self._code = code
+        self._body = body
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, *args):
+        return None
+
+    def getcode(self) -> int:
+        return self._code
+
+    def read(self) -> bytes:
+        return self._body
+
+
+class TestGetRemoteTags:
+    def test_parses_github_api(self, monkeypatch) -> None:
+        body = b'[{"name":"v1.0.0"},{"name":"v1.1.0"}]'
+
+        class FakeUrlLib:
+            @staticmethod
+            def urlopen(url: str):
+                return _FakeResponse(200, body)
+
+        monkeypatch.setattr("utils.git_utils.urllib.request", FakeUrlLib())
+        assert get_remote_tags("dw-0/kiauh") == ["v1.0.0", "v1.1.0"]
+
+    def test_returns_empty_on_http_error(self, monkeypatch) -> None:
+        class FakeUrlLib:
+            @staticmethod
+            def urlopen(url: str):
+                return _FakeResponse(404)
+
+        monkeypatch.setattr("utils.git_utils.urllib.request", FakeUrlLib())
+        assert get_remote_tags("dw-0/kiauh") == []
+
+
+class TestGetLatestRemoteTag:
+    def test_returns_first_tag(self, monkeypatch) -> None:
+        monkeypatch.setattr(
+            "utils.git_utils.get_remote_tags", lambda *_a, **_k: ["v2.0.0", "v1.0.0"]
+        )
+        assert get_latest_remote_tag("dw-0/kiauh") == "v2.0.0"
+
+    def test_returns_empty_when_no_tags(self, monkeypatch) -> None:
+        monkeypatch.setattr("utils.git_utils.get_remote_tags", lambda *_a, **_k: [])
+        assert get_latest_remote_tag("dw-0/kiauh") == ""
+
+
+class TestGetLatestUnstableTag:
+    def test_filters_prereleases(self, monkeypatch) -> None:
+        monkeypatch.setattr(
+            "utils.git_utils.get_remote_tags",
+            lambda *_a, **_k: ["v2.0.0", "v2.0.0-rc.1", "v1.0.0-beta.2"],
+        )
+        assert get_latest_unstable_tag("dw-0/kiauh") == "v2.0.0-rc.1"
+
+    def test_returns_empty_when_stable_only(self, monkeypatch) -> None:
+        monkeypatch.setattr(
+            "utils.git_utils.get_remote_tags", lambda *_a, **_k: ["v2.0.0", "v1.0.0"]
+        )
+        assert get_latest_unstable_tag("dw-0/kiauh") == ""
+
+
+class TestCompareSemverTags:
+    @pytest.mark.parametrize(
+        "tag1,tag2,expected",
+        [
+            ("v1.0.0", "v1.0.1", False),
+            ("v1.1.0", "v1.0.1", True),
+            ("v1.0.0", "v1.0.0", False),
+            ("v2.0.0", "v1.9.9", True),
+        ],
+    )
+    def test_comparison(self, tag1: str, tag2: str, expected: bool) -> None:
+        assert compare_semver_tags(tag1, tag2) is expected
+
+
+class TestGetLocalCommit:
+    def test_describes_head(self, monkeypatch, tmp_path: Path) -> None:
+        repo = tmp_path / "repo"
+        repo.mkdir()
+        (repo / ".git").mkdir()
+
+        monkeypatch.setattr(
+            "utils.git_utils.check_output",
+            lambda *a, **k: "v1.0.0-0-gabc1234",
+        )
+        assert get_local_commit(repo) == "v1.0.0-0-gabc1234"
+
+    def test_returns_none_for_missing_repo(self, tmp_path: Path) -> None:
+        assert get_local_commit(tmp_path / "missing") is None
+
+
+class TestGetRemoteCommit:
+    def test_describes_origin(self, monkeypatch, tmp_path: Path) -> None:
+        repo = tmp_path / "repo"
+        repo.mkdir()
+        (repo / ".git").mkdir()
+
+        def fake_check_output(cmd: str, **kwargs: Any) -> str:
+            if "HEAD" in cmd:
+                return "v1.0.0"
+            return "origin/main"
+
+        monkeypatch.setattr(
+            "utils.git_utils.get_current_branch", lambda *_a, **_k: "main"
+        )
+        monkeypatch.setattr("utils.git_utils.check_output", fake_check_output)
+        assert get_remote_commit(repo) == "origin/main"
+
+    def test_returns_none_for_missing_repo(self, tmp_path: Path) -> None:
+        assert get_remote_commit(tmp_path / "missing") is None
+
+
+class TestGitCmdClone:
+    def test_without_blobless(self, monkeypatch) -> None:
+        runs: List[List[str]] = []
+
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            runs.append(cmd)
+            return None
+
+        monkeypatch.setattr("utils.git_utils.run", fake_run)
+        git_cmd_clone("https://github.com/dw-0/kiauh", Path("/target"))
+        assert runs == [["git", "clone", "https://github.com/dw-0/kiauh", "/target"]]
+
+    def test_with_blobless(self, monkeypatch) -> None:
+        runs: List[List[str]] = []
+
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            runs.append(cmd)
+            return None
+
+        monkeypatch.setattr("utils.git_utils.run", fake_run)
+        git_cmd_clone(
+            "https://github.com/dw-0/kiauh", Path("/target"), blobless=True
+        )
+        assert runs == [
+            [
+                "git",
+                "clone",
+                "--filter=blob:none",
+                "https://github.com/dw-0/kiauh",
+                "/target",
+            ]
+        ]
+
+
+class TestGitCmdCheckoutSingle:
+    def test_runs_git_checkout(self, monkeypatch, tmp_path: Path) -> None:
+        repo = tmp_path / "repo"
+        repo.mkdir()
+        (repo / ".git").mkdir()
+        runs: List[List[str]] = []
+
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            runs.append(cmd)
+            return None
+
+        monkeypatch.setattr("utils.git_utils.run", fake_run)
+        git_cmd_checkout("dev", repo)
+        assert runs == [["git", "checkout", "dev"]]
+
+
+class TestGetRepoUrl:
+    def test_extracts_remote_url(self, monkeypatch, tmp_path: Path) -> None:
+        repo = tmp_path / "repo"
+        repo.mkdir()
+        (repo / ".git").mkdir()
+
+        class FakeResult:
+            stdout = "https://github.com/dw-0/kiauh.git\n"
+
+        monkeypatch.setattr("utils.git_utils.run", lambda *a, **k: FakeResult())
+        assert get_repo_url(repo) == "https://github.com/dw-0/kiauh.git"
+
+    def test_returns_none_for_missing_repo(self, tmp_path: Path) -> None:
+        assert get_repo_url(tmp_path / "missing") is None
+
+    def test_returns_none_on_git_error(self, monkeypatch, tmp_path: Path) -> None:
+        repo = tmp_path / "repo"
+        repo.mkdir()
+        (repo / ".git").mkdir()
+
+        monkeypatch.setattr(
+            "utils.git_utils.run",
+            lambda *a, **k: (_ for _ in ()).throw(CalledProcessError(1, "git")),
+        )
+        assert get_repo_url(repo) is None
+
+
+class _CloneRecorder:
+    def __init__(self):
+        self.calls: List[tuple] = []
+        self.checkouts: List[tuple] = []
+        self.removed: List[Path] = []
+
+    def fake_clone(self, repo: str, target: Path, blobless: bool = False) -> None:
+        self.calls.append((repo, target, blobless))
+
+    def fake_checkout(self, branch: str | None, target: Path) -> None:
+        self.checkouts.append((branch, target))
+
+
+class TestGitCloneWrapper:
+    def test_clones_when_target_missing(self, monkeypatch, tmp_path: Path) -> None:
+        target = tmp_path / "kiauh"
+        recorder = _CloneRecorder()
+        monkeypatch.setattr("utils.git_utils.git_cmd_clone", recorder.fake_clone)
+        monkeypatch.setattr("utils.git_utils.git_cmd_checkout", recorder.fake_checkout)
+
+        git_clone_wrapper("https://github.com/dw-0/kiauh", target, branch="dev")
+
+        assert recorder.calls == [("https://github.com/dw-0/kiauh", target, True)]
+        assert recorder.checkouts == [("dev", target)]
+
+    def test_skips_checkout_for_main(self, monkeypatch, tmp_path: Path) -> None:
+        target = tmp_path / "kiauh"
+        recorder = _CloneRecorder()
+        monkeypatch.setattr("utils.git_utils.git_cmd_clone", recorder.fake_clone)
+        monkeypatch.setattr("utils.git_utils.git_cmd_checkout", recorder.fake_checkout)
+
+        git_clone_wrapper("https://github.com/dw-0/kiauh", target, branch="main")
+
+        assert recorder.checkouts == []
+
+    def test_prompts_before_overwrite(self, monkeypatch, tmp_path: Path) -> None:
+        target = tmp_path / "kiauh"
+        target.mkdir()
+        recorder = _CloneRecorder()
+        removed: List[Path] = []
+
+        monkeypatch.setattr("utils.git_utils.git_cmd_clone", recorder.fake_clone)
+        monkeypatch.setattr("utils.git_utils.git_cmd_checkout", recorder.fake_checkout)
+        monkeypatch.setattr("utils.git_utils.shutil.rmtree", lambda p: removed.append(p))
+        monkeypatch.setattr("utils.git_utils.get_confirm", lambda *a, **k: True)
+
+        git_clone_wrapper("https://github.com/dw-0/kiauh", target, branch="dev")
+
+        assert removed == [target]
+        assert recorder.calls == [("https://github.com/dw-0/kiauh", target, True)]
+
+    def test_respects_decline_to_overwrite(self, monkeypatch, tmp_path: Path) -> None:
+        target = tmp_path / "kiauh"
+        target.mkdir()
+        recorder = _CloneRecorder()
+
+        monkeypatch.setattr("utils.git_utils.git_cmd_clone", recorder.fake_clone)
+        monkeypatch.setattr("utils.git_utils.git_cmd_checkout", recorder.fake_checkout)
+        monkeypatch.setattr(
+            "utils.git_utils.shutil.rmtree",
+            lambda *a, **k: pytest.fail("should not remove"),
+        )
+        monkeypatch.setattr("utils.git_utils.get_confirm", lambda *a, **k: False)
+
+        git_clone_wrapper("https://github.com/dw-0/kiauh", target)
+
+        assert recorder.calls == []
+
+    def test_force_overwrites_without_prompt(self, monkeypatch, tmp_path: Path) -> None:
+        target = tmp_path / "kiauh"
+        target.mkdir()
+        recorder = _CloneRecorder()
+        removed: List[Path] = []
+
+        monkeypatch.setattr("utils.git_utils.git_cmd_clone", recorder.fake_clone)
+        monkeypatch.setattr("utils.git_utils.git_cmd_checkout", recorder.fake_checkout)
+        monkeypatch.setattr("utils.git_utils.shutil.rmtree", lambda p: removed.append(p))
+        monkeypatch.setattr(
+            "utils.git_utils.get_confirm",
+            lambda *a, **k: pytest.fail("should not prompt when forced"),
+        )
+
+        git_clone_wrapper("https://github.com/dw-0/kiauh", target, force=True)
+
+        assert removed == [target]
+        assert recorder.calls == [("https://github.com/dw-0/kiauh", target, True)]
@@ -0,0 +1,158 @@
+from __future__ import annotations
+
+from typing import Any, List
+
+import pytest
+from utils.input_utils import (
+    format_question,
+    get_confirm,
+    get_number_input,
+    get_selection_input,
+    get_string_input,
+    validate_number_input,
+)
+
+
+def _input_sequence(answers: List[str]):
+    it = iter(answers)
+
+    def _input(_prompt: str = "") -> str:
+        return next(it)
+
+    return _input
+
+
+class TestGetConfirm:
+    def test_accepts_yes(self, monkeypatch) -> None:
+        monkeypatch.setattr("builtins.input", _input_sequence(["y"]))
+        assert get_confirm("go?") is True
+
+    def test_accepts_no(self, monkeypatch) -> None:
+        monkeypatch.setattr("builtins.input", _input_sequence(["n"]))
+        assert get_confirm("go?") is False
+
+    def test_default_yes_on_empty(self, monkeypatch) -> None:
+        monkeypatch.setattr("builtins.input", _input_sequence([""]))
+        assert get_confirm("go?", default_choice=True) is True
+
+    def test_default_no_on_empty(self, monkeypatch) -> None:
+        monkeypatch.setattr("builtins.input", _input_sequence([""]))
+        assert get_confirm("go?", default_choice=False) is False
+
+    def test_handles_invalid_then_valid(self, monkeypatch) -> None:
+        monkeypatch.setattr("builtins.input", _input_sequence(["maybe", "yes"]))
+        assert get_confirm("go?") is True
+
+    def test_go_back_returns_none(self, monkeypatch) -> None:
+        monkeypatch.setattr("builtins.input", _input_sequence(["b"]))
+        assert get_confirm("go?", allow_go_back=True) is None
+
+
+class TestGetNumberInput:
+    def test_returns_valid(self, monkeypatch) -> None:
+        monkeypatch.setattr("builtins.input", _input_sequence(["5"]))
+        assert get_number_input("count?", 1, 10) == 5
+
+    def test_uses_default(self, monkeypatch) -> None:
+        monkeypatch.setattr("builtins.input", _input_sequence([""]))
+        assert get_number_input("count?", 1, default=3) == 3
+
+    def test_enforces_minimum(self, monkeypatch) -> None:
+        monkeypatch.setattr("builtins.input", _input_sequence(["0", "2"]))
+        assert get_number_input("count?", 1) == 2
+
+    def test_enforces_maximum(self, monkeypatch) -> None:
+        monkeypatch.setattr("builtins.input", _input_sequence(["11", "9"]))
+        assert get_number_input("count?", 1, 10) == 9
+
+    def test_go_back_returns_none(self, monkeypatch) -> None:
+        monkeypatch.setattr("builtins.input", _input_sequence(["b"]))
+        assert get_number_input("count?", 1, allow_go_back=True) is None
+
+
+class TestGetStringInput:
+    def test_accepts_alphanumeric(self, monkeypatch) -> None:
+        monkeypatch.setattr("builtins.input", _input_sequence(["abc123"]))
+        assert get_string_input("name?") == "abc123"
+
+    def test_rejects_empty(self, monkeypatch) -> None:
+        monkeypatch.setattr("builtins.input", _input_sequence(["", "value"]))
+        assert get_string_input("name?") == "value"
+
+    def test_uses_default(self, monkeypatch) -> None:
+        monkeypatch.setattr("builtins.input", _input_sequence([""]))
+        assert get_string_input("name?", default="fallback") == "fallback"
+
+    def test_validates_regex(self, monkeypatch) -> None:
+        monkeypatch.setattr("builtins.input", _input_sequence(["@", "#"]))
+        assert get_string_input("name?", regex=r"^#+$") == "#"
+
+    def test_rejects_excluded(self, monkeypatch) -> None:
+        monkeypatch.setattr("builtins.input", _input_sequence(["taken", "free"]))
+        assert get_string_input("name?", exclude=["taken"]) == "free"
+
+    def test_allows_special_chars(self, monkeypatch) -> None:
+        monkeypatch.setattr("builtins.input", _input_sequence(["a-b_c"]))
+        assert get_string_input("name?", allow_special_chars=True) == "a-b_c"
+
+    def test_allows_empty_with_special_chars(self, monkeypatch) -> None:
+        monkeypatch.setattr("builtins.input", _input_sequence([""]))
+        assert (
+            get_string_input("name?", allow_empty=True, allow_special_chars=True) == ""
+        )
+
+
+class TestGetSelectionInput:
+    def test_from_list(self, monkeypatch) -> None:
+        monkeypatch.setattr("builtins.input", _input_sequence(["b"]))
+        assert get_selection_input("pick?", ["a", "b", "c"]) == "b"
+
+    def test_from_dict(self, monkeypatch) -> None:
+        monkeypatch.setattr("builtins.input", _input_sequence(["two"]))
+        assert get_selection_input("pick?", {"one": 1, "two": 2}) == "two"
+
+    def test_invalid_then_valid(self, monkeypatch) -> None:
+        monkeypatch.setattr("builtins.input", _input_sequence(["z", "a"]))
+        assert get_selection_input("pick?", ["a", "b"]) == "a"
+
+    def test_invalid_type_raises(self, monkeypatch) -> None:
+        monkeypatch.setattr("builtins.input", _input_sequence(["x"]))
+        with pytest.raises(ValueError):
+            get_selection_input("pick?", 123)  # type: ignore[arg-type]
+
+
+class TestFormatQuestion:
+    def test_includes_default(self) -> None:
+        assert "default=5" in format_question("count", 5)
+
+    def test_no_default(self) -> None:
+        assert "count" in format_question("count")
+        assert "default" not in format_question("count")
+
+
+class TestValidateNumberInput:
+    @pytest.mark.parametrize(
+        "value,min_count,max_count,expected",
+        [
+            ("5", 1, 10, 5),
+            ("1", 1, 10, 1),
+            ("10", 1, 10, 10),
+            ("3", 1, None, 3),
+        ],
+    )
+    def test_valid(
+        self, value: str, min_count: int, max_count: Any, expected: int
+    ) -> None:
+        assert validate_number_input(value, min_count, max_count) == expected
+
+    @pytest.mark.parametrize(
+        "value,min_count,max_count",
+        [
+            ("0", 1, 10),
+            ("11", 1, 10),
+            ("-1", 0, None),
+        ],
+    )
+    def test_raises(self, value: str, min_count: int, max_count: Any) -> None:
+        with pytest.raises(ValueError):
+            validate_number_input(value, min_count, max_count)
@@ -0,0 +1,17 @@
+from __future__ import annotations
+
+from typing import TypeVar
+
+from components.klipper.klipper import Klipper
+from components.moonraker.moonraker import Moonraker
+from utils.instance_type import InstanceType
+
+
+class TestInstanceType:
+    def test_is_typevar(self) -> None:
+        assert isinstance(InstanceType, TypeVar)
+
+    def test_bound_classes_include_components(self) -> None:
+        bound = InstanceType.__constraints__
+        assert Klipper in bound
+        assert Moonraker in bound
@@ -0,0 +1,98 @@
+from __future__ import annotations
+
+from pathlib import Path
+from typing import List
+
+import pytest
+from utils.instance_utils import (
+    get_instance_suffix,
+    get_instances,
+    stop_klipper_instances_interactively,
+)
+
+
+class Klipper:
+    def __init__(self, suffix: str):
+        self.suffix = suffix
+
+    def __eq__(self, other):
+        return isinstance(other, Klipper) and self.suffix == other.suffix
+
+    def __repr__(self):
+        return f"Klipper({self.suffix!r})"
+
+
+class TestGetInstances:
+    def test_returns_empty_when_no_services(self, tmp_path: Path, monkeypatch) -> None:
+        monkeypatch.setattr("utils.instance_utils.SYSTEMD", tmp_path)
+        assert get_instances(Klipper) == []
+
+    def test_raises_when_not_a_class(self, tmp_path: Path, monkeypatch) -> None:
+        monkeypatch.setattr("utils.instance_utils.SYSTEMD", tmp_path)
+        with pytest.raises(ValueError):
+            get_instances("not-a-class")  # type: ignore[arg-type]
+
+    def test_finds_and_sorts_instances(self, tmp_path: Path, monkeypatch) -> None:
+        monkeypatch.setattr("utils.instance_utils.SYSTEMD", tmp_path)
+
+        (tmp_path / "klipper.service").write_text("")
+        (tmp_path / "klipper-1.service").write_text("")
+        (tmp_path / "klipper-10.service").write_text("")
+        (tmp_path / "klipper-a.service").write_text("")
+
+        instances = get_instances(Klipper)
+        assert [i.suffix for i in instances] == ["", "1", "10", "a"]
+
+    def test_excludes_blacklisted_suffixes(self, tmp_path: Path, monkeypatch) -> None:
+        monkeypatch.setattr("utils.instance_utils.SYSTEMD", tmp_path)
+
+        (tmp_path / "klipper.service").write_text("")
+        (tmp_path / "klipper-mcu.service").write_text("")
+
+        instances = get_instances(Klipper)
+        assert [i.suffix for i in instances] == [""]
+
+
+class TestGetInstanceSuffix:
+    @pytest.mark.parametrize(
+        "name,service,expected",
+        [
+            ("klipper", "klipper.service", ""),
+            ("klipper", "klipper-1.service", "1"),
+            ("klipper", "klipper-10.service", "10"),
+            ("moonraker", "moonraker-foo.service", "foo"),
+        ],
+    )
+    def test_suffix(self, name: str, service: str, expected: str) -> None:
+        assert get_instance_suffix(name, Path(service)) == expected
+
+
+class TestStopKlipperInstancesInteractively:
+    def test_empty_returns_true(self, monkeypatch) -> None:
+        monkeypatch.setattr(
+            "utils.instance_utils.get_confirm",
+            lambda *a, **k: pytest.fail("no prompt when no instances"),
+        )
+        assert stop_klipper_instances_interactively([]) is True
+
+    def test_stops_on_confirm(self, monkeypatch) -> None:
+        stopped: List[Klipper] = []
+        instance = Klipper("")
+
+        monkeypatch.setattr("utils.instance_utils.get_confirm", lambda *a, **k: True)
+        monkeypatch.setattr(
+            "utils.instance_utils.InstanceManager.stop_all",
+            lambda instances: stopped.extend(instances),
+        )
+
+        assert stop_klipper_instances_interactively([instance], "update") is True
+        assert [i.suffix for i in stopped] == [""]
+
+    def test_aborts_on_decline(self, monkeypatch) -> None:
+        monkeypatch.setattr("utils.instance_utils.get_confirm", lambda *a, **k: False)
+        monkeypatch.setattr(
+            "utils.instance_utils.InstanceManager.stop_all",
+            lambda *a, **k: pytest.fail("should not stop when declined"),
+        )
+
+        assert stop_klipper_instances_interactively([Klipper("")]) is False
@@ -0,0 +1,686 @@
+from __future__ import annotations
+
+import builtins
+from io import StringIO
+from pathlib import Path
+from subprocess import CalledProcessError
+from typing import Any, List
+
+import pytest
+from utils.sys_utils import (
+    VenvCreationFailedException,
+    check_package_install,
+    check_python_version,
+    cmd_sysctl_manage,
+    cmd_sysctl_service,
+    create_env_file,
+    create_python_venv,
+    create_service_file,
+    download_file,
+    download_progress,
+    get_distro_info,
+    get_ipv4_addr,
+    get_service_file_path,
+    get_system_timezone,
+    get_upgradable_packages,
+    install_python_packages,
+    install_python_requirements,
+    install_system_packages,
+    kill,
+    log_process,
+    parse_packages_from_file,
+    remove_system_service,
+    set_nginx_permissions,
+    unit_file_exists,
+    update_python_pip,
+    update_system_package_lists,
+    upgrade_system_packages,
+)
+
+
+class TestKill:
+    def test_exits_with_error(self, monkeypatch) -> None:
+        exited: List[int] = []
+
+        def fake_exit(code: int) -> None:
+            exited.append(code)
+            raise SystemExit(code)
+
+        monkeypatch.setattr("utils.sys_utils.sys.exit", fake_exit)
+        with pytest.raises(SystemExit):
+            kill("boom")
+        assert exited == [1]
+
+
+class TestCheckPythonVersion:
+    def test_old(self, monkeypatch) -> None:
+        info = type("VI", (), {"major": 3, "minor": 7})()
+        monkeypatch.setattr("utils.sys_utils.sys.version_info", info)
+        assert check_python_version(3, 8) is False
+
+    def test_current(self, monkeypatch) -> None:
+        info = type("VI", (), {"major": 3, "minor": 9})()
+        monkeypatch.setattr("utils.sys_utils.sys.version_info", info)
+        assert check_python_version(3, 8) is True
+
+
+class TestParsePackagesFromFile:
+    def test_reads_pkglist(self, tmp_path: Path) -> None:
+        script = tmp_path / "install.sh"
+        script.write_text('PKGLIST="git curl wget"\nOTHER="x"\n')
+        assert parse_packages_from_file(script) == ["git", "curl", "wget"]
+
+
+class TestCreatePythonVenv:
+    def test_creates_when_missing(self, monkeypatch) -> None:
+        runs: List[List[str]] = []
+
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            runs.append(cmd)
+            return None
+
+        monkeypatch.setattr("utils.sys_utils.run", fake_run)
+        target = Path("/tmp/venv")
+
+        assert create_python_venv(target) is True
+        assert runs == [
+            ["virtualenv", "-p", "/usr/bin/python3", "/tmp/venv"],
+        ]
+
+    def test_declines_recreate(self, monkeypatch) -> None:
+        target = Path("/tmp/venv")
+        monkeypatch.setattr("utils.sys_utils.Path.exists", lambda self: self == target)
+        monkeypatch.setattr("utils.sys_utils.get_confirm", lambda *a, **k: False)
+        monkeypatch.setattr(
+            "utils.sys_utils.run",
+            lambda *a, **k: pytest.fail("should not recreate when declined"),
+        )
+
+        assert create_python_venv(target) is False
+
+    def test_confirms_recreate(self, monkeypatch) -> None:
+        target = Path("/tmp/venv")
+        state = {"exists": True}
+        removed: List[Path] = []
+        runs: List[List[str]] = []
+
+        def fake_exists(self: Path) -> bool:
+            return state["exists"] and str(self) == str(target)
+
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            runs.append(cmd)
+            return None
+
+        def fake_rmtree(p: Path) -> None:
+            removed.append(p)
+            state["exists"] = False
+
+        monkeypatch.setattr("utils.sys_utils.Path.exists", fake_exists)
+        monkeypatch.setattr("utils.sys_utils.get_confirm", lambda *a, **k: True)
+        monkeypatch.setattr("utils.sys_utils.shutil.rmtree", fake_rmtree)
+        monkeypatch.setattr("utils.sys_utils.run", fake_run)
+
+        assert (
+            create_python_venv(target, allow_access_to_system_site_packages=True)
+            is True
+        )
+        assert removed == [target]
+        assert runs == [
+            [
+                "virtualenv",
+                "-p",
+                "/usr/bin/python3",
+                "/tmp/venv",
+                "--system-site-packages",
+            ],
+        ]
+
+    def test_force_recreate(self, monkeypatch) -> None:
+        target = Path("/tmp/venv")
+        state = {"exists": True}
+        removed: List[Path] = []
+
+        def fake_exists(self: Path) -> bool:
+            return state["exists"] and str(self) == str(target)
+
+        def fake_rmtree(p: Path) -> None:
+            removed.append(p)
+            state["exists"] = False
+
+        monkeypatch.setattr("utils.sys_utils.Path.exists", fake_exists)
+        monkeypatch.setattr(
+            "utils.sys_utils.get_confirm",
+            lambda *a, **k: pytest.fail("should not prompt when forced"),
+        )
+        monkeypatch.setattr("utils.sys_utils.shutil.rmtree", fake_rmtree)
+        monkeypatch.setattr("utils.sys_utils.run", lambda *a, **k: None)
+
+        assert create_python_venv(target, force=True) is True
+        assert removed == [target]
+
+    def test_creation_failure(self, monkeypatch) -> None:
+        monkeypatch.setattr(
+            "utils.sys_utils.run",
+            lambda *a, **k: (_ for _ in ()).throw(CalledProcessError(1, "virtualenv")),
+        )
+        assert create_python_venv(Path("/tmp/venv")) is False
+
+    def test_remove_failure(self, monkeypatch) -> None:
+        target = Path("/tmp/venv")
+
+        def fake_exists(self: Path) -> bool:
+            return str(self) == str(target)
+
+        monkeypatch.setattr("utils.sys_utils.Path.exists", fake_exists)
+        monkeypatch.setattr("utils.sys_utils.get_confirm", lambda *a, **k: True)
+        monkeypatch.setattr(
+            "utils.sys_utils.shutil.rmtree",
+            lambda *a, **k: (_ for _ in ()).throw(OSError("locked")),
+        )
+
+        assert create_python_venv(target) is False
+
+
+class TestUpdatePythonPip:
+    def test_raises_when_pip_missing(self, monkeypatch) -> None:
+        monkeypatch.setattr("utils.sys_utils.check_file_exist", lambda *a, **k: False)
+        with pytest.raises(FileNotFoundError):
+            update_python_pip(Path("/tmp/venv"))
+
+    def test_runs_upgrade(self, monkeypatch) -> None:
+        runs: List[List[str]] = []
+
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            runs.append(cmd)
+            return type("R", (), {"returncode": 0, "stderr": ""})()
+
+        monkeypatch.setattr("utils.sys_utils.check_file_exist", lambda *a, **k: True)
+        monkeypatch.setattr("utils.sys_utils.run", fake_run)
+
+        update_python_pip(Path("/tmp/venv"))
+        assert runs == [["/tmp/venv/bin/pip", "install", "-U", "pip"]]
+
+    def test_logs_stderr(self, monkeypatch, capsys) -> None:
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            return type("R", (), {"returncode": 0, "stderr": "some warning"})()
+
+        monkeypatch.setattr("utils.sys_utils.check_file_exist", lambda *a, **k: True)
+        monkeypatch.setattr("utils.sys_utils.run", fake_run)
+
+        update_python_pip(Path("/tmp/venv"))
+
+
+class TestInstallPythonRequirements:
+    def test_success(self, monkeypatch) -> None:
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            return type("R", (), {"returncode": 0, "stderr": ""})()
+
+        monkeypatch.setattr("utils.sys_utils.run", fake_run)
+        install_python_requirements(Path("/tmp/venv"), Path("/tmp/req.txt"))
+
+    def test_failure(self, monkeypatch) -> None:
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            return type("R", (), {"returncode": 1, "stderr": "nope"})()
+
+        monkeypatch.setattr("utils.sys_utils.run", fake_run)
+        with pytest.raises(VenvCreationFailedException):
+            install_python_requirements(Path("/tmp/venv"), Path("/tmp/req.txt"))
+
+
+class TestInstallPythonPackages:
+    def test_success(self, monkeypatch) -> None:
+        captured: List[List[str]] = []
+
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            captured.append(cmd)
+            return type("R", (), {"returncode": 0, "stderr": ""})()
+
+        monkeypatch.setattr("utils.sys_utils.run", fake_run)
+        install_python_packages(Path("/tmp/venv"), ["a", "b"])
+        assert captured == [["/tmp/venv/bin/pip", "install", "a", "b"]]
+
+
+class TestUpdateSystemPackageLists:
+    def test_skips_when_recent(self, monkeypatch) -> None:
+        monkeypatch.setattr("utils.sys_utils.time.time", lambda: 1000)
+        monkeypatch.setattr("utils.sys_utils.os.path.getmtime", lambda p: 900)
+        monkeypatch.setattr(
+            "utils.sys_utils.run",
+            lambda *a, **k: pytest.fail("should not update when recent"),
+        )
+
+        update_system_package_lists(silent=True)
+
+    def test_runs_when_old(self, monkeypatch) -> None:
+        monkeypatch.setattr("utils.sys_utils.time.time", lambda: 100_000)
+        monkeypatch.setattr("utils.sys_utils.os.path.getmtime", lambda p: 0)
+
+        runs: List[List[str]] = []
+
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            runs.append(cmd)
+            return type("R", (), {"returncode": 0, "stderr": ""})()
+
+        monkeypatch.setattr("utils.sys_utils.run", fake_run)
+        update_system_package_lists(silent=True)
+
+        assert runs == [["sudo", "apt-get", "update"]]
+
+    def test_allows_releaseinfo_change(self, monkeypatch) -> None:
+        monkeypatch.setattr("utils.sys_utils.time.time", lambda: 100_000)
+        monkeypatch.setattr("utils.sys_utils.os.path.getmtime", lambda p: 0)
+
+        runs: List[List[str]] = []
+
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            runs.append(cmd)
+            return type("R", (), {"returncode": 0, "stderr": ""})()
+
+        monkeypatch.setattr("utils.sys_utils.run", fake_run)
+        update_system_package_lists(silent=True, rls_info_change=True)
+
+        assert runs == [["sudo", "apt-get", "update", "--allow-releaseinfo-change"]]
+
+
+class TestGetUpgradablePackages:
+    def test_parses_apt_list(self, monkeypatch) -> None:
+        output = (
+            "package1/stable 1.0 [upgradable from: 0.9]\n"
+            "package2/testing 2.0 [upgradable from: 1.0]\n"
+        )
+        monkeypatch.setattr("utils.sys_utils.check_output", lambda *a, **k: output)
+        assert get_upgradable_packages() == ["package1", "package2"]
+
+
+class TestCheckPackageInstall:
+    def test_detects_installed(self, monkeypatch) -> None:
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            return type("R", (), {"stdout": "install ok installed"})()
+
+        monkeypatch.setattr("utils.sys_utils.run", fake_run)
+        assert check_package_install({"git"}) == []
+
+    def test_detects_missing(self, monkeypatch) -> None:
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            return type("R", (), {"stdout": "not-installed"})()
+
+        monkeypatch.setattr("utils.sys_utils.run", fake_run)
+        assert check_package_install({"missing"}) == ["missing"]
+
+
+class TestInstallSystemPackages:
+    def test_runs_apt(self, monkeypatch) -> None:
+        runs: List[List[str]] = []
+
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            runs.append(cmd)
+            return None
+
+        monkeypatch.setattr("utils.sys_utils.run", fake_run)
+        install_system_packages(["git", "curl"])
+        assert runs == [["sudo", "apt-get", "install", "-y", "git", "curl"]]
+
+
+class TestUpgradeSystemPackages:
+    def test_runs_apt(self, monkeypatch) -> None:
+        runs: List[List[str]] = []
+
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            runs.append(cmd)
+            return None
+
+        monkeypatch.setattr("utils.sys_utils.run", fake_run)
+        upgrade_system_packages(["git"])
+        assert runs == [["sudo", "apt-get", "upgrade", "-y", "git"]]
+
+
+class TestGetIpv4Addr:
+    def test_returns_socket_address(self, monkeypatch) -> None:
+        class FakeSocket:
+            def __init__(self, *args):
+                pass
+
+            def settimeout(self, value: float) -> None:
+                pass
+
+            def connect(self, addr: tuple) -> None:
+                pass
+
+            def getsockname(self) -> tuple:
+                return ("192.168.1.50", 54321)
+
+            def close(self) -> None:
+                pass
+
+        monkeypatch.setattr("utils.sys_utils.socket.socket", FakeSocket)
+        assert get_ipv4_addr() == "192.168.1.50"
+
+    def test_falls_back_to_loopback(self, monkeypatch) -> None:
+        class FakeSocket:
+            def __init__(self, *args):
+                pass
+
+            def settimeout(self, value: float) -> None:
+                pass
+
+            def connect(self, addr: tuple) -> None:
+                raise OSError("no route")
+
+            def close(self) -> None:
+                pass
+
+        monkeypatch.setattr("utils.sys_utils.socket.socket", FakeSocket)
+        assert get_ipv4_addr() == "127.0.0.1"
+
+
+class TestDownloadFile:
+    def test_without_progress(self, monkeypatch) -> None:
+        calls: List[tuple] = []
+
+        def fake_urlretrieve(url: str, target: Path, reporthook=None) -> None:
+            calls.append((url, str(target), reporthook))
+
+        monkeypatch.setattr(
+            "utils.sys_utils.urllib.request.urlretrieve", fake_urlretrieve
+        )
+        download_file("http://x/file", Path("/target"), show_progress=False)
+        assert calls == [("http://x/file", "/target", None)]
+
+    def test_with_progress(self, monkeypatch) -> None:
+        calls: List[tuple] = []
+
+        def fake_urlretrieve(url: str, target: Path, reporthook=None) -> None:
+            calls.append((url, str(target), reporthook))
+            if reporthook:
+                reporthook(1, 1024, 2048)
+
+        monkeypatch.setattr(
+            "utils.sys_utils.urllib.request.urlretrieve", fake_urlretrieve
+        )
+        download_file("http://x/file", Path("/target"), show_progress=True)
+        assert calls[0][2] is not None
+
+
+class TestDownloadProgress:
+    def test_writes_to_stdout(self, capsys) -> None:
+        download_progress(1, 1024, 2048)
+        captured = capsys.readouterr()
+        assert "Downloading:" in captured.out
+        assert "50.00%" in captured.out
+
+
+class TestSetNginxPermissions:
+    def test_no_change_when_executable(self, monkeypatch) -> None:
+        monkeypatch.setattr(
+            "utils.sys_utils.run",
+            lambda cmd, **kwargs: type("R", (), {"stdout": "drwxr-xr-x"})()
+            if "ls" in cmd
+            else pytest.fail("should not chmod"),
+        )
+        set_nginx_permissions()
+
+    def test_adds_execute(self, monkeypatch) -> None:
+        commands: List[Any] = []
+
+        def fake_run(cmd, **kwargs):
+            commands.append(cmd)
+            if isinstance(cmd, str):
+                return type("R", (), {"stdout": "drwxr------"})()
+            return None
+
+        monkeypatch.setattr("utils.sys_utils.run", fake_run)
+        monkeypatch.setattr("utils.sys_utils.Path.home", lambda: Path("/home/user"))
+        set_nginx_permissions()
+        assert ["chmod", "og+x", Path("/home/user")] in commands
+
+
+class TestCmdSysctlService:
+    def test_runs_systemctl(self, monkeypatch) -> None:
+        runs: List[List[str]] = []
+
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            runs.append(cmd)
+            return None
+
+        monkeypatch.setattr("utils.sys_utils.run", fake_run)
+        cmd_sysctl_service("klipper", "restart")
+        assert runs == [["sudo", "systemctl", "restart", "klipper"]]
+
+
+class TestCmdSysctlManage:
+    def test_runs_systemctl(self, monkeypatch) -> None:
+        runs: List[List[str]] = []
+
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            runs.append(cmd)
+            return None
+
+        monkeypatch.setattr("utils.sys_utils.run", fake_run)
+        cmd_sysctl_manage("daemon-reload")
+        assert runs == [["sudo", "systemctl", "daemon-reload"]]
+
+
+class TestUnitFileExists:
+    def test_finds_matching_service(self, tmp_path: Path, monkeypatch) -> None:
+        monkeypatch.setattr("utils.sys_utils.SYSTEMD", tmp_path)
+        (tmp_path / "klipper.service").write_text("")
+        (tmp_path / "klipper-1.service").write_text("")
+        (tmp_path / "moonraker.service").write_text("")
+
+        assert unit_file_exists("klipper", "service") is True
+        assert unit_file_exists("moonraker", "service") is True
+        assert unit_file_exists("klipper", "timer") is False
+
+    def test_respects_exclude(self, tmp_path: Path, monkeypatch) -> None:
+        monkeypatch.setattr("utils.sys_utils.SYSTEMD", tmp_path)
+        (tmp_path / "klipper-mcu.service").write_text("")
+
+        assert unit_file_exists("klipper", "service", exclude=["mcu"]) is False
+
+
+class TestLogProcess:
+    def test_prints_stdout(self, monkeypatch, capsys) -> None:
+        lines = iter(["line1\n", "line2\n", ""])
+        poll_results = iter([None, 0])
+
+        class FakeStdout:
+            def fileno(self) -> int:
+                return 7
+
+            def readline(self) -> str:
+                return next(lines)
+
+        class FakeProcess:
+            stdout = FakeStdout()
+
+            def poll(self):
+                return next(poll_results)
+
+        monkeypatch.setattr(
+            "utils.sys_utils.select.select", lambda r, w, x: ([7], [], [])
+        )
+        log_process(FakeProcess())  # type: ignore[arg-type]
+
+        captured = capsys.readouterr()
+        assert "line1" in captured.out
+        assert "line2" in captured.out
+
+
+class TestCreateServiceFile:
+    def test_writes_via_tee(self, monkeypatch) -> None:
+        runs: List[tuple] = []
+
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            runs.append((cmd, kwargs.get("input")))
+            return None
+
+        monkeypatch.setattr("utils.sys_utils.SYSTEMD", Path("/etc/systemd/system"))
+        monkeypatch.setattr("utils.sys_utils.run", fake_run)
+        create_service_file("klipper.service", "[Unit]\n")
+
+        assert runs[0][0] == [
+            "sudo",
+            "tee",
+            Path("/etc/systemd/system/klipper.service"),
+        ]
+        assert runs[0][1] == b"[Unit]\n"
+
+
+class TestCreateEnvFile:
+    def test_writes_file(self, tmp_path: Path) -> None:
+        path = tmp_path / "env"
+        create_env_file(path, "KEY=value\n")
+        assert path.read_text() == "KEY=value\n"
+
+
+class TestRemoveSystemService:
+    def test_rejects_bad_name(self) -> None:
+        with pytest.raises(ValueError):
+            remove_system_service("klipper")
+
+    def test_skips_missing_file(self, tmp_path: Path, monkeypatch) -> None:
+        monkeypatch.setattr("utils.sys_utils.SYSTEMD", tmp_path)
+        remove_system_service("klipper.service")
+
+    def test_full_removal(self, monkeypatch) -> None:
+        sysd = Path("/fake/systemd")
+        service_file = sysd / "klipper.service"
+        monkeypatch.setattr("utils.sys_utils.SYSTEMD", sysd)
+
+        monkeypatch.setattr(
+            "utils.sys_utils.Path.exists",
+            lambda self: str(self) == str(service_file),
+        )
+        monkeypatch.setattr(
+            "utils.sys_utils.Path.is_file",
+            lambda self: str(self) == str(service_file),
+        )
+
+        service_calls: List[tuple] = []
+        manage_calls: List[str] = []
+        removed: List[Path] = []
+
+        monkeypatch.setattr(
+            "utils.sys_utils.cmd_sysctl_service",
+            lambda name, action: service_calls.append((name, action)),
+        )
+        monkeypatch.setattr(
+            "utils.sys_utils.cmd_sysctl_manage",
+            lambda action: manage_calls.append(action),
+        )
+        monkeypatch.setattr(
+            "utils.sys_utils.remove_with_sudo", lambda p: removed.append(p)
+        )
+
+        remove_system_service("klipper.service")
+
+        assert service_calls == [
+            ("klipper.service", "stop"),
+            ("klipper.service", "disable"),
+        ]
+        assert removed == [service_file]
+        assert manage_calls == ["daemon-reload", "reset-failed"]
+
+
+class _FakeInstanceType:
+    pass
+
+
+_FakeInstanceType.__name__ = "Klipper"
+
+
+class TestGetServiceFilePath:
+    def test_builds_path(self, monkeypatch) -> None:
+        monkeypatch.setattr("utils.sys_utils.SYSTEMD", Path("/etc/systemd/system"))
+        assert get_service_file_path(_FakeInstanceType, "") == Path(
+            "/etc/systemd/system/klipper.service"
+        )
+        assert get_service_file_path(_FakeInstanceType, "1") == Path(
+            "/etc/systemd/system/klipper-1.service"
+        )
+
+
+class TestGetDistroInfo:
+    def test_parses_os_release(self, monkeypatch) -> None:
+        content = """
+ID="ubuntu"
+ID_LIKE="debian"
+VERSION_ID="22.04"
+"""
+        monkeypatch.setattr(
+            "utils.sys_utils.check_output", lambda *a, **k: content.encode()
+        )
+        assert get_distro_info() == ("ubuntu", "22.04")
+
+    def test_remaps_raspbian(self, monkeypatch) -> None:
+        content = """
+ID="raspbian"
+ID_LIKE="debian"
+VERSION_ID="11"
+"""
+        monkeypatch.setattr(
+            "utils.sys_utils.check_output", lambda *a, **k: content.encode()
+        )
+        assert get_distro_info() == ("debian", "11")
+
+    def test_raises_on_missing_id(self, monkeypatch) -> None:
+        monkeypatch.setattr(
+            "utils.sys_utils.check_output", lambda *a, **k: b'VERSION_ID="1"\n'
+        )
+        with pytest.raises(ValueError):
+            get_distro_info()
+
+
+class TestGetSystemTimezone:
+    def test_from_etc_timezone(self, monkeypatch) -> None:
+        def fake_open(path: str, mode: str = "r", *args, **kwargs):
+            if path == "/etc/timezone":
+                return StringIO("Europe/Berlin\n")
+            return builtins.open(path, mode, *args, **kwargs)
+
+        monkeypatch.setattr("builtins.open", fake_open)
+        assert get_system_timezone() == "Europe/Berlin"
+
+    def test_fallback_to_timedatectl(self, monkeypatch) -> None:
+        def fake_open(path: str, mode: str = "r", *args, **kwargs):
+            raise FileNotFoundError(path)
+
+        monkeypatch.setattr("builtins.open", fake_open)
+
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            class Result:
+                stdout = "Timezone=America/New_York\n"
+
+            return Result()
+
+        monkeypatch.setattr("utils.sys_utils.run", fake_run)
+        assert get_system_timezone() == "America/New_York"
+
+    def test_fallback_to_readlink(self, monkeypatch) -> None:
+        def fake_open(path: str, mode: str = "r", *args, **kwargs):
+            raise FileNotFoundError(path)
+
+        monkeypatch.setattr("builtins.open", fake_open)
+
+        def fake_run(cmd: List[str], **kwargs: Any) -> Any:
+            if cmd[:2] == ["timedatectl", "show"]:
+                raise CalledProcessError(1, "timedatectl")
+
+            class Result:
+                stdout = "/usr/share/zoneinfo/Asia/Tokyo\n"
+
+            return Result()
+
+        monkeypatch.setattr("utils.sys_utils.run", fake_run)
+        assert get_system_timezone() == "Asia/Tokyo"
+
+    def test_defaults_to_utc(self, monkeypatch) -> None:
+        def fake_open(path: str, mode: str = "r", *args, **kwargs):
+            raise FileNotFoundError(path)
+
+        monkeypatch.setattr("builtins.open", fake_open)
+        monkeypatch.setattr(
+            "utils.sys_utils.run",
+            lambda *a, **k: (_ for _ in ()).throw(CalledProcessError(1, "timedatectl")),
+        )
+        assert get_system_timezone() == "UTC"
@@ -33,5 +33,5 @@ warn_unreachable = true

 [tool.pytest.ini_options]
 minversion = "8.2.1"
-testpaths = ["kiauh/core/simple_config_parser/tests"]
+testpaths = ["kiauh/core/simple_config_parser/tests", "kiauh/utils/tests"]
 pythonpath = ["kiauh"]
Author	SHA1	Message	Date
dw-0	7b5522ac94	feat(tests): add unit tests for shared utilities	2026-07-04 12:58:20 +02:00
Cody D DixonandGitHub	a42b730688	fix: catch FileNotFoundError in get_current_branch when component dir is missing (#813 ) Error when opening KIUAH fix get_current_branch only catches CalledProcessError, not FileNotFoundError. When crowsnest isn't installed, the missing dir propagates the exception. Fix	2026-06-29 22:43:10 +02:00
dw-0	77d6c87aa0	refactor(readme): update section titles and improve table formatting	2026-06-29 22:20:55 +02:00
dw-0	b893ff14f7	chore(readme): remove jetbrains as sponsor	2026-06-29 21:36:58 +02:00
dw-0	43b0994ac5	fix(README_zh): correct Fluidd logo image path in documentation	2026-06-29 21:31:55 +02:00
dw-0	040edc1d4f	chore: remove AGENTS.md	2026-06-28 12:50:59 +02:00
Paul GitHub Claude Opus 4.8 dw-0	750dba1dbe	feat(extensions): add Moongate for Klipper (#809 ) * feat(extensions): add Moongate for Klipper Adds Moongate for Klipper as extension #15 (next free index after KAMP). Moongate pairs a printer with the Moongate Android app for secure remote access and print monitoring over a Cloudflare quick-tunnel fronted by an EdDSA auth proxy. The extension is KIAUH-native for the parts KIAUH owns (Moonraker instance discovery, the install/remove confirmation dialogs, moonraker.conf backup, and the repo clone wired into the update manager) and delegates the heavy, security-sensitive install steps (cloudflared, the moongate-authproxy and moongate-tunnel systemd services, the Moonraker host rebind) to Moongate's own idempotent, non-interactive install/update/uninstall scripts so that logic stays maintained upstream in one place. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com> * fix(metadata): update index for Moongate extension * refactor(moongate_extension): enhance error handling and update docstring for clarity --------- Co-authored-by: Claude Opus 4.8 <noreply@anthropic.com> Co-authored-by: dw-0 <th33xitus@gmail.com>	2026-06-28 12:49:30 +02:00
Cody D Dixon GitHub Cody Dixon dw-0	6f4b471008	feat(extension): Add DroidKlipp extension (#804 ) * Add DroidKlipp extension * fix(extensions): restart adb_monitor and redeploy monitor on DroidKlipp update The update flow only ran git_pull_wrapper, which left the running adb_monitor service executing stale in-memory code. It also never rebuilt the deployed ~/droidklipp_monitor.py, since that file is generated by the installer rather than tracked in the repo. - stop adb_monitor before the pull, start it after (mirrors mobileraker) - after pulling, re-deploy droidklipp_monitor.py into $HOME so the service picks up the updated code - best-effort restart the service if the update fails * fix(droidklipp): clean up comments and update website link in metadata --------- Co-authored-by: Cody Dixon <codydixon71@gmail.com> Co-authored-by: dw-0 <th33xitus@gmail.com>	2026-06-28 12:07:19 +02:00
GustavoTheThird GitHub dw-0	5077765fd6	fix: fluidd logo (#811 ) * fix: fluid logo * fix: use correct logo.svg instead of avatar --------- Co-authored-by: dw-0 <th33xitus@gmail.com>	2026-06-27 12:53:20 +02:00
Patrick GehrsitzandGitHub	9f97ae6c2a	refactor(crowsnest): fix crowsnest install status and update for v5 (#799 ) fix: fix crowsnest install status and update for v5 Crowsnest v5 introduced multiple breaking changes resulting in a 'Incomplete' install status even after successful installation. This adds support for the new v5 setup with backwards compatibility for old versions. Signed-off-by: Patrick Gehrsitz <github@mryel.de>	2026-05-30 15:36:32 +02:00
_Redstone_c_andGitHub	b90a8f13b1	fix(switch_repo): honor use_python_binary when recreating venv (#793 ) * fix(switch_repo): honor use_python_binary when recreating venv * fix(switch_repo): validate name at function entry	2026-04-24 13:34:45 +02:00