Refactor code into modular structure and add comprehensive tests

- Split main.rs into 10 focused modules for better maintainability
- Add 37 unit tests covering desktop entry, Tauri config, validation,
  Chromium backend, and app config serialization
- Update version to v0.1.1-alpha.1

.github/workflows/aur-publish.yml

@@ -0,0 +1,91 @@
+name: Publish to AUR
+
+on:
+  push:
+    tags:
+      - "v*"
+  workflow_dispatch:
+    inputs:
+      tag:
+        description: "Tag to publish to AUR (e.g. v0.1.0-alpha.8)"
+        required: true
+        type: string
+
+permissions:
+  contents: read
+
+jobs:
+  aur-publish:
+    name: Publish deskify-bin
+    runs-on: ubuntu-latest
+    container: archlinux:latest
+
+    steps:
+      - name: Install dependencies
+        run: |
+          pacman -Syu --noconfirm
+          pacman -S --noconfirm --needed base-devel git openssh curl
+          useradd -m -u 1000 builder || true
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ inputs.tag || github.ref_name }}
+
+      - name: Generate PKGBUILD (deskify-bin)
+        run: bash packaging/generate-pkgbuild-bin.sh "${{ inputs.tag || github.ref_name }}"
+
+      - name: Generate .SRCINFO
+        run: |
+          rm -rf /home/builder/work
+          mkdir -p /home/builder/work
+          cp -R . /home/builder/work
+          chown -R builder:builder /home/builder/work
+          su - builder -c "cd /home/builder/work/packaging && makepkg --printsrcinfo > .SRCINFO"
+          cp /home/builder/work/packaging/.SRCINFO packaging/.SRCINFO
+
+      - name: Configure SSH for AUR
+        env:
+          AUR_SSH_PRIVATE_KEY: ${{ secrets.AUR_SSH_PRIVATE_KEY }}
+        run: |
+          test -n "${AUR_SSH_PRIVATE_KEY}" || { echo "Missing secret: AUR_SSH_PRIVATE_KEY" >&2; exit 1; }
+          mkdir -p ~/.ssh
+          chmod 700 ~/.ssh
+          printf "%s\n" "${AUR_SSH_PRIVATE_KEY}" > ~/.ssh/aur
+          chmod 600 ~/.ssh/aur
+          touch ~/.ssh/known_hosts
+          chmod 600 ~/.ssh/known_hosts
+          # Ensure host key is present for non-interactive git/ssh.
+          ssh-keyscan -t rsa,ecdsa,ed25519 aur.archlinux.org >> ~/.ssh/known_hosts 2>/dev/null
+          cat >> ~/.ssh/config <<'EOF'
+          Host aur.archlinux.org
+            User aur
+            IdentityFile ~/.ssh/aur
+            IdentitiesOnly yes
+          EOF
+
+      - name: Publish to AUR (deskify-bin)
+        env:
+          AUR_USERNAME: ${{ secrets.AUR_USERNAME }}
+          AUR_EMAIL: ${{ secrets.AUR_EMAIL }}
+        run: |
+          export GIT_SSH_COMMAND="ssh -i ~/.ssh/aur -o IdentitiesOnly=yes -o UserKnownHostsFile=$HOME/.ssh/known_hosts -o StrictHostKeyChecking=yes"
+
+          git config --global user.name "${AUR_USERNAME:-deskify-bot}"
+          git config --global user.email "${AUR_EMAIL:-noreply@example.invalid}"
+
+          rm -rf /tmp/aur-repo
+          git clone ssh://aur@aur.archlinux.org/deskify-bin.git /tmp/aur-repo
+
+          cp packaging/PKGBUILD /tmp/aur-repo/PKGBUILD
+          cp packaging/.SRCINFO /tmp/aur-repo/.SRCINFO
+
+          cd /tmp/aur-repo
+          if git diff --quiet; then
+            echo "No changes to publish."
+            exit 0
+          fi
+
+          git add PKGBUILD .SRCINFO
+          git commit -m "Update deskify-bin to ${{ inputs.tag || github.ref_name }}"
+          git push

CHANGELOG.md

@@ -7,6 +7,59 @@ and this project follows early MVP/alpha versioning with tags like `v0.1.0-alpha
 
 ## [Unreleased]
 
+## [v0.1.1-alpha.1] - 2026-05-04
+
+### Added
+- Comprehensive unit test suite (37 tests covering desktop entry escaping, Tauri config generation, validation, Chromium backend, and app config serialization)
+- Module refactoring: code split into 10 focused modules (types, validation, tauri, chromium, icon, desktop, install, app, doctor)
+
+### Fixed
+- Test coverage gaps resolved with tests for:
+  - `desktop_exec_escape` handling of empty strings, whitespace, quotes, and backslashes
+  - `validate_remove_id` rejection of uppercase, special characters, and path traversal attempts
+  - Tauri config generation (fullscreen, no-decorations, dark-mode, user-agent, window dimensions, CSP)
+  - App config serialization roundtrip
+
+### Changed
+- Split `main.rs` (~1900 lines) into modular structure:
+  - `src/types.rs` - CLI definitions and types
+  - `src/validation.rs` - ID sanitization and validation
+  - `src/tauri.rs` - Tauri config and project generation
+  - `src/chromium.rs` - Browser detection and exec building
+  - `src/icon.rs` - Icon fetching and processing
+  - `src/desktop.rs` - Desktop entry utilities
+  - `src/install.rs` - App installation logic
+  - `src/app.rs` - App management (list/remove/config)
+  - `src/doctor.rs` - Diagnostics
+  - `src/main.rs` - Entry point and orchestration
+
+## [v0.1.0-alpha.9] - 2026-02-25
+
+### Fixed
+- Accept legacy `profile_scope=default` in persisted app configs (treated as `isolated`) and fall back to desktop metadata when a config is invalid
+- Validate Chromium browser binaries before installing `.desktop` entries (prevents silent failures with wrapper scripts)
+
+### Added
+- AUR publish automation (PKGBUILD generator + GitHub Actions workflow) for `deskify-bin`
+
+### Documentation
+- Quick Start improvements and Chromium backend troubleshooting notes
+- AUR install instructions and alpha warning (`yay -S deskify-bin`)
+
+## [v0.1.0-alpha.8] - 2026-02-25
+
+### Added
+- Persisted app metadata under `~/.local/share/deskify/apps/<id>.json`
+- `deskify list --verbose` to show URL/backend when metadata is available
+
+### Changed
+- `deskify update <id>` no longer requires `--url` when metadata exists (migrates older installs on first update/build)
+
+## [v0.1.0-alpha.7] - 2026-02-25
+
+### Added
+- AUR `deskify-bin` packaging template with checksums
+
 ## [v0.1.0-alpha.6] - 2026-02-23
 
 ### Added

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "deskify"
-version = "0.1.0"
+version = "0.1.1-alpha.1"
 edition = "2024"
 
 [dependencies]

README.md

@@ -192,6 +192,16 @@ Notes:
 - The `tauri` backend still requires Tauri/WebKitGTK system dependencies to build wrappers locally.
 - The `chromium` backend does not require Tauri prerequisites (but it requires an installed Chromium-based browser).
 
+### Arch Linux (AUR)
+
+An AUR package is available (prebuilt binary package):
+
+```bash
+yay -S deskify-bin
+```
+
+⚠️ The AUR package tracks **alpha** tags (`v0.1.0-alpha.N`). Expect occasional breaking changes during early development.
+
 ### Option B: Build from source (Tauri mode)
 
 ### 1. System Dependencies
@@ -352,6 +362,15 @@ Note for Chromium backend:
 
 - `--no-decorations` is best-effort and may be ignored by the browser/window manager.
 - `--width` and `--height` are applied together (`--window-size`) only when both are provided.
+- Deskify auto-detects a Chromium-based browser from `PATH`, but some distros ship Chromium-based browser commands (Chrome/Chromium/Brave, etc.) as wrapper scripts or use different binary names/paths (for example on BigLinux). If launches fail, set `--browser-bin` to a real browser binary.
+- Flatpak-installed browsers are not supported out of the box (they usually require `flatpak run ...`). Use a native browser binary for now; Flatpak support may be added in a future release.
+
+Troubleshooting (find the real browser binary):
+
+```bash
+command -v chrome chromium google-chrome google-chrome-stable brave-browser 2>/dev/null
+ls -la /usr/bin/chrome /usr/bin/chromium /usr/bin/google-chrome /usr/bin/google-chrome-stable 2>/dev/null
+```
 
 ### Managing Apps (`list` & `remove`)
 You can view all applications generated by `deskify`:

packaging/PKGBUILD

@@ -1,19 +1,20 @@
 pkgname=deskify-bin
-pkgver=0.1.0_alpha.6
+pkgver=0.1.0.alpha.8
 pkgrel=1
 pkgdesc="Turn websites into Linux desktop apps (prebuilt binary package)"
 arch=('x86_64')
 url="https://github.com/spalencsar/deskify"
 license=('MIT')
 depends=('glibc')
+optdepends=('chromium: for --backend chromium')
 provides=('deskify')
 conflicts=('deskify')
 
-_tag="v0.1.0-alpha.6"
+_tag="v0.1.0-alpha.8"
 source=("deskify::https://github.com/spalencsar/deskify/releases/download/${_tag}/deskify-linux-x86_64"
         "LICENSE::https://raw.githubusercontent.com/spalencsar/deskify/${_tag}/LICENSE")
 
-sha256sums=('6962571579b32fcf3119d0d749770b584ce57ef1efe4feea8813314d2ed61d7a'
+sha256sums=('7ab62ff193c2666983c72844c13f368a0ecc1fcd6da40fe95f544c9999e05f30'
             'd4e53458cd2dd461f234186497b6d9b21566c477737a4d31fa6f018ef610486f')
 
 package() {

packaging/README.md

@@ -1,4 +1,4 @@
-## AUR package template (manual)
+## AUR package template (manual + CI)
 
 This folder contains a minimal `PKGBUILD` template for a future AUR package:
 
@@ -9,7 +9,7 @@ Notes:
 - Update `_tag` and `pkgver` when you publish a new release tag.
 - Update `sha256sums` to match the release asset + LICENSE for that tag.
 
-Local build test:
+### Local build test
 
 ```bash
 cd packaging
@@ -19,8 +19,51 @@ makepkg -sf
 To compute sha256 sums for a tag:
 
 ```bash
-TAG="v0.1.0-alpha.6"
+TAG="v0.1.0-alpha.7"
 curl -fL -o /tmp/deskify-linux-x86_64 "https://github.com/spalencsar/deskify/releases/download/${TAG}/deskify-linux-x86_64"
 curl -fL -o /tmp/LICENSE "https://raw.githubusercontent.com/spalencsar/deskify/${TAG}/LICENSE"
 sha256sum /tmp/deskify-linux-x86_64 /tmp/LICENSE
 ```
+
+### Manual AUR publish (first time)
+
+1. Create an AUR account and submit the `deskify-bin` package once via the AUR web UI.
+2. Configure SSH for AUR and test connectivity.
+3. Clone the AUR repo, copy `PKGBUILD` and `.SRCINFO`, then push.
+
+Example:
+
+```bash
+ssh-keygen -t ed25519 -f ~/.ssh/aur -C "deskify-aur"
+# Add ~/.ssh/aur.pub to: aur.archlinux.org -> My Account -> SSH Keys
+
+cat >> ~/.ssh/config <<'EOF'
+Host aur.archlinux.org
+  IdentityFile ~/.ssh/aur
+  User aur
+EOF
+
+ssh -T aur@aur.archlinux.org
+
+git clone ssh://aur@aur.archlinux.org/deskify-bin.git
+cd deskify-bin
+
+cp /path/to/deskify/packaging/PKGBUILD .
+makepkg --printsrcinfo > .SRCINFO
+
+git add PKGBUILD .SRCINFO
+git commit -m "Initial release: deskify-bin"
+git push
+```
+
+### CI publish on tags
+
+This repo includes a workflow that publishes `deskify-bin` on tag pushes (`v*`):
+
+- `.github/workflows/aur-publish.yml`
+
+Required GitHub secrets:
+
+- `AUR_SSH_PRIVATE_KEY` (private key content for the AUR account)
+- `AUR_USERNAME` (optional, used for git commits)
+- `AUR_EMAIL` (optional, used for git commits)

packaging/generate-pkgbuild-bin.sh

@@ -0,0 +1,73 @@
+#!/usr/bin/env bash
+set -euo pipefail
+
+TAG="${1:-}"
+if [[ -z "${TAG}" ]]; then
+  TAG="$(git describe --tags --abbrev=0)"
+fi
+
+if [[ "${TAG}" != v* ]]; then
+  echo "Error: expected tag like v0.1.0-alpha.7, got: ${TAG}" >&2
+  exit 1
+fi
+
+VERSION="${TAG#v}"
+
+# Arch PKGBUILD pkgver must not contain '-'. Use dots instead.
+PKGVER="${VERSION//-/.}"
+
+ASSET_URL="https://github.com/spalencsar/deskify/releases/download/${TAG}/deskify-linux-x86_64"
+LICENSE_URL="https://raw.githubusercontent.com/spalencsar/deskify/${TAG}/LICENSE"
+
+tmp_dir="$(mktemp -d)"
+trap 'rm -rf "${tmp_dir}"' EXIT
+
+asset_path="${tmp_dir}/deskify-linux-x86_64"
+license_path="${tmp_dir}/LICENSE"
+
+wait_seconds="${WAIT_FOR_ASSET_SECONDS:-300}"
+interval_seconds="${WAIT_FOR_ASSET_INTERVAL_SECONDS:-5}"
+deadline=$((SECONDS + wait_seconds))
+
+while ! curl -fsI "${ASSET_URL}" >/dev/null 2>&1; do
+  if (( SECONDS >= deadline )); then
+    echo "Error: release asset not available yet: ${ASSET_URL}" >&2
+    echo "Tip: the GitHub Release workflow may still be building. Re-run the AUR workflow once the asset exists." >&2
+    exit 1
+  fi
+  sleep "${interval_seconds}"
+done
+
+curl -fL -o "${asset_path}" "${ASSET_URL}"
+curl -fL -o "${license_path}" "${LICENSE_URL}"
+
+ASSET_SHA256="$(sha256sum "${asset_path}" | awk '{print $1}')"
+LICENSE_SHA256="$(sha256sum "${license_path}" | awk '{print $1}')"
+
+cat > packaging/PKGBUILD <<EOF
+pkgname=deskify-bin
+pkgver=${PKGVER}
+pkgrel=1
+pkgdesc="Turn websites into Linux desktop apps (prebuilt binary package)"
+arch=('x86_64')
+url="https://github.com/spalencsar/deskify"
+license=('MIT')
+depends=('glibc')
+optdepends=('chromium: for --backend chromium')
+provides=('deskify')
+conflicts=('deskify')
+
+_tag="${TAG}"
+source=("deskify::https://github.com/spalencsar/deskify/releases/download/\${_tag}/deskify-linux-x86_64"
+        "LICENSE::https://raw.githubusercontent.com/spalencsar/deskify/\${_tag}/LICENSE")
+
+sha256sums=('${ASSET_SHA256}'
+            '${LICENSE_SHA256}')
+
+package() {
+  install -Dm755 "\${srcdir}/deskify" "\${pkgdir}/usr/bin/deskify"
+  install -Dm644 "\${srcdir}/LICENSE" "\${pkgdir}/usr/share/licenses/\${pkgname}/LICENSE"
+}
+EOF
+
+echo "Wrote packaging/PKGBUILD for ${TAG}"

src/app.rs

@@ -0,0 +1,340 @@
+use anyhow::{Context, Result};
+use directories::BaseDirs;
+use std::fs;
+use std::path::PathBuf;
+
+use crate::chromium::{
+    backend_str, build_chromium_exec, chromium_profile_dir, profile_scope_str,
+    resolve_chromium_binary,
+};
+use crate::types::{Backend, DeskifyAppConfig, ProfileScope};
+use crate::validation::{is_deskify_desktop_entry, validate_remove_id};
+
+pub fn deskify_data_dir() -> Result<PathBuf> {
+    let base_dirs =
+        BaseDirs::new().ok_or_else(|| anyhow::anyhow!("Could not find system BaseDirs"))?;
+    Ok(base_dirs.data_local_dir().join("deskify"))
+}
+
+pub fn app_config_path(id: &str) -> Result<PathBuf> {
+    validate_remove_id(id)?;
+    Ok(deskify_data_dir()?
+        .join("apps")
+        .join(format!("{}.json", id)))
+}
+
+pub fn read_app_config(id: &str) -> Result<Option<DeskifyAppConfig>> {
+    let path = app_config_path(id)?;
+    if !path.exists() {
+        return Ok(None);
+    }
+    let content = fs::read_to_string(&path)
+        .with_context(|| format!("Failed to read app config {}", path.display()))?;
+    match serde_json::from_str::<DeskifyAppConfig>(&content) {
+        Ok(cfg) => Ok(Some(cfg)),
+        Err(err) => {
+            eprintln!(
+                "Warning: Failed to parse app config {} ({}). Falling back to desktop entry metadata.",
+                path.display(),
+                err
+            );
+            Ok(None)
+        }
+    }
+}
+
+pub fn write_app_config_from_args(args: &crate::types::BuildArgs) -> Result<()> {
+    validate_remove_id(&args.internal_id)?;
+    let path = app_config_path(&args.internal_id)?;
+    if let Some(dir) = path.parent() {
+        fs::create_dir_all(dir).context("Failed to create app config directory")?;
+    }
+    let cfg = DeskifyAppConfig {
+        schema_version: 1,
+        id: args.internal_id.clone(),
+        name: args.name.clone(),
+        url: args.url.clone(),
+        backend: args.backend,
+        browser_bin: args.browser_bin.clone(),
+        profile_scope: args.profile_scope,
+        fullscreen: args.fullscreen,
+        no_decorations: args.no_decorations,
+        user_agent: args.user_agent.clone(),
+        width: args.width,
+        height: args.height,
+        dark_mode: args.dark_mode,
+    };
+    fs::write(
+        &path,
+        serde_json::to_string_pretty(&cfg).context("Failed to serialize app config")?,
+    )
+    .with_context(|| format!("Failed to write app config {}", path.display()))?;
+    Ok(())
+}
+
+pub fn remove_app_config(id: &str) -> Result<()> {
+    let path = app_config_path(id)?;
+    if path.exists() {
+        fs::remove_file(&path).with_context(|| format!("Failed to remove {}", path.display()))?;
+        println!("Removed app config: {:?}", path);
+    }
+    Ok(())
+}
+
+pub fn list_apps_with_options(verbose: bool) -> Result<()> {
+    let base_dirs =
+        BaseDirs::new().ok_or_else(|| anyhow::anyhow!("Could not find system BaseDirs"))?;
+    let applications_dir = base_dirs.data_local_dir().join("applications");
+
+    println!("Installed Deskify Apps:");
+    let mut found = false;
+
+    if applications_dir.exists() {
+        for entry in
+            fs::read_dir(applications_dir).context("Failed to read applications directory")?
+        {
+            let entry = entry?;
+            let path = entry.path();
+            if path.extension().and_then(|s| s.to_str()) == Some("desktop")
+                && let Ok(content) = fs::read_to_string(&path)
+                && is_deskify_desktop_entry(&content)
+            {
+                let name = content
+                    .lines()
+                    .find(|l| l.starts_with("Name="))
+                    .and_then(|l| l.strip_prefix("Name="))
+                    .unwrap_or("Unknown");
+
+                let internal_id = path
+                    .file_stem()
+                    .and_then(|s| s.to_str())
+                    .unwrap_or("Unknown");
+                let backend = content
+                    .lines()
+                    .find(|l| l.starts_with("X-Deskify-Backend="))
+                    .and_then(|l| l.strip_prefix("X-Deskify-Backend="))
+                    .unwrap_or("legacy");
+
+                if verbose && validate_remove_id(internal_id).is_ok() {
+                    if let Some(cfg) = read_app_config(internal_id)? {
+                        println!(
+                            "- {} (Internal ID: {}, Backend: {}, URL: {})",
+                            name,
+                            internal_id,
+                            backend_str(cfg.backend),
+                            cfg.url
+                        );
+                    } else {
+                        let url = content
+                            .lines()
+                            .find(|l| l.starts_with("X-Deskify-URL="))
+                            .and_then(|l| l.strip_prefix("X-Deskify-URL="));
+                        if let Some(url) = url {
+                            println!(
+                                "- {} (Internal ID: {}, Backend: {}, URL: {})",
+                                name, internal_id, backend, url
+                            );
+                        } else {
+                            println!(
+                                "- {} (Internal ID: {}, Backend: {})",
+                                name, internal_id, backend
+                            );
+                        }
+                    }
+                } else {
+                    println!(
+                        "- {} (Internal ID: {}, Backend: {})",
+                        name, internal_id, backend
+                    );
+                }
+                found = true;
+            }
+        }
+    }
+
+    if !found {
+        println!("No apps found.");
+    }
+
+    Ok(())
+}
+
+pub fn read_desktop_entry_value(id: &str, key: &str) -> Result<Option<String>> {
+    validate_remove_id(id)?;
+    let base_dirs =
+        BaseDirs::new().ok_or_else(|| anyhow::anyhow!("Could not find system BaseDirs"))?;
+    let desktop_path = base_dirs
+        .data_local_dir()
+        .join("applications")
+        .join(format!("{}.desktop", id));
+    if !desktop_path.exists() {
+        return Ok(None);
+    }
+    let content = fs::read_to_string(&desktop_path)
+        .with_context(|| format!("Failed to read desktop entry {}", desktop_path.display()))?;
+    if !is_deskify_desktop_entry(&content) {
+        return Ok(None);
+    }
+    let prefix = format!("{}=", key);
+    Ok(content
+        .lines()
+        .find(|line| line.starts_with(&prefix))
+        .and_then(|line| line.strip_prefix(&prefix))
+        .map(str::to_string))
+}
+
+pub fn read_installed_app_display_name(id: &str) -> Result<Option<String>> {
+    validate_remove_id(id)?;
+    let base_dirs =
+        BaseDirs::new().ok_or_else(|| anyhow::anyhow!("Could not find system BaseDirs"))?;
+    let desktop_path = base_dirs
+        .data_local_dir()
+        .join("applications")
+        .join(format!("{}.desktop", id));
+    if !desktop_path.exists() {
+        return Ok(None);
+    }
+    let content = fs::read_to_string(&desktop_path)
+        .with_context(|| format!("Failed to read desktop entry {}", desktop_path.display()))?;
+    if !is_deskify_desktop_entry(&content) {
+        return Ok(None);
+    }
+    let name = content
+        .lines()
+        .find(|line| line.starts_with("Name="))
+        .and_then(|line| line.strip_prefix("Name="))
+        .map(str::to_string);
+    Ok(name)
+}
+
+pub fn remove_app_with_options(safe_name: &str, remove_profile: bool) -> Result<()> {
+    validate_remove_id(safe_name)?;
+
+    let base_dirs =
+        BaseDirs::new().ok_or_else(|| anyhow::anyhow!("Could not find system BaseDirs"))?;
+
+    let executable_dir = base_dirs
+        .executable_dir()
+        .map(|p| p.to_path_buf())
+        .unwrap_or_else(|| base_dirs.home_dir().join(".local/bin"));
+    let data_local_dir = base_dirs.data_local_dir();
+
+    let binary_path = executable_dir.join(safe_name);
+    if binary_path.exists() {
+        fs::remove_file(&binary_path).context("Failed to remove binary")?;
+        println!("Removed binary: {:?}", binary_path);
+    } else {
+        println!("Binary not found: {:?}", binary_path);
+    }
+
+    let desktop_path = data_local_dir
+        .join("applications")
+        .join(format!("{}.desktop", safe_name));
+    if desktop_path.exists() {
+        fs::remove_file(&desktop_path).context("Failed to remove .desktop file")?;
+        println!("Removed desktop entry: {:?}", desktop_path);
+    } else {
+        println!("Desktop entry not found: {:?}", desktop_path);
+    }
+
+    let icon_path = data_local_dir
+        .join("icons/hicolor/128x128/apps")
+        .join(format!("{}.png", safe_name));
+    if icon_path.exists() {
+        fs::remove_file(&icon_path).context("Failed to remove icon")?;
+        println!("Removed icon: {:?}", icon_path);
+    } else {
+        println!("Icon not found: {:?}", icon_path);
+    }
+
+    let profile_path = data_local_dir.join("deskify/profiles").join(safe_name);
+    if remove_profile {
+        if profile_path.exists() {
+            fs::remove_dir_all(&profile_path).context("Failed to remove Chromium profile")?;
+            println!("Removed Chromium profile: {:?}", profile_path);
+        } else {
+            println!("Chromium profile not found: {:?}", profile_path);
+        }
+    } else if profile_path.exists() {
+        println!("Keeping Chromium profile: {:?}", profile_path);
+    }
+
+    println!("Successfully removed app '{}'.", safe_name);
+    let _ = remove_app_config(safe_name);
+    Ok(())
+}
+
+pub fn print_generated_config(args: &crate::types::BuildArgs) -> Result<()> {
+    match args.backend {
+        Backend::Tauri => {
+            let config = crate::tauri::build_tauri_config_value(args, &args.internal_id, false);
+            println!(
+                "{}",
+                serde_json::to_string_pretty(&config)
+                    .context("Failed to serialize generated config")?
+            );
+        }
+        Backend::Chromium => {
+            let browser = resolve_chromium_binary(args.browser_bin.as_deref())?;
+            let profile_dir = chromium_profile_dir(&args.internal_id)?;
+            let profile_dir = match args.profile_scope {
+                ProfileScope::Isolated => Some(profile_dir),
+                ProfileScope::Shared => None,
+            };
+            let exec = build_chromium_exec(args, &browser, profile_dir.as_deref());
+            let value = serde_json::json!({
+                "backend": "chromium",
+                "name": args.name,
+                "id": args.internal_id,
+                "url": args.url,
+                "browser": browser.display().to_string(),
+                "profileScope": profile_scope_str(args.profile_scope),
+                "exec": exec,
+            });
+            println!(
+                "{}",
+                serde_json::to_string_pretty(&value)
+                    .context("Failed to serialize generated config")?
+            );
+        }
+    }
+    Ok(())
+}
+
+pub fn print_build_plan(action: &str, args: &crate::types::BuildArgs, existing_id: Option<&str>) {
+    let id = existing_id.unwrap_or(&args.internal_id);
+    println!("{} plan:", action);
+    if let Some(id) = existing_id {
+        println!("- Existing app ID: {}", id);
+    }
+    println!("- URL: {}", args.url);
+    println!("- Name: {}", args.name);
+    println!("- Internal ID: {}", id);
+    match args.backend {
+        Backend::Tauri => {
+            println!("- Backend: tauri (system WebView)");
+            println!("- Local build: cargo tauri build (temporary generated project)");
+            println!("- Install targets: local binary + XDG icon + .desktop entry");
+        }
+        Backend::Chromium => {
+            println!("- Backend: chromium (installed browser runtime)");
+            println!("- Local build: none");
+            println!("- Install targets: XDG icon + .desktop entry (+ optional isolated profile)");
+            println!("- Profile scope: {}", profile_scope_str(args.profile_scope));
+            if let Some(path) = &args.browser_bin {
+                println!("- Browser binary: {}", path);
+            } else {
+                println!("- Browser binary: auto-detect from PATH");
+            }
+            if args.no_decorations {
+                println!("- Note: --no-decorations is not guaranteed in Chromium app mode");
+            }
+        }
+    }
+    if args.fullscreen {
+        println!("- Window: fullscreen enabled");
+    }
+    if args.no_decorations {
+        println!("- Window: native decorations disabled");
+    }
+}

src/chromium.rs

@@ -0,0 +1,146 @@
+use anyhow::{Context, Result};
+use std::env;
+use std::path::{Path, PathBuf};
+use std::process::Command;
+
+use crate::desktop::desktop_exec_escape;
+use crate::types::{BuildArgs, ProfileScope};
+use crate::validation::validate_remove_id;
+use directories::BaseDirs;
+
+pub fn chromium_candidates() -> &'static [&'static str] {
+    &[
+        "google-chrome",
+        "chromium",
+        "chromium-browser",
+        "brave-browser",
+        "vivaldi",
+        "microsoft-edge",
+    ]
+}
+
+pub fn find_binary_in_path(name: &str) -> Option<PathBuf> {
+    let path_var = env::var_os("PATH")?;
+    for dir in env::split_paths(&path_var) {
+        let candidate = dir.join(name);
+        if candidate.is_file() {
+            return Some(candidate);
+        }
+    }
+    None
+}
+
+pub fn chromium_binary_works(path: &Path) -> Result<()> {
+    let output = Command::new(path)
+        .arg("--version")
+        .output()
+        .with_context(|| format!("Failed to execute browser binary {}", path.display()))?;
+    if output.status.success() {
+        return Ok(());
+    }
+    let stderr = String::from_utf8_lossy(&output.stderr).trim().to_string();
+    let stdout = String::from_utf8_lossy(&output.stdout).trim().to_string();
+    let details = if !stderr.is_empty() {
+        stderr
+    } else if !stdout.is_empty() {
+        stdout
+    } else {
+        format!("exit code {}", output.status)
+    };
+    Err(anyhow::anyhow!(
+        "Browser binary exists but failed to run: {} ({})",
+        path.display(),
+        details
+    ))
+}
+
+pub fn resolve_chromium_binary(explicit: Option<&str>) -> Result<PathBuf> {
+    if let Some(path) = explicit {
+        let candidate = PathBuf::from(path);
+        if candidate.is_file() {
+            chromium_binary_works(&candidate).with_context(|| {
+                "The specified browser binary does not appear to be usable. If it's a wrapper script, ensure the underlying browser exists."
+            })?;
+            return Ok(candidate);
+        }
+        return Err(anyhow::anyhow!(
+            "Specified browser binary does not exist or is not a file: {}",
+            candidate.display()
+        ));
+    }
+
+    for candidate in chromium_candidates() {
+        if let Some(path) = find_binary_in_path(candidate)
+            && chromium_binary_works(&path).is_ok()
+        {
+            return Ok(path);
+        }
+    }
+
+    Err(anyhow::anyhow!(
+        "No Chromium-based browser found in PATH. Install Chromium/Chrome/Brave or use --browser-bin /path/to/browser."
+    ))
+}
+
+pub fn chromium_profile_dir(internal_id: &str) -> Result<PathBuf> {
+    validate_remove_id(internal_id)?;
+    let base_dirs =
+        BaseDirs::new().ok_or_else(|| anyhow::anyhow!("Could not find system BaseDirs"))?;
+    Ok(base_dirs
+        .data_local_dir()
+        .join("deskify")
+        .join("profiles")
+        .join(internal_id))
+}
+
+pub fn chromium_window_size_arg(width: Option<f64>, height: Option<f64>) -> Option<String> {
+    match (width, height) {
+        (Some(w), Some(h)) => Some(format!("--window-size={},{}", w as i64, h as i64)),
+        _ => None,
+    }
+}
+
+pub fn build_chromium_exec(
+    args: &BuildArgs,
+    browser_path: &Path,
+    profile_dir: Option<&Path>,
+) -> String {
+    let mut parts = vec![browser_path.display().to_string()];
+    parts.push("--no-first-run".to_string());
+    parts.push("--no-default-browser-check".to_string());
+    parts.push(format!("--class={}", args.internal_id));
+    parts.push(format!("--app={}", args.url));
+
+    if let Some(profile_dir) = profile_dir {
+        parts.push(format!("--user-data-dir={}", profile_dir.display()));
+    }
+    if args.fullscreen {
+        parts.push("--start-fullscreen".to_string());
+    }
+    if let Some(window_size) = chromium_window_size_arg(args.width, args.height) {
+        parts.push(window_size);
+    }
+    if let Some(user_agent) = &args.user_agent {
+        parts.push(format!("--user-agent={}", user_agent));
+    }
+    if args.dark_mode {
+        parts.push("--force-dark-mode".to_string());
+    }
+
+    let escaped: Vec<String> = parts.iter().map(|s| desktop_exec_escape(s)).collect();
+    escaped.join(" ")
+}
+
+pub fn profile_scope_str(scope: ProfileScope) -> &'static str {
+    match scope {
+        ProfileScope::Isolated => "isolated",
+        ProfileScope::Shared => "shared",
+    }
+}
+
+pub fn backend_str(backend: crate::types::Backend) -> &'static str {
+    match backend {
+        crate::types::Backend::Tauri => "tauri",
+        crate::types::Backend::Chromium => "chromium",
+    }
+}

src/desktop.rs

@@ -0,0 +1,50 @@
+use anyhow::Result;
+use directories::BaseDirs;
+use std::path::PathBuf;
+
+pub fn desktop_exec_escape(arg: &str) -> String {
+    if arg.is_empty() {
+        return "\"\"".to_string();
+    }
+
+    let needs_quotes = arg
+        .chars()
+        .any(|c| c.is_whitespace() || c == '"' || c == '\\');
+    if !needs_quotes {
+        return arg.to_string();
+    }
+
+    let escaped = arg.replace('\\', "\\\\").replace('"', "\\\"");
+    format!("\"{}\"", escaped)
+}
+
+#[allow(dead_code)]
+pub fn desktop_exec_join(args: &[String]) -> String {
+    args.iter()
+        .map(|arg| desktop_exec_escape(arg))
+        .collect::<Vec<_>>()
+        .join(" ")
+}
+
+pub fn desktop_paths(internal_id: &str) -> Result<(PathBuf, PathBuf, PathBuf, PathBuf)> {
+    let base_dirs = BaseDirs::new()
+        .ok_or_else(|| anyhow::anyhow!("Could not find system BaseDirs (e.g. $HOME)"))?;
+    let data_local_dir = base_dirs.data_local_dir();
+    let executable_dir = base_dirs
+        .executable_dir()
+        .map(|p| p.to_path_buf())
+        .unwrap_or_else(|| base_dirs.home_dir().join(".local/bin"));
+
+    let applications_dir = data_local_dir.join("applications");
+    let icon_dir = data_local_dir.join("icons/hicolor/128x128/apps");
+    let target_bin = executable_dir.join(internal_id);
+    let target_icon = icon_dir.join(format!("{}.png", internal_id));
+    let desktop_file_path = applications_dir.join(format!("{}.desktop", internal_id));
+
+    Ok((
+        target_bin,
+        target_icon,
+        desktop_file_path,
+        data_local_dir.to_path_buf(),
+    ))
+}

src/doctor.rs

@@ -0,0 +1,93 @@
+use anyhow::Result;
+use directories::BaseDirs;
+use std::env;
+use std::process::Command;
+
+use crate::chromium::resolve_chromium_binary;
+
+pub fn run_doctor() -> Result<()> {
+    let mut failed = false;
+
+    let checks = vec![
+        ("cargo", vec!["--version"], true),
+        ("rustc", vec!["--version"], true),
+        ("pkg-config", vec!["--version"], false),
+    ];
+
+    println!("Deskify doctor");
+    println!("-------------");
+
+    for (cmd, args, critical) in checks {
+        match Command::new(cmd).args(args).output() {
+            Ok(output) if output.status.success() => {
+                let version = String::from_utf8_lossy(&output.stdout).trim().to_string();
+                println!("[ok] {} {}", cmd, version);
+            }
+            _ => {
+                println!(
+                    "[{}] {} not found or failed",
+                    if critical { "fail" } else { "warn" },
+                    cmd
+                );
+                if critical {
+                    failed = true;
+                }
+            }
+        }
+    }
+
+    match Command::new("cargo").args(["tauri", "--version"]).output() {
+        Ok(output) if output.status.success() => {
+            println!("[ok] {}", String::from_utf8_lossy(&output.stdout).trim());
+        }
+        _ => {
+            println!(
+                "[fail] cargo tauri not available (install with: cargo install tauri-cli --version \"^2.0.0\")"
+            );
+            failed = true;
+        }
+    }
+
+    if let Ok(output) = Command::new("pkg-config")
+        .args(["--modversion", "webkit2gtk-4.1"])
+        .output()
+    {
+        if output.status.success() {
+            println!(
+                "[ok] webkit2gtk-4.1 {}",
+                String::from_utf8_lossy(&output.stdout).trim()
+            );
+        } else {
+            println!("[warn] webkit2gtk-4.1 not found via pkg-config");
+        }
+    }
+
+    match resolve_chromium_binary(None) {
+        Ok(path) => println!("[ok] chromium browser found: {}", path.display()),
+        Err(_) => println!("[warn] no chromium-based browser found in PATH"),
+    }
+
+    let base_dirs =
+        BaseDirs::new().ok_or_else(|| anyhow::anyhow!("Could not find system BaseDirs"))?;
+    let executable_dir = base_dirs
+        .executable_dir()
+        .map(|p| p.to_path_buf())
+        .unwrap_or_else(|| base_dirs.home_dir().join(".local/bin"));
+    let applications_dir = base_dirs.data_local_dir().join("applications");
+    let icons_dir = base_dirs
+        .data_local_dir()
+        .join("icons/hicolor/128x128/apps");
+    println!("[info] executable dir: {}", executable_dir.display());
+    println!("[info] applications dir: {}", applications_dir.display());
+    println!("[info] icons dir: {}", icons_dir.display());
+    if let Ok(exe) = env::current_exe() {
+        println!("[info] deskify path: {}", exe.display());
+    }
+
+    if failed {
+        Err(anyhow::anyhow!("Doctor found critical issues"))
+    } else {
+        println!("Doctor completed: no critical issues detected.");
+        Ok(())
+    }
+}

src/icon.rs

@@ -0,0 +1,120 @@
+use anyhow::{Context, Result};
+use image::{DynamicImage, ImageFormat};
+use regex::Regex;
+use std::fs;
+use std::io::Read;
+use std::path::Path;
+use url::Url;
+
+pub fn write_rgba_png(img: DynamicImage, output_path: &Path) -> Result<()> {
+    let rgba = img.to_rgba8();
+    let rgba_img = DynamicImage::ImageRgba8(rgba);
+    rgba_img
+        .save_with_format(output_path, ImageFormat::Png)
+        .with_context(|| format!("Failed to write RGBA PNG icon to {}", output_path.display()))?;
+    Ok(())
+}
+
+pub fn download_icon_from_url(icon_url: &str, output_path: &Path) -> Result<bool> {
+    let response = match ureq::get(icon_url).call() {
+        Ok(resp) => resp,
+        Err(_) => return Ok(false),
+    };
+    let mut bytes = Vec::new();
+    if response.into_reader().read_to_end(&mut bytes).is_err() || bytes.is_empty() {
+        return Ok(false);
+    }
+    let img = match image::load_from_memory(&bytes) {
+        Ok(img) => img,
+        Err(_) => return Ok(false),
+    };
+    write_rgba_png(img, output_path)?;
+    Ok(true)
+}
+
+pub fn extract_icon_candidates_from_html(base_url: &Url, html: &str) -> Vec<String> {
+    let link_re = Regex::new(r#"(?is)<link\s+[^>]*rel\s*=\s*["'][^"']*icon[^"']*["'][^>]*href\s*=\s*["']([^"']+)["'][^>]*>"#).unwrap();
+    let mut candidates = Vec::new();
+    for cap in link_re.captures_iter(html) {
+        if let Some(href) = cap.get(1)
+            && let Ok(joined) = base_url.join(href.as_str())
+        {
+            let candidate = joined.to_string();
+            if !candidates.contains(&candidate) {
+                candidates.push(candidate);
+            }
+        }
+    }
+    candidates
+}
+
+pub fn try_download_site_icon(website_url: &str, output_path: &Path) -> Result<bool> {
+    let base_url = match Url::parse(website_url) {
+        Ok(url) => url,
+        Err(_) => return Ok(false),
+    };
+
+    let mut html = String::new();
+    if let Ok(response) = ureq::get(website_url).call()
+        && response.into_reader().read_to_string(&mut html).is_ok()
+    {
+        for icon_url in extract_icon_candidates_from_html(&base_url, &html) {
+            if download_icon_from_url(&icon_url, output_path)? {
+                return Ok(true);
+            }
+        }
+    }
+
+    if let Ok(favicon_url) = base_url.join("/favicon.ico")
+        && download_icon_from_url(favicon_url.as_str(), output_path)?
+    {
+        return Ok(true);
+    }
+
+    Ok(false)
+}
+
+pub fn fetch_or_create_icon(
+    website_url: &str,
+    custom_icon: Option<&String>,
+    output_path: &Path,
+) -> Result<()> {
+    if let Some(icon_path) = custom_icon {
+        if Path::new(icon_path).exists() {
+            let img = image::open(icon_path)
+                .with_context(|| format!("Failed to read custom icon image from {}", icon_path))?;
+            write_rgba_png(img, output_path)?;
+            return Ok(());
+        } else {
+            eprintln!(
+                "Warning: Custom icon path '{}' does not exist, falling back to downloaded icon.",
+                icon_path
+            );
+        }
+    }
+
+    if try_download_site_icon(website_url, output_path)? {
+        return Ok(());
+    }
+
+    if let Ok(parsed_url) = Url::parse(website_url)
+        && let Some(host) = parsed_url.host_str()
+    {
+        println!("Falling back to Google favicon API for {}...", host);
+        let api_url = format!("https://www.google.com/s2/favicons?domain={}&sz=128", host);
+        if download_icon_from_url(&api_url, output_path)? {
+            return Ok(());
+        }
+    }
+
+    let dummy_png: [u8; 67] = [
+        0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44,
+        0x52, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x01, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f,
+        0x15, 0xc4, 0x89, 0x00, 0x00, 0x00, 0x0a, 0x49, 0x44, 0x41, 0x54, 0x78, 0x9c, 0x63, 0x00,
+        0x01, 0x00, 0x00, 0x05, 0x00, 0x01, 0x0d, 0x0a, 0x2d, 0xb4, 0x00, 0x00, 0x00, 0x00, 0x49,
+        0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
+    ];
+    fs::write(output_path, dummy_png).context("Failed to write dummy icon fallback")?;
+
+    Ok(())
+}

src/install.rs

@@ -0,0 +1,141 @@
+use anyhow::{Context, Result};
+use std::fs;
+use std::path::Path;
+
+use crate::chromium::{
+    build_chromium_exec, chromium_profile_dir, profile_scope_str, resolve_chromium_binary,
+};
+use crate::desktop::desktop_paths;
+use crate::types::{BuildArgs, ProfileScope};
+
+pub fn install_tauri_app(args: &BuildArgs, bin_path: &Path, icon_path: &Path) -> Result<()> {
+    let (target_bin, target_icon, desktop_file_path, _data_local_dir) =
+        desktop_paths(&args.internal_id)?;
+    let executable_dir = target_bin
+        .parent()
+        .ok_or_else(|| anyhow::anyhow!("Invalid executable target path"))?;
+    let icon_dir = target_icon
+        .parent()
+        .ok_or_else(|| anyhow::anyhow!("Invalid icon target path"))?;
+    let applications_dir = desktop_file_path
+        .parent()
+        .ok_or_else(|| anyhow::anyhow!("Invalid applications target path"))?;
+
+    fs::create_dir_all(executable_dir).context("Failed to create ~/.local/bin directory")?;
+    fs::copy(bin_path, &target_bin).context("Failed to move binary to installation directory")?;
+
+    fs::create_dir_all(icon_dir).context("Failed to create icons directory")?;
+    if icon_path.exists() {
+        let _ = fs::copy(icon_path, &target_icon);
+    }
+
+    fs::create_dir_all(applications_dir).context("Failed to create applications directory")?;
+
+    let desktop_entry = format!(
+        r#"
+[Desktop Entry]
+Version=1.0
+Name={}
+Exec={}
+Icon={}
+StartupWMClass={}
+Terminal=false
+Type=Application
+Categories=Network;WebBrowser;
+X-Deskify-Managed=true
+X-Deskify-Backend=tauri
+"#,
+        args.name,
+        target_bin.to_string_lossy(),
+        args.internal_id,
+        args.internal_id
+    );
+
+    fs::write(&desktop_file_path, desktop_entry.trim()).context("Failed to write .desktop file")?;
+
+    println!("App successfully installed!");
+    println!(
+        "You can now launch '{}' from your application menu.",
+        args.name
+    );
+
+    Ok(())
+}
+
+pub fn install_chromium_app(args: &BuildArgs, icon_path: &Path) -> Result<()> {
+    let browser = resolve_chromium_binary(args.browser_bin.as_deref())?;
+    let profile_dir = match args.profile_scope {
+        ProfileScope::Isolated => Some(chromium_profile_dir(&args.internal_id)?),
+        ProfileScope::Shared => None,
+    };
+
+    if matches!((args.width, args.height), (Some(_), None) | (None, Some(_))) {
+        eprintln!(
+            "Warning: Chromium backend requires both --width and --height for --window-size; ignoring partial size override."
+        );
+    }
+    if args.no_decorations {
+        eprintln!(
+            "Warning: --no-decorations is not reliably supported in Chromium app mode and may be ignored."
+        );
+    }
+
+    let (target_bin, target_icon, desktop_file_path, _data_local_dir) =
+        desktop_paths(&args.internal_id)?;
+    let icon_dir = target_icon
+        .parent()
+        .ok_or_else(|| anyhow::anyhow!("Invalid icon target path"))?;
+    let applications_dir = desktop_file_path
+        .parent()
+        .ok_or_else(|| anyhow::anyhow!("Invalid applications target path"))?;
+
+    fs::create_dir_all(icon_dir).context("Failed to create icons directory")?;
+    fs::create_dir_all(applications_dir).context("Failed to create applications directory")?;
+    if let Some(profile_dir) = &profile_dir {
+        fs::create_dir_all(profile_dir).context("Failed to create Chromium profile directory")?;
+    }
+
+    let _ = fs::copy(icon_path, &target_icon);
+
+    let exec = build_chromium_exec(args, &browser, profile_dir.as_deref());
+    let desktop_entry = format!(
+        r#"
+[Desktop Entry]
+Version=1.0
+Name={}
+Exec={}
+Icon={}
+StartupWMClass={}
+Terminal=false
+Type=Application
+Categories=Network;WebBrowser;
+X-Deskify-Managed=true
+X-Deskify-Backend=chromium
+X-Deskify-URL={}
+X-Deskify-ProfileScope={}
+X-Deskify-Browser={}
+"#,
+        args.name,
+        exec,
+        args.internal_id,
+        args.internal_id,
+        args.url,
+        profile_scope_str(args.profile_scope),
+        browser.display()
+    );
+    fs::write(&desktop_file_path, desktop_entry.trim()).context("Failed to write .desktop file")?;
+
+    if target_bin.exists() {
+        println!(
+            "Note: existing binary {} left in place (Chromium backend does not use it).",
+            target_bin.display()
+        );
+    }
+
+    println!("App successfully installed (Chromium backend)!");
+    println!(
+        "You can now launch '{}' from your application menu.",
+        args.name
+    );
+    Ok(())
+}

src/tauri.rs

@@ -0,0 +1,156 @@
+use anyhow::{Context, Result};
+use serde_json::{Map, Value, json};
+use std::fs;
+use std::path::{Path, PathBuf};
+use std::process::Command;
+
+use crate::types::BuildArgs;
+
+pub fn build_tauri_config_value(
+    args: &BuildArgs,
+    safe_identifier: &str,
+    bundle_active: bool,
+) -> Value {
+    let mut window_config = Map::<String, Value>::new();
+    window_config.insert("title".to_string(), json!(args.name));
+    window_config.insert("url".to_string(), json!(args.url));
+
+    if args.fullscreen {
+        window_config.insert("fullscreen".to_string(), json!(true));
+    }
+    if args.no_decorations {
+        window_config.insert("decorations".to_string(), json!(false));
+    }
+    if let Some(ua) = &args.user_agent {
+        window_config.insert("userAgent".to_string(), json!(ua));
+    }
+    if let Some(w) = args.width {
+        window_config.insert("width".to_string(), json!(w));
+    }
+    if let Some(h) = args.height {
+        window_config.insert("height".to_string(), json!(h));
+    }
+    if args.dark_mode {
+        window_config.insert("theme".to_string(), json!("Dark"));
+    }
+
+    json!({
+        "$schema": "https://schema.tauri.app/config/2",
+        "productName": args.name,
+        "version": "0.1.0",
+        "identifier": format!("com.deskify.{}", safe_identifier),
+        "build": {
+            "frontendDist": "dist"
+        },
+        "app": {
+            "windows": [Value::Object(window_config)],
+            "security": { "csp": null }
+        },
+        "bundle": {
+            "active": bundle_active,
+            "targets": "all",
+            "icon": ["icons/icon.png"]
+        }
+    })
+}
+
+pub fn generate_project(args: &BuildArgs, project_dir: &Path, icon_path: &Path) -> Result<()> {
+    let src_dir = project_dir.join("src");
+    fs::create_dir_all(&src_dir).context("Failed to create src directory")?;
+
+    let cargo_toml = r#"
+[package]
+name = "deskify-app"
+version = "0.1.0"
+description = "A native application wrapper"
+authors = ["deskify"]
+edition = "2021"
+
+[dependencies]
+tauri = { version = "2.0.0", features = [] }
+
+[build-dependencies]
+tauri-build = "2.0.0"
+"#;
+    fs::write(project_dir.join("Cargo.toml"), cargo_toml).context("Failed to write Cargo.toml")?;
+
+    let build_rs = r#"
+fn main() {
+    tauri_build::build()
+}
+"#;
+    fs::write(project_dir.join("build.rs"), build_rs).context("Failed to write build.rs")?;
+
+    let main_rs = r#"
+#![cfg_attr(
+    all(not(debug_assertions), target_os = "windows"),
+    windows_subsystem = "windows"
+)]
+
+fn main() {
+    tauri::Builder::default()
+        .run(tauri::generate_context!())
+        .expect("error while running tauri application");
+}
+"#;
+    fs::write(src_dir.join("main.rs"), main_rs).context("Failed to write src/main.rs")?;
+
+    let dist_dir = project_dir.join("dist");
+    fs::create_dir_all(&dist_dir).context("Failed to create dist directory")?;
+    fs::write(
+        dist_dir.join("index.html"),
+        "<!DOCTYPE html><html><body></body></html>",
+    )
+    .context("Failed to write dummy index.html")?;
+
+    let icons_dir = project_dir.join("icons");
+    fs::create_dir_all(&icons_dir).context("Failed to create icons directory")?;
+    fs::copy(icon_path, icons_dir.join("icon.png")).context("Failed to copy icon")?;
+
+    let tauri_conf = build_tauri_config_value(args, &args.internal_id, false);
+    fs::write(
+        project_dir.join("tauri.conf.json"),
+        serde_json::to_string_pretty(&tauri_conf).context("Failed to serialize tauri.conf.json")?,
+    )
+    .context("Failed to write tauri.conf.json")?;
+
+    Ok(())
+}
+
+pub fn build_project(project_dir: &Path) -> Result<PathBuf> {
+    let tauri_check = Command::new("cargo")
+        .arg("tauri")
+        .arg("--version")
+        .output()
+        .context("Failed to execute `cargo`. Make sure rust/cargo is installed.")?;
+
+    if !tauri_check.status.success() {
+        return Err(anyhow::anyhow!(
+            "Tauri CLI is not installed or not working.\nPlease install it by running:\n  cargo install tauri-cli --version \"^2.0.0\""
+        ));
+    }
+
+    println!("Building native app (this may take a few minutes the first time)...");
+
+    let status = Command::new("cargo")
+        .arg("tauri")
+        .arg("build")
+        .current_dir(project_dir)
+        .status()
+        .context("Failed to execute `cargo tauri build`")?;
+
+    if !status.success() {
+        return Err(anyhow::anyhow!("Tauri build completed with an error"));
+    }
+
+    let bin_path = project_dir.join("target/release/deskify-app");
+    if bin_path.exists() {
+        println!("Successfully built binary at {:?}", bin_path);
+        Ok(bin_path)
+    } else {
+        Err(anyhow::anyhow!(
+            "Binary not found after build (expected at {:?})",
+            bin_path
+        ))
+    }
+}

src/types.rs

@@ -0,0 +1,161 @@
+use clap::{Parser, Subcommand};
+
+#[derive(
+    clap::ValueEnum, serde::Serialize, serde::Deserialize, Debug, Clone, Copy, PartialEq, Eq,
+)]
+#[serde(rename_all = "lowercase")]
+pub enum Backend {
+    Tauri,
+    Chromium,
+}
+
+#[derive(
+    clap::ValueEnum, serde::Serialize, serde::Deserialize, Debug, Clone, Copy, PartialEq, Eq,
+)]
+#[serde(rename_all = "lowercase")]
+pub enum ProfileScope {
+    #[serde(alias = "default")]
+    Isolated,
+    Shared,
+}
+
+#[derive(Debug, Clone)]
+pub struct BuildArgs {
+    pub url: String,
+    pub name: String,
+    pub internal_id: String,
+    pub icon: Option<String>,
+    pub fullscreen: bool,
+    pub no_decorations: bool,
+    pub user_agent: Option<String>,
+    pub width: Option<f64>,
+    pub height: Option<f64>,
+    pub dark_mode: bool,
+    pub backend: Backend,
+    pub browser_bin: Option<String>,
+    pub profile_scope: ProfileScope,
+}
+
+#[derive(serde::Serialize, serde::Deserialize, Debug, Clone)]
+pub struct DeskifyAppConfig {
+    pub schema_version: u32,
+    pub id: String,
+    pub name: String,
+    pub url: String,
+    pub backend: Backend,
+    pub browser_bin: Option<String>,
+    pub profile_scope: ProfileScope,
+    pub fullscreen: bool,
+    pub no_decorations: bool,
+    pub user_agent: Option<String>,
+    pub width: Option<f64>,
+    pub height: Option<f64>,
+    pub dark_mode: bool,
+}
+
+#[derive(Parser, Debug)]
+#[command(author, version, about, long_about = None)]
+pub struct Cli {
+    #[command(subcommand)]
+    pub command: Commands,
+}
+
+#[derive(Subcommand, Debug)]
+pub enum Commands {
+    Build {
+        #[arg(short, long)]
+        url: String,
+
+        #[arg(short, long)]
+        name: String,
+
+        #[arg(short, long)]
+        icon: Option<String>,
+
+        #[arg(short, long)]
+        fullscreen: bool,
+
+        #[arg(long)]
+        no_decorations: bool,
+
+        #[arg(short = 'A', long)]
+        user_agent: Option<String>,
+
+        #[arg(short = 'W', long)]
+        width: Option<f64>,
+
+        #[arg(short = 'H', long)]
+        height: Option<f64>,
+
+        #[arg(short, long)]
+        dark_mode: bool,
+
+        #[arg(long, value_enum, default_value_t = Backend::Tauri)]
+        backend: Backend,
+
+        #[arg(long)]
+        browser_bin: Option<String>,
+
+        #[arg(long, value_enum, default_value_t = ProfileScope::Isolated)]
+        profile_scope: ProfileScope,
+
+        #[arg(long)]
+        print_config: bool,
+
+        #[arg(long)]
+        dry_run: bool,
+    },
+    List {
+        #[arg(long)]
+        verbose: bool,
+    },
+    Doctor,
+    Remove {
+        id: String,
+    },
+    Update {
+        id: String,
+
+        #[arg(short, long)]
+        url: Option<String>,
+
+        #[arg(short, long)]
+        name: Option<String>,
+
+        #[arg(short, long)]
+        icon: Option<String>,
+
+        #[arg(short, long, action = clap::ArgAction::SetTrue)]
+        fullscreen: Option<bool>,
+
+        #[arg(long, action = clap::ArgAction::SetTrue)]
+        no_decorations: Option<bool>,
+
+        #[arg(short = 'A', long)]
+        user_agent: Option<String>,
+
+        #[arg(short = 'W', long)]
+        width: Option<f64>,
+
+        #[arg(short = 'H', long)]
+        height: Option<f64>,
+
+        #[arg(short, long, action = clap::ArgAction::SetTrue)]
+        dark_mode: Option<bool>,
+
+        #[arg(long, value_enum)]
+        backend: Option<Backend>,
+
+        #[arg(long)]
+        browser_bin: Option<String>,
+
+        #[arg(long, value_enum)]
+        profile_scope: Option<ProfileScope>,
+
+        #[arg(long)]
+        dry_run: bool,
+
+        #[arg(long)]
+        print_config: bool,
+    },
+}

src/validation.rs

@@ -0,0 +1,31 @@
+use anyhow::{Result, anyhow};
+use regex::Regex;
+
+pub fn sanitize_app_id(name: &str) -> String {
+    let re = Regex::new(r"[^a-z0-9-]").unwrap();
+    let lower_name = name.to_lowercase().replace(' ', "-");
+    let sanitized = re.replace_all(&lower_name, "");
+    if sanitized.is_empty() {
+        "app".to_string()
+    } else {
+        sanitized.to_string()
+    }
+}
+
+pub fn validate_remove_id(id: &str) -> Result<()> {
+    let re = Regex::new(r"^[a-z0-9-]+$").unwrap();
+    if re.is_match(id) {
+        Ok(())
+    } else {
+        Err(anyhow!(
+            "Invalid app ID '{}'. Allowed characters: lowercase letters, numbers, and '-'.",
+            id
+        ))
+    }
+}
+
+pub fn is_deskify_desktop_entry(content: &str) -> bool {
+    content.contains("X-Deskify-Managed=true")
+        || (content.contains("Categories=Network;WebBrowser;")
+            && (content.contains(".local/bin/") || content.contains("deskify")))
+}