smbcloud-cli 0.4.12__tar.gz → 0.5.0__tar.gz

{smbcloud_cli-0.4.12 → smbcloud_cli-0.5.0}/Cargo.lock

@@ -2528,7 +2528,7 @@ checksum = "8ed6a63f02c8539c91a8685a86f4099661ba3da017932f6ebbea6de3f0fa7c90"
 
 [[package]]
 name = "smbcloud-auth"
-version = "0.4.12"
+version = "0.5.0"
 dependencies = [
  "log",
  "reqwest",
@@ -2543,7 +2543,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-auth-sdk"
-version = "0.4.12"
+version = "0.5.0"
 dependencies = [
  "base64",
  "reqwest",
@@ -2558,7 +2558,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-auth-sdk-py"
-version = "0.4.12"
+version = "0.5.0"
 dependencies = [
  "pyo3",
  "pythonize",
@@ -2572,7 +2572,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-auth-sdk-wasm"
-version = "0.4.12"
+version = "0.5.0"
 dependencies = [
  "serde-wasm-bindgen",
  "smbcloud-auth-sdk",
@@ -2585,7 +2585,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-cli"
-version = "0.4.12"
+version = "0.5.0"
 dependencies = [
  "anyhow",
  "chrono",
@@ -2611,6 +2611,7 @@ dependencies = [
  "serde_repr",
  "smbcloud-auth",
  "smbcloud-deploy",
+ "smbcloud-email-sdk",
  "smbcloud-mail",
  "smbcloud-model",
  "smbcloud-network",
@@ -2627,11 +2628,12 @@ dependencies = [
  "tracing-bunyan-formatter",
  "tracing-subscriber",
  "url-builder",
+ "xcrs",
 ]
 
 [[package]]
 name = "smbcloud-deploy"
-version = "0.4.12"
+version = "0.5.0"
 dependencies = [
  "anyhow",
  "smbcloud-model",
@@ -2643,7 +2645,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-email-sdk"
-version = "0.4.12"
+version = "0.5.0"
 dependencies = [
  "anyhow",
  "log",
@@ -2658,7 +2660,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-gresiq"
-version = "0.4.12"
+version = "0.5.0"
 dependencies = [
  "native-tls",
  "postgres-native-tls",
@@ -2672,7 +2674,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-gresiq-sdk"
-version = "0.4.12"
+version = "0.5.0"
 dependencies = [
  "anyhow",
  "log",
@@ -2686,7 +2688,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-mail"
-version = "0.4.12"
+version = "0.5.0"
 dependencies = [
  "reqwest",
  "serde",
@@ -2698,7 +2700,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-model"
-version = "0.4.12"
+version = "0.5.0"
 dependencies = [
  "chrono",
  "log",
@@ -2714,7 +2716,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-network"
-version = "0.4.12"
+version = "0.5.0"
 dependencies = [
  "clap 4.6.2",
  "log",
@@ -2727,7 +2729,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-networking"
-version = "0.4.12"
+version = "0.5.0"
 dependencies = [
  "smbcloud-network",
  "url-builder",
@@ -2735,7 +2737,7 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-networking-project"
-version = "0.4.12"
+version = "0.5.0"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2753,11 +2755,11 @@ dependencies = [
 
 [[package]]
 name = "smbcloud-s6n"
-version = "0.4.12"
+version = "0.5.0"
 
 [[package]]
 name = "smbcloud-utils"
-version = "0.4.12"
+version = "0.5.0"
 dependencies = [
  "anyhow",
  "dirs",
@@ -3993,6 +3995,22 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ffae5123b2d3fc086436f8834ae3ab053a283cfac8fe0a0b8eaae044768a4c4"
 
+[[package]]
+name = "xcrs"
+version = "0.5.0"
+dependencies = [
+ "anyhow",
+ "base64",
+ "clap 4.6.2",
+ "reqwest",
+ "rmcp",
+ "schemars",
+ "serde",
+ "serde_json",
+ "tempfile",
+ "tokio",
+]
+
 [[package]]
 name = "yoke"
 version = "0.8.3"

{smbcloud_cli-0.4.12 → smbcloud_cli-0.5.0}/Cargo.toml

@@ -1,10 +1,11 @@
 [workspace]
 resolver = "2"
-members = ["crates/cli", "crates/smbcloud-*"]
+members = ["crates/cli", "crates/smbcloud-*", "crates/xcrs"]
 
 [workspace.dependencies]
 anyhow = "1.0.58"
 async-trait = "0.1.51"
+base64 = "0.22"
 chrono = "0.4"
 clap = "4.1.6"
 clap_mangen = "0.2.10"
@@ -28,17 +29,17 @@ schemars = "1"
 serde = "1"
 serde_json = "1.0.82"
 serde_repr = "0.1"
-smbcloud-auth = { version = "0.4.9", path = "crates/smbcloud-auth" }
-smbcloud-auth-sdk = { version = "0.4.9", path = "crates/smbcloud-auth-sdk" }
-smbcloud-deploy = { version = "0.4.9", path = "crates/smbcloud-deploy" }
-smbcloud-email-sdk = { version = "0.4.9", path = "crates/smbcloud-email-sdk" }
-smbcloud-gresiq-sdk = { version = "0.4.9", path = "crates/smbcloud-gresiq-sdk" }
-smbcloud-mail = { version = "0.4.9", path = "crates/smbcloud-mail" }
-smbcloud-model = { version = "0.4.9", path = "crates/smbcloud-model" }
-smbcloud-network = { version = "0.4.9", path = "crates/smbcloud-network" }
-smbcloud-networking = { version = "0.4.9", path = "crates/smbcloud-networking" }
-smbcloud-networking-project = { version = "0.4.9", path = "crates/smbcloud-networking-project" }
-smbcloud-utils = { version = "0.4.9", path = "crates/smbcloud-utils" }
+smbcloud-auth = { version = "0.5.0", path = "crates/smbcloud-auth" }
+smbcloud-auth-sdk = { version = "0.5.0", path = "crates/smbcloud-auth-sdk" }
+smbcloud-deploy = { version = "0.5.0", path = "crates/smbcloud-deploy" }
+smbcloud-email-sdk = { version = "0.5.0", path = "crates/smbcloud-email-sdk" }
+smbcloud-gresiq-sdk = { version = "0.5.0", path = "crates/smbcloud-gresiq-sdk" }
+smbcloud-mail = { version = "0.5.0", path = "crates/smbcloud-mail" }
+smbcloud-model = { version = "0.5.0", path = "crates/smbcloud-model" }
+smbcloud-network = { version = "0.5.0", path = "crates/smbcloud-network" }
+smbcloud-networking = { version = "0.5.0", path = "crates/smbcloud-networking" }
+smbcloud-networking-project = { version = "0.5.0", path = "crates/smbcloud-networking-project" }
+smbcloud-utils = { version = "0.5.0", path = "crates/smbcloud-utils" }
 spinners = "4.1.0"
 strum = "0.27"
 strum_macros = "0.27"
@@ -55,3 +56,4 @@ tsync = "2"
 uniffi = "0.31"
 url-builder = "0.1.1"
 wasm-bindgen = "0.2"
+xcrs = { version = "0.5.0", path = "crates/xcrs" }

{smbcloud_cli-0.4.12 → smbcloud_cli-0.5.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: smbcloud-cli
-Version: 0.4.12
+Version: 0.5.0
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Developers

{smbcloud_cli-0.4.12 → smbcloud_cli-0.5.0}/crates/cli/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "smbcloud-cli"
-version = "0.4.12"
+version = "0.5.0"
 edition = "2021"
 authors = ["Seto Elkahfi <seto@smbcloud.xyz>"]
 description = "smbCloud command line interface."
@@ -47,6 +47,7 @@ serde_json = { workspace = true }
 serde_repr = { workspace = true }
 smbcloud-auth = { workspace = true }
 smbcloud-deploy = { workspace = true }
+smbcloud-email-sdk = { workspace = true }
 smbcloud-mail = { workspace = true }
 smbcloud-model = { workspace = true }
 smbcloud-network = { workspace = true }
@@ -63,6 +64,7 @@ tracing = { workspace = true, features = ["log"] }
 tracing-bunyan-formatter = { workspace = true }
 tracing-subscriber = { workspace = true, features = ["registry", "env-filter"] }
 url-builder = { workspace = true }
+xcrs = { workspace = true }
 
 [target.'cfg(not(windows))'.dependencies]
 openssl = { workspace = true }

smbcloud_cli-0.5.0/crates/cli/src/cli/mod.rs

@@ -0,0 +1,210 @@
+use {
+    crate::{account, cloud_auth, mail, project, tenant},
+    clap::{Parser, Subcommand, ValueEnum},
+    smbcloud_network::environment::Environment,
+    spinners::Spinner,
+    std::path::PathBuf,
+};
+
+pub struct CommandResult {
+    pub spinner: Spinner,
+    pub symbol: String,
+    pub msg: String,
+}
+
+impl CommandResult {
+    pub fn stop_and_persist(mut self) {
+        self.spinner.stop_and_persist(&self.symbol, self.msg);
+    }
+}
+
+#[derive(Debug, Clone, Copy, Default, PartialEq, Eq, ValueEnum)]
+pub enum McpScope {
+    #[default]
+    Cloud,
+    Automation,
+}
+
+#[derive(Parser)]
+#[clap(author, version, about)]
+pub struct Cli {
+    /// Environment: dev, production
+    #[arg(short, long, env = "ENVIRONMENT", default_value = "production")]
+    pub environment: Environment,
+
+    /// Log level: trace, debug, info, warn, error, off
+    #[clap(short, long, global = true)]
+    pub log_level: Option<String>,
+
+    /// Non-interactive mode for CI/automation: disable prompts. Confirmations
+    /// use their default; prompts that need real input fail fast instead of
+    /// blocking. Also enabled by SMB_CI=1 or the conventional CI env var.
+    #[arg(long, global = true, env = "SMB_CI")]
+    pub ci: bool,
+
+    /// Full-screen TUI mode: render read commands in an interactive ratatui
+    /// view instead of plain text. Mutually exclusive with --mcp.
+    #[arg(long, global = true, conflicts_with = "mcp")]
+    pub tui: bool,
+
+    /// Run as an MCP (Model Context Protocol) server over stdio instead of a
+    /// one-shot command. Implies non-interactive; the subcommand is ignored.
+    #[arg(long, global = true)]
+    pub mcp: bool,
+
+    /// MCP tool profile to expose. Cloud serves smbCloud resources; automation
+    /// serves cross-platform mobile and TV device tools.
+    #[arg(
+        long = "scope",
+        global = true,
+        value_enum,
+        default_value_t,
+        requires = "mcp"
+    )]
+    pub mcp_scope: McpScope,
+
+    #[command(subcommand)]
+    pub command: Option<Commands>,
+}
+
+#[derive(Subcommand)]
+pub enum Commands {
+    #[clap(about = "Your account info.", display_order = 3)]
+    Me {},
+    #[clap(
+        about = "Deploy project. This is smb main command. Requires an smbCloud account.",
+        display_order = 0
+    )]
+    Deploy {
+        /// Name of the sub-project to deploy (for monorepo configs with [[projects]]).
+        /// Matches the `name` field in .smb/config.toml. Omit to deploy the root project.
+        #[arg(short, long)]
+        project: Option<String>,
+    },
+    #[clap(
+        about = "Initialize project. Requires an smbCloud account.",
+        display_order = 1
+    )]
+    Init {},
+    #[clap(about = "Login to your account.", display_order = 2)]
+    Login {},
+    #[clap(about = "Logout from your account.", display_order = 3)]
+    Logout {},
+    #[clap(about = "Manage your account.")]
+    Account {
+        #[clap(subcommand)]
+        command: account::cli::Commands,
+    },
+    #[clap(about = "Manage your projects.")]
+    Project {
+        #[clap(subcommand)]
+        command: project::cli::Commands,
+    },
+    #[clap(about = "Manage your tenants.")]
+    Tenant {
+        #[clap(subcommand)]
+        command: tenant::cli::Commands,
+    },
+    #[clap(about = "Manage smbCloud Mail.")]
+    Mail {
+        #[clap(subcommand)]
+        command: mail::cli::Commands,
+    },
+    #[clap(about = "Manage smbCloud Auth apps.")]
+    Auth {
+        #[clap(subcommand)]
+        command: cloud_auth::cli::Commands,
+    },
+    #[clap(about = "Run and control XCRS ControlKit on Apple devices.")]
+    ControlKit {
+        #[clap(subcommand)]
+        command: ControlKitCommands,
+    },
+    #[clap(
+        about = "Migrate local .smb/config.toml deploy fields to the smbCloud server.",
+        display_order = 4
+    )]
+    Migrate {},
+}
+
+#[cfg(test)]
+mod tests {
+    use super::*;
+
+    #[test]
+    fn mcp_defaults_to_cloud_scope() {
+        let cli = Cli::try_parse_from(["smb", "--mcp"]).expect("MCP arguments should parse");
+
+        assert_eq!(cli.mcp_scope, McpScope::Cloud);
+    }
+
+    #[test]
+    fn mcp_accepts_automation_scope() {
+        let cli = Cli::try_parse_from(["smb", "--mcp", "--scope", "automation"])
+            .expect("automation MCP arguments should parse");
+
+        assert_eq!(cli.mcp_scope, McpScope::Automation);
+    }
+
+    #[test]
+    fn scope_requires_mcp_mode() {
+        // `Cli` has no `Debug` impl (clap's `Parser` doesn't require one), so
+        // `expect_err`/`unwrap_err` (which bound the `Ok` type on `Debug`)
+        // don't apply here; match the `Result` instead.
+        let result = Cli::try_parse_from(["smb", "--scope", "automation"]);
+        let error = match result {
+            Err(error) => error,
+            Ok(_) => panic!("scope without MCP mode should be rejected"),
+        };
+
+        assert_eq!(
+            error.kind(),
+            clap::error::ErrorKind::MissingRequiredArgument
+        );
+    }
+}
+
+#[derive(Subcommand)]
+pub enum ControlKitCommands {
+    #[clap(about = "Build a signed ControlKit XCTest runner for a physical device.")]
+    Build {
+        #[arg(long)]
+        project_path: PathBuf,
+        #[arg(long, default_value = "ControlKit")]
+        scheme: String,
+        #[arg(long, default_value = "Release")]
+        configuration: String,
+        #[arg(long)]
+        device_udid: String,
+        #[arg(long)]
+        derived_data_path: PathBuf,
+    },
+    #[clap(about = "Start a built ControlKit XCTest runner on a physical device.")]
+    Start {
+        #[arg(long)]
+        device_udid: String,
+        #[arg(long)]
+        xctestrun_path: PathBuf,
+        #[arg(long, default_value = "::")]
+        listen_host: String,
+        #[arg(long, default_value_t = 12004)]
+        listen_port: u16,
+        #[arg(long, default_value_t = 120)]
+        timeout_seconds: u64,
+        #[arg(long)]
+        log_path: Option<PathBuf>,
+    },
+    #[clap(about = "Call a running ControlKit JSON-RPC method.")]
+    Call {
+        #[arg(long, required_unless_present = "host", conflicts_with = "host")]
+        device_udid: Option<String>,
+        #[arg(long, conflicts_with = "device_udid")]
+        host: Option<String>,
+        #[arg(long, default_value_t = 12004)]
+        port: u16,
+        #[arg(long)]
+        method: String,
+        #[arg(long, default_value = "{}")]
+        params: String,
+    },
+}

{smbcloud_cli-0.4.12 → smbcloud_cli-0.5.0}/crates/cli/src/cloud-auth/render.rs

@@ -28,7 +28,9 @@ pub(crate) fn print_auth_apps(auth_apps: &[AuthApp]) {
             "#{} {} project={}",
             auth_app.id,
             style(&auth_app.name).bold(),
-            auth_app.project_id.as_deref().unwrap_or("-")
+            auth_app
+                .project_id
+                .map_or_else(|| "-".to_string(), |id| id.to_string())
         );
     }
 }
@@ -37,7 +39,9 @@ pub(crate) fn print_auth_app_detail(auth_app: &AuthApp) {
     print_heading("Auth app");
     print_field("ID", &auth_app.id);
     print_field("Name", &auth_app.name);
-    print_optional_field("Project ID", auth_app.project_id.as_deref());
+    if let Some(project_id) = auth_app.project_id {
+        print_field("Project ID", project_id.to_string());
+    }
     print_optional_field("Support email", auth_app.support_email.as_deref());
     print_optional_field("Secret", auth_app.secret.as_deref());
     print_field("Created at", auth_app.created_at.to_rfc3339());

{smbcloud_cli-0.4.12 → smbcloud_cli-0.5.0}/crates/cli/src/cloud-deploy/config.rs

@@ -124,6 +124,9 @@ pub(crate) async fn overlay_server_config(
             if let Some(remote_pm2_env) = deploy_config.pm2_env {
                 config.project.pm2_env = Some(remote_pm2_env);
             }
+            if let Some(remote_process_manager) = deploy_config.process_manager {
+                config.project.process_manager = Some(remote_process_manager);
+            }
             if let Some(remote_port) = deploy_config.port {
                 config.project.port = Some(remote_port);
             }

{smbcloud_cli-0.4.12 → smbcloud_cli-0.5.0}/crates/cli/src/cloud-deploy/process_deploy_nextjs_ssr.rs

@@ -85,6 +85,83 @@ fn prune_dangling_symlinks(root: &std::path::Path) -> std::io::Result<usize> {
     Ok(removed)
 }
 
+/// Build the shell snippet that (re)starts the app after the standalone bundle
+/// is on the server.
+///
+/// Two supervisors are supported, selected by `process_manager` (matched
+/// case-insensitively):
+/// - `None` / `"pm2"` → **pm2** (default): delete + start fresh, preferring an
+///   operator-managed `ecosystem.config.cjs`/`.js`, else `pm2 start node --
+///   server.js` with `PORT`/`HOSTNAME` inline.
+/// - `"systemd"` → a **git-owned `systemctl --user` service** named
+///   `<pm2_app>.service` (created out-of-band; see the smbcloud-deploy-nextjs
+///   skill). Restarted with no sudo — the deploy SSHes as the git app-owner,
+///   and `systemctl --user` (with `XDG_RUNTIME_DIR` set) drives that user's own
+///   manager. Fails loudly if the unit does not exist.
+///
+/// Any other value is a hard error rather than a silent fall back to pm2: on an
+/// app already migrated to systemd, a typo like `system` would otherwise start
+/// a second pm2 process that collides with the systemd-owned port — the exact
+/// double-supervisor outage this option exists to prevent.
+///
+/// The returned snippet references the shell var `$PM2_APP` (set earlier in the
+/// deploy script). `port` is only used by the pm2 path.
+fn restart_stanza(process_manager: Option<&str>, port: u16) -> Result<String> {
+    let use_systemd = match process_manager.map(str::trim) {
+        None | Some("") => false,
+        Some(m) if m.eq_ignore_ascii_case("pm2") => false,
+        Some(m) if m.eq_ignore_ascii_case("systemd") => true,
+        Some(other) => {
+            return Err(anyhow!(fail_message(&format!(
+                "Unknown process_manager '{other}' in .smb/config.toml. \
+                 Expected \"pm2\" (default) or \"systemd\"."
+            ))))
+        }
+    };
+
+    Ok(if use_systemd {
+        r#"    echo "Restarting $PM2_APP via systemd --user…"
+    export XDG_RUNTIME_DIR="/run/user/$(id -u)"
+    UNIT="$PM2_APP.service"
+    if ! systemctl --user cat "$UNIT" >/dev/null 2>&1; then
+        echo "Error: systemd --user unit $UNIT not found on the server."
+        echo "Create ~/.config/systemd/user/$UNIT and enable it (see the"
+        echo "smbcloud-deploy-nextjs skill, 'Process manager: systemd --user'),"
+        echo "or unset process_manager to stay on pm2. Then re-deploy."
+        exit 1
+    fi
+    systemctl --user restart "$UNIT"
+    sleep 3
+    if ! systemctl --user is-active "$UNIT" >/dev/null 2>&1; then
+        echo "Error: $UNIT failed to become active after restart."
+        systemctl --user status "$UNIT" --no-pager 2>&1 | head -20 || true
+        exit 1
+    fi
+    echo "Done."
+"#
+        .to_string()
+    } else {
+        format!(
+            r#"    echo "Starting $PM2_APP with pm2..."
+    if pm2 describe "$PM2_APP" > /dev/null 2>&1; then
+        pm2 delete "$PM2_APP"
+    fi
+
+    if [ -f ecosystem.config.cjs ]; then
+        pm2 start ecosystem.config.cjs --only "$PM2_APP" --env production
+    elif [ -f ecosystem.config.js ]; then
+        pm2 start ecosystem.config.js --only "$PM2_APP" --env production
+    else
+        NODE_ENV=production PORT={port} HOSTNAME=127.0.0.1 pm2 start node --name "$PM2_APP" -- server.js
+    fi
+
+    pm2 save
+    echo "Done."
+"#
+        )
+    })
+}
+
 /// Deploys a Next.js SSR app using standalone output mode.
 ///
 /// Requires `output: 'standalone'` in next.config.js. This produces a
@@ -99,7 +176,8 @@ fn prune_dangling_symlinks(root: &std::path::Path) -> std::io::Result<usize> {
 ///   4. rsync .next/standalone/  → server:path/          (server + bundled deps)
 ///   5. rsync .next/static/      → server:path/.next/static/  (static chunks)
 ///   6. rsync public/            → server:path/public/   (public assets)
-///   7. SSH: pm2 delete + start fresh (prefer server `ecosystem.config.cjs` or `.js` if present)
+///   7. SSH: restart the app — pm2 (default) or a git-owned systemd --user
+///      service when `process_manager = "systemd"` (see `restart_stanza`)
 ///   8. PATCH deployment record as Done
 pub async fn process_deploy_nextjs_ssr(env: Environment, config: Config) -> Result<CommandResult> {
     let source = config.project.source.as_deref().unwrap_or(".");
@@ -530,6 +608,9 @@ pub async fn process_deploy_nextjs_ssr(env: Environment, config: Config) -> Resu
         )
     };
 
+    // Runtime supervisor: pm2 (default) or a git-owned systemd --user service.
+    let restart_stanza = restart_stanza(config.project.process_manager.as_deref(), port)?;
+
     let deploy_script = format!(
         r#"set -e
     APP_PATH="{remote_path}"
@@ -662,26 +743,11 @@ EOF
         ln -sfn ../../server.js .next/standalone/server.js
     fi
 
-    echo "Starting $PM2_APP with pm2..."
-    if pm2 describe "$PM2_APP" > /dev/null 2>&1; then
-        pm2 delete "$PM2_APP"
-    fi
-
-    if [ -f ecosystem.config.cjs ]; then
-        pm2 start ecosystem.config.cjs --only "$PM2_APP" --env production
-    elif [ -f ecosystem.config.js ]; then
-        pm2 start ecosystem.config.js --only "$PM2_APP" --env production
-    else
-        NODE_ENV=production PORT={port} HOSTNAME=127.0.0.1 pm2 start node --name "$PM2_APP" -- server.js
-    fi
-
-    pm2 save
-    echo "Done."
-    "#,
+{restart}    "#,
         remote_path = remote_path,
         pm2_app = pm2_app,
         runtime_subdir = runtime_subdir_for_shell,
-        port = port,
+        restart = restart_stanza,
         ecosystem_config = ecosystem_config_content,
     );
 
@@ -828,7 +894,11 @@ async fn mark_failed(
 
 #[cfg(all(test, unix))]
 mod tests {
-    use {super::prune_dangling_symlinks, std::os::unix::fs::symlink, tempfile::tempdir};
+    use {
+        super::{prune_dangling_symlinks, restart_stanza},
+        std::os::unix::fs::symlink,
+        tempfile::tempdir,
+    };
 
     /// Mirrors the real failure: a pnpm compat link points at a version dir that
     /// was never traced into the bundle, so it dangles and must be pruned, while
@@ -915,4 +985,40 @@ mod tests {
             "the dangling root symlink is gone"
         );
     }
+
+    #[test]
+    fn restart_stanza_defaults_to_pm2() {
+        for pm in [None, Some(""), Some("pm2"), Some("PM2"), Some(" pm2 ")] {
+            let s = restart_stanza(pm, 3025).expect("pm2 selector is valid");
+            assert!(s.contains("pm2 start"), "pm={pm:?} should use pm2");
+            assert!(s.contains("PORT=3025"), "pm={pm:?} injects the port");
+            assert!(!s.contains("systemctl"), "pm={pm:?} must not touch systemd");
+        }
+    }
+
+    /// An unrecognized supervisor must abort the deploy, not quietly run pm2
+    /// alongside a systemd-owned process and fight over the port.
+    #[test]
+    fn restart_stanza_rejects_unknown_process_manager() {
+        for pm in ["system", "systemctl", "supervisord", "PM3"] {
+            let err = restart_stanza(Some(pm), 3025)
+                .expect_err("unknown process_manager must be rejected");
+            let msg = err.to_string();
+            assert!(msg.contains(pm), "error names the offending value: {msg}");
+            assert!(msg.contains("systemd"), "error lists valid options: {msg}");
+        }
+    }
+
+    #[test]
+    fn restart_stanza_systemd_uses_user_unit_no_sudo() {
+        let s = restart_stanza(Some("systemd"), 3025).expect("systemd selector is valid");
+        assert!(s.contains("systemctl --user restart \"$UNIT\""));
+        assert!(s.contains("UNIT=\"$PM2_APP.service\""));
+        assert!(s.contains("XDG_RUNTIME_DIR=\"/run/user/$(id -u)\""));
+        // No sudo (git drives its own user manager) and no pm2 fallback.
+        assert!(!s.contains("sudo"), "must not require sudo");
+        assert!(!s.contains("pm2 "), "systemd path must not call pm2");
+        // Case-insensitive selector.
+        assert_eq!(s, restart_stanza(Some("SystemD"), 3025).unwrap());
+    }
 }

{smbcloud_cli-0.4.12 → smbcloud_cli-0.5.0}/crates/cli/src/cloud-deploy/process_migrate.rs

@@ -197,6 +197,7 @@ fn strip_project(project: &Project) -> Project {
         package_manager: None,
         pm2_app: None,
         pm2_env: None,
+        process_manager: None,
         port: None,
         shared_lib: None,
         compile_cmd: None,