From 8b8b9b90b9c700dfc4a1942534f54035791c689c Mon Sep 17 00:00:00 2001
From: bernard <bernard.xiong@gmail.com>
Date: Wed, 7 Oct 2026 16:26:40 +0800
Subject: [PATCH 1/2] Add ms-probe diagnostic package

Register Real-Thread/ms-probe under tools with latest tracking main. Load package-local diagnostic options after download and document GPL-2.0 / commercial dual licensing.
---
 tools/Kconfig               |  1 +
 tools/ms-probe/Kconfig      | 32 ++++++++++++++++++++++++++++++++
 tools/ms-probe/package.json | 29 +++++++++++++++++++++++++++++
 3 files changed, 62 insertions(+)
 create mode 100644 tools/ms-probe/Kconfig
 create mode 100644 tools/ms-probe/package.json

diff --git a/tools/Kconfig b/tools/Kconfig
index 1284631db8..43977d33cd 100644
--- a/tools/Kconfig
+++ b/tools/Kconfig
@@ -5,6 +5,7 @@ source "$PKGS_DIR/packages/tools/sorch/Kconfig"
 source "$PKGS_DIR/packages/tools/dict/Kconfig"
 source "$PKGS_DIR/packages/tools/CmBacktrace/Kconfig"
 source "$PKGS_DIR/packages/tools/MCoreDump/Kconfig"
+source "$PKGS_DIR/packages/tools/ms-probe/Kconfig"
 source "$PKGS_DIR/packages/tools/EasyFlash/Kconfig"
 source "$PKGS_DIR/packages/tools/EasyLogger/Kconfig"
 source "$PKGS_DIR/packages/tools/SystemView/Kconfig"
diff --git a/tools/ms-probe/Kconfig b/tools/ms-probe/Kconfig
new file mode 100644
index 0000000000..1135712912
--- /dev/null
+++ b/tools/ms-probe/Kconfig
@@ -0,0 +1,32 @@
+# Kconfig file for package ms-probe
+menuconfig PKG_USING_MS_PROBE
+    bool "ms-probe: Microscope fault diagnostics, backtrace and coredump"
+    default n
+    help
+        GPL-2.0 / commercial dual-licensed development diagnostics.
+        Run pkgs --update after selecting the package, then open menuconfig
+        again to configure Scope, backtrace, coredump and BSP-specific options.
+        Disable this package and Fault injection in production builds.
+
+if PKG_USING_MS_PROBE
+
+    config PKG_MS_PROBE_PATH
+        string
+        default "/packages/tools/ms-probe"
+
+    choice
+        prompt "Version"
+        default PKG_USING_MS_PROBE_LATEST_VERSION
+
+        config PKG_USING_MS_PROBE_LATEST_VERSION
+            bool "latest"
+    endchoice
+
+    config PKG_MS_PROBE_VER
+        string
+        default "latest" if PKG_USING_MS_PROBE_LATEST_VERSION
+
+    # Optional until pkgs --update downloads the package into the BSP.
+    osource "packages/ms-probe-latest/Kconfig.options"
+
+endif
diff --git a/tools/ms-probe/package.json b/tools/ms-probe/package.json
new file mode 100644
index 0000000000..ca5173f1fd
--- /dev/null
+++ b/tools/ms-probe/package.json
@@ -0,0 +1,29 @@
+{
+  "name": "ms-probe",
+  "description": "Microscope embedded fault diagnostics, backtrace and coredump for RT-Thread",
+  "description_zh": "Microscope 嵌入式 Fault 诊断、栈回溯与 Coredump 软件包",
+  "enable": "PKG_USING_MS_PROBE",
+  "keywords": [
+    "microscope",
+    "fault",
+    "backtrace",
+    "coredump"
+  ],
+  "category": "tools",
+  "author": {
+    "name": "Real-Thread",
+    "email": "business@rt-thread.com",
+    "github": "Real-Thread"
+  },
+  "license": "GPL-2.0",
+  "repository": "https://github.com/Real-Thread/ms-probe",
+  "homepage": "https://github.com/Real-Thread/ms-probe#readme",
+  "site": [
+    {
+      "version": "latest",
+      "URL": "https://github.com/Real-Thread/ms-probe.git",
+      "filename": "ms-probe.zip",
+      "VER_SHA": "main"
+    }
+  ]
+}

From 25175bb5b0a9a1b0cfe1ec1c40bac53fa3bc384b Mon Sep 17 00:00:00 2001
From: bernard <bernard.xiong@gmail.com>
Date: Wed, 7 Oct 2026 21:30:28 +0800
Subject: [PATCH 2/2] Align ms-probe index with probe-only package
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

同步软件包描述、关键词和 Kconfig 帮助，移除设备端 Backtrace/CoreDump 能力说明。

保留 latest/main 下载及共享配置入口，与精简后的 ms-probe 元数据保持一致。
---
 tools/ms-probe/Kconfig      | 5 +++--
 tools/ms-probe/package.json | 8 ++++----
 2 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/tools/ms-probe/Kconfig b/tools/ms-probe/Kconfig
index 1135712912..e8fdf8beff 100644
--- a/tools/ms-probe/Kconfig
+++ b/tools/ms-probe/Kconfig
@@ -1,11 +1,12 @@
 # Kconfig file for package ms-probe
 menuconfig PKG_USING_MS_PROBE
-    bool "ms-probe: Microscope fault diagnostics, backtrace and coredump"
+    bool "ms-probe: Microscope fault-state diagnostic probe"
     default n
     help
         GPL-2.0 / commercial dual-licensed development diagnostics.
         Run pkgs --update after selecting the package, then open menuconfig
-        again to configure Scope, backtrace, coredump and BSP-specific options.
+        again to configure Scope protocol and BSP-specific options.
+        The host analyzes the exported Context and whitelisted memory.
         Disable this package and Fault injection in production builds.
 
 if PKG_USING_MS_PROBE
diff --git a/tools/ms-probe/package.json b/tools/ms-probe/package.json
index ca5173f1fd..37b4bc4722 100644
--- a/tools/ms-probe/package.json
+++ b/tools/ms-probe/package.json
@@ -1,13 +1,13 @@
 {
   "name": "ms-probe",
-  "description": "Microscope embedded fault diagnostics, backtrace and coredump for RT-Thread",
-  "description_zh": "Microscope 嵌入式 Fault 诊断、栈回溯与 Coredump 软件包",
+  "description": "Microscope fault-state diagnostic probe for RT-Thread",
+  "description_zh": "Microscope 嵌入式故障现场诊断 Probe 软件包",
   "enable": "PKG_USING_MS_PROBE",
   "keywords": [
     "microscope",
     "fault",
-    "backtrace",
-    "coredump"
+    "probe",
+    "diagnostics"
   ],
   "category": "tools",
   "author": {