From 8be724ce337c819017d535b1e9e97ca1adf8d85f Mon Sep 17 00:00:00 2001
From: wnlen <62139570+wnlen@users.noreply.github.com>
Date: Wed, 29 Apr 2026 17:06:59 +0800
Subject: [PATCH] optimize: fast enable proxy when runtime is already running

---
 scripts/core/alias.sh    |  1 -
 scripts/core/clashctl.sh | 12 +++++++-----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/scripts/core/alias.sh b/scripts/core/alias.sh
index 778f9f8..247925e 100644
--- a/scripts/core/alias.sh
+++ b/scripts/core/alias.sh
@@ -258,7 +258,6 @@ _clash_alias_auto_restore_proxy() {
   _clash_alias_persist_enabled || return 0
   _clash_alias_export_proxy || return 0
 
-  echo "♻️ 已恢复当前 shell 代理环境（来自持久化状态）"
   return 0
 }
 
diff --git a/scripts/core/clashctl.sh b/scripts/core/clashctl.sh
index 159b12c..7e58983 100644
--- a/scripts/core/clashctl.sh
+++ b/scripts/core/clashctl.sh
@@ -200,7 +200,7 @@ cmd_on() {
 
   prepare
 
-  # fast path：已经完全开启时，直接返回
+  # fast path 1：代理已经完整开启
   if status_is_running 2>/dev/null \
     && proxy_controller_reachable 2>/dev/null \
     && [ "$(system_proxy_status 2>/dev/null || echo off)" = "on" ] \
@@ -210,14 +210,17 @@ cmd_on() {
     return 0
   fi
 
-  ensure_on_path_ready
-
-  if [ "$already_on" = "true" ]; then
+  # fast path 2：runtime 已运行，只是系统代理被关了
+  if status_is_running 2>/dev/null \
+    && proxy_controller_reachable 2>/dev/null; then
+    system_proxy_enable || true
     print_on_feedback
     trap - ERR
     return 0
   fi
 
+  ensure_on_path_ready
+
   if status_is_running 2>/dev/null && ! proxy_controller_reachable 2>/dev/null; then
     ui_warn "检测到内核已运行但控制器不可访问，正在重启以加载当前配置"
     service_restart || die_state "控制器启动失败：内核重启未完成" "clashctl logs mihomo"
@@ -294,7 +297,6 @@ cmd_off() {
   local system_proxy_rc
 
   prepare
-  service_stop
 
   if system_proxy_disable; then
     :