fix(plugin): address remaining README/changelog review findings

- Guard fetchChangelog with a request id + plugin identity check so a slow
  changelog response for plugin A can no longer overwrite plugin B's page
  (same race class that was fixed for the README fetch)
- Skip the duplicate README fetch triggered when the plugin-switch watcher
  resets readmeLocale back to the default
- Return the originally declared locale key (e.g. zh-CN) as resolved_locale
  instead of the normalized lowercase tag, keeping it consistent with
  available_locales and the documented format
- Also catch ValueError when resolving declared README paths so an entry
  with an embedded NUL byte degrades gracefully instead of failing the
  request

Author: antares127

astrbot/dashboard/services/plugin_service.py

@@ -1978,7 +1978,8 @@ def _resolve_declared_readme(plugin_dir: Path, filename: str) -> Path | None:
         try:
             resolved = (plugin_dir / relative).resolve(strict=True)
             root = plugin_dir.resolve(strict=True)
-        except (OSError, RuntimeError):
+        except (OSError, RuntimeError, ValueError):
+            # ValueError covers paths with embedded NUL bytes.
             return None
         if not resolved.is_file():
             return None
@@ -2018,8 +2019,10 @@ def get_plugin_readme(
         declared = self._get_plugin_readmes(plugin_name)
         available_locales = [key for key in declared if key != "default"]
         requested = self._normalize_locale(locale)
+        # Map the normalized tag to the originally declared locale key so the
+        # resolved locale matches the spelling used in available_locales.
         locale_paths = {
-            self._normalize_locale(key): value
+            self._normalize_locale(key): (key, value)
             for key, value in declared.items()
             if key != "default"
         }
@@ -2034,7 +2037,8 @@ def get_plugin_readme(
                 if base_language in locale_paths:
                     matched_locale = base_language
             if matched_locale:
-                candidates.append((matched_locale, locale_paths[matched_locale]))
+                declared_locale, path = locale_paths[matched_locale]
+                candidates.append((declared_locale, path))
         candidates.append((None, declared.get("default") or "README.md"))
 
         readme_path = None

dashboard/src/views/extension/PluginDetailPage.vue

@@ -98,6 +98,10 @@ const readmeLocale = ref("");
 const readmeAvailableLocales = ref([]);
 let readmeRequestId = 0;
 let detailRequestId = 0;
+let changelogRequestId = 0;
+// Set when the plugin-switch watcher resets readmeLocale, so the locale
+// watcher skips the fetch that the plugin-switch flow already performs.
+let skipNextLocaleWatch = false;
 const readmeLocaleItems = computed(() => [
   { title: `${tm("detail.readmeLanguageAuto")} (${locale.value})`, value: "" },
   ...readmeAvailableLocales.value.map((item) => ({ title: item, value: item })),
@@ -805,7 +809,14 @@ const fetchReadme = async () => {
 
 const fetchChangelog = async () => {
   const plugin = pluginData.value || {};
-  if (!plugin?.name) return;
+  const pluginName = plugin.name;
+  if (!pluginName) return;
+
+  const requestId = ++changelogRequestId;
+  // A response is stale when a newer changelog request started or the user
+  // has switched to another plugin since this request began.
+  const isCurrent = () =>
+    requestId === changelogRequestId && props.plugin?.name === pluginName;
 
   changelogLoading.value = true;
   changelogError.value = "";
@@ -822,21 +833,26 @@ const fetchChangelog = async () => {
 
     try {
       const content = await fetchRemoteMarkdown(changelogUrl);
+      if (!isCurrent()) return;
       if (!content.trim()) {
         changelogEmpty.value = true;
         return;
       }
       renderedChangelog.value = renderMarkdown(content);
     } catch (err) {
+      if (!isCurrent()) return;
       changelogError.value = err?.message || String(err);
     } finally {
-      changelogLoading.value = false;
+      if (isCurrent()) {
+        changelogLoading.value = false;
+      }
     }
     return;
   }
 
   try {
     const res = await pluginApi.changelog(plugin.name);
+    if (!isCurrent()) return;
 
     if (res.data.status !== "ok") {
       changelogError.value = res.data.message || tm("messages.operationFailed");
@@ -851,9 +867,12 @@ const fetchChangelog = async () => {
 
     renderedChangelog.value = renderMarkdown(content);
   } catch (err) {
+    if (!isCurrent()) return;
     changelogError.value = err?.message || String(err);
   } finally {
-    changelogLoading.value = false;
+    if (isCurrent()) {
+      changelogLoading.value = false;
+    }
   }
 };
 
@@ -874,6 +893,9 @@ watch(
   ],
   async () => {
     logoLoadFailed.value = false;
+    // The locale watcher below would fire on this reset and duplicate the
+    // README fetch that this flow performs after the detail request.
+    skipNextLocaleWatch = readmeLocale.value !== "";
     readmeLocale.value = "";
     const isCurrent = await fetchPluginDetail();
     // The plugin selection changed while the detail request was pending;
@@ -888,6 +910,10 @@ watch(
 
 // Follow the WebUI language until the user picks a README variant explicitly.
 watch([() => locale.value, readmeLocale], () => {
+  if (skipNextLocaleWatch) {
+    skipNextLocaleWatch = false;
+    return;
+  }
   fetchReadme();
 });