From d7c97b87347ec98682762f1bc6f137b4a81569ab Mon Sep 17 00:00:00 2001
From: Priyanshu Verma <priyanshuverma@outlook.in>
Date: Tue, 10 Mar 2026 09:33:39 +0530
Subject: [PATCH 1/2] feat: pinned distro template

Signed-off-by: Priyanshu Verma <priyanshuverma@outlook.in>
---
 docs/template-spec.md     | 12 +++++-
 install.sh                | 12 ------
 src/cli/mod.rs            |  3 --
 src/commands/create.rs    | 84 ++++++++++++++++++++-------------------
 src/commands/enter.rs     | 12 ------
 src/commands/open.rs      |  1 -
 src/container/meta.rs     |  4 --
 src/runtime/nspawn.rs     |  8 ----
 src/shell_config.rs       |  9 -----
 src/template/registry.rs  |  5 ---
 src/template/spec.rs      | 36 +++++++++++++++++
 src/template/yaml_spec.rs | 14 +++++++
 src/user.rs               |  7 ----
 tests/e2e.rs              | 79 ------------------------------------
 upgrade.sh                | 10 -----
 15 files changed, 104 insertions(+), 192 deletions(-)

diff --git a/docs/template-spec.md b/docs/template-spec.md
index 611fe1b..4eeb45b 100644
--- a/docs/template-spec.md
+++ b/docs/template-spec.md
@@ -20,7 +20,7 @@ Every field is optional except `schema` and `name`.
 | `schema` | `string` | **yes** | Must be `dxon/v1` |
 | `name` | `string` | **yes** | Short identifier shown in the registry, no spaces |
 | `description` | `string` | no | One-line description of the environment |
-| `base` | `string` | no | Suggested base distribution: `arch`, `debian`, or `alpine` |
+| `base` | `string` | no | Pinned base distribution for this template: `arch`, `debian`, or `alpine` |
 | `packages` | `map<distro, list<string>>` | no | Per-distro package lists installed before steps run |
 | `env` | `map<string, string>` | no | Environment variables set inside the container |
 | `run` | `list<string>` | no | Commands run after all steps complete |
@@ -44,6 +44,16 @@ dXon selects the list matching the chosen distribution and installs those packag
 
 Supported keys: `arch`, `debian`, `alpine`.
 
+If your template is intentionally distro-specific, set `base` and only define that distro key in `packages`.
+
+```yaml
+base: debian
+packages:
+  debian: [curl, git, ca-certificates]
+```
+
+When `base` is set, `dxon create --template ...` automatically uses that distro.
+
 ---
 
 ## `env` — environment variables
diff --git a/install.sh b/install.sh
index 428f7b4..502224a 100755
--- a/install.sh
+++ b/install.sh
@@ -1,7 +1,4 @@
 #!/usr/bin/env sh
-# dXon install script
-# Usage: curl -sSfL https://raw.githubusercontent.com/P8labs/dxon/master/install.sh | sh
-# Or:    wget -qO- https://raw.githubusercontent.com/P8labs/dxon/master/install.sh | sh
 
 set -e
 
@@ -9,7 +6,6 @@ REPO="P8labs/dxon"
 BINARY="dxon"
 INSTALL_DIR="${DXON_INSTALL_DIR:-/usr/local/bin}"
 
-# ── helpers ────────────────────────────────────────────────────────────────────
 
 info()  { printf '\033[0;34m  info\033[0m  %s\n' "$*"; }
 ok()    { printf '\033[0;32m    ok\033[0m  %s\n' "$*"; }
@@ -22,7 +18,6 @@ need_cmd() {
     fi
 }
 
-# ── detect OS ──────────────────────────────────────────────────────────────────
 
 detect_os() {
     OS="$(uname -s 2>/dev/null | tr '[:upper:]' '[:lower:]')"
@@ -33,7 +28,6 @@ detect_os() {
     esac
 }
 
-# ── detect architecture ────────────────────────────────────────────────────────
 
 detect_arch() {
     ARCH="$(uname -m 2>/dev/null)"
@@ -45,7 +39,6 @@ detect_arch() {
     esac
 }
 
-# ── fetch latest release tag ───────────────────────────────────────────────────
 
 latest_version() {
     if command -v curl >/dev/null 2>&1; then
@@ -63,7 +56,6 @@ latest_version() {
     fi
 }
 
-# ── download binary ────────────────────────────────────────────────────────────
 
 download() {
     ASSET="${BINARY}-${VERSION}-${OS}-${ARCH}"
@@ -86,7 +78,6 @@ download() {
     echo "$TMP"
 }
 
-# ── install binary ───────────────────────────────────────────download/v0.3.0/dxon-linux-x86_64──────────────────
 
 install_bin() {
     TMPFILE="$1"
@@ -106,7 +97,6 @@ install_bin() {
     fi
 }
 
-# ── check systemd-nspawn ────────────────────────────────────────────────────────
 
 check_nspawn() {
     if ! command -v systemd-nspawn >/dev/null 2>&1; then
@@ -120,13 +110,11 @@ check_nspawn() {
     fi
 }
 
-# ── main ───────────────────────────────────────────────────────────────────────
 
 main() {
     detect_os
     detect_arch
 
-    # Allow pinning a version via env var
     if [ -n "$DXON_VERSION" ]; then
         VERSION="$DXON_VERSION"
     else
diff --git a/src/cli/mod.rs b/src/cli/mod.rs
index 13c7b6a..24c435e 100644
--- a/src/cli/mod.rs
+++ b/src/cli/mod.rs
@@ -29,11 +29,8 @@ pub enum Commands {
         packages: Vec<String>,
         #[arg(long, short = 'y')]
         trust: bool,
-        /// Shell to install: bash, zsh, fish.
         #[arg(long, value_name = "SHELL")]
         shell: Option<String>,
-        /// Copy or bind-mount host shell config into the container.
-        /// Valid values: copy, bind.
         #[arg(long, value_name = "MODE")]
         shell_config: Option<String>,
     },
diff --git a/src/commands/create.rs b/src/commands/create.rs
index ace9370..244e2f8 100644
--- a/src/commands/create.rs
+++ b/src/commands/create.rs
@@ -46,36 +46,6 @@ pub fn run(store: &ContainerStore, cfg: &mut Config, args: CreateArgs) -> Result
         return Err(DxonError::ContainerExists(name).into());
     }
 
-    let distro_choices = &["arch", "debian", "alpine"];
-
-    let distro_str: String = match args.distro {
-        Some(d) => d,
-        None => {
-            let default_idx = cfg
-                .default_distro
-                .as_deref()
-                .and_then(|d| distro_choices.iter().position(|&c| c == d))
-                .unwrap_or(0);
-
-            let idx = Select::with_theme(&theme)
-                .with_prompt("Base distribution")
-                .items(distro_choices)
-                .default(default_idx)
-                .interact()?;
-            distro_choices[idx].to_string()
-        }
-    };
-    let distro = Distro::parse(&distro_str)?;
-
-    let (bootstrap_tool, hint) = host.bootstrap_tool_for(&distro_str);
-    if !user::command_available(bootstrap_tool) {
-        return Err(DxonError::MissingTool {
-            tool: bootstrap_tool.to_string(),
-            hint: format!("on {}: {hint}", host.pretty_name),
-        }
-        .into());
-    }
-
     let (tmpl, tmpl_name): (Option<DxTemplate>, Option<String>) = match args.template {
         Some(ref t) => {
             let (loaded, source) = template::resolve(t, cfg.effective_registry_url())?;
@@ -112,6 +82,49 @@ pub fn run(store: &ContainerStore, cfg: &mut Config, args: CreateArgs) -> Result
         }
     };
 
+    let distro_choices = &["arch", "debian", "alpine"];
+    let template_distro = tmpl.as_ref().and_then(|t| t.pinned_distro());
+
+    let distro_str: String = match (args.distro, template_distro) {
+        (Some(requested), Some(pinned)) => {
+            if requested != pinned {
+                anyhow::bail!(
+                    "template '{}' is pinned to distro '{}' but '--distro {}' was provided",
+                    tmpl_name.as_deref().unwrap_or("<template>"),
+                    pinned,
+                    requested
+                );
+            }
+            requested
+        }
+        (Some(requested), None) => requested,
+        (None, Some(pinned)) => pinned.to_string(),
+        (None, None) => {
+            let default_idx = cfg
+                .default_distro
+                .as_deref()
+                .and_then(|d| distro_choices.iter().position(|&c| c == d))
+                .unwrap_or(0);
+
+            let idx = Select::with_theme(&theme)
+                .with_prompt("Base distribution")
+                .items(distro_choices)
+                .default(default_idx)
+                .interact()?;
+            distro_choices[idx].to_string()
+        }
+    };
+    let distro = Distro::parse(&distro_str)?;
+
+    let (bootstrap_tool, hint) = host.bootstrap_tool_for(&distro_str);
+    if !user::command_available(bootstrap_tool) {
+        return Err(DxonError::MissingTool {
+            tool: bootstrap_tool.to_string(),
+            hint: format!("on {}: {hint}", host.pretty_name),
+        }
+        .into());
+    }
+
     let mut answers: HashMap<String, String> = HashMap::new();
     if let Some(ref t) = tmpl {
         for prompt in &t.prompts {
@@ -284,7 +297,6 @@ pub fn run(store: &ContainerStore, cfg: &mut Config, args: CreateArgs) -> Result
         let host_home = user::resolve_home();
         let shell_name = chosen_shell.as_deref().unwrap_or("bash");
 
-        // Resolve the container user's home directory (e.g. /home/priyanshu or /root).
         let container_home_abs = if host_user.uid == 0 {
             std::path::PathBuf::from("/root")
         } else {
@@ -394,8 +406,6 @@ fn provision(
     println!("{} bootstrapping {} rootfs…", "→".cyan(), distro_str.bold());
     bootstrap(distro, rootfs)?;
 
-    // Create a matching user/group inside the container so that file
-    // ownership inside /workspace matches the host user.
     ensure_container_user(rootfs, &host_user.username, host_user.uid, host_user.gid)?;
 
     let mut installed_packages: Vec<String> = Vec::new();
@@ -466,13 +476,11 @@ fn provision(
 
         let shell_path = format!("/bin/{shell}");
         let shell_bin = format!("/usr/{shell}");
-        // Set the default shell for root.
         let chsh_root = format!(
             "chsh -s {shell_path} root 2>/dev/null || chsh -s {shell_bin} root 2>/dev/null || true"
         );
         let _ = run_command(rootfs, &chsh_root, &HashMap::new());
 
-        // Also set the default shell for the mapped container user.
         if host_user.uid != 0 {
             let chsh_user = format!(
                 "chsh -s {shell_path} {username} 2>/dev/null || chsh -s {shell_bin} {username} 2>/dev/null || true",
@@ -482,13 +490,9 @@ fn provision(
         }
     }
 
-    // Create /workspace and assign it to the mapped user so the host user
-    // can write project files without permission errors.
     run_command(rootfs, "mkdir -p /workspace", &HashMap::new())?;
 
     let final_repo = if let Some(url) = repo {
-        // Derive the target directory name from the URL, stripping a trailing
-        // ".git" suffix if present (e.g. "https://github.com/foo/bar.git" → "bar").
         let repo_name = url
             .trim_end_matches('/')
             .rsplit('/')
@@ -513,8 +517,6 @@ fn provision(
         None
     };
 
-    // Recursively chown /workspace to the mapped UID/GID (covers both the
-    // empty directory case and any files placed there by git clone above).
     let chown_cmd = format!("chown -R {}:{} /workspace", host_user.uid, host_user.gid);
     let _ = run_command(rootfs, &chown_cmd, &HashMap::new());
 
diff --git a/src/commands/enter.rs b/src/commands/enter.rs
index cf93622..5644961 100644
--- a/src/commands/enter.rs
+++ b/src/commands/enter.rs
@@ -290,15 +290,6 @@ fn sanitize_workspace_subpath(raw: &str) -> Result<PathBuf> {
     Ok(out)
 }
 
-/// Remove a stale `/run/systemd/nspawn/unix-export/<machine_name>` mount point
-/// left behind by a container that exited uncleanly (crash, OOM, SIGKILL, etc.).
-///
-/// When systemd-nspawn starts with `--machine=<name>` it bind-mounts a socket
-/// under that path. Normally nspawn cleans it up on exit, but after an unclean
-/// shutdown the mount point persists and the next `systemd-nspawn --machine=<name>`
-/// invocation refuses to start with "Mount point … exists already, refusing."
-///
-/// This is only called after confirming the machine is NOT currently running.
 fn cleanup_stale_nspawn_machine(machine_name: &str) {
     let socket_path = format!("/run/systemd/nspawn/unix-export/{machine_name}");
 
@@ -306,7 +297,6 @@ fn cleanup_stale_nspawn_machine(machine_name: &str) {
         return;
     }
 
-    // 1. Ask machinectl to terminate — it knows how to clean up registered machines.
     if crate::user::command_available("machinectl") {
         let _ = crate::user::privileged_command("machinectl")
             .arg("terminate")
@@ -316,7 +306,6 @@ fn cleanup_stale_nspawn_machine(machine_name: &str) {
             .status();
     }
 
-    // 2. If still present it is likely a stale bind-mount; unmount it lazily.
     if std::path::Path::new(&socket_path).exists() {
         let _ = crate::user::privileged_command("umount")
             .arg("--lazy")
@@ -326,7 +315,6 @@ fn cleanup_stale_nspawn_machine(machine_name: &str) {
             .status();
     }
 
-    // 3. Last resort: plain removal (works when the path is only a dead socket file).
     if std::path::Path::new(&socket_path).exists() {
         let _ = crate::user::privileged_command("rm")
             .arg("-f")
diff --git a/src/commands/open.rs b/src/commands/open.rs
index af69157..86e238e 100644
--- a/src/commands/open.rs
+++ b/src/commands/open.rs
@@ -476,7 +476,6 @@ mod tests {
         fs::create_dir_all(&vscode).unwrap();
 
         let jsonc = r#"{
-    // User preference
     "editor.tabSize": 4
 }"#;
         fs::write(vscode.join("settings.json"), jsonc).unwrap();
diff --git a/src/container/meta.rs b/src/container/meta.rs
index 2eddac4..4471dd9 100644
--- a/src/container/meta.rs
+++ b/src/container/meta.rs
@@ -22,16 +22,12 @@ pub struct ContainerConfig {
     pub shell: Option<String>,
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub shell_config_mode: Option<String>,
-    /// Username mapped from the host into the container (e.g. "priyanshu").
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub container_user: Option<String>,
-    /// UID of the mapped user inside the container.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub container_uid: Option<u32>,
-    /// GID of the mapped user inside the container.
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub container_gid: Option<u32>,
-    /// Default working directory when entering the container (e.g. "/workspace").
     #[serde(default, skip_serializing_if = "Option::is_none")]
     pub workspace_dir: Option<String>,
 }
diff --git a/src/runtime/nspawn.rs b/src/runtime/nspawn.rs
index f85ca23..0cf9eea 100644
--- a/src/runtime/nspawn.rs
+++ b/src/runtime/nspawn.rs
@@ -138,10 +138,6 @@ fn prompt_package_failure(
     }
 }
 
-/// Ensure a user with the given `username`, `uid`, and `gid` exists inside the
-/// container rootfs, creating the group and user if necessary.
-///
-/// This is a no-op when `uid == 0` (root always exists).
 pub fn ensure_container_user(rootfs: &Path, username: &str, uid: u32, gid: u32) -> Result<()> {
     if uid == 0 {
         return Ok(());
@@ -149,7 +145,6 @@ pub fn ensure_container_user(rootfs: &Path, username: &str, uid: u32, gid: u32)
 
     let env = HashMap::new();
 
-    // Check whether the user already exists.
     let check_cmd = format!("id {username} >/dev/null 2>&1");
     if run_command(rootfs, &check_cmd, &env).is_ok() {
         return Ok(());
@@ -161,14 +156,11 @@ pub fn ensure_container_user(rootfs: &Path, username: &str, uid: u32, gid: u32)
         username.bold()
     );
 
-    // Create the group if it doesn't already exist (gracefully ignore errors
-    // from distros where the group was created as part of an earlier step).
     let group_cmd = format!(
         "getent group {gid} >/dev/null 2>&1 || groupadd -g {gid} {username} 2>/dev/null || true"
     );
     let _ = run_command(rootfs, &group_cmd, &env);
 
-    // Create the user with a matching UID/GID and a real home directory.
     let user_cmd = format!("useradd -u {uid} -g {gid} -m -s /bin/sh {username}");
     run_command(rootfs, &user_cmd, &env)?;
 
diff --git a/src/shell_config.rs b/src/shell_config.rs
index 0310a32..f7e77b8 100644
--- a/src/shell_config.rs
+++ b/src/shell_config.rs
@@ -103,10 +103,6 @@ fn config_files_for(shell: &str, host_home: &Path) -> Vec<(PathBuf, PathBuf)> {
         .collect()
 }
 
-/// Copy shell config files from the host into the container.
-///
-/// `container_home_abs` is the absolute path of the user's home directory
-/// *inside* the container, e.g. `/home/priyanshu` or `/root`.
 pub fn apply_copy(
     rootfs: &Path,
     host_home: &Path,
@@ -196,11 +192,6 @@ fn copy_file_with_path_sub(
     user::privileged_write(dst, &content)
 }
 
-/// Build `--bind=` argument strings for systemd-nspawn to live-mount shell
-/// config files from the host into `container_home_abs` inside the container.
-///
-/// `container_home_abs` is the absolute path of the user's home directory
-/// *inside* the container, e.g. `/home/priyanshu` or `/root`.
 pub fn bind_args(host_home: &Path, shell: &str, container_home_abs: &Path) -> Vec<String> {
     let files = config_files_for(shell, host_home);
 
diff --git a/src/template/registry.rs b/src/template/registry.rs
index 6a04bf7..3bd0576 100644
--- a/src/template/registry.rs
+++ b/src/template/registry.rs
@@ -12,7 +12,6 @@ pub fn template_cache_dir() -> PathBuf {
     crate::user::resolve_home().join(".dxon").join("templates")
 }
 
-/// Expected cache path for the named template: `~/.dxon/templates/<name>.yaml`.
 fn cached_template_path(name: &str) -> PathBuf {
     template_cache_dir().join(format!("{name}.yaml"))
 }
@@ -239,7 +238,6 @@ mod tests {
 
     #[test]
     fn list_cached_names_returns_empty_when_dir_absent() {
-        // Should not panic even when the cache directory doesn't exist.
         let _ = list_cached_names();
     }
 
@@ -251,7 +249,6 @@ mod tests {
         std::fs::write(cache.join("rust.yaml"), "schema: dxon/v1\nname: rust\n").unwrap();
         std::fs::write(cache.join("nodejs.yaml"), "schema: dxon/v1\nname: nodejs\n").unwrap();
 
-        // Validate that the directory contains both files.
         let files: std::collections::HashSet<_> = std::fs::read_dir(&cache)
             .unwrap()
             .flatten()
@@ -297,7 +294,6 @@ mod tests {
 
     #[test]
     fn json_index_accepts_optional_fields() {
-        // tags and distros are optional; path is required
         let src = r#"
 {
   "templates": [
@@ -434,7 +430,6 @@ mod tests {
 
     #[test]
     fn resolve_path_from_index_finds_correct_entry() {
-        // This tests the logic inline (no network) using a synthetic index.
         let entries = vec![
             TemplateEntry {
                 name: "nodejs".into(),
diff --git a/src/template/spec.rs b/src/template/spec.rs
index 2e4ff9b..9ec48c9 100644
--- a/src/template/spec.rs
+++ b/src/template/spec.rs
@@ -27,6 +27,8 @@ pub struct TemplateMeta {
 
 #[derive(Debug, Clone, Serialize, Deserialize, Default)]
 pub struct BaseConfig {
+    #[serde(default, skip_serializing_if = "Option::is_none")]
+    pub distro: Option<String>,
     #[serde(default)]
     pub distros: Vec<String>,
     #[serde(default)]
@@ -76,6 +78,13 @@ impl DxTemplate {
         yaml.validate()?;
         Ok(yaml.into_dx_template())
     }
+
+    pub fn pinned_distro(&self) -> Option<&str> {
+        self.base
+            .distro
+            .as_deref()
+            .or_else(|| self.base.distros.first().map(|s| s.as_str()))
+    }
 }
 
 #[cfg(test)]
@@ -214,4 +223,31 @@ env = { HOME = "/root", PATH = "/usr/bin" }
         assert_eq!(t.runtime.env.get("HOME"), Some(&"/root".to_string()));
         assert_eq!(t.runtime.env.get("PATH"), Some(&"/usr/bin".to_string()));
     }
+
+    #[test]
+    fn pinned_distro_prefers_explicit_base_distro() {
+        let src = r#"
+[meta]
+name = "x"
+
+[base]
+distro = "debian"
+distros = ["arch"]
+"#;
+        let t = DxTemplate::from_toml(src).unwrap();
+        assert_eq!(t.pinned_distro(), Some("debian"));
+    }
+
+    #[test]
+    fn pinned_distro_falls_back_to_first_distros_entry() {
+        let src = r#"
+[meta]
+name = "x"
+
+[base]
+distros = ["alpine"]
+"#;
+        let t = DxTemplate::from_toml(src).unwrap();
+        assert_eq!(t.pinned_distro(), Some("alpine"));
+    }
 }
diff --git a/src/template/yaml_spec.rs b/src/template/yaml_spec.rs
index aca9e9a..e3eea54 100644
--- a/src/template/yaml_spec.rs
+++ b/src/template/yaml_spec.rs
@@ -141,6 +141,7 @@ impl YamlTemplate {
         };
 
         let base = BaseConfig {
+            distro: self.base.clone(),
             distros: self.base.into_iter().collect(),
             packages: Vec::new(),
             packages_by_distro: self.packages,
@@ -340,4 +341,17 @@ steps:
         assert_eq!(dx.steps[0].commands, vec!["node --version"]);
         assert_eq!(dx.steps[0].when["pm"], "npm");
     }
+
+    #[test]
+    fn into_dx_template_maps_base_distro() {
+        let src = r#"
+schema: dxon/v1
+name: myenv
+base: debian
+"#;
+        let yaml = YamlTemplate::from_yaml(src).unwrap();
+        let dx = yaml.into_dx_template();
+        assert_eq!(dx.base.distro, Some("debian".to_string()));
+        assert_eq!(dx.pinned_distro(), Some("debian"));
+    }
 }
diff --git a/src/user.rs b/src/user.rs
index ac6a303..4d3b949 100644
--- a/src/user.rs
+++ b/src/user.rs
@@ -11,7 +11,6 @@ pub fn is_root() -> bool {
     get_current_uid() == 0
 }
 
-/// Information about the host user that should be mapped into the container.
 #[derive(Debug, Clone)]
 pub struct HostUser {
     pub username: String,
@@ -19,10 +18,6 @@ pub struct HostUser {
     pub gid: u32,
 }
 
-/// Detect the effective host user.
-///
-/// When running under `sudo`, returns the original (pre-sudo) user so that
-/// container ownership matches the person who invoked dxon, not root.
 pub fn detect_host_user() -> HostUser {
     if is_root() {
         if let Ok(sudo_user) = env::var("SUDO_USER") {
@@ -36,7 +31,6 @@ pub fn detect_host_user() -> HostUser {
                 }
             }
         }
-        // Truly running as root (not via sudo).
         return HostUser {
             username: "root".to_string(),
             uid: 0,
@@ -50,7 +44,6 @@ pub fn detect_host_user() -> HostUser {
     let username = if let Some(user) = get_user_by_uid(uid) {
         user.name().to_string_lossy().into_owned()
     } else {
-        // Fallback: walk /etc/passwd manually.
         std::fs::read_to_string("/etc/passwd")
             .ok()
             .and_then(|contents| {
diff --git a/tests/e2e.rs b/tests/e2e.rs
index 10c939c..52581b9 100644
--- a/tests/e2e.rs
+++ b/tests/e2e.rs
@@ -1,35 +1,15 @@
-/// End-to-end tests for the `dxon` binary.
-///
-/// Each test invokes the real binary against a fully-isolated temporary home
-/// directory (`HOME`) and containers directory (`DXON_DIR`), so they never
-/// touch the developer's real config or containers.
-///
-/// Tests that require external tools (`pacstrap`, `debootstrap`,
-/// `systemd-nspawn`) or network access are marked `#[ignore]` and must be
-/// opted into explicitly:
-///
-///   cargo test --test e2e                        # fast, offline tests
-///   cargo test --test e2e -- --include-ignored   # all tests
 use std::fs;
 use std::path::PathBuf;
 use std::process::{Command, Output};
 use tempfile::TempDir;
 
-// ---------------------------------------------------------------------------
-// Test harness helpers
-// ---------------------------------------------------------------------------
 
-/// Locate the `dxon` binary built by Cargo.
-///
-/// Integration test binaries live in `target/debug/deps/`, so we pop up to
-/// `target/debug/` and look for the main binary there.
 fn dxon_bin() -> PathBuf {
     let mut path = std::env::current_exe()
         .expect("cannot determine current exe path")
         .canonicalize()
         .expect("cannot canonicalize exe path");
 
-    // Remove the test binary name and the optional "deps" directory.
     path.pop();
     if path.file_name().map(|n| n == "deps").unwrap_or(false) {
         path.pop();
@@ -44,12 +24,8 @@ fn dxon_bin() -> PathBuf {
     path
 }
 
-/// An isolated environment for a single test: a temporary directory used as
-/// both `HOME` and the parent for a dedicated containers directory.
 struct TestEnv {
-    /// Temporary directory acting as the synthetic `HOME`.
     home: TempDir,
-    /// Path used as the `DXON_DIR` (containers store) for this test.
     containers_dir: PathBuf,
 }
 
@@ -64,13 +40,6 @@ impl TestEnv {
         }
     }
 
-    /// Build a `Command` for `dxon` with the test environment pre-configured.
-    ///
-    /// Sets:
-    ///  - `HOME`       → isolated temp directory (config lives here)
-    ///  - `DXON_DIR`   → containers subdirectory inside the temp dir
-    ///  - `NO_COLOR`   → disables ANSI escape codes for easy string matching
-    ///  - clears `SUDO_USER` to avoid privilege escalation surprises
     fn cmd(&self, args: &[&str]) -> Command {
         let mut c = Command::new(dxon_bin());
         c.args(args)
@@ -81,27 +50,21 @@ impl TestEnv {
         c
     }
 
-    /// Run `dxon <args>` and return the raw `Output`.
     fn run(&self, args: &[&str]) -> Output {
         self.cmd(args)
             .output()
             .expect("failed to execute dxon binary")
     }
 
-    /// Return the combined stdout of `dxon <args>` as a `String`.
     fn stdout(&self, args: &[&str]) -> String {
         String::from_utf8_lossy(&self.run(args).stdout).into_owned()
     }
 
-    /// Return the combined stderr of `dxon <args>` as a `String`.
     #[allow(dead_code)]
     fn stderr(&self, args: &[&str]) -> String {
         String::from_utf8_lossy(&self.run(args).stderr).into_owned()
     }
 
-    /// Create a minimal fake container entry (directory + `meta.json`) so
-    /// that read-only commands (`list`, `info`) can be tested without
-    /// actually bootstrapping a real rootfs.
     fn create_fake_container(&self, name: &str, distro: &str) {
         let container_dir = self.containers_dir.join(name);
         let rootfs_dir = container_dir.join("rootfs");
@@ -129,9 +92,6 @@ impl TestEnv {
     }
 }
 
-// ---------------------------------------------------------------------------
-// Basic CLI flag tests
-// ---------------------------------------------------------------------------
 
 #[test]
 fn help_exits_zero() {
@@ -153,7 +113,6 @@ fn help_exits_zero() {
 fn version_flag_shows_version() {
     let env = TestEnv::new();
     let out = env.run(&["--version"]);
-    // clap exits 0 for --version
     assert!(
         out.status.success(),
         "`dxon --version` should exit 0, got: {}",
@@ -174,7 +133,6 @@ fn version_flag_shows_version() {
 fn no_subcommand_shows_help_and_fails() {
     let env = TestEnv::new();
     let out = env.run(&[]);
-    // clap exits non-zero when no subcommand is given
     assert!(
         !out.status.success(),
         "`dxon` with no args should exit non-zero, got: {}",
@@ -182,9 +140,6 @@ fn no_subcommand_shows_help_and_fails() {
     );
 }
 
-// ---------------------------------------------------------------------------
-// `dxon list` tests
-// ---------------------------------------------------------------------------
 
 #[test]
 fn list_empty_store_exits_zero() {
@@ -240,9 +195,6 @@ fn list_shows_multiple_fake_containers() {
     );
 }
 
-// ---------------------------------------------------------------------------
-// `dxon info` tests
-// ---------------------------------------------------------------------------
 
 #[test]
 fn info_nonexistent_container_fails() {
@@ -295,15 +247,11 @@ fn info_fake_container_shows_packages() {
     );
 }
 
-// ---------------------------------------------------------------------------
-// `dxon delete` tests
-// ---------------------------------------------------------------------------
 
 #[test]
 fn delete_nonexistent_container_fails() {
     let env = TestEnv::new();
     let out = env.run(&["delete", "ghost-container"]);
-    // delete.rs calls std::process::exit(1) for missing containers
     assert!(
         !out.status.success(),
         "`dxon delete <missing>` should exit non-zero"
@@ -315,7 +263,6 @@ fn delete_force_removes_fake_container() {
     let env = TestEnv::new();
     env.create_fake_container("disposable", "arch");
 
-    // Confirm the container directory exists before deletion.
     let container_dir = env.containers_dir.join("disposable");
     assert!(
         container_dir.exists(),
@@ -348,9 +295,6 @@ fn delete_force_outputs_confirmation() {
     );
 }
 
-// ---------------------------------------------------------------------------
-// `dxon config` tests
-// ---------------------------------------------------------------------------
 
 #[test]
 fn config_show_exits_zero() {
@@ -368,7 +312,6 @@ fn config_show_exits_zero() {
 fn config_show_displays_config_path() {
     let env = TestEnv::new();
     let stdout = env.stdout(&["config", "show"]);
-    // Should mention the config file path
     assert!(
         stdout.contains("config.toml") || stdout.contains("dxon"),
         "expected config path or 'dxon' in config show output, got:\n{stdout}"
@@ -392,7 +335,6 @@ fn config_set_known_key_succeeds() {
 fn config_set_persists_and_shows_in_config_show() {
     let env = TestEnv::new();
 
-    // Set the value.
     let set_out = env.run(&["config", "set", "default_distro", "debian"]);
     assert!(
         set_out.status.success(),
@@ -400,7 +342,6 @@ fn config_set_persists_and_shows_in_config_show() {
         String::from_utf8_lossy(&set_out.stderr)
     );
 
-    // Verify the value appears in `config show`.
     let stdout = env.stdout(&["config", "show"]);
     assert!(
         stdout.contains("debian"),
@@ -467,8 +408,6 @@ fn config_set_registry_url_succeeds() {
         String::from_utf8_lossy(&out.stderr)
     );
 
-    // Verify the value was persisted to the config TOML file directly,
-    // since `config show` does not currently display registry_url.
     let config_path = env
         .home
         .path()
@@ -483,9 +422,6 @@ fn config_set_registry_url_succeeds() {
     );
 }
 
-// ---------------------------------------------------------------------------
-// `dxon template` tests (require network — ignored by default)
-// ---------------------------------------------------------------------------
 
 #[test]
 #[ignore = "requires network access to the remote registry"]
@@ -505,7 +441,6 @@ fn template_list_exits_zero() {
 fn template_list_shows_templates() {
     let env = TestEnv::new();
     let stdout = env.stdout(&["template", "list"]);
-    // The registry ships with at least rust and python templates.
     assert!(
         stdout.contains("rust") || stdout.contains("python") || stdout.contains("go"),
         "expected at least one well-known template in output, got:\n{stdout}"
@@ -536,16 +471,12 @@ fn template_refresh_exits_zero() {
     );
 }
 
-// ---------------------------------------------------------------------------
-// `dxon create` tests (require system bootstrap tools — ignored in CI)
-// ---------------------------------------------------------------------------
 
 #[test]
 #[ignore = "requires pacstrap / debootstrap / systemd-nspawn and root privileges"]
 fn create_arch_container_full_lifecycle() {
     let env = TestEnv::new();
 
-    // Create
     let create_out = env.run(&["create", "testbox", "--distro", "arch", "--trust"]);
     assert!(
         create_out.status.success(),
@@ -553,16 +484,13 @@ fn create_arch_container_full_lifecycle() {
         String::from_utf8_lossy(&create_out.stderr)
     );
 
-    // Info
     let info_stdout = env.stdout(&["info", "testbox"]);
     assert!(info_stdout.contains("testbox"));
     assert!(info_stdout.contains("arch"));
 
-    // List
     let list_stdout = env.stdout(&["list"]);
     assert!(list_stdout.contains("testbox"));
 
-    // Delete
     let delete_out = env.run(&["delete", "--force", "testbox"]);
     assert!(
         delete_out.status.success(),
@@ -570,7 +498,6 @@ fn create_arch_container_full_lifecycle() {
         String::from_utf8_lossy(&delete_out.stderr)
     );
 
-    // Confirm gone
     let list_after = env.stdout(&["list"]);
     assert!(
         !list_after.contains("testbox"),
@@ -578,18 +505,13 @@ fn create_arch_container_full_lifecycle() {
     );
 }
 
-// ---------------------------------------------------------------------------
-// `--dir` flag / `DXON_DIR` override tests
-// ---------------------------------------------------------------------------
 
 #[test]
 fn dir_flag_uses_specified_directory() {
     let env = TestEnv::new();
-    // Create a second isolated containers directory.
     let alt_dir = env.home.path().join("alt-containers");
     fs::create_dir_all(&alt_dir).unwrap();
 
-    // Manually populate it with a fake container.
     let container_dir = alt_dir.join("altbox");
     let rootfs = container_dir.join("rootfs");
     fs::create_dir_all(&rootfs).unwrap();
@@ -608,7 +530,6 @@ fn dir_flag_uses_specified_directory() {
     );
     fs::write(container_dir.join("meta.json"), meta_json).unwrap();
 
-    // Run `dxon list --dir <alt_dir>` — should find "altbox".
     let out = Command::new(dxon_bin())
         .args(["list", "--dir", alt_dir.to_str().unwrap()])
         .env("HOME", env.home.path())
diff --git a/upgrade.sh b/upgrade.sh
index 96e26d9..852c575 100755
--- a/upgrade.sh
+++ b/upgrade.sh
@@ -1,20 +1,16 @@
 #!/usr/bin/env sh
-# dXon upgrade script
-# Usage: curl -sSfL https://raw.githubusercontent.com/P8labs/dxon/master/upgrade.sh | sh
 
 set -e
 
 REPO="P8labs/dxon"
 BINARY="dxon"
 
-# ── helpers ────────────────────────────────────────────────────────────────────
 
 info()  { printf '\033[0;34m  info\033[0m  %s\n' "$*"; }
 ok()    { printf '\033[0;32m    ok\033[0m  %s\n' "$*"; }
 warn()  { printf '\033[0;33m  warn\033[0m  %s\n' "$*" >&2; }
 error() { printf '\033[0;31m error\033[0m  %s\n' "$*" >&2; exit 1; }
 
-# ── find current install ───────────────────────────────────────────────────────
 
 find_current() {
     CURRENT_BIN="$(command -v "$BINARY" 2>/dev/null)"
@@ -30,7 +26,6 @@ find_current() {
     info "current: ${CURRENT_VERSION:-(unknown)} at ${CURRENT_BIN}"
 }
 
-# ── fetch latest release tag ───────────────────────────────────────────────────
 
 latest_version() {
     if command -v curl >/dev/null 2>&1; then
@@ -50,16 +45,13 @@ latest_version() {
     info "latest:  ${LATEST}"
 }
 
-# ── version comparison helper ─────────────────────────────────────────────────-
 
-# Strips a leading 'v' for comparison: v0.3.0 → 0.3.0
 strip_v() { echo "${1#v}"; }
 
 already_current() {
     [ "$(strip_v "$CURRENT_VERSION")" = "$(strip_v "$LATEST")" ]
 }
 
-# ── detect OS / arch ───────────────────────────────────────────────────────────
 
 detect_platform() {
     OS="$(uname -s 2>/dev/null | tr '[:upper:]' '[:lower:]')"
@@ -77,7 +69,6 @@ detect_platform() {
     esac
 }
 
-# ── download & install ─────────────────────────────────────────────────────────
 
 download_and_install() {
     ASSET="${BINARY}-${LATEST}-${OS}-${ARCH}"
@@ -112,7 +103,6 @@ download_and_install() {
     fi
 }
 
-# ── main ───────────────────────────────────────────────────────────────────────
 
 main() {
     find_current

From df1e87d930064be23dd3617013f089d4dd6c0d1c Mon Sep 17 00:00:00 2001
From: Priyanshu Verma <priyanshuverma@outlook.in>
Date: Tue, 10 Mar 2026 09:37:09 +0530
Subject: [PATCH 2/2] chore: format lint fix

Signed-off-by: Priyanshu Verma <priyanshuverma@outlook.in>
---
 tests/e2e.rs | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/tests/e2e.rs b/tests/e2e.rs
index 52581b9..7717de4 100644
--- a/tests/e2e.rs
+++ b/tests/e2e.rs
@@ -3,7 +3,6 @@ use std::path::PathBuf;
 use std::process::{Command, Output};
 use tempfile::TempDir;
 
-
 fn dxon_bin() -> PathBuf {
     let mut path = std::env::current_exe()
         .expect("cannot determine current exe path")
@@ -92,7 +91,6 @@ impl TestEnv {
     }
 }
 
-
 #[test]
 fn help_exits_zero() {
     let env = TestEnv::new();
@@ -140,7 +138,6 @@ fn no_subcommand_shows_help_and_fails() {
     );
 }
 
-
 #[test]
 fn list_empty_store_exits_zero() {
     let env = TestEnv::new();
@@ -195,7 +192,6 @@ fn list_shows_multiple_fake_containers() {
     );
 }
 
-
 #[test]
 fn info_nonexistent_container_fails() {
     let env = TestEnv::new();
@@ -247,7 +243,6 @@ fn info_fake_container_shows_packages() {
     );
 }
 
-
 #[test]
 fn delete_nonexistent_container_fails() {
     let env = TestEnv::new();
@@ -295,7 +290,6 @@ fn delete_force_outputs_confirmation() {
     );
 }
 
-
 #[test]
 fn config_show_exits_zero() {
     let env = TestEnv::new();
@@ -422,7 +416,6 @@ fn config_set_registry_url_succeeds() {
     );
 }
 
-
 #[test]
 #[ignore = "requires network access to the remote registry"]
 fn template_list_exits_zero() {
@@ -471,7 +464,6 @@ fn template_refresh_exits_zero() {
     );
 }
 
-
 #[test]
 #[ignore = "requires pacstrap / debootstrap / systemd-nspawn and root privileges"]
 fn create_arch_container_full_lifecycle() {
@@ -505,7 +497,6 @@ fn create_arch_container_full_lifecycle() {
     );
 }
 
-
 #[test]
 fn dir_flag_uses_specified_directory() {
     let env = TestEnv::new();