feat: 同步upstream v4.11.2并解决冲突，保留MOD管理器新布局

- 合并upstream27个新提交

- 解决4个冲突文件（i18n、ReadmeDialog、ExtensionPage）

- 保留MOD管理器架构重构

- 吸收upstream的视图模式持久化功能

Author: AstralSolipsism

astrbot/builtin_stars/astrbot/process_llm_request.py

@@ -37,10 +37,20 @@ async def _ensure_persona(self, req: ProviderRequest, cfg: dict, umo: str):
 
         if not persona_id:
             persona_id = req.conversation.persona_id or cfg.get("default_personality")
-            if not persona_id and persona_id != "[%None]":  # [%None] 为用户取消人格
-                default_persona = self.ctx.persona_manager.selected_default_persona_v3
-                if default_persona:
-                    persona_id = default_persona["name"]
+
+        # [%None] 为用户取消人格
+        # 同时兼容配置为 "default" 但库中不存在该 persona 的情况：
+        # - 优先使用当前 persona_manager 选中的默认 persona（会被插件如 meme_manager 修改）
+        # - 再兜底用 get_default_persona_v3()
+        if (not persona_id or persona_id == "default") and persona_id != "[%None]":
+            default_persona = self.ctx.persona_manager.selected_default_persona_v3
+            if not default_persona:
+                try:
+                    default_persona = await self.ctx.persona_manager.get_default_persona_v3(umo)
+                except Exception:
+                    default_persona = None
+            if default_persona:
+                persona_id = default_persona.get("name") or persona_id
 
         persona = next(
             builtins.filter(
@@ -49,6 +59,16 @@ async def _ensure_persona(self, req: ProviderRequest, cfg: dict, umo: str):
             ),
             None,
         )
+
+        # 兼容：配置指向的 persona 不存在时，回退到默认 persona，避免 system_prompt 为空
+        if not persona and persona_id != "[%None]":
+            persona = self.ctx.persona_manager.selected_default_persona_v3
+            if not persona:
+                try:
+                    persona = await self.ctx.persona_manager.get_default_persona_v3(umo)
+                except Exception:
+                    persona = None
+
         if persona:
             if prompt := persona["prompt"]:
                 req.system_prompt += prompt

astrbot/dashboard/routes/__init__.py

@@ -8,6 +8,7 @@
 from .knowledge_base import KnowledgeBaseRoute
 from .log import LogRoute
 from .persona import PersonaRoute
+from .pipeline import PipelineRoute
 from .platform import PlatformRoute
 from .plugin import PluginRoute
 from .session_management import SessionManagementRoute
@@ -27,6 +28,7 @@
     "KnowledgeBaseRoute",
     "LogRoute",
     "PersonaRoute",
+    "PipelineRoute",
     "PlatformRoute",
     "PluginRoute",
     "SessionManagementRoute",

astrbot/dashboard/server.py

@@ -69,6 +69,7 @@ def __init__(
             core_lifecycle.plugin_manager,
         )
         self.command_route = CommandRoute(self.context)
+        self.pipeline_route = PipelineRoute(self.context, core_lifecycle)
         self.cr = ConfigRoute(self.context, core_lifecycle)
         self.lr = LogRoute(self.context, core_lifecycle.log_broker)
         self.sfr = StaticFileRoute(self.context)

dashboard/src/components/shared/ReadmeDialog.vue

@@ -247,14 +247,27 @@ const _show = computed({
 </template>
 
 <style>
+/* 更贴近 GitHub 的 markdown 展示样式（不引入新依赖，仅调整样式）
+ * 合并策略：颜色/背景走 upstream 的 var(--v-theme-*) token；保留本地布局增强（word-wrap、首尾 margin、task list、表格横向滚动）
+ */
 .markdown-body {
   font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Helvetica, Arial,
     sans-serif;
+  font-size: 16px;
   line-height: 1.6;
+  word-wrap: break-word;
   padding: 8px 0;
   color: var(--v-theme-secondaryText);
 }
 
+.markdown-body > :first-child {
+  margin-top: 0;
+}
+
+.markdown-body > :last-child {
+  margin-bottom: 0;
+}
+
 .markdown-body h1,
 .markdown-body h2,
 .markdown-body h3,
@@ -279,17 +292,66 @@ const _show = computed({
   padding-bottom: 0.3em;
 }
 
+.markdown-body h3 {
+  font-size: 1.25em;
+}
+
 .markdown-body p {
   margin-top: 0;
   margin-bottom: 16px;
 }
 
+.markdown-body hr {
+  height: 0.25em;
+  padding: 0;
+  margin: 24px 0;
+  background-color: var(--v-theme-containerBg);
+  border: 0;
+}
+
+.markdown-body a {
+  color: var(--v-theme-primary);
+  text-decoration: none;
+}
+
+.markdown-body a:hover {
+  text-decoration: underline;
+}
+
+/* Lists */
+.markdown-body ul,
+.markdown-body ol {
+  padding-left: 2em;
+  margin-top: 0;
+  margin-bottom: 16px;
+}
+
+.markdown-body li + li {
+  margin-top: 0.25em;
+}
+
+.markdown-body li > p {
+  margin-top: 0;
+}
+
+/* Task list */
+.markdown-body .task-list-item {
+  list-style-type: none;
+}
+
+.markdown-body .task-list-item input[type="checkbox"] {
+  margin: 0 0.35em 0 0;
+  vertical-align: middle;
+}
+
+/* Code */
 .markdown-body code {
   padding: 0.2em 0.4em;
   margin: 0;
   background-color: var(--v-theme-codeBg);
-  border-radius: 3px;
-  font-family: "SFMono-Regular", Consolas, "Liberation Mono", Menlo, monospace;
+  border-radius: 6px;
+  font-family: ui-monospace, SFMono-Regular, Consolas, "Liberation Mono", Menlo,
+    monospace;
   font-size: 85%;
 }
 
@@ -299,57 +361,53 @@ const _show = computed({
   font-size: 85%;
   line-height: 1.45;
   background-color: var(--v-theme-containerBg);
-  border-radius: 3px;
-  margin-bottom: 16px;
+  border: 1px solid var(--v-theme-border);
+  border-radius: 6px;
+  margin: 0 0 16px;
 }
 
 .markdown-body pre code {
   background-color: transparent;
   padding: 0;
 }
 
-.markdown-body ul,
-.markdown-body ol {
-  padding-left: 2em;
-  margin-bottom: 16px;
-}
-
-.markdown-body img {
-  max-width: 100%;
-  margin: 8px 0;
-  box-sizing: border-box;
-  background-color: var(--v-theme-background);
-  border-radius: 3px;
-}
-
+/* Blockquote */
 .markdown-body blockquote {
   padding: 0 1em;
   color: var(--v-theme-secondaryText);
   border-left: 0.25em solid var(--v-theme-border);
-  margin-bottom: 16px;
-}
-
-.markdown-body a {
-  color: var(--v-theme-primary);
-  text-decoration: none;
+  margin: 0 0 16px;
 }
 
-.markdown-body a:hover {
-  text-decoration: underline;
+/* Images */
+.markdown-body img {
+  max-width: 100%;
+  height: auto;
+  margin: 0.5em 0;
+  box-sizing: border-box;
+  background-color: var(--v-theme-background);
+  border-radius: 6px;
 }
 
+/* Tables (GitHub-like + 横向滚动) */
 .markdown-body table {
   border-spacing: 0;
   border-collapse: collapse;
-  width: 100%;
-  overflow: auto;
-  margin-bottom: 16px;
+  width: max-content;
+  min-width: 100%;
+  display: block;
+  overflow-x: auto;
+  margin: 0 0 16px;
 }
 
 .markdown-body table th,
 .markdown-body table td {
   padding: 6px 13px;
-  border: 1px solid var(--v-theme-background);
+  border: 1px solid var(--v-theme-border);
+}
+
+.markdown-body table th {
+  font-weight: 600;
 }
 
 .markdown-body table tr {
@@ -358,15 +416,7 @@ const _show = computed({
 }
 
 .markdown-body table tr:nth-child(2n) {
-  background-color: var(--v-theme-background);
-}
-
-.markdown-body hr {
-  height: 0.25em;
-  padding: 0;
-  margin: 24px 0;
   background-color: var(--v-theme-containerBg);
-  border: 0;
 }
 </style>
 

dashboard/src/i18n/locales/en-US/features/extension.json

@@ -7,6 +7,14 @@
     "handlersOperation": "Manage Handlers",
     "market": "Extension Market"
   },
+  "modManager": {
+    "panelTabs": {
+      "info": "Info",
+      "config": "Configuration",
+      "behavior": "Behavior",
+      "overview": "Overview"
+    }
+  },
   "search": {
     "placeholder": "Search extensions...",
     "marketPlaceholder": "Search market extensions..."
@@ -216,5 +224,71 @@
   },
   "pluginChangelog": {
     "menuTitle": "View Changelog"
+  },
+  "pipeline": {
+    "tabTitle": "Execution Chain",
+    "traceTabTitle": "Impact Chain",
+    "toolbar": {
+      "refresh": "Refresh Snapshot",
+      "promptPreview": "Prompt Preview"
+    },
+    "scope": {
+      "label": "Scope",
+      "global": "Global",
+      "session": "Session",
+      "sessionUmo": "Session UMO"
+    },
+    "rightTabs": {
+      "detail": "Stage Detail",
+      "conflicts": "Conflict List"
+    },
+    "fishbone": {
+      "noSnapshot": "No snapshot data",
+      "noParticipants": "No participants",
+      "viewDetail": "View detail"
+    },
+    "detail": {
+      "viewImpactChain": "View Impact Chain",
+      "noSnapshot": "No snapshot data",
+      "noStageSelected": "No stage selected",
+      "noStageSelectedHint": "Select a stage from the fishbone on the left",
+      "noParticipants": "No participants",
+      "noParticipantsHint": "No plugins participated in this stage",
+      "participants": " participants",
+      "conflicts": " conflicts",
+      "plugin": "Plugin",
+      "trigger": "Trigger"
+    },
+    "conflictList": {
+      "title": "Conflict List",
+      "total": "{count} total",
+      "none": "No conflicts",
+      "noneHint": "No conflicts detected",
+      "severity": {
+        "error": "Critical",
+        "warn": "Warning",
+        "info": "Info"
+      },
+      "involved": "Involved"
+    },
+    "promptPreview": {
+      "title": "Prompt Injection Preview",
+      "emptyTitle": "No data",
+      "emptyHint": "This snapshot does not contain prompt preview information",
+      "overwriteWarn": "Multiple overwrite operations detected; final prompt may be overwritten and order may be unstable.",
+      "contexts": "contexts",
+      "injectedBy": "injected_by",
+      "chain": "Injection chain",
+      "headers": {
+        "plugin": "Plugin",
+        "handler": "Handler",
+        "priority": "Priority",
+        "field": "Field",
+        "mutation": "Mutation"
+      },
+      "finalSystemPrompt": "Final System Prompt",
+      "finalPrompt": "Final Prompt",
+      "close": "Close"
+    }
   }
 }