From a92dfc3913d790e6f7676f5143c321aaa4f02102 Mon Sep 17 00:00:00 2001
From: LIghtJUNction <lightjunction.me@gmail.com>
Date: Wed, 18 Mar 2026 20:12:53 +0800
Subject: [PATCH] refactor: simplify cli initialization and uninstall messaging

---
 astrbot/cli/commands/cmd_init.py      |  2 +-
 astrbot/cli/commands/cmd_uninstall.py | 86 +++++++++------------------
 2 files changed, 28 insertions(+), 60 deletions(-)

diff --git a/astrbot/cli/commands/cmd_init.py b/astrbot/cli/commands/cmd_init.py
index 8d470f530..d0e2ea367 100644
--- a/astrbot/cli/commands/cmd_init.py
+++ b/astrbot/cli/commands/cmd_init.py
@@ -102,7 +102,7 @@ async def initialize_astrbot(
         else:
             await check_dashboard(astrbot_root)
     else:
-        click.echo("你可以使用在线面版（v4.14.4+），填写后端地址的方式来控制。")
+        click.echo("你可以使用在线面版（需支持配置后端）来控制。")
 
 
 @click.command()
diff --git a/astrbot/cli/commands/cmd_uninstall.py b/astrbot/cli/commands/cmd_uninstall.py
index cea900313..06e8b5340 100644
--- a/astrbot/cli/commands/cmd_uninstall.py
+++ b/astrbot/cli/commands/cmd_uninstall.py
@@ -1,7 +1,5 @@
 import os
-import platform
 import shutil
-import subprocess
 from pathlib import Path
 
 import click
@@ -15,65 +13,27 @@ from astrbot.core.utils.astrbot_path import astrbot_paths
     "--keep-data", is_flag=True, help="Keep data directory (config, plugins, etc.)"
 )
 def uninstall(yes: bool, keep_data: bool) -> None:
-    """Uninstall AstrBot systemd service and cleanup data"""
+    """Remove AstrBot files from the current root directory."""
 
     if os.environ.get("ASTRBOT_SYSTEMD") == "1":
         yes = True
 
-    # 1. Remove Systemd Service
-    if platform.system() == "Linux" and shutil.which("systemctl"):
-        service_path = Path.home() / ".config" / "systemd" / "user" / "astrbot.service"
-
-        if service_path.exists():
-            if yes or click.confirm(
-                "Detected AstrBot systemd service. Stop and remove it?",
-                default=True,
-            ):
-                try:
-                    if os.environ.get("ASTRBOT_SYSTEMD") != "1":
-                        click.echo("Stopping AstrBot service...")
-                        subprocess.run(
-                            ["systemctl", "--user", "stop", "astrbot"], check=False
-                        )
-                    else:
-                        click.echo(
-                            "Skipping stop service (running as systemd service)."
-                        )
-
-                    click.echo("Disabling AstrBot service...")
-                    subprocess.run(
-                        ["systemctl", "--user", "disable", "astrbot"], check=False
-                    )
-
-                    click.echo(f"Removing service file: {service_path}")
-                    service_path.unlink()
-
-                    click.echo("Reloading systemd daemon...")
-                    subprocess.run(["systemctl", "--user", "daemon-reload"], check=True)
-                    click.echo("Systemd service uninstalled.")
-
-                except subprocess.CalledProcessError as e:
-                    click.echo(f"Failed to remove systemd service: {e}", err=True)
-                except Exception as e:
-                    click.echo(
-                        f"An error occurred during service removal: {e}", err=True
-                    )
-
-    # 2. Remove Data
-    if keep_data:
-        click.echo("Skipping data removal as requested.")
-        return
-
-    # Helper paths
     dot_astrbot = astrbot_paths.root / ".astrbot"
     lock_file = astrbot_paths.root / "astrbot.lock"
     data_dir = astrbot_paths.data
+    removable_paths: list[Path] = [dot_astrbot, lock_file]
+
+    if not keep_data:
+        removable_paths.insert(0, data_dir)
 
     # Check if this looks like an AstrBot root before blowing things up
     if not dot_astrbot.exists() and not data_dir.exists():
         click.echo("No AstrBot initialization found in current directory.")
         return
 
+    if keep_data:
+        click.echo("Keeping data directory as requested.")
+
     if yes or click.confirm(
         f"Are you sure you want to remove AstrBot data at {astrbot_paths.root}? \n"
         f"This will delete:\n"
@@ -83,18 +43,26 @@ def uninstall(yes: bool, keep_data: bool) -> None:
         default=False,
         abort=True,
     ):
-        if data_dir.exists():
-            click.echo(f"Removing directory: {data_dir}")
-            shutil.rmtree(data_dir)
+        removed_any = False
+        for path in removable_paths:
+            if not path.exists():
+                continue
+            removed_any = True
+            if path.is_dir():
+                click.echo(f"Removing directory: {path}")
+                shutil.rmtree(path)
+            else:
+                click.echo(f"Removing file: {path}")
+                path.unlink()
 
-        if dot_astrbot.exists():
-            click.echo(f"Removing file: {dot_astrbot}")
-            dot_astrbot.unlink()
+        if removed_any:
+            click.echo("AstrBot files removed successfully.")
+        else:
+            click.echo("No removable AstrBot files were found.")
 
-        if lock_file.exists():
-            click.echo(f"Removing file: {lock_file}")
-            lock_file.unlink()
-
-        click.echo("AstrBot data removed successfully.")
+        # TODO: Consider adding an explicit `--service` cleanup mode instead of
+        # touching systemd or other service managers during normal uninstall.
+        # TODO: Consider adding package-manager-specific uninstall helpers once
+        # the CLI can reliably detect the installation source.
         click.echo("uv: uv tool uninstall astrbot")
         click.echo("paru/yay: paru -R astrbot")