diff --git a/firmware/CMakeLists.txt b/firmware/CMakeLists.txt
index dbe9da57..17330753 100644
--- a/firmware/CMakeLists.txt
+++ b/firmware/CMakeLists.txt
@@ -2,11 +2,22 @@
 # CMakeLists in this exact order for cmake to work correctly
 cmake_minimum_required(VERSION 3.16)
 
-set(PROJECT_VER "1.4.1")
+set(PROJECT_VER "1.5.1")
 add_definitions(-DFIRMWARE_VERSION=\"${PROJECT_VER}\")
 
 # Add this line to disable the specific warning
 add_compile_options(-Wno-missing-field-initializers)
 
+# Auto-load a local sdkconfig overlay (git-ignored) when present. Lets
+# self-hosted / custom deployments pin CONFIG_STACKCHAN_SERVER_URL,
+# CONFIG_OTA_URL, etc. without touching committed defaults.
+# Manual equivalent: SDKCONFIG_DEFAULTS="sdkconfig.defaults;sdkconfig.defaults.local" idf.py build
+if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/sdkconfig.defaults.local")
+    set(SDKCONFIG_DEFAULTS
+        "${CMAKE_CURRENT_SOURCE_DIR}/sdkconfig.defaults;${CMAKE_CURRENT_SOURCE_DIR}/sdkconfig.defaults.local"
+        CACHE STRING "ESP-IDF sdkconfig default files (auto-extended with local overlay)" FORCE)
+    message(STATUS "StackChan: detected sdkconfig.defaults.local, applying overlay")
+endif()
+
 include($ENV{IDF_PATH}/tools/cmake/project.cmake)
 project(stack-chan)
diff --git a/firmware/README.md b/firmware/README.md
index ffc20f2f..20a73bf6 100644
--- a/firmware/README.md
+++ b/firmware/README.md
@@ -17,6 +17,16 @@ python3 ./fetch_repos.py
 idf.py build
 ```
 
+### Host-side tests
+
+The motion coordinate helpers can be tested without ESP-IDF hardware:
+
+```bash
+cmake -S tests -B build-host-tests
+cmake --build build-host-tests
+ctest --test-dir build-host-tests --output-on-failure
+```
+
 ### Flash
 
 ```bash
diff --git a/firmware/main/Kconfig.projbuild b/firmware/main/Kconfig.projbuild
index 304e48d8..89592a0c 100644
--- a/firmware/main/Kconfig.projbuild
+++ b/firmware/main/Kconfig.projbuild
@@ -1,3 +1,16 @@
+menu "StackChan Server"
+
+config STACKCHAN_SERVER_URL
+    string "StackChan server base URL"
+    default "http://47.113.125.164:12800"
+    help
+        Base URL (scheme + host + port, no trailing slash) of the StackChan backend.
+        The HAL composes endpoint paths like /stackChan/device/user,
+        /stackChan/apps and /stackChan/ws from this base. Override in your
+        sdkconfig.defaults.local to point at a self-hosted deployment.
+
+endmenu
+
 menu "Xiaozhi Assistant"
 
 config OTA_URL
diff --git a/firmware/main/apps/app_setup/workers/ai_agent.cpp b/firmware/main/apps/app_setup/workers/ai_agent.cpp
index 1b0710aa..3f713d95 100644
--- a/firmware/main/apps/app_setup/workers/ai_agent.cpp
+++ b/firmware/main/apps/app_setup/workers/ai_agent.cpp
@@ -207,9 +207,36 @@ XiaozhiGeneralWorker::XiaozhiGeneralWorker()
     _slider_idle_motion->setValue(current_index);
     _slider_idle_motion->onValueChanged().connect([this](int32_t value) { _pending_idle_motion_index = value; });
 
+    _panel_startup = std::make_unique<Container>(_panel->get());
+    _panel_startup->setSize(296, 120);
+    _panel_startup->align(LV_ALIGN_TOP_MID, 0, 196);
+    _panel_startup->setBgColor(lv_color_hex(0xD2E3FF));
+    _panel_startup->setBorderWidth(0);
+    _panel_startup->setRadius(18);
+    _panel_startup->setPadding(0, 0, 0, 0);
+    _panel_startup->removeFlag(LV_OBJ_FLAG_SCROLLABLE);
+
+    _label_startup_title = std::make_unique<Label>(_panel_startup->get());
+    _label_startup_title->setText("Start AI Agent on boot:");
+    _label_startup_title->setTextFont(&lv_font_montserrat_16);
+    _label_startup_title->setTextColor(lv_color_hex(0x26206A));
+    _label_startup_title->setWidth(260);
+    _label_startup_title->setTextAlign(LV_TEXT_ALIGN_CENTER);
+    _label_startup_title->align(LV_ALIGN_TOP_MID, 0, 18);
+
+    _switch_start_ai_on_boot = std::make_unique<Switch>(_panel_startup->get());
+    _switch_start_ai_on_boot->setSize(64, 36);
+    _switch_start_ai_on_boot->align(LV_ALIGN_TOP_MID, 0, 66);
+    _switch_start_ai_on_boot->setBgColor(lv_color_hex(0xB8D3FD), LV_PART_MAIN);
+    _switch_start_ai_on_boot->setBgColor(lv_color_hex(0x615B9E), LV_PART_INDICATOR | LV_STATE_CHECKED);
+    _switch_start_ai_on_boot->setBgColor(lv_color_hex(0xFFFFFF), LV_PART_KNOB);
+    if (_config.startAiAgentOnBoot) {
+        _switch_start_ai_on_boot->addState(LV_STATE_CHECKED);
+    }
+
     _btn_confirm = std::make_unique<Button>(_panel->get());
     apply_button_common_style(*_btn_confirm);
-    _btn_confirm->align(LV_ALIGN_TOP_MID, 0, 196);
+    _btn_confirm->align(LV_ALIGN_TOP_MID, 0, 326);
     _btn_confirm->setSize(290, 50);
     _btn_confirm->label().setText("Confirm");
     _btn_confirm->onClick().connect([this]() { _confirm_flag = true; });
@@ -227,6 +254,7 @@ void XiaozhiGeneralWorker::update()
 
     if (_confirm_flag) {
         _confirm_flag = false;
+        _config.startAiAgentOnBoot = _switch_start_ai_on_boot->getValue();
         GetHAL().setXiaozhiConfig(_config);
         mclog::tagInfo(_tag, "xiaozhi config updated: idleRandomMovementLevel={} ({})", _config.idleRandomMovementLevel,
                        _idle_motion_level_labels[_config.idleRandomMovementLevel]);
diff --git a/firmware/main/apps/app_setup/workers/workers.h b/firmware/main/apps/app_setup/workers/workers.h
index ea5b5f3d..a48a2511 100644
--- a/firmware/main/apps/app_setup/workers/workers.h
+++ b/firmware/main/apps/app_setup/workers/workers.h
@@ -341,9 +341,12 @@ class XiaozhiGeneralWorker : public WorkerBase {
 
     std::unique_ptr<uitk::lvgl_cpp::Container> _panel;
     std::unique_ptr<uitk::lvgl_cpp::Container> _panel_general;
+    std::unique_ptr<uitk::lvgl_cpp::Container> _panel_startup;
     std::unique_ptr<uitk::lvgl_cpp::Label> _label_idle_motion_title;
     std::unique_ptr<uitk::lvgl_cpp::Label> _label_idle_motion_value;
     std::unique_ptr<uitk::lvgl_cpp::Slider> _slider_idle_motion;
+    std::unique_ptr<uitk::lvgl_cpp::Label> _label_startup_title;
+    std::unique_ptr<uitk::lvgl_cpp::Switch> _switch_start_ai_on_boot;
     std::unique_ptr<uitk::lvgl_cpp::Button> _btn_confirm;
 
     XiaozhiConfig_t _config;
diff --git a/firmware/main/hal/board/hal_bridge.cc b/firmware/main/hal/board/hal_bridge.cc
index 6ea7fb16..93eb6399 100644
--- a/firmware/main/hal/board/hal_bridge.cc
+++ b/firmware/main/hal/board/hal_bridge.cc
@@ -24,6 +24,7 @@ static constexpr std::string_view _xiaozhi_config_nvs_ns
 static constexpr std::string_view _xiaozhi_config_idle_shutdown_time_key           = "idle_sec";
 static constexpr std::string_view _xiaozhi_config_allow_shutdown_when_charging_key = "ext_pwr";
 static constexpr std::string_view _xiaozhi_config_idle_random_movement_key         = "idle_lv";
+static constexpr std::string_view _xiaozhi_config_start_ai_agent_on_boot_key       = "boot_ai";
 
 namespace hal_bridge {
 
@@ -129,6 +130,8 @@ XiaozhiConfig_t get_xiaozhi_config()
         settings.GetBool(_xiaozhi_config_allow_shutdown_when_charging_key.data(), config.allowShutdownWhenCharging);
     config.idleRandomMovementLevel =
         settings.GetInt(_xiaozhi_config_idle_random_movement_key.data(), config.idleRandomMovementLevel);
+    config.startAiAgentOnBoot =
+        settings.GetBool(_xiaozhi_config_start_ai_agent_on_boot_key.data(), config.startAiAgentOnBoot);
 
     return config;
 }
@@ -139,6 +142,7 @@ void set_xiaozhi_config(const XiaozhiConfig_t& config)
     settings.SetInt(_xiaozhi_config_idle_shutdown_time_key.data(), config.idleShutdownTimeSeconds);
     settings.SetBool(_xiaozhi_config_allow_shutdown_when_charging_key.data(), config.allowShutdownWhenCharging);
     settings.SetInt(_xiaozhi_config_idle_random_movement_key.data(), config.idleRandomMovementLevel);
+    settings.SetBool(_xiaozhi_config_start_ai_agent_on_boot_key.data(), config.startAiAgentOnBoot);
 }
 
 void app_play_sound(const std::string_view& sound)
diff --git a/firmware/main/hal/board/hal_bridge.h b/firmware/main/hal/board/hal_bridge.h
index ee3f6bd0..aab08f04 100644
--- a/firmware/main/hal/board/hal_bridge.h
+++ b/firmware/main/hal/board/hal_bridge.h
@@ -28,6 +28,7 @@ struct XiaozhiConfig_t {
     uint32_t idleShutdownTimeSeconds = 600;
     bool allowShutdownWhenCharging   = false;
     uint8_t idleRandomMovementLevel  = 2;
+    bool startAiAgentOnBoot          = false;
 };
 
 void lock();
diff --git a/firmware/main/hal/board/stackchan.cc b/firmware/main/hal/board/stackchan.cc
index 7349b145..88963ffe 100644
--- a/firmware/main/hal/board/stackchan.cc
+++ b/firmware/main/hal/board/stackchan.cc
@@ -24,6 +24,51 @@
 
 #define XPOWERS_AXP2101_ICC_CHG_SET (0x62)
 
+namespace {
+
+struct LcdInitCommand {
+    uint8_t command;
+    uint8_t data[15];
+    uint8_t data_size;
+    uint16_t delay_ms;
+};
+
+constexpr LcdInitCommand kIli9342eInitCommands[] = {
+    {0xDD, {0x01}, 1, 0},
+    {0x3A, {0x55}, 1, 0},
+    {0x21, {}, 0, 0},
+    {0x36, {0x08}, 1, 0},
+    {0xD5, {0x00}, 1, 0},
+    {0xB1, {0x22}, 1, 0},
+    {0xC8, {0x38}, 1, 0},
+    {0xCB, {0x1C}, 1, 0},
+    {0xC9, {0x1A}, 1, 0},
+    {0xCA, {0x1A}, 1, 0},
+    {0xB7, {0x5A, 0x41, 0x11, 0x19}, 4, 0},
+    {0xE4, {0x04, 0x08, 0x11, 0x06, 0x12, 0x07, 0x3A, 0x76, 0x47, 0x07, 0x0F, 0x0A, 0x11, 0x19, 0x05}, 15, 0},
+    {0xE5, {0x02, 0x03, 0x07, 0x06, 0x12, 0x07, 0x36, 0x5F, 0x48, 0x06, 0x10, 0x0C, 0x16, 0x14, 0x09}, 15, 0},
+    {0x11, {}, 0, 120},
+    {0x29, {}, 0, 120},
+};
+
+esp_err_t ApplyIli9342eInit(esp_lcd_panel_io_handle_t panel_io)
+{
+    for (const auto& init_command : kIli9342eInitCommands) {
+        const void* data = init_command.data_size == 0 ? nullptr : init_command.data;
+        esp_err_t err    = esp_lcd_panel_io_tx_param(panel_io, init_command.command, data, init_command.data_size);
+        if (err != ESP_OK) {
+            ESP_LOGE(TAG, "ILI9342E command 0x%02X failed: %s", init_command.command, esp_err_to_name(err));
+            return err;
+        }
+        if (init_command.delay_ms != 0) {
+            vTaskDelay(pdMS_TO_TICKS(init_command.delay_ms));
+        }
+    }
+    return ESP_OK;
+}
+
+}  // namespace
+
 class Pmic : public Axp2101 {
 public:
     /**
@@ -177,6 +222,12 @@ class Aw9523 : public I2cDevice {
 
 class Ft6336 : public I2cDevice {
 public:
+    struct ControllerVersion {
+        uint8_t cipher  = 0;
+        uint8_t firm_id = 0;
+        uint8_t vendor  = 0;
+    };
+
     struct TouchPoint_t {
         int num = 0;
         int x   = -1;
@@ -185,8 +236,6 @@ class Ft6336 : public I2cDevice {
 
     Ft6336(i2c_master_bus_handle_t i2c_bus, uint8_t addr) : I2cDevice(i2c_bus, addr)
     {
-        uint8_t chip_id = ReadReg(0xA3);
-        ESP_LOGI(TAG, "Get chip ID: 0x%02X", chip_id);
         read_buffer_ = new uint8_t[6];
     }
 
@@ -195,6 +244,34 @@ class Ft6336 : public I2cDevice {
         delete[] read_buffer_;
     }
 
+    bool ReadControllerVersion(ControllerVersion& version)
+    {
+        constexpr int kMaxAttempts  = 5;
+        constexpr int kRetryDelayMs = 20;
+
+        version = {};
+        for (int attempt = 0; attempt < kMaxAttempts; ++attempt) {
+            const uint8_t work_mode[] = {0x00, 0x00};
+            uint8_t info[6]           = {};
+            esp_err_t err             = i2c_master_transmit(i2c_device_, work_mode, sizeof(work_mode), 100);
+            if (err == ESP_OK) {
+                err = TryReadRegs(0xA3, info, sizeof(info));
+            }
+
+            if (err == ESP_OK && info[0] != 0 && info[5] != 0) {
+                version.cipher  = info[0];
+                version.firm_id = info[3];
+                version.vendor  = info[5];
+                return true;
+            }
+
+            if (attempt + 1 < kMaxAttempts) {
+                vTaskDelay(pdMS_TO_TICKS(kRetryDelayMs));
+            }
+        }
+        return false;
+    }
+
     bool UpdateTouchPoint()
     {
         auto err = TryReadRegs(0x02, read_buffer_, 6);
@@ -371,11 +448,14 @@ class M5StackCoreS3Board : public WifiBoard {
         hal_bridge::set_touch_point(touch_point.num, touch_point.x, touch_point.y);
     }
 
-    void InitializeFt6336TouchPad()
+    void InitializeFt6336()
     {
         ESP_LOGI(TAG, "Init FT6336");
         ft6336_ = new Ft6336(i2c_bus_, 0x38);
+    }
 
+    void StartTouchpadTimer()
+    {
         // 创建定时器，20ms 间隔
         esp_timer_create_args_t timer_args = {
             .callback =
@@ -435,6 +515,22 @@ class M5StackCoreS3Board : public WifiBoard {
         aw9523_->ResetIli9342();
 
         esp_lcd_panel_init(panel);
+
+        Ft6336::ControllerVersion touch_version;
+        const bool touch_version_valid = ft6336_->ReadControllerVersion(touch_version);
+        const bool is_ili9342e = touch_version_valid && touch_version.firm_id == 0x12 && touch_version.vendor == 0x11;
+        if (touch_version_valid) {
+            ESP_LOGI(TAG, "CIPHER:0x%02X / FIRMID:0x%02X / VENDID:0x%02X, panel:%s", touch_version.cipher,
+                     touch_version.firm_id, touch_version.vendor, is_ili9342e ? "ILI9342E" : "ILI9342C");
+        } else {
+            ESP_LOGW(TAG, "FT6336 version read failed, panel:ILI9342C");
+        }
+
+        if (is_ili9342e) {
+            ESP_LOGI(TAG, "Apply ILI9342E panel initialization");
+            ESP_ERROR_CHECK(ApplyIli9342eInit(panel_io));
+        }
+
         esp_lcd_panel_invert_color(panel, true);
         esp_lcd_panel_swap_xy(panel, DISPLAY_SWAP_XY);
         esp_lcd_panel_mirror(panel, DISPLAY_MIRROR_X, DISPLAY_MIRROR_Y);
@@ -498,10 +594,11 @@ class M5StackCoreS3Board : public WifiBoard {
         InitializePowerSaveTimer();
         InitializeAw9523();
         I2cDetect();
+        InitializeFt6336();
         InitializeSpi();
         InitializeIli9342Display();
         InitializeCamera();
-        InitializeFt6336TouchPad();
+        StartTouchpadTimer();
         GetBacklight()->RestoreBrightness();
     }
 
diff --git a/firmware/main/hal/board/stackchan_display.cc b/firmware/main/hal/board/stackchan_display.cc
index e280eeb7..7459888a 100644
--- a/firmware/main/hal/board/stackchan_display.cc
+++ b/firmware/main/hal/board/stackchan_display.cc
@@ -254,7 +254,14 @@ void StackChanAvatarDisplay::SetupUI()
     auto avatar = std::make_unique<DefaultAvatar>();
     avatar->init(lv_screen_active());
     avatar->getPanel()->onClick().connect([]() {
+        static uint32_t last_toggle_tick = 0;
+        const uint32_t now               = GetHAL().millis();
+        if (last_toggle_tick != 0 && now - last_toggle_tick < 2000) {
+            return;
+        }
+
         if (hal_bridge::is_xiaozhi_ready()) {
+            last_toggle_tick = now;
             hal_bridge::toggle_xiaozhi_chat_state();
         }
     });
diff --git a/firmware/main/hal/hal.cpp b/firmware/main/hal/hal.cpp
index fded31db..3ca8a143 100644
--- a/firmware/main/hal/hal.cpp
+++ b/firmware/main/hal/hal.cpp
@@ -209,6 +209,7 @@ XiaozhiConfig_t Hal::getXiaozhiConfig()
         .idleShutdownTimeSeconds   = bridge_config.idleShutdownTimeSeconds,
         .allowShutdownWhenCharging = bridge_config.allowShutdownWhenCharging,
         .idleRandomMovementLevel   = bridge_config.idleRandomMovementLevel,
+        .startAiAgentOnBoot        = bridge_config.startAiAgentOnBoot,
     };
 }
 
@@ -218,6 +219,7 @@ void Hal::setXiaozhiConfig(XiaozhiConfig_t config)
         .idleShutdownTimeSeconds   = config.idleShutdownTimeSeconds,
         .allowShutdownWhenCharging = config.allowShutdownWhenCharging,
         .idleRandomMovementLevel   = config.idleRandomMovementLevel,
+        .startAiAgentOnBoot        = config.startAiAgentOnBoot,
     });
 }
 
diff --git a/firmware/main/hal/hal.h b/firmware/main/hal/hal.h
index 5f9efcf5..b8d3c80f 100644
--- a/firmware/main/hal/hal.h
+++ b/firmware/main/hal/hal.h
@@ -118,6 +118,7 @@ struct XiaozhiConfig_t {
     uint32_t idleShutdownTimeSeconds = 600;
     bool allowShutdownWhenCharging   = false;
     uint8_t idleRandomMovementLevel  = 2;
+    bool startAiAgentOnBoot          = false;
 };
 
 /**
diff --git a/firmware/main/hal/hal_account.cpp b/firmware/main/hal/hal_account.cpp
index f87d83e6..b953d27c 100644
--- a/firmware/main/hal/hal_account.cpp
+++ b/firmware/main/hal/hal_account.cpp
@@ -17,9 +17,20 @@ static const std::string_view _setting_ns              = "account";
 static const std::string_view _setting_username_key    = "username";
 static const std::string_view _setting_device_name_key = "device_name";
 
-static const std::string_view _get_user_account_info_url    = "http://47.113.125.164:12800/stackChan/device/user";
-static const std::string_view _get_device_info_url          = "http://47.113.125.164:12800/stackChan/device/info";
-static const std::string_view _unbind_user_account_info_url = "http://47.113.125.164:12800/stackChan/device/unbind";
+static std::string get_user_account_info_url()
+{
+    return secret_logic::get_server_url() + "/stackChan/device/user";
+}
+
+static std::string get_device_info_url()
+{
+    return secret_logic::get_server_url() + "/stackChan/device/info";
+}
+
+static std::string get_unbind_user_account_info_url()
+{
+    return secret_logic::get_server_url() + "/stackChan/device/unbind";
+}
 
 static bool request_authorized_get(std::string_view token, std::string_view url, std::string &response,
                                    std::function<void(std::string_view)> onLog)
@@ -58,7 +69,8 @@ static bool fetch_username(std::string_view token, std::string &username, std::f
     onLog("Updating user account info...");
 
     std::string response;
-    if (!request_authorized_get(token, _get_user_account_info_url, response, onLog)) {
+    const std::string url = get_user_account_info_url();
+    if (!request_authorized_get(token, url, response, onLog)) {
         return false;
     }
 
@@ -101,7 +113,8 @@ static bool fetch_device_name(std::string_view token, std::string &deviceName,
     onLog("Updating device info...");
 
     std::string response;
-    if (!request_authorized_get(token, _get_device_info_url, response, onLog)) {
+    const std::string url = get_device_info_url();
+    if (!request_authorized_get(token, url, response, onLog)) {
         return false;
     }
 
@@ -193,7 +206,7 @@ bool Hal::unbindAccount(std::function<void(std::string_view)> onLog)
     mclog::tagInfo(_tag, "requesting to unbind account...");
     onLog("Unbinding account...");
 
-    if (!http->Open("POST", std::string(_unbind_user_account_info_url))) {
+    if (!http->Open("POST", get_unbind_user_account_info_url())) {
         mclog::tagError(_tag, "failed to open http request");
         onLog("Failed to connect to server");
         return false;
diff --git a/firmware/main/hal/hal_app_center.cpp b/firmware/main/hal/hal_app_center.cpp
index 5dedc047..2dd1e497 100644
--- a/firmware/main/hal/hal_app_center.cpp
+++ b/firmware/main/hal/hal_app_center.cpp
@@ -5,6 +5,7 @@
  */
 #include "hal.h"
 #include "utils/ota/ota.h"
+#include "utils/secret_logic/secret_logic.h"
 #include <mooncake_log.h>
 #include <memory>
 #include <board.h>
@@ -12,7 +13,10 @@
 
 static const std::string_view _tag = "HAL-AppCenter";
 
-static const std::string_view _app_info_list_url = "http://47.113.125.164:12800/stackChan/apps";
+static std::string get_app_info_list_url()
+{
+    return secret_logic::get_server_url() + "/stackChan/apps";
+}
 
 static const char *get_json_string(cJSON *item, std::initializer_list<const char *> keys)
 {
@@ -33,7 +37,7 @@ app_center::AppInfoList_t Hal::fetchAppList()
     auto network = board.GetNetwork();
 
     auto http = network->CreateHttp(0);
-    if (!http->Open("GET", std::string(_app_info_list_url))) {
+    if (!http->Open("GET", get_app_info_list_url())) {
         mclog::tagError(_tag, "failed to open http connection");
         return app_list;
     }
diff --git a/firmware/main/hal/hal_ble.cpp b/firmware/main/hal/hal_ble.cpp
index ead2a0a5..57df760b 100644
--- a/firmware/main/hal/hal_ble.cpp
+++ b/firmware/main/hal/hal_ble.cpp
@@ -7,38 +7,294 @@
 #include "utils/bleprph/bleprph.h"
 #include "utils/secret_logic/secret_logic.h"
 #include <ArduinoJson.hpp>
+#include <algorithm>
+#include <cstdint>
 #include <mooncake_log.h>
 #include <mooncake.h>
 #include <settings.h>
 #include <esp_mac.h>
 
-static const std::string_view _tag = "HAL-BLE";
+static const std::string_view _tag              = "HAL-BLE";
+static const uint8_t _ble_fragment_magic0       = 0xAA;
+static const uint8_t _ble_fragment_magic1       = 0x55;
+static const uint8_t _ble_fragment_magic2       = 0xC3;
+static const uint8_t _ble_fragment_version      = 1;
+static const uint16_t _ble_fragment_header_len  = 10;
+static const uint16_t _ble_fallback_payload_len = 20;
+static uint16_t _ble_dynamic_payload            = _ble_fallback_payload_len;
+
+using BleNotifyCallback = int (*)(const char*, uint16_t);
+
+static void _recordIncomingWritePayload(uint16_t len)
+{
+    if (len > _ble_dynamic_payload && len <= STACKCHAN_MAX_JSON_LEN) {
+        _ble_dynamic_payload = len;
+    }
+}
+
+static bool _sendFragmentedNotify(BleNotifyCallback notify, const char* json_data, uint16_t json_len, const char* tag)
+{
+    const uint16_t usable_payload = _ble_dynamic_payload;
+
+    if (json_data == nullptr || json_len == 0) {
+        return true;
+    }
+
+    if (json_len > STACKCHAN_MAX_JSON_LEN) {
+        mclog::tagWarn(_tag, "{} payload exceed max len: {}", tag, json_len);
+        return false;
+    }
+
+    if (json_len <= usable_payload) {
+        return notify(json_data, json_len) == 0;
+    }
+
+    if (usable_payload <= _ble_fragment_header_len) {
+        mclog::tagWarn(_tag, "{} mtu payload too small for fragmentation", tag);
+        return false;
+    }
+
+    const uint16_t max_chunk_payload = usable_payload - _ble_fragment_header_len;
+    const uint16_t total_packets     = (json_len + max_chunk_payload - 1) / max_chunk_payload;
+
+    if (total_packets == 0) {
+        mclog::tagWarn(_tag, "{} invalid packet count", tag);
+        return false;
+    }
+
+    mclog::tagInfo(_tag, "{} fragmented notify: total={}, mtu_payload={}, chunk_payload={}, packets={}", tag, json_len,
+                   usable_payload, max_chunk_payload, total_packets);
+
+    for (uint16_t idx = 0; idx < total_packets; idx++) {
+        const uint16_t start     = idx * max_chunk_payload;
+        const uint16_t chunk_len = std::min<uint16_t>(max_chunk_payload, json_len - start);
+
+        std::string packet;
+        packet.reserve(_ble_fragment_header_len + chunk_len);
+        packet.push_back(static_cast<char>(_ble_fragment_magic0));
+        packet.push_back(static_cast<char>(_ble_fragment_magic1));
+        packet.push_back(static_cast<char>(_ble_fragment_magic2));
+        packet.push_back(static_cast<char>(_ble_fragment_version));
+
+        packet.push_back(static_cast<char>((idx >> 8) & 0xFF));
+        packet.push_back(static_cast<char>(idx & 0xFF));
+        packet.push_back(static_cast<char>((total_packets >> 8) & 0xFF));
+        packet.push_back(static_cast<char>(total_packets & 0xFF));
+        packet.push_back(static_cast<char>((json_len >> 8) & 0xFF));
+        packet.push_back(static_cast<char>(json_len & 0xFF));
+
+        packet.append(json_data + start, json_data + start + chunk_len);
+
+        if (notify(packet.data(), static_cast<uint16_t>(packet.size())) != 0) {
+            mclog::tagWarn(_tag, "{} fragmented notify failed at packet={}", tag, idx);
+            return false;
+        }
+    }
+
+    return true;
+}
+
+class BleFragmentAssembler {
+public:
+    bool consume(const char* data, uint16_t len, std::string& out_data, uint16_t& out_len)
+    {
+        if (!isFragmentFrame(data, len)) {
+            out_data.assign(data, data + len);
+            reset();
+            out_len = len;
+            return true;
+        }
+
+        const auto* raw              = reinterpret_cast<const uint8_t*>(data);
+        const uint16_t packet_index  = (uint16_t(raw[4]) << 8) | uint16_t(raw[5]);
+        const uint16_t total_packets = (uint16_t(raw[6]) << 8) | uint16_t(raw[7]);
+        const uint16_t total_len     = (uint16_t(raw[8]) << 8) | uint16_t(raw[9]);
+        const uint16_t payload_len   = len - _ble_fragment_header_len;
+
+        if (total_packets == 0 || total_len == 0 || total_len > STACKCHAN_MAX_JSON_LEN) {
+            mclog::tagWarn(_tag, "ignore invalid fragment header: total_packets={}, total_len={}", total_packets,
+                           total_len);
+            reset();
+            return false;
+        }
+
+        if (!_assembling) {
+            if (packet_index != 0) {
+                mclog::tagWarn(_tag, "unexpected fragment index {}", packet_index);
+                return false;
+            }
+            start(total_len, total_packets);
+        } else if (packet_index == 0) {
+            // Allow the sender to resend the first packet and restart assembly.
+            start(total_len, total_packets);
+        } else if (packet_index != _expected_packet_index || total_packets != _expected_total_packets ||
+                   total_len != _expected_total_len) {
+            mclog::tagWarn(_tag, "fragment sequence mismatch: idx={} expected={}", packet_index,
+                           _expected_packet_index);
+            reset();
+            return false;
+        }
+
+        if (payload_len == 0) {
+            if (_expected_total_packets > 1) {
+                mclog::tagWarn(_tag, "empty fragment payload, total_packets={}", total_packets);
+                reset();
+                return false;
+            }
+            out_data = "";
+            out_len  = 0;
+            reset();
+            return true;
+        }
+
+        if (_buffer.size() + payload_len > _expected_total_len) {
+            mclog::tagWarn(_tag, "fragment payload overflow: idx={} expected_len={} current_len={} frag_len={}",
+                           packet_index, _expected_total_len, _buffer.size(), payload_len);
+            reset();
+            return false;
+        }
+
+        _buffer.append(reinterpret_cast<const char*>(raw + _ble_fragment_header_len), payload_len);
+        _expected_packet_index++;
+
+        if (_expected_packet_index < _expected_total_packets) {
+            if (_buffer.size() < _expected_total_len) {
+                return false;
+            }
+            mclog::tagWarn(_tag, "fragment frame too short before completion: expected_len={} received={}",
+                           _expected_total_len, _buffer.size());
+            reset();
+            return false;
+        }
+
+        if (_buffer.size() != _expected_total_len) {
+            mclog::tagWarn(_tag, "fragmented frame incomplete: expected={}, received={}", _expected_total_len,
+                           _buffer.size());
+            reset();
+            return false;
+        }
+
+        _buffer.push_back('\0');
+        out_data = _buffer.substr(0, _expected_total_len);
+        out_len  = _expected_total_len;
+        reset();
+        return true;
+    }
+
+private:
+    bool isFragmentFrame(const char* data, uint16_t len) const
+    {
+        if (len <= _ble_fragment_header_len || data == nullptr) {
+            return false;
+        }
+
+        const auto* raw = reinterpret_cast<const uint8_t*>(data);
+        return raw[0] == _ble_fragment_magic0 && raw[1] == _ble_fragment_magic1 && raw[2] == _ble_fragment_magic2 &&
+               raw[3] == _ble_fragment_version;
+    }
+
+    void start(uint16_t total_len, uint16_t total_packets)
+    {
+        _assembling             = true;
+        _expected_total_len     = total_len;
+        _expected_total_packets = total_packets;
+        _expected_packet_index  = 0;
+        _buffer.clear();
+        _buffer.reserve(total_len);
+    }
+
+    void reset()
+    {
+        _assembling             = false;
+        _expected_total_len     = 0;
+        _expected_total_packets = 0;
+        _expected_packet_index  = 0;
+        _buffer.clear();
+    }
+
+    bool _assembling                 = false;
+    uint16_t _expected_total_len     = 0;
+    uint16_t _expected_total_packets = 0;
+    uint16_t _expected_packet_index  = 0;
+    std::string _buffer;
+};
+
+static BleFragmentAssembler _motion_assembler;
+static BleFragmentAssembler _avatar_assembler;
+static BleFragmentAssembler _config_assembler;
+static BleFragmentAssembler _rgb_assembler;
+static std::string _motion_payload_cache;
+static std::string _avatar_payload_cache;
+static std::string _config_payload_cache;
+static std::string _rgb_payload_cache;
+
+static const char* _cachePayload(std::string& cache, const std::string& payload)
+{
+    cache = payload;
+    return cache.c_str();
+}
 
 static int _handle_ble_motion_write(const char* json_data, uint16_t len, uint16_t conn_handle)
 {
-    // mclog::tagInfo(_tag, "on motion:\n{}", json_data);
-    GetHAL().onBleMotionData.emit(json_data);
+    std::string payload;
+    uint16_t payload_len = len;
+    (void)conn_handle;
+    _recordIncomingWritePayload(len);
+    if (!_motion_assembler.consume(json_data, len, payload, payload_len)) {
+        return 0;
+    }
+    if (payload_len == 0) {
+        return 0;
+    }
+    GetHAL().onBleMotionData.emit(_cachePayload(_motion_payload_cache, payload));
     return 0;
 }
 
 static int _handle_ble_avatar_write(const char* json_data, uint16_t len, uint16_t conn_handle)
 {
-    // mclog::tagInfo(_tag, "on avatar:\n{}", json_data);
-    GetHAL().onBleAvatarData.emit(json_data);
+    std::string payload;
+    uint16_t payload_len = len;
+    (void)conn_handle;
+    _recordIncomingWritePayload(len);
+    if (!_avatar_assembler.consume(json_data, len, payload, payload_len)) {
+        return 0;
+    }
+    if (payload_len == 0) {
+        return 0;
+    }
+    GetHAL().onBleAvatarData.emit(_cachePayload(_avatar_payload_cache, payload));
     return 0;
 }
 
 static int _handle_ble_config_write(const char* json_data, uint16_t len, uint16_t conn_handle)
 {
-    // mclog::tagInfo(_tag, "on config:\n{}", json_data);
-    GetHAL().onBleConfigData.emit(json_data);
+    std::string payload;
+    uint16_t payload_len = len;
+    (void)conn_handle;
+    _recordIncomingWritePayload(len);
+    if (!_config_assembler.consume(json_data, len, payload, payload_len)) {
+        return 0;
+    }
+    if (payload_len == 0) {
+        return 0;
+    }
+    GetHAL().onBleConfigData.emit(_cachePayload(_config_payload_cache, payload));
     return 0;
 }
 
 static int _handle_ble_rgb_write(const char* json_data, uint16_t len, uint16_t conn_handle)
 {
-    // mclog::tagInfo(_tag, "on rgb:\n{}", json_data);
-    GetHAL().onBleRgbData.emit(json_data);
+    std::string payload;
+    uint16_t payload_len = len;
+    (void)conn_handle;
+    _recordIncomingWritePayload(len);
+    if (!_rgb_assembler.consume(json_data, len, payload, payload_len)) {
+        return 0;
+    }
+    if (payload_len == 0) {
+        return 0;
+    }
+    GetHAL().onBleRgbData.emit(_cachePayload(_rgb_payload_cache, payload));
     return 0;
 }
 
@@ -238,7 +494,16 @@ class WifiConfigServer {
 
         std::string json_str;
         ArduinoJson::serializeJson(doc, json_str);
-        stackchan_ble_notify_config(json_str.c_str(), json_str.length());
+        if (json_str.length() > UINT16_MAX) {
+            mclog::tagWarn(_tag, "Config notify payload too large: {}", json_str.length());
+            return;
+        }
+
+        const auto notify_ok = _sendFragmentedNotify(stackchan_ble_notify_config, json_str.c_str(),
+                                                     static_cast<uint16_t>(json_str.length()), "Config notify");
+        if (!notify_ok) {
+            mclog::tagWarn(_tag, "Config notify fragmented send failed");
+        }
     }
 };
 
diff --git a/firmware/main/hal/hal_servo.cpp b/firmware/main/hal/hal_servo.cpp
index ff81a746..a2429e29 100644
--- a/firmware/main/hal/hal_servo.cpp
+++ b/firmware/main/hal/hal_servo.cpp
@@ -23,18 +23,20 @@ struct ServoConfig_t {
     std::string settingNs;
     std::string settingZeroPositionKey;
     bool enablePwmMode = false;
+    bool enableStallProtection = false;
 };
 
 class ScsServo : public Servo {
 public:
     static inline const std::string _tag = "ScsServo";
 
-    ScsServo(const ServoConfig_t& config) : _config(config)
+    ScsServo(const ServoConfig_t& config) : _config(config), _runtime_raw_pos_limit(config.rawPosLimit)
     {
     }
 
     void init() override
     {
+        reset_runtime_limits();
         set_angle_limit(_config.angleLimit);
         get_zero_pos_from_nvs();
         Servo::init();
@@ -72,10 +74,14 @@ class ScsServo : public Servo {
     void set_angle_impl(int angle) override
     {
         int mapped_angle = _zero_pos + angle * 16 / 5 / 10;  // 一步对应 0.3125度, 0.3125 = 5/16
-        mapped_angle     = uitk::clamp(mapped_angle, _config.rawPosLimit.x, _config.rawPosLimit.y);
+        mapped_angle     = uitk::clamp(mapped_angle, _runtime_raw_pos_limit.x, _runtime_raw_pos_limit.y);
 
         // mclog::tagInfo(_tag, "id: {} mapped angle: {}", _id, mapped_angle);
 
+        if (update_stall_protection(mapped_angle)) {
+            return;
+        }
+
         check_mode(Mode::Position);
         _scs_bus.WritePos(_config.id, mapped_angle, 20, 0);
     }
@@ -83,8 +89,15 @@ class ScsServo : public Servo {
     int getCurrentAngle() override
     {
         int current_pos = _scs_bus.ReadPos(_config.id);
-        int angle       = (current_pos - _zero_pos) * 5 * 10 / 16;
-        angle           = uitk::clamp(angle, getAngleLimit().x, getAngleLimit().y);
+        if (!is_raw_pos_valid(current_pos)) {
+            int fallback_angle = uitk::clamp(Servo::getCurrentAngle(), getAngleLimit().x, getAngleLimit().y);
+            mclog::tagWarn(_tag, "id: {} ignore invalid current pos: {}, fallback angle: {}", _config.id, current_pos,
+                           fallback_angle);
+            return fallback_angle;
+        }
+
+        int angle = raw_pos_to_angle(current_pos);
+        angle     = uitk::clamp(angle, getAngleLimit().x, getAngleLimit().y);
         // mclog::tagInfo(_tag, "id: {} current pos: {} angle: {}", _id, current_pos, angle);
         return angle;
     }
@@ -112,7 +125,15 @@ class ScsServo : public Servo {
 
     void setCurrentAngleAsZero() override
     {
-        _zero_pos = _scs_bus.ReadPos(_config.id);
+        int current_pos = _scs_bus.ReadPos(_config.id);
+        if (!is_raw_pos_valid(current_pos)) {
+            mclog::tagWarn(_tag, "id: {} ignore invalid zero calibration pos: {}, keep zero pos: {}", _config.id,
+                           current_pos, _zero_pos);
+            return;
+        }
+
+        _zero_pos = current_pos;
+        reset_runtime_limits();
 
         Settings settings(_config.settingNs, true);
         settings.SetInt(_config.settingZeroPositionKey, _zero_pos);
@@ -123,6 +144,7 @@ class ScsServo : public Servo {
     void resetZeroCalibration() override
     {
         _zero_pos = _config.defaultZeroPos;
+        reset_runtime_limits();
 
         Settings settings(_config.settingNs, true);
         settings.SetInt(_config.settingZeroPositionKey, _zero_pos);
@@ -148,9 +170,153 @@ class ScsServo : public Servo {
     enum class Mode { Position = 0, PWM = 1 };
 
     ServoConfig_t _config;
+    Vector2i _runtime_raw_pos_limit;
     int _zero_pos      = 0;
     Mode _current_mode = Mode::Position;
 
+    static constexpr uint32_t kStallFeedbackIntervalMs = 50;
+    static constexpr int kStallMinTargetDeltaRaw       = 8;
+    static constexpr int kStallMaxPositionDeltaRaw     = 1;
+    static constexpr int kStallCurrentRiseThreshold    = 80;
+    static constexpr int kStallLoadRiseThreshold       = 150;
+    static constexpr int kStallCurrentAbsThreshold     = 350;
+    static constexpr int kStallLoadAbsThreshold        = 650;
+    static constexpr int kStallConfirmSamples          = 2;
+
+    uint32_t _last_stall_check_tick = 0;
+    int _last_stall_raw_pos         = 0;
+    int _last_stall_current_abs     = 0;
+    int _last_stall_load_abs        = 0;
+    int _last_stall_direction       = 0;
+    int _stall_confirm_count        = 0;
+    bool _last_stall_feedback_valid = false;
+
+    static int abs_int(int value)
+    {
+        return value < 0 ? -value : value;
+    }
+
+    bool is_raw_pos_valid(int raw_pos) const
+    {
+        return raw_pos >= _config.rawPosLimit.x && raw_pos <= _config.rawPosLimit.y;
+    }
+
+    int raw_pos_to_angle(int raw_pos) const
+    {
+        return (raw_pos - _zero_pos) * 5 * 10 / 16;
+    }
+
+    void reset_runtime_limits()
+    {
+        _runtime_raw_pos_limit = _config.rawPosLimit;
+        set_angle_limit(_config.angleLimit);
+        reset_stall_detection();
+    }
+
+    void reset_stall_detection()
+    {
+        _last_stall_feedback_valid = false;
+        _last_stall_direction      = 0;
+        _stall_confirm_count       = 0;
+    }
+
+    bool update_stall_protection(int target_raw_pos)
+    {
+        if (!_config.enableStallProtection) {
+            return false;
+        }
+
+        const uint32_t now = GetHAL().millis();
+        if (now - _last_stall_check_tick < kStallFeedbackIntervalMs) {
+            return false;
+        }
+        _last_stall_check_tick = now;
+
+        if (_scs_bus.FeedBack(_config.id) < 0) {
+            reset_stall_detection();
+            return false;
+        }
+
+        const int current_raw_pos = _scs_bus.ReadPos(-1);
+        const int current_abs     = abs_int(_scs_bus.ReadCurrent(-1));
+        const int load_abs        = abs_int(_scs_bus.ReadLoad(-1));
+
+        if (!is_raw_pos_valid(current_raw_pos)) {
+            reset_stall_detection();
+            return false;
+        }
+
+        const int target_delta = target_raw_pos - current_raw_pos;
+        if (abs_int(target_delta) < kStallMinTargetDeltaRaw) {
+            reset_stall_detection();
+            return false;
+        }
+
+        const int direction = target_delta > 0 ? 1 : -1;
+        if (_last_stall_feedback_valid && direction == _last_stall_direction) {
+            const int pos_delta = abs_int(current_raw_pos - _last_stall_raw_pos);
+            const bool position_stuck = pos_delta <= kStallMaxPositionDeltaRaw;
+            const bool current_spike  = current_abs >= kStallCurrentAbsThreshold ||
+                                       current_abs - _last_stall_current_abs >= kStallCurrentRiseThreshold;
+            const bool load_spike = load_abs >= kStallLoadAbsThreshold ||
+                                    load_abs - _last_stall_load_abs >= kStallLoadRiseThreshold;
+
+            if (position_stuck && (current_spike || load_spike)) {
+                _stall_confirm_count++;
+            } else if (pos_delta > kStallMaxPositionDeltaRaw) {
+                _stall_confirm_count = 0; 
+            }
+        } else {
+            _stall_confirm_count = 0;
+        }
+
+        _last_stall_raw_pos         = current_raw_pos;
+        _last_stall_current_abs     = current_abs;
+        _last_stall_load_abs        = load_abs;
+        _last_stall_direction       = direction;
+        _last_stall_feedback_valid = true;
+
+        if (_stall_confirm_count < kStallConfirmSamples) {
+            return false;
+        }
+
+        handle_stall(current_raw_pos, direction, current_abs, load_abs);
+        return true;
+    }
+
+    void handle_stall(int raw_pos, int direction, int current_abs, int load_abs)
+    {
+        int angle = raw_pos_to_angle(raw_pos);
+        angle     = uitk::clamp(angle, _config.angleLimit.x, _config.angleLimit.y);
+
+        auto angle_limit = getAngleLimit();
+        if (direction > 0) {
+            if (raw_pos < _runtime_raw_pos_limit.y) {
+                _runtime_raw_pos_limit.y = raw_pos;
+            }
+            if (angle < angle_limit.y) {
+                angle_limit.y = angle;
+            }
+        } else {
+            if (raw_pos > _runtime_raw_pos_limit.x) {
+                _runtime_raw_pos_limit.x = raw_pos;
+            }
+            if (angle > angle_limit.x) {
+                angle_limit.x = angle;
+            }
+        }
+        set_angle_limit(angle_limit);
+        stop_motion_at_angle(angle);
+        reset_stall_detection();
+
+        check_mode(Mode::Position);
+        _scs_bus.WritePos(_config.id, raw_pos, 20, 0);
+
+        mclog::tagWarn(_tag,
+                       "id: {} stall detected, raw: {}, angle: {}, dir: {}, current: {}, load: {}, limit: [{}, {}]",
+                       _config.id, raw_pos, angle, direction, current_abs, load_abs, angle_limit.x, angle_limit.y);
+    }
+
     void check_mode(Mode targetMode)
     {
         if (targetMode == _current_mode) {
@@ -184,6 +350,7 @@ void Hal::servo_init()
     pitch_servo_config.rawPosLimit            = Vector2i(0, 1000);
     pitch_servo_config.settingNs              = "servo";
     pitch_servo_config.settingZeroPositionKey = "zero_pos_2";
+    pitch_servo_config.enableStallProtection  = true;
 
     auto yaw_servo   = std::make_unique<ScsServo>(yaw_servo_config);
     auto pitch_servo = std::make_unique<ScsServo>(pitch_servo_config);
diff --git a/firmware/main/hal/utils/secret_logic/secret_logic.cpp b/firmware/main/hal/utils/secret_logic/secret_logic.cpp
index 4dafb509..7194b6f6 100644
--- a/firmware/main/hal/utils/secret_logic/secret_logic.cpp
+++ b/firmware/main/hal/utils/secret_logic/secret_logic.cpp
@@ -4,12 +4,17 @@
  * SPDX-License-Identifier: MIT
  */
 #include "secret_logic.h"
+#include <sdkconfig.h>
 
 namespace secret_logic {
 
 __attribute__((weak)) std::string get_server_url()
 {
+#ifdef CONFIG_STACKCHAN_SERVER_URL
+    return CONFIG_STACKCHAN_SERVER_URL;
+#else
     return "http://localhost:3000";
+#endif
 }
 
 __attribute__((weak)) std::string generate_auth_token()
diff --git a/firmware/main/main.cpp b/firmware/main/main.cpp
index 164a7516..3f11ed65 100644
--- a/firmware/main/main.cpp
+++ b/firmware/main/main.cpp
@@ -26,31 +26,36 @@ extern "C" void app_main(void)
     ui_hal::on_delay([](uint32_t ms) { GetHAL().delay(ms); });
     ui_hal::on_get_tick([]() { return GetHAL().millis(); });
 
-    // Install apps
-    GetMooncake().installApp(std::make_unique<AppLauncher>());
-    GetMooncake().installApp(std::make_unique<AppAiAgent>());
-    GetMooncake().installApp(std::make_unique<AppAvatar>());
-    GetMooncake().installApp(std::make_unique<AppEspnowControl>());
-    GetMooncake().installApp(std::make_unique<AppAppCenter>());
-    GetMooncake().installApp(std::make_unique<AppEzdata>());
-    GetMooncake().installApp(std::make_unique<AppDance>());
-    GetMooncake().installApp(std::make_unique<AppSetup>());
-
-    // Main loop
-    while (1) {
-        GetHAL().feedTheDog();
-        GetHAL().updateHeapStatusLog();
-
-        GetMooncake().update();
-
-        if (GetHAL().isXiaozhiStartRequested()) {
-            break;
+    const bool skip_mooncake =
+        GetHAL().getXiaozhiConfig().startAiAgentOnBoot && GetHAL().getWarmRebootTarget() < 0;
+
+    if (!skip_mooncake) {
+        // Install apps
+        GetMooncake().installApp(std::make_unique<AppLauncher>());
+        GetMooncake().installApp(std::make_unique<AppAiAgent>());
+        GetMooncake().installApp(std::make_unique<AppAvatar>());
+        GetMooncake().installApp(std::make_unique<AppEspnowControl>());
+        GetMooncake().installApp(std::make_unique<AppAppCenter>());
+        GetMooncake().installApp(std::make_unique<AppEzdata>());
+        GetMooncake().installApp(std::make_unique<AppDance>());
+        GetMooncake().installApp(std::make_unique<AppSetup>());
+
+        // Main loop
+        while (1) {
+            GetHAL().feedTheDog();
+            GetHAL().updateHeapStatusLog();
+
+            GetMooncake().update();
+
+            if (GetHAL().isXiaozhiStartRequested()) {
+                break;
+            }
         }
-    }
 
-    // Uninstall all apps and destroy mooncake
-    GetMooncake().uninstallAllApps();
-    DestroyMooncake();
+        // Uninstall all apps and destroy mooncake
+        GetMooncake().uninstallAllApps();
+        DestroyMooncake();
+    }
 
     // Start xiaozhi, never returns
     GetHAL().startXiaozhi();
diff --git a/firmware/main/stackchan/motion/motion.cpp b/firmware/main/stackchan/motion/motion.cpp
index 8d74832d..21e54683 100644
--- a/firmware/main/stackchan/motion/motion.cpp
+++ b/firmware/main/stackchan/motion/motion.cpp
@@ -4,7 +4,7 @@
  * SPDX-License-Identifier: MIT
  */
 #include "motion.h"
-#include <cmath>
+#include "motion_math.h"
 
 using namespace uitk;
 using namespace stackchan::motion;
@@ -77,27 +77,15 @@ void Motion::stop()
 
 void Motion::lookAtNormalized(float x, float y, int speed)
 {
-    int yaw_angle =
-        uitk::map_range(x, -1.0f, 1.0f, (float)_yaw_servo->getAngleLimit().x, (float)_yaw_servo->getAngleLimit().y);
-    int pitch_angle =
-        uitk::map_range(y, -1.0f, 1.0f, (float)_pitch_servo->getAngleLimit().x, (float)_pitch_servo->getAngleLimit().y);
-    moveWithSpeed(yaw_angle, pitch_angle, speed);
+    auto angles = calculateNormalizedLookAngles(
+        x, y, _yaw_servo->getAngleLimit().x, _yaw_servo->getAngleLimit().y, _pitch_servo->getAngleLimit().x, _pitch_servo->getAngleLimit().y);
+    moveWithSpeed(angles.yaw, angles.pitch, speed);
 }
 
 void Motion::lookAtPoint(float x, float y, float z, int speed)
 {
-    // Yaw: 绕 Z 轴旋转。使用 atan2(y, x)
-    float yaw_rad = std::atan2(y, x);
-
-    // Pitch: 俯仰。使用 atan2(z, sqrt(x*x + y*y))
-    float ground_dist = std::sqrt(x * x + y * y);
-    float pitch_rad   = std::atan2(z, ground_dist);
-
-    // 将弧度转换为你的舵机单位 (-1280~1280 等)
-    int yaw_angle   = static_cast<int>(to_degrees(yaw_rad) * 10);
-    int pitch_angle = static_cast<int>(to_degrees(pitch_rad) * 10);
-
-    moveWithSpeed(yaw_angle, pitch_angle, speed);
+    auto angles = calculatePointLookAngles(x, y, z);
+    moveWithSpeed(angles.yaw, angles.pitch, speed);
 }
 
 bool Motion::isMoving()
diff --git a/firmware/main/stackchan/motion/motion.h b/firmware/main/stackchan/motion/motion.h
index 030863b0..871d69f5 100644
--- a/firmware/main/stackchan/motion/motion.h
+++ b/firmware/main/stackchan/motion/motion.h
@@ -163,13 +163,6 @@ class Motion {
     std::unique_ptr<Servo> _yaw_servo;
     std::unique_ptr<Servo> _pitch_servo;
     bool _is_modify_locked = false;
-
-    static constexpr float RAD_TO_DEG = 180.0f / M_PI;
-
-    inline float to_degrees(float radians)
-    {
-        return radians * RAD_TO_DEG;
-    }
 };
 
 }  // namespace stackchan::motion
diff --git a/firmware/main/stackchan/motion/motion_math.cpp b/firmware/main/stackchan/motion/motion_math.cpp
new file mode 100644
index 00000000..f3843713
--- /dev/null
+++ b/firmware/main/stackchan/motion/motion_math.cpp
@@ -0,0 +1,62 @@
+/*
+ * SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+ *
+ * SPDX-License-Identifier: MIT
+ */
+#include "motion_math.h"
+#include <algorithm>
+#include <cmath>
+
+namespace stackchan::motion {
+
+namespace {
+
+constexpr float kRadiansToDegrees = 180.0f / static_cast<float>(M_PI);
+
+float clampNormalized(float value)
+{
+    return std::clamp(value, -1.0f, 1.0f);
+}
+
+float mapRange(float value, float inMin, float inMax, float outMin, float outMax)
+{
+    if (inMax == inMin) {
+        return outMin;
+    }
+    float ratio = (value - inMin) / (inMax - inMin);
+    return outMin + ratio * (outMax - outMin);
+}
+
+int radiansToTenthsOfDegrees(float radians)
+{
+    return static_cast<int>(radians * kRadiansToDegrees * 10.0f);
+}
+
+}  // namespace
+
+int mapNormalizedValueToAngle(float value, int minimum, int maximum)
+{
+    return static_cast<int>(mapRange(clampNormalized(value), -1.0f, 1.0f, static_cast<float>(minimum), static_cast<float>(maximum)));
+}
+
+MotionAngles calculateNormalizedLookAngles(float x, float y, int yawMin, int yawMax, int pitchMin, int pitchMax)
+{
+    return {
+        .yaw = mapNormalizedValueToAngle(x, yawMin, yawMax),
+        .pitch = mapNormalizedValueToAngle(y, pitchMin, pitchMax),
+    };
+}
+
+MotionAngles calculatePointLookAngles(float x, float y, float z)
+{
+    float yawRadians = std::atan2(y, x);
+    float groundDistance = std::sqrt(x * x + y * y);
+    float pitchRadians = std::atan2(z, groundDistance);
+
+    return {
+        .yaw = radiansToTenthsOfDegrees(yawRadians),
+        .pitch = radiansToTenthsOfDegrees(pitchRadians),
+    };
+}
+
+}  // namespace stackchan::motion
diff --git a/firmware/main/stackchan/motion/motion_math.h b/firmware/main/stackchan/motion/motion_math.h
new file mode 100644
index 00000000..9a0642e7
--- /dev/null
+++ b/firmware/main/stackchan/motion/motion_math.h
@@ -0,0 +1,19 @@
+/*
+ * SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+ *
+ * SPDX-License-Identifier: MIT
+ */
+#pragma once
+
+namespace stackchan::motion {
+
+struct MotionAngles {
+    int yaw;
+    int pitch;
+};
+
+int mapNormalizedValueToAngle(float value, int minimum, int maximum);
+MotionAngles calculateNormalizedLookAngles(float x, float y, int yawMin, int yawMax, int pitchMin, int pitchMax);
+MotionAngles calculatePointLookAngles(float x, float y, float z);
+
+}  // namespace stackchan::motion
diff --git a/firmware/main/stackchan/motion/servo.cpp b/firmware/main/stackchan/motion/servo.cpp
index e999cf93..cfbefe0e 100644
--- a/firmware/main/stackchan/motion/servo.cpp
+++ b/firmware/main/stackchan/motion/servo.cpp
@@ -116,6 +116,13 @@ void Servo::update_angle_anim_target(int angle)
     _snap_to_target_on_rest = true;
 }
 
+void Servo::stop_motion_at_angle(int angle)
+{
+    angle = uitk::clamp(angle, _angle_limit.x, _angle_limit.y);
+    _angle_anim.teleport(angle);
+    _snap_to_target_on_rest = false;
+}
+
 uitk::SpringOptions_t Servo::map_speed_to_spring_options(int speed)
 {
     speed = uitk::clamp(speed, 0, 1000);
diff --git a/firmware/main/stackchan/motion/servo.h b/firmware/main/stackchan/motion/servo.h
index 9fac5ff6..f621c64d 100644
--- a/firmware/main/stackchan/motion/servo.h
+++ b/firmware/main/stackchan/motion/servo.h
@@ -177,6 +177,7 @@ class Servo {
 
     void apply_default_spring_options();
     void update_angle_anim_target(int angle);
+    void stop_motion_at_angle(int angle);
     uitk::SpringOptions_t map_speed_to_spring_options(int speed);
 };
 
diff --git a/firmware/tests/CMakeLists.txt b/firmware/tests/CMakeLists.txt
new file mode 100644
index 00000000..df2ecb53
--- /dev/null
+++ b/firmware/tests/CMakeLists.txt
@@ -0,0 +1,18 @@
+cmake_minimum_required(VERSION 3.16)
+
+project(stackchan_firmware_tests LANGUAGES CXX)
+
+enable_testing()
+
+add_executable(motion_math_test
+    motion_math_test.cpp
+    ../main/stackchan/motion/motion_math.cpp
+)
+
+target_include_directories(motion_math_test PRIVATE
+    ../main
+)
+
+target_compile_features(motion_math_test PRIVATE cxx_std_17)
+
+add_test(NAME motion_math_test COMMAND $<TARGET_FILE:motion_math_test>)
diff --git a/firmware/tests/motion_math_test.cpp b/firmware/tests/motion_math_test.cpp
new file mode 100644
index 00000000..0aa12107
--- /dev/null
+++ b/firmware/tests/motion_math_test.cpp
@@ -0,0 +1,69 @@
+/*
+ * SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+ *
+ * SPDX-License-Identifier: MIT
+ */
+#include <cmath>
+#include <cstdlib>
+#include <iostream>
+#include <stackchan/motion/motion_math.h>
+
+namespace {
+
+using stackchan::motion::MotionAngles;
+using stackchan::motion::calculateNormalizedLookAngles;
+using stackchan::motion::calculatePointLookAngles;
+using stackchan::motion::mapNormalizedValueToAngle;
+
+void expectEqual(int actual, int expected, const char* label)
+{
+    if (actual != expected) {
+        std::cerr << label << ": expected " << expected << ", got " << actual << '\n';
+        std::exit(1);
+    }
+}
+
+void expectAngles(MotionAngles actual, MotionAngles expected, const char* label)
+{
+    expectEqual(actual.yaw, expected.yaw, label);
+    expectEqual(actual.pitch, expected.pitch, label);
+}
+
+void testNormalizedMapping()
+{
+    expectEqual(mapNormalizedValueToAngle(-1.0f, -1280, 1280), -1280, "normalized min");
+    expectEqual(mapNormalizedValueToAngle(0.0f, -1280, 1280), 0, "normalized center");
+    expectEqual(mapNormalizedValueToAngle(1.0f, -1280, 1280), 1280, "normalized max");
+    expectEqual(mapNormalizedValueToAngle(2.0f, -1280, 1280), 1280, "normalized clamp high");
+    expectEqual(mapNormalizedValueToAngle(-2.0f, 30, 870), 30, "normalized clamp low");
+}
+
+void testNormalizedLookAngles()
+{
+    expectAngles(
+        calculateNormalizedLookAngles(0.5f, -0.5f, -1280, 1280, 30, 870),
+        MotionAngles{640, 240},
+        "normalized look"
+    );
+}
+
+void testPointLookAngles()
+{
+    expectAngles(calculatePointLookAngles(1.0f, 0.0f, 0.0f), MotionAngles{0, 0}, "point forward");
+    expectAngles(calculatePointLookAngles(0.0f, 1.0f, 0.0f), MotionAngles{900, 0}, "point left");
+    expectAngles(calculatePointLookAngles(0.0f, -1.0f, 0.0f), MotionAngles{-900, 0}, "point right");
+
+    MotionAngles diagonal = calculatePointLookAngles(1.0f, 1.0f, 1.0f);
+    expectEqual(diagonal.yaw, 450, "point diagonal yaw");
+    expectEqual(diagonal.pitch, 352, "point diagonal pitch");
+}
+
+}  // namespace
+
+int main()
+{
+    testNormalizedMapping();
+    testNormalizedLookAngles();
+    testPointLookAngles();
+    return 0;
+}
diff --git a/remote/code/.clangd b/remote/code/.clangd
new file mode 100644
index 00000000..437f2554
--- /dev/null
+++ b/remote/code/.clangd
@@ -0,0 +1,2 @@
+CompileFlags:
+    Remove: [-f*, -m*]
diff --git a/remote/code/dependencies.lock b/remote/code/dependencies.lock
index 196998df..5f6060f0 100644
--- a/remote/code/dependencies.lock
+++ b/remote/code/dependencies.lock
@@ -1,6 +1,6 @@
 dependencies:
   espressif/cmake_utilities:
-    component_hash: 351350613ceafba240b761b4ea991e0f231ac7a9f59a9ee901f751bddc0bb18f
+    component_hash: 05165f30922b422b4b90c08845e6d449329b97370fbd06309803d8cb539d79e3
     dependencies:
     - name: idf
       require: private
@@ -8,23 +8,23 @@ dependencies:
     source:
       registry_url: https://components.espressif.com
       type: service
-    version: 0.5.3
+    version: 1.1.1
   espressif/esp-now:
-    component_hash: 56f902e978ec0b70528ad30a45265b56bf2b91653d13e0badc78159f39f41ece
+    component_hash: 217f4e2c1672bcc71e5890fb3659528bbce5f1a8a995b1668fec9374acbd0f45
     dependencies:
     - name: espressif/cmake_utilities
       registry_url: https://components.espressif.com
       require: private
-      version: 0.*
+      version: '>=0.5.3'
     - name: idf
       require: private
       version: '>=4.4'
     source:
       registry_url: https://components.espressif.com/
       type: service
-    version: 2.5.2
+    version: 2.5.3
   espressif/i2c_bus:
-    component_hash: 4e990dc11734316186b489b362c61d41f23f79d58bc169795cec215e528cba14
+    component_hash: 483112c1619c54c38d0b734fb25f1678733267858a77b7af2f48cc7db6dbbd84
     dependencies:
     - name: espressif/cmake_utilities
       registry_url: https://components.espressif.com
@@ -36,7 +36,7 @@ dependencies:
     source:
       registry_url: https://components.espressif.com/
       type: service
-    version: 1.5.0
+    version: 1.5.2
   idf:
     source:
       type: idf
@@ -49,29 +49,29 @@ dependencies:
       type: service
     version: 8.4.0
   m5stack/m5gfx:
-    component_hash: 4c420c89ae7bfe33231dab80b784f4508591279b2a3a935ac849dddb1942d0d5
+    component_hash: 96695547f4403f0864a637325b63b37276233999fcbdd5e485f4e71fd2210020
     dependencies: []
     source:
       registry_url: https://components.espressif.com
       type: service
-    version: 0.2.17
+    version: 0.2.23
   m5stack/m5unified:
-    component_hash: 1c75bb80654da6c7fcdd11ef7a1cb9b7d6db2e98f96612a4babf12b5e9bc7196
+    component_hash: 363c05d034f103471dcbe76e5e0773ecc0fe263212930259867212341b1e48a4
     dependencies:
     - name: m5stack/m5gfx
       registry_url: https://components.espressif.com
       require: private
-      version: ^0.2.17
+      version: '>=0.2.22'
     source:
       registry_url: https://components.espressif.com/
       type: service
-    version: 0.2.11
+    version: 0.2.17
 direct_dependencies:
 - espressif/esp-now
 - espressif/i2c_bus
 - idf
 - lvgl/lvgl
 - m5stack/m5unified
-manifest_hash: 1a633f7edf3e64c57d1f921f15913b2bf6deda0e71113957a364b6552fa37e9b
+manifest_hash: dcf5a8b9158ceba6656057f11794d186f6222be421c6b2023bdeee009adce7e8
 target: esp32
 version: 2.0.0
diff --git a/remote/code/StackChan-RemoteControl-ESPNow-jyy-20260325_0x0.bin b/remote/code/k151-R-StackChan-RemoteControl-ESPNow-v1.2-jyy-20260617_0x0.bin
similarity index 50%
rename from remote/code/StackChan-RemoteControl-ESPNow-jyy-20260325_0x0.bin
rename to remote/code/k151-R-StackChan-RemoteControl-ESPNow-v1.2-jyy-20260617_0x0.bin
index a2efeed0..056e4f12 100644
Binary files a/remote/code/StackChan-RemoteControl-ESPNow-jyy-20260325_0x0.bin and b/remote/code/k151-R-StackChan-RemoteControl-ESPNow-v1.2-jyy-20260617_0x0.bin differ
diff --git a/remote/code/main/StackChan-RemoteControl-ESPNow.cpp b/remote/code/main/StackChan-RemoteControl-ESPNow.cpp
index 5248f497..dc23aaf1 100644
--- a/remote/code/main/StackChan-RemoteControl-ESPNow.cpp
+++ b/remote/code/main/StackChan-RemoteControl-ESPNow.cpp
@@ -77,8 +77,8 @@ void app_main(void)
 
     M5.begin();
     M5.Power.begin();
-    M5.Power.Axp192.setLDO2(2800);  // set LDO2 to 2.8V for external devices
-    M5.Imu.init(&M5.In_I2C);        // init IMU with internal I2C port
+    M5.Lcd.setBrightness(100);  // set brightness to 100
+    M5.Imu.init(&M5.In_I2C);    // init IMU with internal I2C port
     printf("IN_I2C port: %d\n", M5.In_I2C.getPort());
     printf("M5 Display width: %ld, height: %ld\n", M5.Display.width(), M5.Display.height());
 
diff --git a/remote/code/main/idf_component.yml b/remote/code/main/idf_component.yml
index e62ca394..7ca97b98 100644
--- a/remote/code/main/idf_component.yml
+++ b/remote/code/main/idf_component.yml
@@ -14,7 +14,7 @@ dependencies:
   #   # `public` flag doesn't have an effect dependencies of the `main` component.
   #   # All dependencies of `main` are public by default.
   #   public: true
-  m5stack/m5unified: ^0.2.11
+  m5stack/m5unified: ^0.2.17
   espressif/esp-now: =*
   espressif/i2c_bus: ^1.5.0
   lvgl/lvgl: ^8.4.0
diff --git a/remote/code/partitions.csv b/remote/code/partitions.csv
new file mode 100644
index 00000000..43960095
--- /dev/null
+++ b/remote/code/partitions.csv
@@ -0,0 +1,4 @@
+# Name,   Type, SubType, Offset,  Size,     Flags
+nvs,      data, nvs,     0x9000,  0x6000,
+phy_init, data, phy,     0xf000,  0x1000,
+factory,  app,  factory, 0x10000, 0x1F0000,
diff --git a/remote/code/sdkconfig b/remote/code/sdkconfig
index 59d1b4fb..575382a1 100644
--- a/remote/code/sdkconfig
+++ b/remote/code/sdkconfig
@@ -374,14 +374,14 @@ CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
 # CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
 CONFIG_ESPTOOLPY_FLASHFREQ="40m"
 # CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
-# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y
+# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_32MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set
-CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
+CONFIG_ESPTOOLPY_FLASHSIZE="2MB"
 # CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE is not set
 CONFIG_ESPTOOLPY_BEFORE_RESET=y
 # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
@@ -396,12 +396,12 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 # Partition Table
 #
 # CONFIG_PARTITION_TABLE_SINGLE_APP is not set
-CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
+# CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA_LARGE is not set
-# CONFIG_PARTITION_TABLE_CUSTOM is not set
+CONFIG_PARTITION_TABLE_CUSTOM=y
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp_large.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table
@@ -777,7 +777,7 @@ CONFIG_ESP_HTTP_CLIENT_EVENT_POST_TIMEOUT=2000
 #
 # HTTP Server
 #
-CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
+CONFIG_HTTPD_MAX_REQ_HDR_LEN=512
 CONFIG_HTTPD_MAX_URI_LEN=512
 CONFIG_HTTPD_ERR_RESP_NO_DELAY=y
 CONFIG_HTTPD_PURGE_BUF_LEN=32
@@ -875,7 +875,7 @@ CONFIG_RTC_CLK_CAL_CYCLES=1024
 #
 # Peripheral Control
 #
-CONFIG_PERIPH_CTRL_FUNC_IN_IRAM=y
+# CONFIG_PERIPH_CTRL_FUNC_IN_IRAM is not set
 # end of Peripheral Control
 
 #
@@ -944,7 +944,7 @@ CONFIG_ESP_PHY_CALIBRATION_MODE=0
 # Power Management
 #
 # CONFIG_PM_ENABLE is not set
-CONFIG_PM_SLP_IRAM_OPT=y
+# CONFIG_PM_SLP_IRAM_OPT is not set
 # end of Power Management
 
 #
@@ -1380,7 +1380,7 @@ CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
 # CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set
 CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID=y
 # CONFIG_LWIP_DHCP_RESTORE_LAST_IP is not set
-CONFIG_LWIP_DHCP_OPTIONS_LEN=69
+CONFIG_LWIP_DHCP_OPTIONS_LEN=68
 CONFIG_LWIP_NUM_NETIF_CLIENT_DATA=0
 CONFIG_LWIP_DHCP_COARSE_TIMER_SECS=1
 
@@ -1959,6 +1959,17 @@ CONFIG_ESPNOW_OTA_WAIT_RESPONSE_TIMEOUT=10000
 # CONFIG_ESPNOW_AUTO_RESTORE_CHANNEL is not set
 # CONFIG_ESPNOW_DATA_FAST_ACK is not set
 
+#
+# ESP-NOW Task Configuration
+#
+
+#
+# Avoid heavy processing in handlers; offload to app task via queues.
+#
+CONFIG_ESPNOW_TASK_STACK_SIZE=4096
+CONFIG_ESPNOW_TASK_PRIORITY=1
+# end of ESP-NOW Task Configuration
+
 #
 # ESP-NOW Utils Configuration
 #
@@ -2035,9 +2046,9 @@ CONFIG_LV_COLOR_CHROMA_KEY_HEX=0x00FF00
 # Memory settings
 #
 # CONFIG_LV_MEM_CUSTOM is not set
-CONFIG_LV_MEM_SIZE_KILOBYTES=128
+CONFIG_LV_MEM_SIZE_KILOBYTES=32
 CONFIG_LV_MEM_ADDR=0x0
-CONFIG_LV_MEM_BUF_MAX_NUM=32
+CONFIG_LV_MEM_BUF_MAX_NUM=16
 # CONFIG_LV_MEMCPY_MEMSET_STD is not set
 # end of Memory settings
 
diff --git a/remote/code/sdkconfig.old b/remote/code/sdkconfig.old
index 2cc0fcdc..226a64c1 100644
--- a/remote/code/sdkconfig.old
+++ b/remote/code/sdkconfig.old
@@ -247,7 +247,7 @@ CONFIG_IDF_TOOLCHAIN_GCC=y
 CONFIG_IDF_TARGET_ARCH_XTENSA=y
 CONFIG_IDF_TARGET_ARCH="xtensa"
 CONFIG_IDF_TARGET="esp32"
-CONFIG_IDF_INIT_VERSION="5.4.2"
+CONFIG_IDF_INIT_VERSION="$IDF_INIT_VERSION"
 CONFIG_IDF_TARGET_ESP32=y
 CONFIG_IDF_FIRMWARE_CHIP_ID=0x0000
 
@@ -374,14 +374,14 @@ CONFIG_ESPTOOLPY_FLASHFREQ_40M=y
 # CONFIG_ESPTOOLPY_FLASHFREQ_20M is not set
 CONFIG_ESPTOOLPY_FLASHFREQ="40m"
 # CONFIG_ESPTOOLPY_FLASHSIZE_1MB is not set
-# CONFIG_ESPTOOLPY_FLASHSIZE_2MB is not set
-CONFIG_ESPTOOLPY_FLASHSIZE_4MB=y
+CONFIG_ESPTOOLPY_FLASHSIZE_2MB=y
+# CONFIG_ESPTOOLPY_FLASHSIZE_4MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_8MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_16MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_32MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_64MB is not set
 # CONFIG_ESPTOOLPY_FLASHSIZE_128MB is not set
-CONFIG_ESPTOOLPY_FLASHSIZE="4MB"
+CONFIG_ESPTOOLPY_FLASHSIZE="2MB"
 # CONFIG_ESPTOOLPY_HEADER_FLASHSIZE_UPDATE is not set
 CONFIG_ESPTOOLPY_BEFORE_RESET=y
 # CONFIG_ESPTOOLPY_BEFORE_NORESET is not set
@@ -395,13 +395,13 @@ CONFIG_ESPTOOLPY_MONITOR_BAUD=115200
 #
 # Partition Table
 #
-# CONFIG_PARTITION_TABLE_SINGLE_APP is not set
-CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE=y
+CONFIG_PARTITION_TABLE_SINGLE_APP=y
+# CONFIG_PARTITION_TABLE_SINGLE_APP_LARGE is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA is not set
 # CONFIG_PARTITION_TABLE_TWO_OTA_LARGE is not set
 # CONFIG_PARTITION_TABLE_CUSTOM is not set
 CONFIG_PARTITION_TABLE_CUSTOM_FILENAME="partitions.csv"
-CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp_large.csv"
+CONFIG_PARTITION_TABLE_FILENAME="partitions_singleapp.csv"
 CONFIG_PARTITION_TABLE_OFFSET=0x8000
 CONFIG_PARTITION_TABLE_MD5=y
 # end of Partition Table
@@ -777,7 +777,7 @@ CONFIG_ESP_HTTP_CLIENT_EVENT_POST_TIMEOUT=2000
 #
 # HTTP Server
 #
-CONFIG_HTTPD_MAX_REQ_HDR_LEN=1024
+CONFIG_HTTPD_MAX_REQ_HDR_LEN=512
 CONFIG_HTTPD_MAX_URI_LEN=512
 CONFIG_HTTPD_ERR_RESP_NO_DELAY=y
 CONFIG_HTTPD_PURGE_BUF_LEN=32
@@ -875,7 +875,7 @@ CONFIG_RTC_CLK_CAL_CYCLES=1024
 #
 # Peripheral Control
 #
-CONFIG_PERIPH_CTRL_FUNC_IN_IRAM=y
+# CONFIG_PERIPH_CTRL_FUNC_IN_IRAM is not set
 # end of Peripheral Control
 
 #
@@ -944,7 +944,7 @@ CONFIG_ESP_PHY_CALIBRATION_MODE=0
 # Power Management
 #
 # CONFIG_PM_ENABLE is not set
-CONFIG_PM_SLP_IRAM_OPT=y
+# CONFIG_PM_SLP_IRAM_OPT is not set
 # end of Power Management
 
 #
@@ -1380,7 +1380,7 @@ CONFIG_LWIP_DHCP_DOES_ARP_CHECK=y
 # CONFIG_LWIP_DHCP_DISABLE_CLIENT_ID is not set
 CONFIG_LWIP_DHCP_DISABLE_VENDOR_CLASS_ID=y
 # CONFIG_LWIP_DHCP_RESTORE_LAST_IP is not set
-CONFIG_LWIP_DHCP_OPTIONS_LEN=69
+CONFIG_LWIP_DHCP_OPTIONS_LEN=68
 CONFIG_LWIP_NUM_NETIF_CLIENT_DATA=0
 CONFIG_LWIP_DHCP_COARSE_TIMER_SECS=1
 
@@ -1959,6 +1959,17 @@ CONFIG_ESPNOW_OTA_WAIT_RESPONSE_TIMEOUT=10000
 # CONFIG_ESPNOW_AUTO_RESTORE_CHANNEL is not set
 # CONFIG_ESPNOW_DATA_FAST_ACK is not set
 
+#
+# ESP-NOW Task Configuration
+#
+
+#
+# Avoid heavy processing in handlers; offload to app task via queues.
+#
+CONFIG_ESPNOW_TASK_STACK_SIZE=4096
+CONFIG_ESPNOW_TASK_PRIORITY=1
+# end of ESP-NOW Task Configuration
+
 #
 # ESP-NOW Utils Configuration
 #
@@ -2035,7 +2046,7 @@ CONFIG_LV_COLOR_CHROMA_KEY_HEX=0x00FF00
 # Memory settings
 #
 # CONFIG_LV_MEM_CUSTOM is not set
-CONFIG_LV_MEM_SIZE_KILOBYTES=64
+CONFIG_LV_MEM_SIZE_KILOBYTES=32
 CONFIG_LV_MEM_ADDR=0x0
 CONFIG_LV_MEM_BUF_MAX_NUM=16
 # CONFIG_LV_MEMCPY_MEMSET_STD is not set
diff --git a/server/LICENSE b/server/LICENSE
new file mode 100644
index 00000000..98d36b65
--- /dev/null
+++ b/server/LICENSE
@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2026 M5Stack Technology CO LTD
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/server/README.MD b/server/README.MD
index 32a29cdc..11b9098c 100644
--- a/server/README.MD
+++ b/server/README.MD
@@ -1,278 +1,1124 @@
 # StackChan Server
 
-**StackChan Server** is the backend server for the open-source StackChan project. It provides RESTful APIs for device management, user authentication, post management, comment systems, and dance control functionalities.
+StackChan Server is the backend service for the StackChan ecosystem. It serves StackChan devices, the mobile app, the web-based admin console, and selected third-party integrations from a single Go service.
 
----
+This repository already includes:
 
-## Features
+- Go backend source code
+- MySQL schema initialization SQL
+- Prebuilt Flutter Web admin assets
+- Docker and Kustomize deployment templates
+- WebSocket forwarding between StackChan devices and app clients
+- XiaoZhi integration logic
 
-- **Device Management**: Device binding, unbinding, and information updates
-- **User Authentication**: Login, registration, and JWT-based token authentication
-- **Post System**: Create, read, and manage posts with text and image support
-- **Comment System**: Full CRUD operations for post comments
-- **Dance Control**: Dance creation, management, and motion data handling
-- **App Store Integration**: App management and distribution
-- **AI Agent Integration**: XiaoZhi (小智) AI assistant integration with agent configuration
-- **Persistent Storage**: MySQL database with ORM-based data access
-
----
+Security note: this README intentionally uses placeholders such as `<your-server-host>`, `<admin-token>`, and `<your-secret>` instead of real hostnames, production addresses, keys, or tokens.
 
 ## Table of Contents
 
-- [Prerequisites](#prerequisites)
-- [Database Setup](#database-setup)
-- [Configuration](#configuration)
-- [Installation](#installation)
-- [Running the Server](#running-the-server)
-- [API Documentation](#api-documentation)
-- [Project Structure](#project-structure)
-- [Contributing](#contributing)
-- [License](#license)
+- [1. Overview](#1-overview)
+- [2. Architecture and Modules](#2-architecture-and-modules)
+- [3. Requirements](#3-requirements)
+- [4. Quick Start from Scratch](#4-quick-start-from-scratch)
+- [5. Configuration Guide](#5-configuration-guide)
+- [6. Admin Console Guide](#6-admin-console-guide)
+- [7. App Workflow](#7-app-workflow)
+- [8. Device Workflow](#8-device-workflow)
+- [9. Authentication and Response Format](#9-authentication-and-response-format)
+- [10. API Reference by Module](#10-api-reference-by-module)
+- [11. WebSocket Protocol](#11-websocket-protocol)
+- [12. Database Overview](#12-database-overview)
+- [13. Project Structure](#13-project-structure)
+- [14. Development, Build, and Deployment](#14-development-build-and-deployment)
+- [15. Operational Notes](#15-operational-notes)
+- [16. License](#16-license)
+
+## 1. Overview
+
+StackChan Server covers four main responsibilities:
+
+1. User identity
+   - The app delegates registration and login to a remote M5Stack-compatible user system.
+   - After a successful login, this service stores the user profile locally and issues its own JWT.
+
+2. Device and content management
+   - Devices can be created automatically, bound to users, unbound, renamed, and queried.
+   - Dances, panoramic images, posts, comments, and friend relationships are stored in MySQL.
+
+3. Admin console features
+   - Admin login
+   - App Store item management
+   - File upload for icons, firmware, media, and other assets
+
+4. Real-time communication
+   - App clients and StackChan devices connect through `/stackChan/ws`.
+   - The server forwards audio, image, motion-control, call-state, and status messages.
+
+## 2. Architecture and Modules
+
+### 2.1 Actors
+
+The system has four major client types:
+
+- Admin users: log in to the web console and manage App Store content
+- App users: register, log in, bind devices, manage dances, and read device data
+- StackChan devices: upload data, fetch content, and establish WebSocket sessions
+- XiaoZhi platform: used for token retrieval, device unbind flow, and agent reset operations
+
+### 2.2 Route Groups
+
+| Route Prefix | Client | Purpose |
+| --- | --- | --- |
+| `/admin/stackChan` | Admin console | Admin login, upload, App Store management |
+| `/stackChan/v2` | Mobile app | User login, registration, device binding, dance management |
+| `/stackChan` | Device / legacy client | Device APIs, posts, pano, uploads, public app list, XiaoZhi APIs |
+| `/stackChan/ws` | App / device | WebSocket real-time channel |
+| `/file/*` | All clients | Static file access for uploaded files and built-in media |
+| `/` | Browser | Flutter Web admin console |
+
+### 2.3 Core Modules
+
+- User module: remote login/registration plus local JWT issuance
+- Device module: device bootstrap, bind/unbind, device info queries
+- Dance module: motion JSON, dance name, and music URL management
+- Community module: posts and comments from devices
+- Pano module: panoramic image records per device
+- App Store module: admin-side CRUD, public read access for app/device clients
+- File module: upload and serve files under `/file`
+- WebSocket module: connection pools, message forwarding, heartbeat, stale-connection cleanup
+- XiaoZhi module: token retrieval, forced refresh, and device-side reset support
+
+## 3. Requirements
+
+### 3.1 Runtime Dependencies
+
+- Go: `go 1.26.3` as declared in `go.mod`
+- MySQL: recommended `8.0+`
+- OS: macOS, Linux, or Windows for development; Linux recommended for production
 
----
+### 3.2 Optional Tooling
 
-## Prerequisites
+- GoFrame CLI (`gf`) for `make build`, `make dao`, and `make ctrl`
+- Docker for image packaging
+- `kubectl` and `kustomize` for Kubernetes deployment
 
-- **Go**: The project is developed in Go. Install **Go 1.24+** from
-  the [official download page](https://golang.google.cn/dl/).
+## 4. Quick Start from Scratch
 
-Verify installation:
+### 4.1 Clone the Repository
 
 ```bash
-go version
-# Expected output: "go version go1.24.x ..." (or similar)
+git clone <your-repo-url>
+cd stackchan-server
 ```
 
-- **MySQL**: Version 8.0+ for database storage
-- **Git**: For cloning the repository
+### 4.2 Create the Database
 
----
+The SQL file uses the `stackChan.` schema prefix, so create the database first:
 
-## Database Setup
+```sql
+CREATE DATABASE IF NOT EXISTS stackChan
+  DEFAULT CHARACTER SET utf8mb4
+  COLLATE utf8mb4_0900_ai_ci;
+```
 
-Before running the project, you need to create the MySQL database first:
+Then import the schema:
 
 ```bash
-# Execute the database initialization script
-mysql -u your_username -p < check_list/create_mysql_database.sql
+mysql -u <db_user> -p < check_list/create_mysql_database.sql
 ```
 
-This will create the `stackChan` database and all required tables.
+If you want to use another database name, update all of the following:
+
+- `check_list/create_mysql_database.sql`
+- `manifest/config/config.yaml`
+- `hack/config.yaml`
+
+### 4.3 Configure the Service
 
----
+Primary config file:
 
-## Configuration
+- `manifest/config/config.yaml`
 
-Update the `manifest/config/config.yaml` file with your actual configuration:
+At minimum, review these sections:
 
-### 1. Database Connection
+- `server.address`
+- `database.default.link`
+- `jwt.secret`
+- `admin.users`
+- `m5stack.*`
+- `rsa.server.*`
+- `xiaozhi.*`
+
+Minimal example with placeholders only:
 
 ```yaml
+server:
+  address: ":12800"
+  openapiPath: "/api.json"
+
+logger:
+  path: "./logs"
+  file: "{Y-m-d}.log"
+  level: "all"
+  stdout: true
+
 database:
   default:
-    link: "mysql:your_username:your_password@tcp(127.0.0.1:3306)/stackChan?charset=utf8mb4&collation=utf8mb4_0900_ai_ci"
-```
+    link: "mysql:<db_user>:<db_password>@tcp(<db_host>:3306)/stackChan?charset=utf8mb4&collation=utf8mb4_0900_ai_ci"
+
+jwt:
+  secret: "<long-random-jwt-secret>"
 
-### 2. JWT Configuration
+admin:
+  users:
+    - username: "<admin-username>"
+      password: "<admin-password>"
 
-For production use, generate your own secure JWT secret key.
+m5stack:
+  loginUrl: ""
+  registrationUrl: ""
+  registrationToken: "Bearer <registration-token>"
+  issuer: ""
+  audience: ""
 
-**Generate a secure JWT secret key:**
+xiaozhi:
+  secret_key: "<xiaozhi-secret-key>"
+  generate_license_token: "<xiaozhi-license-token>"
+```
+
+Generate a JWT secret, for example:
 
-Option 1: Using OpenSSL (recommended)
 ```bash
-# Generate a 32-byte (256-bit) random secret key encoded in base64
 openssl rand -base64 32
 ```
 
-Option 2: Using Python
+### 4.4 Run the Service
+
+Development mode:
+
 ```bash
-python3 -c "import secrets; import base64; print(base64.b64encode(secrets.token_bytes(32)).decode())"
+go run .
 ```
 
-Update the configuration in `manifest/config/config.yaml`:
-```yaml
-jwt:
-  secret: "your_generated_secret_key_here"
+Or build first:
+
+```bash
+go build -o stackChan .
+./stackChan
 ```
 
-### 3. RSA Keys
+Example local endpoints after startup:
 
-For production use, generate your own RSA key pairs for encryption.
+- `http://<your-server-host>:12800/` - admin console
+- `http://<your-server-host>:12800/api.json` - OpenAPI JSON
+- `http://<your-server-host>:12800/file/...` - static files
 
-### 4. XiaoZhi Configuration
+### 4.5 Initial Smoke Check
 
-Set your XiaoZhi (小智) API secret key:
+Recommended checks after startup:
+
+1. Open `http://<your-server-host>:12800/` in a browser.
+2. Open `http://<your-server-host>:12800/api.json`.
+3. Call the admin login API and verify a token is returned.
+4. Upload one file and confirm it can be fetched from `/file/...`.
+
+## 5. Configuration Guide
+
+### 5.1 `server`
+
+- `address`: GoFrame listen address, for example `:12800`
+- `openapiPath`: OpenAPI JSON output path, currently `/api.json`
+- `swaggerPath`: commented out by default; enable only if you intend to expose Swagger UI
+
+Note: the service also calls `s.SetPort(12800)` inside `internal/cmd/cmd.go`. If you change the port strategy, check both the config and the code path.
+
+### 5.2 `logger`
+
+Logs are written to `./logs` and also printed to stdout by default.
+
+Useful knobs:
+
+- `level`
+- `stdout`
+- `rotateExpire`
+- `rotateBackup`
+- `rotateSize`
+
+### 5.3 `database`
+
+The project currently targets MySQL only.
+
+If you change table definitions, you will usually also want to regenerate GoFrame models:
+
+```bash
+make dao
+```
+
+Before doing so, make sure `hack/config.yaml` points to the correct database instance.
+
+### 5.4 `jwt`
+
+- Both user JWTs and admin JWTs use `jwt.secret`
+- User tokens are generated with a long expiration window
+- Admin tokens are generated with a 24-hour expiration
+
+Use a strong secret in any non-test environment.
+
+### 5.5 `admin.users`
+
+This section defines admin console credentials.
+
+Example:
 
 ```yaml
-xiaozhi:
-  secret_key: "your_xiaozhi_secret_key_here"
-  generate_license_token: "your_xiaozhi_generate_license_token_here"
+admin:
+  users:
+    - username: "<admin-username>"
+      password: "<admin-password>"
 ```
 
----
+### 5.6 `m5stack`
+
+This section is used by app-side registration and login.
+
+- `loginUrl`: remote login endpoint
+- `registrationUrl`: remote registration endpoint
+- `registrationToken`: remote registration Authorization value
+- `issuer` / `audience`: JWT claim values written into locally issued tokens
+
+### 5.7 `rsa`
+
+The device API group and WebSocket entry both rely on an RSA-encrypted MAC token.
 
-## Installation
+- The server decrypts the incoming header with `rsa.server.private`
+- The app/device side must encrypt with `rsa.server.public`
+
+Recommended key-generation commands:
 
 ```bash
-# Clone the repository
-git clone https://github.com/m5stack/StackChan.git
-cd StackChan/server
+openssl genpkey -algorithm RSA -pkeyopt rsa_keygen_bits:2048 -out server_private.pem
+openssl rsa -in server_private.pem -pubout -out server_public.pem
+openssl genpkey -algorithm RSA -pkeyopt rsa_keygen_bits:2048 -out client_private.pem
+openssl rsa -in client_private.pem -pubout -out client_public.pem
+```
+
+### 5.8 `xiaozhi`
+
+Used for XiaoZhi integration.
+
+- `secret_key`: exchanged for the developer token
+- `generate_license_token`: returned by the license-token endpoint
+
+The service caches the XiaoZhi token in memory and refresh logic resets it on a 24-hour cycle.
+
+## 6. Admin Console Guide
+
+The built admin console is stored under `web/management` and served directly by the Go server.
 
-# Download dependencies
-go mod download
+Entry URL:
+
+```text
+http://<your-server-host>:12800/
 ```
 
----
+You can define a shell variable for examples below:
 
-## Running the Server
+```bash
+BASE_URL="http://<your-server-host>:12800"
+```
 
-### Development Mode
+### 6.1 Admin Login
 
 ```bash
-go run main.go
+curl -X POST "$BASE_URL/admin/stackChan/login" \
+  -H 'Content-Type: application/json' \
+  -d '{
+    "user_name": "<admin-username>",
+    "pass_word": "<admin-password>"
+  }'
 ```
 
-### Build and Run
+Success shape:
+
+```json
+{
+  "code": 0,
+  "message": "",
+  "data": {
+    "token": "<admin-token>"
+  }
+}
+```
+
+Important details:
+
+- All admin APIs except `/admin/stackChan/login` require `Authorization`
+- The current middleware expects the raw token value, not `Bearer <token>`
+
+### 6.2 Upload an App Icon, Firmware, or Asset File
 
 ```bash
-# Build for current platform
-go build -o stackchan-server main.go
+curl -X POST "$BASE_URL/admin/stackChan/uploadFile" \
+  -H "Authorization: <admin-token>" \
+  -F "file=@./icon.png" \
+  -F "name=icon.png" \
+  -F "directory=apps"
+```
 
-# Run
-./stackchan-server    # Linux/macOS
-stackchan-server.exe  # Windows
+Typical response:
+
+```json
+{
+  "code": 0,
+  "message": "",
+  "data": {
+    "path": "file/apps/icon.png"
+  }
+}
 ```
 
-### Using Makefile
+The public URL is then:
+
+```text
+$BASE_URL/file/apps/icon.png
+```
+
+### 6.3 Add an App Store Item
 
 ```bash
-# Build
-make build
+curl -X POST "$BASE_URL/admin/stackChan/app/add" \
+  -H "Authorization: <admin-token>" \
+  -H 'Content-Type: application/json' \
+  -d '{
+    "appName": "StackChan Demo",
+    "appIconUrl": "'$BASE_URL'/file/apps/icon.png",
+    "description": "Demo app for StackChan",
+    "firmwareUrl": "'$BASE_URL'/file/apps/demo.bin"
+  }'
+```
+
+Field summary:
+
+- `appName`: required
+- `appIconUrl`: recommended as a full public URL
+- `description`: free text description
+- `firmwareUrl`: firmware or package download URL
+
+### 6.4 List Apps
+
+```bash
+curl -H "Authorization: <admin-token>" \
+  "$BASE_URL/admin/stackChan/apps"
+```
+
+### 6.5 Update an App
+
+```bash
+curl -X PUT "$BASE_URL/admin/stackChan/app/update" \
+  -H "Authorization: <admin-token>" \
+  -H 'Content-Type: application/json' \
+  -d '{
+    "id": 1,
+    "appName": "StackChan Demo v2",
+    "description": "Updated description"
+  }'
+```
+
+### 6.6 Delete an App
+
+```bash
+curl -X DELETE "$BASE_URL/admin/stackChan/app/delete" \
+  -H "Authorization: <admin-token>" \
+  -H 'Content-Type: application/json' \
+  -d '{"id":1}'
+```
+
+Deletion is soft delete only: `app_store.is_deleted` is set to `1`.
+
+## 7. App Workflow
+
+App-side APIs are grouped under `/stackChan/v2`.
+
+### 7.1 Register a User
+
+```bash
+curl -X POST "$BASE_URL/stackChan/v2/user/registration" \
+  -H 'Content-Type: application/json' \
+  -d '{
+    "username": "<app-username>",
+    "email": "<user-email>",
+    "password": "<user-password>"
+  }'
+```
+
+This request is proxied to the configured remote registration endpoint.
+
+### 7.2 Log In
 
-# Run
-make run
+```bash
+curl -X POST "$BASE_URL/stackChan/v2/user/login" \
+  -H 'Content-Type: application/json' \
+  -d '{
+    "username": "<app-username>",
+    "password": "<user-password>"
+  }'
 ```
 
----
+The response contains a locally issued JWT, referenced below as `<user-token>`.
 
-## API Documentation
+### 7.3 Get Current User Info
 
-The server provides RESTful APIs organized by module:
+```bash
+curl "$BASE_URL/stackChan/v2/user" \
+  -H "token: Bearer <user-token>"
+```
 
-### Device APIs (`/api/device/*`)
-- `POST /device/bind` - Bind a device to the current user
-- `POST /device/unbind` - Unbind a device from the current user
-- `PUT /device/update` - Update device information
-- `GET /devices` - Get list of devices
+### 7.4 Bind a Device
 
-### User APIs (`/api/user/*`)
-- `POST /user/login` - User login
-- `POST /user/registration` - User registration
-- `GET /user` - Get user information
+```bash
+curl -X POST "$BASE_URL/stackChan/v2/device/bind" \
+  -H "token: Bearer <user-token>" \
+  -H 'Content-Type: application/json' \
+  -d '{"mac":"AA:BB:CC:DD:EE:FF"}'
+```
 
-### Dance APIs (`/api/dance/*`)
-- `POST /dance` - Create a new dance
-- `GET /dance` - Get dance information
-- `PUT /dance` - Update dance details
-- `DELETE /dance` - Delete a dance
+On success, the server will:
 
-### Post APIs (`/api/post/*`)
-- `GET /post/get` - Get post details
-- Post listing and comment operations
+- Create the device record if it does not exist
+- Store the current user UID into `device.uid`
+- Set `bind_time`
 
-### Admin APIs (`/api/admin/*`)
-- App management operations
-- User management
+### 7.5 List Devices for the Current User
 
----
+```bash
+curl "$BASE_URL/stackChan/v2/devices" \
+  -H "token: Bearer <user-token>"
+```
 
-## Project Structure
+### 7.6 Update a Device
 
+```bash
+curl -X PUT "$BASE_URL/stackChan/v2/device/update" \
+  -H "token: Bearer <user-token>" \
+  -H 'Content-Type: application/json' \
+  -d '{
+    "mac": "AA:BB:CC:DD:EE:FF",
+    "name": "Desk StackChan"
+  }'
 ```
-stackChan/
-├── api/                    # API definitions and request/response structures
-│   ├── admin/             # Admin module APIs
-│   ├── appstore/          # App store module APIs
-│   ├── dance/             # Dance module APIs
-│   ├── device/            # Device module APIs
-│   ├── friend/            # Friend module APIs
-│   ├── post/              # Post module APIs
-│   ├── user/              # User module APIs
-│   └── xiaozhi/           # XiaoZhi AI module APIs
-├── internal/              # Internal application code
-│   ├── boot/             # Boot initialization
-│   ├── cmd/              # Command entry
-│   ├── consts/           # Constants definitions
-│   ├── controller/       # API controllers
-│   ├── dao/              # Data Access Objects
-│   ├── logic/            # Business logic
-│   ├── middleware/       # HTTP middlewares
-│   ├── model/            # Data models
-│   ├── packed/           # Packed assets
-│   ├── service/          # Business services
-│   └── xiaozhi/          # XiaoZhi integration
-├── manifest/             # Deployment and configuration
-│   ├── config/           # Configuration files
-│   ├── deploy/           # Deployment scripts
-│   └── docker/           # Docker configurations
-├── utility/              # Utility functions (RSA, etc.)
-├── web/                  # Web frontend assets
-├── main.go               # Application entry
-├── go.mod                # Go module definition
-├── go.sum                # Go dependencies checksum
-├── Makefile              # Build scripts
-└── README.MD             # This file
+
+Note: the request struct includes `longitude` and `latitude`, but the default SQL schema does not currently create those columns in the `device` table. Add the columns first if you plan to use them.
+
+### 7.7 Unbind a Device
+
+```bash
+curl -X POST "$BASE_URL/stackChan/v2/device/unbind" \
+  -H "token: Bearer <user-token>" \
+  -H 'Content-Type: application/json' \
+  -d '{"mac":"AA:BB:CC:DD:EE:FF"}'
 ```
 
----
+This flow attempts to:
 
-## Architecture Overview
+- Restore the default XiaoZhi agent configuration
+- Unbind the device on the XiaoZhi side
+- Clear the local bind relationship
 
-The project follows a layered architecture:
+### 7.8 Restore the Default Agent Configuration
 
-1. **API Layer**: Defines request/response structures and routes
-2. **Controller Layer**: Handles HTTP requests and responses
-3. **Service Layer**: Implements business logic
-4. **DAO Layer**: Data access and database operations
-5. **Model Layer**: Data structures and entities
+```bash
+curl -X POST "$BASE_URL/stackChan/v2/device/agent/restore" \
+  -H "token: Bearer <user-token>" \
+  -H 'Content-Type: application/json' \
+  -d '{"mac":"AA:BB:CC:DD:EE:FF"}'
+```
 
-The project uses the GoFrame framework for rapid development and robust infrastructure.
+### 7.9 Manage Dances
 
----
+List dances for a specific device:
 
-## Contributing
+```bash
+curl -G "$BASE_URL/stackChan/v2/dance" \
+  -H "token: Bearer <user-token>" \
+  --data-urlencode "mac=AA:BB:CC:DD:EE:FF"
+```
 
-Contributions are welcome! Please feel free to submit a Pull Request.
+Create a dance:
 
-For major changes, please open an issue first to discuss what you would like to change.
+```bash
+curl -X POST "$BASE_URL/stackChan/v2/dance" \
+  -H "token: Bearer <user-token>" \
+  -H 'Content-Type: application/json' \
+  -d '{
+    "mac": "AA:BB:CC:DD:EE:FF",
+    "danceName": "wave-demo",
+    "musicUrl": "'$BASE_URL'/file/music/stackchan_music.mp3",
+    "danceData": [
+      {
+        "leftEye": {"x":0,"y":0,"rotation":0,"weight":100,"size":0},
+        "rightEye": {"x":0,"y":0,"rotation":0,"weight":100,"size":0},
+        "mouth": {"x":0,"y":0,"rotation":0,"weight":0,"size":0},
+        "pitchServo": {"angle":450,"speed":900},
+        "yawServo": {"angle":0,"speed":900},
+        "leftRgbColor": "#AAAAAA",
+        "rightRgbColor": "#AAAAAA",
+        "durationMs": 1000
+      }
+    ]
+  }'
+```
 
-### Development Guidelines
+Get dance details:
 
-- Follow Go conventions and best practices
-- Write clear, descriptive comments in English
-- Add tests for new features
-- Ensure all existing tests pass
-- Update documentation as needed
+```bash
+curl -G "$BASE_URL/stackChan/v2/danceData" \
+  -H "token: Bearer <user-token>" \
+  --data-urlencode "id=1"
+```
 
----
+Update a dance:
 
-## License
+```bash
+curl -X PUT "$BASE_URL/stackChan/v2/dance" \
+  -H "token: Bearer <user-token>" \
+  -H 'Content-Type: application/json' \
+  -d '{"id":1,"danceName":"wave-demo-v2"}'
+```
 
-[SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD](LICENSE)
+Delete a dance:
 
-[SPDX-License-Identifier: MIT](LICENSE)
+```bash
+curl -X DELETE "$BASE_URL/stackChan/v2/dance" \
+  -H "token: Bearer <user-token>" \
+  -H 'Content-Type: application/json' \
+  -d '{"id":1}'
+```
 
----
+## 8. Device Workflow
 
-## Support
+Device-side APIs mainly use `/stackChan` plus `/stackChan/ws`.
 
-For questions and support, please open an issue in the GitHub repository or contact the M5Stack team.
+### 8.1 Build the Device Authorization Header
 
----
+Both the device REST APIs and WebSocket endpoint expect an RSA-encrypted MAC token.
 
-## Acknowledgments
+Plain text format:
+
+```text
+<mac>|<nonce>|<unix_timestamp_seconds>
+```
+
+Generation logic:
+
+```text
+plainText = "AA:BB:CC:DD:EE:FF|random_nonce|1710000000"
+cipher    = RSA-OAEP-SHA256-Encrypt(plainText, rsa.server.public)
+header    = Base64(cipher)
+```
+
+Request header:
+
+```http
+Authorization: <rsa-mac-token>
+```
 
-- [GoFrame](https://goframe.org/) - The Go framework used in this project
-- [M5Stack](https://m5stack.com/) - For supporting open-source development
-- All contributors who help improve this project
\ No newline at end of file
+The server will:
+
+- Base64-decode the header
+- Decrypt it using `rsa.server.private`
+- Extract the MAC from the payload
+- Reject tokens whose timestamp differs from server time by more than 10 seconds
+
+### 8.2 Create a Device Record
+
+```bash
+curl -X POST "$BASE_URL/stackChan/device" \
+  -H "Authorization: <rsa-mac-token>" \
+  -H 'Content-Type: application/json' \
+  -d '{"name":"My StackChan"}'
+```
+
+### 8.3 Get Device Info
+
+```bash
+curl "$BASE_URL/stackChan/device/info" \
+  -H "Authorization: <rsa-mac-token>"
+```
+
+### 8.4 Update Device Info
+
+```bash
+curl -X PUT "$BASE_URL/stackChan/device/info" \
+  -H "Authorization: <rsa-mac-token>" \
+  -H 'Content-Type: application/json' \
+  -d '{"name":"Living Room StackChan"}'
+```
+
+### 8.5 Get the User Bound to This Device
+
+```bash
+curl "$BASE_URL/stackChan/device/user" \
+  -H "Authorization: <rsa-mac-token>"
+```
+
+### 8.6 Unbind from the Device Side
+
+```bash
+curl -X POST "$BASE_URL/stackChan/device/unbind" \
+  -H "Authorization: <rsa-mac-token>"
+```
+
+### 8.7 Fetch Random Online Devices
+
+```bash
+curl -G "$BASE_URL/stackChan/device/randomList" \
+  -H "Authorization: <rsa-mac-token>" \
+  --data-urlencode "pageSize=6"
+```
+
+This list is drawn from the currently connected StackChan WebSocket clients and excludes the caller's own MAC.
+
+### 8.8 Friend, Post, Comment, and Pano APIs
+
+Add a friend device:
+
+```bash
+curl -X POST "$BASE_URL/stackChan/friend" \
+  -H "Authorization: <rsa-mac-token>" \
+  -H 'Content-Type: application/json' \
+  -d '{"friendMac":"11:22:33:44:55:66"}'
+```
+
+Create a post:
+
+```bash
+curl -X POST "$BASE_URL/stackChan/post/add" \
+  -H "Authorization: <rsa-mac-token>" \
+  -H 'Content-Type: application/json' \
+  -d '{
+    "content_text": "hello stackchan",
+    "content_image": "'$BASE_URL'/file/posts/a.jpg"
+  }'
+```
+
+List posts:
+
+```bash
+curl -G "$BASE_URL/stackChan/post/get" \
+  -H "Authorization: <rsa-mac-token>" \
+  --data-urlencode "page=1" \
+  --data-urlencode "pageSize=10"
+```
+
+Create a comment:
+
+```bash
+curl -X POST "$BASE_URL/stackChan/post/comment/create" \
+  -H "Authorization: <rsa-mac-token>" \
+  -H 'Content-Type: application/json' \
+  -d '{"postId":1,"content":"nice!"}'
+```
+
+List comments:
+
+```bash
+curl -G "$BASE_URL/stackChan/post/comment/get" \
+  -H "Authorization: <rsa-mac-token>" \
+  --data-urlencode "postId=1" \
+  --data-urlencode "page=1" \
+  --data-urlencode "pageSize=10"
+```
+
+Add a panoramic image record:
+
+```bash
+curl -X POST "$BASE_URL/stackChan/pano" \
+  -H "Authorization: <rsa-mac-token>" \
+  -H 'Content-Type: application/json' \
+  -d '{"url":"'$BASE_URL'/file/pano/p1.jpg"}'
+```
+
+List panoramic images:
+
+```bash
+curl "$BASE_URL/stackChan/pano" \
+  -H "Authorization: <rsa-mac-token>"
+```
+
+### 8.9 Upload a File from the Device Side
+
+```bash
+curl -X POST "$BASE_URL/stackChan/uploadFile" \
+  -H "Authorization: <rsa-mac-token>" \
+  -F "file=@./photo.jpg" \
+  -F "name=photo.jpg" \
+  -F "directory=posts"
+```
+
+### 8.10 Public App List and XiaoZhi APIs
+
+Get the public app list:
+
+```bash
+curl "$BASE_URL/stackChan/apps"
+```
+
+Get the current XiaoZhi developer token:
+
+```bash
+curl "$BASE_URL/stackChan/xiaozhi/token"
+```
+
+Force a token refresh:
+
+```bash
+curl "$BASE_URL/stackChan/xiaozhi/token/refresh"
+```
+
+Get the license token:
+
+```bash
+curl "$BASE_URL/stackChan/xiaozhi/generateLicenseToken"
+```
+
+## 9. Authentication and Response Format
+
+### 9.1 Authentication Rules
+
+| Group | Prefix | Header | Notes |
+| --- | --- | --- | --- |
+| Admin | `/admin/stackChan` | `Authorization: <admin-token>` | `/login` is public |
+| App | `/stackChan/v2` | `token: Bearer <user-token>` | `/user/login` and `/user/registration` are public |
+| Device | `/stackChan` | `Authorization: <rsa-mac-token>` | Most APIs depend on MAC extraction |
+| WebSocket | `/stackChan/ws` | `Authorization: <rsa-mac-token>` | Query parameter `deviceType` is also required |
+| Static files | `/file/*` | none | Direct file access |
+
+Additional notes:
+
+- The app middleware strips the `Bearer ` prefix automatically
+- The admin middleware expects the raw token value
+- Some `/stackChan` routes do not hard-fail if no MAC is present, but clients should still follow the standard header format consistently
+
+### 9.2 Unified Response Shape
+
+GoFrame wraps normal API responses in this shape:
+
+```json
+{
+  "code": 0,
+  "message": "",
+  "data": {}
+}
+```
+
+On failure:
+
+- `code` contains an error code
+- `message` contains the error description
+- `data` is usually `null`
+
+## 10. API Reference by Module
+
+### 10.1 Admin APIs: `/admin/stackChan`
+
+| Method | Path | Purpose | Main Parameters |
+| --- | --- | --- | --- |
+| POST | `/login` | Admin login | `user_name`, `pass_word` |
+| POST | `/uploadFile` | Upload icon, firmware, or asset file | form-data: `file`, `name`, `directory` |
+| POST | `/app/add` | Create App Store item | `appName`, `appIconUrl`, `description`, `firmwareUrl` |
+| GET | `/apps` | List apps | none |
+| PUT | `/app/update` | Update app | `id` required, others optional |
+| DELETE | `/app/delete` | Soft delete app | `id` |
+
+### 10.2 App APIs: `/stackChan/v2`
+
+| Method | Path | Purpose | Main Parameters |
+| --- | --- | --- | --- |
+| POST | `/user/registration` | Register user | `username`, `email`, `password` |
+| POST | `/user/login` | Log in and obtain JWT | `username`, `password` |
+| GET | `/user` | Get current user | header `token` |
+| GET | `/devices` | List current user's devices | header `token` |
+| POST | `/device/bind` | Bind device | `mac` |
+| POST | `/device/unbind` | Unbind device | `mac` |
+| PUT | `/device/update` | Update bound device | `mac`, optional `name`, `longitude`, `latitude` |
+| POST | `/device/agent/restore` | Restore default agent config | `mac` |
+| GET | `/dance` | List dances for a device | query `mac` |
+| POST | `/dance` | Create dance for a device | `mac`, `danceName`, `danceData`, `musicUrl` |
+| GET | `/danceData` | Get dance details | query `id` |
+| PUT | `/dance` | Update dance | `id` plus optional fields |
+| DELETE | `/dance` | Delete dance | `id` |
+
+### 10.3 Device APIs: `/stackChan`
+
+| Method | Path | Purpose | Main Parameters |
+| --- | --- | --- | --- |
+| POST | `/device` | Create device record | `name` |
+| PUT | `/device` | Update device name | `name` |
+| GET | `/device/info` | Get current device info | none |
+| PUT | `/device/info` | Update current device info | `name` |
+| GET | `/device/randomList` | List random online devices | query `pageSize` |
+| GET | `/device/user` | Get bound user for current device | none |
+| POST | `/device/unbind` | Unbind from device side | none |
+| POST | `/friend` | Add friend device | `friendMac` |
+| GET | `/dance` | List current device dances | none |
+| POST | `/dance` | Create dance for current device | `danceName`, `danceData`, `musicUrl` |
+| GET | `/danceData` | Get dance details | query `id` |
+| PUT | `/dance` | Update dance | `id` plus optional fields |
+| DELETE | `/dance` | Delete dance | `id` |
+| GET | `/musicList` | List built-in music files | none |
+| POST | `/pano` | Add pano record | `url` |
+| GET | `/pano` | List pano records | none |
+| POST | `/uploadFile` | Upload file | form-data: `file`, `name`, `directory` |
+| GET | `/apps` | Get public App Store list | none |
+| GET | `/xiaozhi/token` | Get XiaoZhi token | none |
+| GET | `/xiaozhi/token/refresh` | Force XiaoZhi token refresh | none |
+| GET | `/xiaozhi/generateLicenseToken` | Get license token | none |
+
+### 10.4 Community APIs: `/stackChan`
+
+| Method | Path | Purpose | Main Parameters |
+| --- | --- | --- | --- |
+| POST | `/post/add` | Create post | `content_text`, optional `content_image` |
+| GET | `/post/get` | Paginated post list | `page`, `pageSize` |
+| DELETE | `/post/delete` | Delete post | `id` |
+| POST | `/post/comment/create` | Create comment | `postId`, `content` |
+| GET | `/post/comment/get` | Paginated comment list | `postId`, `page`, `pageSize` |
+| DELETE | `/post/comment/delete` | Delete comment | `postId`, `commentId` |
+
+### 10.5 Public App Store Response
+
+Public list endpoint:
+
+```bash
+curl "$BASE_URL/stackChan/apps"
+```
+
+Returned fields usually include:
+
+- `id`
+- `appName`
+- `appIconUrl`
+- `description`
+- `firmwareUrl`
+- `createAt`
+- `updateAt`
+
+## 11. WebSocket Protocol
+
+Example endpoint URLs:
+
+```text
+ws://<your-server-host>:12800/stackChan/ws?deviceType=StackChan
+ws://<your-server-host>:12800/stackChan/ws?deviceType=App&deviceId=<app-device-id>
+```
+
+Requirements:
+
+- `Authorization: <rsa-mac-token>` must be sent
+- `deviceType=StackChan` means a hardware client
+- `deviceType=App` means an app client and also requires `deviceId`
+
+### 11.1 Binary Frame Format
+
+```text
+1 byte  : msgType
+4 bytes : payload length (big endian)
+N bytes : payload
+```
+
+### 11.2 Message Types
+
+| Value | Name | Meaning |
+| --- | --- | --- |
+| `0x01` | `Opus` | Audio frame |
+| `0x02` | `Jpeg` | Image frame |
+| `0x03` | `ControlAvatar` | Avatar / expression control |
+| `0x04` | `ControlMotion` | Motion control |
+| `0x05` | `OnCamera` | Turn camera on |
+| `0x06` | `OffCamera` | Turn camera off |
+| `0x07` | `TextMessage` | Text message |
+| `0x09` | `RequestCall` | Request call |
+| `0x0A` | `RefuseCall` | Refuse call |
+| `0x0B` | `AgreeCall` | Accept call |
+| `0x0C` | `HangupCall` | Hang up |
+| `0x0D` | `UpdateDeviceName` | Update device name |
+| `0x0E` | `GetDeviceName` | Query device name |
+| `0x10` | `ping` | Server heartbeat |
+| `0x11` | `pong` | Client heartbeat response |
+| `0x12` | `OnPhoneScreen` | Start phone-screen projection |
+| `0x13` | `OffPhoneScreen` | Stop phone-screen projection |
+| `0x14` | `Dance` | Dance playback message |
+| `0x15` | `GetAvatarPosture` | Query avatar posture |
+| `0x16` | `DeviceOffline` | Device offline notification |
+| `0x17` | `DeviceOnline` | Device online notification |
+| `0x18` | `OnAudio` | Start audio subscription |
+| `0x19` | `OffAudio` | Stop audio subscription |
+| `0x1A` | `AimedTakePhoto` | Directed photo capture |
+
+### 11.3 Timers
+
+At startup, the server launches two recurring tasks:
+
+- every 5 seconds: send WebSocket heartbeat messages
+- every 15 seconds: clean expired connections
+
+## 12. Database Overview
+
+Schema file:
+
+- `check_list/create_mysql_database.sql`
+
+Main tables:
+
+| Table | Purpose |
+| --- | --- |
+| `user` | Cached local user profile, keyed by remote UID |
+| `device` | Device table, keyed by `mac` |
+| `device_dance` | Dance motion data |
+| `device_friend` | Device friendship links |
+| `device_pano` | Panoramic image records |
+| `device_post` | Device-created posts |
+| `device_post_comment` | Post comments |
+| `app_store` | Admin-managed app list |
+
+Additional notes:
+
+- `app_store` uses soft delete through `is_deleted`
+- `device.bind_time` is currently stored as a string, not a datetime type
+- The SQL script does not create the `stackChan` database itself; create it first
+
+## 13. Project Structure
+
+```text
+.
+├── api/                         # GoFrame API definitions
+│   ├── admin/                   # Admin APIs
+│   ├── appstore/                # Public App Store APIs
+│   ├── dance/                   # Dance APIs
+│   ├── device/                  # Device and app-device APIs
+│   ├── file/                    # Upload APIs
+│   ├── friend/                  # Friend APIs
+│   ├── pano/                    # Pano APIs
+│   ├── post/                    # Post and comment APIs
+│   ├── stackchandevice/         # Device-bound-user and device-unbind APIs
+│   ├── user/                    # User login and registration APIs
+│   └── xiaozhi/                 # XiaoZhi APIs
+├── check_list/                  # MySQL bootstrap SQL
+├── file/                        # Uploaded files and built-in music
+├── hack/                        # GoFrame CLI and generation config
+├── internal/
+│   ├── boot/                    # Heartbeat and cleanup schedulers
+│   ├── cmd/                     # HTTP server startup and route binding
+│   ├── controller/              # Controllers
+│   ├── dao/                     # GoFrame DAO layer
+│   ├── middleware/              # Auth and CORS middleware
+│   ├── model/                   # Business models and entities
+│   ├── packed/                  # Embedded/static resource linkage
+│   ├── service/                 # Service layer
+│   ├── web_socket/              # WebSocket pools and forwarding
+│   └── xiaozhi/                 # XiaoZhi client logic
+├── manifest/
+│   ├── config/                  # Runtime config
+│   ├── deploy/                  # Kustomize templates
+│   └── docker/                  # Docker build files
+├── resource/                    # Template/resource directory
+├── utility/                     # Helpers such as RSA decryption
+├── web/management/              # Built Flutter Web admin assets
+├── LICENSE
+├── Makefile
+├── README.MD
+└── main.go
+```
+
+## 14. Development, Build, and Deployment
+
+### 14.1 Common Commands
+
+```bash
+# Run directly
+go run .
+
+# Build a binary
+go build -o stackChan .
+
+# Build via GoFrame CLI
+make build
+
+# Generate controller/sdk code
+make ctrl
+
+# Generate DAO/DO/Entity from the database
+make dao
+
+# Build Docker image
+make image
+```
+
+Notes:
+
+- `make build`, `make dao`, and `make ctrl` rely on the `gf` CLI
+- If `gf` is not installed, the Makefile attempts to download and install it automatically
+
+### 14.2 Docker
+
+Dockerfile path:
+
+- `manifest/docker/Dockerfile`
+
+Expected inputs:
+
+- compiled binary named `stackChan`
+- a `config.yaml` file placed in the build context
+
+Typical flow:
+
+```bash
+go build -o stackChan .
+cp manifest/config/config.yaml ./config.yaml
+docker build -f manifest/docker/Dockerfile -t stackchan-server:local .
+```
+
+### 14.3 Kubernetes
+
+The repository includes `manifest/deploy/kustomize`, but treat it as a starter template rather than production-ready deployment.
+
+Before using it, review at least:
+
+- service names still based on `template-single`
+- target port still based on `8000`
+- placeholder deployment metadata
+- environment-specific config alignment with your real service port and image name
+
+## 15. Operational Notes
+
+1. The admin console is shipped as static assets
+   - The repository contains the built output under `web/management`
+   - It does not include the Flutter source project for that frontend
+
+2. There is a hard-coded external music URL in the v2 dance default path
+   - Review `internal/controller/dance/dance_v2_get_list.go`
+   - Replace it with your own public file URL or local deployment URL before production use
+
+3. The device update API exposes `longitude` and `latitude`
+   - The default schema does not create those columns
+   - Add the columns first if you want to enable that feature cleanly
+
+4. Do not publish environment-specific config values as-is
+   - Replace admin credentials, JWT secret, registration token, RSA keys, and XiaoZhi secrets before deployment
+   - If you plan to open-source the full repository, sanitize runtime config files separately from this README
+
+5. Admin and app token headers are intentionally different
+   - Admin: `Authorization: <admin-token>`
+   - App: `token: Bearer <user-token>`
+
+## 16. License
+
+This project is released under the MIT License.
+
+See the root file:
+
+- `LICENSE`
+
+```text
+MIT License
+Copyright (c) 2026 M5Stack Technology CO LTD
+```
diff --git a/server/api/admin/admin.go b/server/api/admin/admin.go
index 78197832..5dc85306 100644
--- a/server/api/admin/admin.go
+++ b/server/api/admin/admin.go
@@ -1,8 +1,3 @@
-/*
-SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
-SPDX-License-Identifier: MIT
-*/
-
 // =================================================================================
 // Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
 // =================================================================================
diff --git a/server/api/appstore/appstore.go b/server/api/appstore/appstore.go
index be685e1a..75f9efa0 100644
--- a/server/api/appstore/appstore.go
+++ b/server/api/appstore/appstore.go
@@ -1,8 +1,3 @@
-/*
-SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
-SPDX-License-Identifier: MIT
-*/
-
 // =================================================================================
 // Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
 // =================================================================================
diff --git a/server/api/pano/pano.go b/server/api/pano/pano.go
index 3261f713..a64168a8 100644
--- a/server/api/pano/pano.go
+++ b/server/api/pano/pano.go
@@ -1,8 +1,3 @@
-/*
-SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
-SPDX-License-Identifier: MIT
-*/
-
 // =================================================================================
 // Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
 // =================================================================================
diff --git a/server/api/stackchandevice/stackchandevice.go b/server/api/stackchandevice/stackchandevice.go
index e8025cb0..2208046d 100644
--- a/server/api/stackchandevice/stackchandevice.go
+++ b/server/api/stackchandevice/stackchandevice.go
@@ -1,8 +1,3 @@
-/*
-SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
-SPDX-License-Identifier: MIT
-*/
-
 // =================================================================================
 // Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
 // =================================================================================
diff --git a/server/api/user/user.go b/server/api/user/user.go
index 3744839f..75adc0ea 100644
--- a/server/api/user/user.go
+++ b/server/api/user/user.go
@@ -1,8 +1,3 @@
-/*
-SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
-SPDX-License-Identifier: MIT
-*/
-
 // =================================================================================
 // Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
 // =================================================================================
diff --git a/server/api/xiaozhi/xiaozhi.go b/server/api/xiaozhi/xiaozhi.go
index 29adc5ad..128d966e 100644
--- a/server/api/xiaozhi/xiaozhi.go
+++ b/server/api/xiaozhi/xiaozhi.go
@@ -1,8 +1,3 @@
-/*
-SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
-SPDX-License-Identifier: MIT
-*/
-
 // =================================================================================
 // Code generated and maintained by GoFrame CLI tool. DO NOT EDIT.
 // =================================================================================
diff --git a/server/go.mod b/server/go.mod
index edbb42a6..02e53b73 100644
--- a/server/go.mod
+++ b/server/go.mod
@@ -1,6 +1,6 @@
 module stackChan
 
-go 1.26.2
+go 1.26.3
 
 require (
 	github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.0
diff --git a/server/go.sum b/server/go.sum
new file mode 100644
index 00000000..674c509c
--- /dev/null
+++ b/server/go.sum
@@ -0,0 +1,38 @@
+filippo.io/edwards25519 v1.2.0/go.mod h1:xzAOLCNug/yB62zG1bQ8uziwrIqIuxhctzJT18Q77mc=
+github.com/BurntSushi/toml v1.6.0/go.mod h1:ukJfTF/6rtPPRCnwkur4qwRxa8vTRFBF0uk2lLoLwho=
+github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
+github.com/clbanning/mxj/v2 v2.7.0/go.mod h1:hNiWqW14h+kc+MdF9C6/YoRfjEJoR3ou6tn/Qo+ve2s=
+github.com/clipperhouse/displaywidth v0.11.0/go.mod h1:bkrFNkf81G8HyVqmKGxsPufD3JhNl3dSqnGhOoSD/o0=
+github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
+github.com/emirpasic/gods/v2 v2.0.0-alpha/go.mod h1:W0y4M2dtBB9U5z3YlghmpuUhiaZT2h6yoeE+C1sCp6A=
+github.com/fatih/color v1.19.0/go.mod h1:zNk67I0ZUT1bEGsSGyCZYZNrHuTkJJB+r6Q9VuMi0LE=
+github.com/fsnotify/fsnotify v1.9.0/go.mod h1:8jBTzvmWwFyi3Pb8djgCCO5IBqzKJ/Jwo8TRcHyHii0=
+github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
+github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
+github.com/go-sql-driver/mysql v1.9.3/go.mod h1:qn46aNg1333BRMNU69Lq93t8du/dwxI64Gl8i5p1WMU=
+github.com/goccy/go-json v0.10.6/go.mod h1:oq7eo15ShAhp70Anwd5lgX2pLfOS3QCiwU/PULtXL6M=
+github.com/gogf/gf/contrib/drivers/mysql/v2 v2.10.0/go.mod h1:6v7oGBF9wv59WERJIOJxXmLhkUcxwON3tPYW3AZ7wbY=
+github.com/gogf/gf/v2 v2.10.0/go.mod h1:Svl1N+E8G/QshU2DUbh/3J/AJauqCgUnxHurXWR4Qx0=
+github.com/golang-jwt/jwt/v5 v5.3.1/go.mod h1:fxCRLWMO43lRc8nhHWY6LGqRcf+1gQWArsqaEUEa5bE=
+github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/websocket v1.5.3/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
+github.com/grokify/html-strip-tags-go v0.1.0/go.mod h1:ZdzgfHEzAfz9X6Xe5eBLVblWIxXfYSQ40S/VKrAOGpc=
+github.com/magiconair/properties v1.8.10/go.mod h1:Dhd985XPs7jluiymwWYZ0G4Z61jb3vdS329zhj2hYo0=
+github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
+github.com/mattn/go-isatty v0.0.21/go.mod h1:ZXfXG4SQHsB/w3ZeOYbR0PrPwLy+n6xiMrJlRFqopa4=
+github.com/mattn/go-runewidth v0.0.23/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
+github.com/olekukonko/cat v0.0.0-20250911104152-50322a0618f6/go.mod h1:rEKTHC9roVVicUIfZK7DYrdIoM0EOr8mK1Hj5s3JjH0=
+github.com/olekukonko/errors v1.2.0/go.mod h1:ppzxA5jBKcO1vIpCXQ9ZqgDh8iwODz6OXIGKU8r5m4Y=
+github.com/olekukonko/ll v0.1.8/go.mod h1:RPRC6UcscfFZgjo1nulkfMH5IM0QAYim0LfnMvUuozw=
+github.com/olekukonko/tablewriter v1.1.4/go.mod h1:+kedxuyTtgoZLwif3P1Em4hARJs+mVnzKxmsCL/C5RY=
+go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
+go.opentelemetry.io/otel v1.43.0/go.mod h1:JuG+u74mvjvcm8vj8pI5XiHy1zDeoCS2LB1spIq7Ay0=
+go.opentelemetry.io/otel/metric v1.43.0/go.mod h1:RDnPtIxvqlgO8GRW18W6Z/4P462ldprJtfxHxyKd2PY=
+go.opentelemetry.io/otel/sdk v1.43.0/go.mod h1:P+IkVU3iWukmiit/Yf9AWvpyRDlUeBaRg6Y+C58QHzg=
+go.opentelemetry.io/otel/trace v1.43.0/go.mod h1:/QJhyVBUUswCphDVxq+8mld+AvhXZLhe+8WVFxiFff0=
+golang.org/x/net v0.53.0/go.mod h1:JvMuJH7rrdiCfbeHoo3fCQU24Lf5JJwT9W3sJFulfgs=
+golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
+golang.org/x/text v0.36.0/go.mod h1:NIdBknypM8iqVmPiuco0Dh6P5Jcdk8lJL0CUebqK164=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
diff --git a/server/internal/cmd/cmd.go b/server/internal/cmd/cmd.go
index ae6c84d6..fbbd8ef0 100644
--- a/server/internal/cmd/cmd.go
+++ b/server/internal/cmd/cmd.go
@@ -81,7 +81,7 @@ var (
 			})
 
 			// Do not use SetServerRoot, globally only provide frontend entry via /web
-			//s.SetServerRoot("web/management")
+			s.SetServerRoot("web/management")
 
 			s.SetPort(12800)
 			s.Run()
diff --git a/server/internal/controller/admin/admin_v1_delete_app.go b/server/internal/controller/admin/admin_v1_delete_app.go
index ae6de79e..86b87158 100644
--- a/server/internal/controller/admin/admin_v1_delete_app.go
+++ b/server/internal/controller/admin/admin_v1_delete_app.go
@@ -13,12 +13,13 @@ import (
 
 	"stackChan/api/admin/v1"
 	"stackChan/internal/dao"
-
-	"github.com/gogf/gf/v2/frame/g"
+	"stackChan/internal/model/do"
 )
 
 func (c *ControllerV1) DeleteApp(ctx context.Context, req *v1.DeleteAppReq) (res *v1.DeleteAppRes, err error) {
-	_, err = dao.AppStore.Ctx(ctx).Where("id", req.Id).Data(g.Map{"is_deleted": 1}).Update()
+	_, err = dao.AppStore.Ctx(ctx).WherePri(req.Id).Data(do.AppStore{
+		IsDeleted: 1,
+	}).Update()
 	if err != nil {
 		return nil, gerror.WrapCode(gcode.CodeInternalError, err, "Failed to delete app")
 	}
diff --git a/server/internal/controller/dance/dance_v1_get_list.go b/server/internal/controller/dance/dance_v1_get_list.go
index 6f7c59f3..096a8039 100644
--- a/server/internal/controller/dance/dance_v1_get_list.go
+++ b/server/internal/controller/dance/dance_v1_get_list.go
@@ -7,9 +7,8 @@ package dance
 
 import (
 	"context"
-	"stackChan/internal/dao"
 	"stackChan/internal/model"
-	"stackChan/internal/model/do"
+	"stackChan/internal/service"
 
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
@@ -24,35 +23,10 @@ func (c *ControllerV1) GetList(ctx context.Context, req *v1.GetListReq) (res *v1
 		return nil, gerror.NewCode(gcode.CodeInvalidParameter)
 	}
 
-	var danceList []model.Dance
-	err = dao.DeviceDance.Ctx(ctx).Where(do.DeviceDance{
-		Mac: mac,
-	}).Scan(&danceList)
+	danceList, err := service.GetOrCreateDanceList(ctx, mac, "file/music/stackchan_music.mp3")
 	if err != nil {
 		return nil, err
 	}
 
-	// Core modification: insert default data only when query result is empty
-	if len(danceList) == 0 {
-		// Insert single default dance data
-		defaultDance := do.DeviceDance{
-			Mac:       mac,
-			MusicUrl:  "file/music/stackchan_music.mp3",
-			DanceData: model.DefaultDanceData,
-		}
-		_, err = dao.DeviceDance.Ctx(ctx).Data(defaultDance).Insert()
-		if err != nil {
-			return nil, err
-		}
-
-		// Re-query list (one data exists now)
-		err = dao.DeviceDance.Ctx(ctx).Where(do.DeviceDance{
-			Mac: mac,
-		}).Scan(&danceList)
-		if err != nil {
-			return nil, err
-		}
-	}
-
 	return new(v1.GetListRes(danceList)), nil
 }
diff --git a/server/internal/controller/dance/dance_v2_get_list.go b/server/internal/controller/dance/dance_v2_get_list.go
index bf0f3310..8839b6b9 100644
--- a/server/internal/controller/dance/dance_v2_get_list.go
+++ b/server/internal/controller/dance/dance_v2_get_list.go
@@ -8,43 +8,14 @@ package dance
 import (
 	"context"
 	"stackChan/api/dance/v2"
-	"stackChan/internal/dao"
-	"stackChan/internal/model"
-	"stackChan/internal/model/do"
+	"stackChan/internal/service"
 )
 
 func (c *ControllerV2) GetList(ctx context.Context, req *v2.GetListReq) (res *v2.GetListRes, err error) {
-	mac := req.Mac
-	var danceList []model.Dance
-	err = dao.DeviceDance.Ctx(ctx).Where(do.DeviceDance{
-		Mac: mac,
-	}).Scan(&danceList)
+	danceList, err := service.GetOrCreateDanceList(ctx, req.Mac, "http://47.113.125.164:12800/file/music/stackchan_music.mp3")
 	if err != nil {
 		return nil, err
 	}
 
-	// Core modification: insert default data only when query result is empty
-	if len(danceList) == 0 {
-		// Insert single default dance data
-		defaultDance := do.DeviceDance{
-			DanceName: "StackChan Dance",
-			Mac:       mac,
-			MusicUrl:  "http://47.113.125.164:12800/file/music/stackchan_music.mp3",
-			DanceData: model.DefaultDanceData,
-		}
-		_, err = dao.DeviceDance.Ctx(ctx).Data(defaultDance).Insert()
-		if err != nil {
-			return nil, err
-		}
-
-		// Re-query list (one data exists now)
-		err = dao.DeviceDance.Ctx(ctx).Where(do.DeviceDance{
-			Mac: mac,
-		}).Scan(&danceList)
-		if err != nil {
-			return nil, err
-		}
-	}
-
 	return new(v2.GetListRes(danceList)), nil
 }
diff --git a/server/internal/controller/device/device_v2_agent_restore_default.go b/server/internal/controller/device/device_v2_agent_restore_default.go
index 64c03d25..b513d912 100644
--- a/server/internal/controller/device/device_v2_agent_restore_default.go
+++ b/server/internal/controller/device/device_v2_agent_restore_default.go
@@ -8,19 +8,22 @@ package device
 import (
 	"context"
 	"stackChan/api/device/v2"
+	"stackChan/internal/service"
+
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
 )
 
 func (c *ControllerV2) AgentRestoreDefault(ctx context.Context, req *v2.AgentRestoreDefaultReq) (res *v2.AgentRestoreDefaultRes, err error) {
-	return new(v2.AgentRestoreDefaultRes(true)), err
-	//if req.Mac == "" {
-	//	return nil, gerror.NewCode(gcode.CodeMissingParameter, "Device MAC address cannot be empty")
-	//}
-	//restoreResponse, err := service.RestoreDefaultAgent(req.Mac)
-	//if err != nil {
-	//	return nil, err
-	//}
-	//if !restoreResponse {
-	//	return nil, gerror.NewCode(gcode.CodeInternalError, "Failed to restore default configuration")
-	//}
-	//return new(v2.AgentRestoreDefaultRes(true)), nil
+	if req.Mac == "" {
+		return nil, gerror.NewCode(gcode.CodeMissingParameter, "Device MAC address cannot be empty")
+	}
+	restoreResponse, err := service.RestoreDefaultAgent(req.Mac)
+	if err != nil {
+		return nil, err
+	}
+	if !restoreResponse {
+		return nil, gerror.NewCode(gcode.CodeInternalError, "Failed to restore default configuration")
+	}
+	return new(v2.AgentRestoreDefaultRes(true)), nil
 }
diff --git a/server/internal/controller/device/device_v2_bind_device.go b/server/internal/controller/device/device_v2_bind_device.go
index 9f26dab9..b33a1768 100644
--- a/server/internal/controller/device/device_v2_bind_device.go
+++ b/server/internal/controller/device/device_v2_bind_device.go
@@ -9,8 +9,10 @@ import (
 	"context"
 	"stackChan/internal/dao"
 	"stackChan/internal/model"
+	"stackChan/internal/model/do"
 	"stackChan/internal/service"
 
+	"github.com/gogf/gf/v2/database/gdb"
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
 	"github.com/gogf/gf/v2/frame/g"
@@ -21,8 +23,6 @@ import (
 
 // BindDevice Device binding interface
 func (c *ControllerV2) BindDevice(ctx context.Context, req *v2.BindDeviceReq) (res *v2.BindDeviceRes, err error) {
-	// 1. Get current logged-in user UID (from context)
-	_, err = service.CreateMacIfNotExists(ctx, req.Mac)
 	uid := g.RequestFromCtx(ctx).GetCtxVar(model.Uid).Int64()
 	if uid == 0 {
 		return nil, gerror.NewCode(gcode.CodeMissingParameter, "User UID cannot be empty")
@@ -30,10 +30,21 @@ func (c *ControllerV2) BindDevice(ctx context.Context, req *v2.BindDeviceReq) (r
 	if req.Mac == "" {
 		return nil, gerror.NewCode(gcode.CodeMissingParameter, "Device MAC address cannot be empty")
 	}
-	_, err = dao.Device.Ctx(ctx).
-		Where("mac = ?", req.Mac).
-		Data("uid", uid, "bind_time", gtime.Now().Format("Y-m-d H:i:s")).
-		Update()
+
+	err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
+		if err = service.CreateMacIfNotExistsWithTx(ctx, tx, req.Mac); err != nil {
+			return err
+		}
+
+		_, err = dao.Device.Ctx(ctx).TX(tx).
+			Where("mac = ?", req.Mac).
+			Data(do.Device{
+				Uid:      uid,
+				BindTime: gtime.Now().Format("Y-m-d H:i:s"),
+			}).
+			Update()
+		return err
+	})
 	if err != nil {
 		return nil, gerror.WrapCode(gcode.CodeDbOperationError, err, "Device binding failed")
 	}
diff --git a/server/internal/service/dance.go b/server/internal/service/dance.go
new file mode 100644
index 00000000..50b65184
--- /dev/null
+++ b/server/internal/service/dance.go
@@ -0,0 +1,55 @@
+/*
+SPDX-FileCopyrightText: 2026 M5Stack Technology CO LTD
+SPDX-License-Identifier: MIT
+*/
+
+package service
+
+import (
+	"context"
+	"stackChan/internal/dao"
+	"stackChan/internal/model"
+	"stackChan/internal/model/do"
+
+	"github.com/gogf/gf/v2/database/gdb"
+	"github.com/gogf/gf/v2/frame/g"
+)
+
+const defaultDanceName = "StackChan Dance"
+
+func GetOrCreateDanceList(ctx context.Context, mac string, defaultMusicURL string) (danceList []model.Dance, err error) {
+	err = g.DB().Transaction(ctx, func(ctx context.Context, tx gdb.TX) error {
+		if err = CreateMacIfNotExistsWithTx(ctx, tx, mac); err != nil {
+			return err
+		}
+
+		// Serialize default initialization for the same device to avoid duplicate seed rows.
+		if _, err = dao.Device.Ctx(ctx).TX(tx).Where("mac", mac).LockUpdate().One(); err != nil {
+			return err
+		}
+
+		if err = dao.DeviceDance.Ctx(ctx).TX(tx).Where(do.DeviceDance{
+			Mac: mac,
+		}).Scan(&danceList); err != nil {
+			return err
+		}
+
+		if len(danceList) > 0 {
+			return nil
+		}
+
+		if _, err = dao.DeviceDance.Ctx(ctx).TX(tx).Data(do.DeviceDance{
+			DanceName: defaultDanceName,
+			Mac:       mac,
+			MusicUrl:  defaultMusicURL,
+			DanceData: model.DefaultDanceData,
+		}).Insert(); err != nil {
+			return err
+		}
+
+		return dao.DeviceDance.Ctx(ctx).TX(tx).Where(do.DeviceDance{
+			Mac: mac,
+		}).Scan(&danceList)
+	})
+	return danceList, err
+}
diff --git a/server/internal/service/device.go b/server/internal/service/device.go
index cc9b4b0d..b87bb575 100644
--- a/server/internal/service/device.go
+++ b/server/internal/service/device.go
@@ -10,24 +10,42 @@ import (
 	"stackChan/internal/dao"
 	"stackChan/internal/model/do"
 	"stackChan/internal/model/entity"
+
+	"github.com/gogf/gf/v2/database/gdb"
+	"github.com/gogf/gf/v2/errors/gcode"
+	"github.com/gogf/gf/v2/errors/gerror"
 )
 
 func CreateMacIfNotExists(ctx context.Context, mac string) (id int64, err error) {
-	count, err := dao.Device.Ctx(ctx).Where("mac = ?", mac).Count()
+	if err = validateMac(mac); err != nil {
+		return 0, err
+	}
+
+	_, err = dao.Device.Ctx(ctx).Data(do.Device{
+		Mac: mac,
+	}).InsertIgnore()
 	if err != nil {
 		return 0, err
 	}
-	if count > 0 {
-		return 0, nil
+	return 0, nil
+}
+
+func CreateMacIfNotExistsWithTx(ctx context.Context, tx gdb.TX, mac string) error {
+	if err := validateMac(mac); err != nil {
+		return err
 	}
-	id, err = dao.Device.Ctx(ctx).Data(do.Device{
+
+	_, err := dao.Device.Ctx(ctx).TX(tx).Data(do.Device{
 		Mac: mac,
-	}).InsertAndGetId()
+	}).InsertIgnore()
+	return err
+}
 
-	if err != nil {
-		return 0, err
+func validateMac(mac string) error {
+	if mac == "" {
+		return gerror.NewCode(gcode.CodeMissingParameter, "Device MAC address cannot be empty")
 	}
-	return id, nil
+	return nil
 }
 
 func GetDeviceName(ctx context.Context, mac string) (name string, err error) {
diff --git a/server/internal/service/logs/2026-04-28.log b/server/internal/service/logs/2026-04-28.log
new file mode 100644
index 00000000..48e6930a
--- /dev/null
+++ b/server/internal/service/logs/2026-04-28.log
@@ -0,0 +1 @@
+2026-04-28T11:21:26.547+08:00 [INFO] {38544d753667aa188bdf205b0608ffab} xiaozhi token auto refresh ticker started, refresh cycle: 24 hours
diff --git a/server/internal/service/user.go b/server/internal/service/user.go
index e82e604b..146bb5a1 100644
--- a/server/internal/service/user.go
+++ b/server/internal/service/user.go
@@ -141,8 +141,7 @@ func Registration(ctx context.Context, req *v2.RegistrationReq) (res *v2.Registr
 	if err != nil {
 		return nil, err
 	}
-	responseData := v2.RegistrationRes(remoteResp)
-	return &responseData, nil
+	return new(v2.RegistrationRes(remoteResp)), nil
 }
 
 // callRemoteRegister Call remote registration interface
diff --git a/server/utility/rsa.go b/server/utility/rsa.go
index 1bfeba4f..ea028dbc 100644
--- a/server/utility/rsa.go
+++ b/server/utility/rsa.go
@@ -12,6 +12,7 @@ import (
 	"crypto/x509"
 	"encoding/pem"
 	"errors"
+	"fmt"
 
 	"github.com/gogf/gf/v2/frame/g"
 	"github.com/gogf/gf/v2/os/gctx"
@@ -261,6 +262,15 @@ func GenerateFourKeys() {
 	clientPrivateKey, clientPublicKey = generateKeyPair(2048)
 
 	// Print PEM
+	//fmt.Println("=== Server Private Key ===")
+	//fmt.Println(keyToPEM(serverPrivateKey, true))
+	//fmt.Println("=== Server Public Key ===")
+	//fmt.Println(keyToPEM(serverPublicKey, false))
+
+	fmt.Println("=== Client Private Key ===")
+	fmt.Println(keyToPEM(clientPrivateKey, true))
+	fmt.Println("=== Client Public Key ===")
+	fmt.Println(keyToPEM(clientPublicKey, false))
 
 	// Mark initialization complete
 	initialized = true