release: v2.1.2 - plugin lib fixes, doc context persistence, release workflow

massif-01 · massif-01 · commit 688522c80b16 · 2026-02-14T01:22:52.000+08:00
Plugin fixes:
- excel-parser v1.0.2: lib 404 fix, install downloads deps from manifest
- markdown-enhancer v1.0.1: add dependencies for market install
- Plugin settings: fix x-for key for select options (object format)

Features:
- Document/table content now persists in chat history for follow-up

Fixes:
- AbortError when stopping stream generation
- BUNDLED_PLUGINS_DIR path for local dev

Docs:
- Plugins README: dependencies requirement for lib/ plugins
- Add .github/workflows/release.yml for multi-platform Docker build
diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -0,0 +1,53 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  build-and-push:
+    name: Build multi-platform Docker image
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Extract version from tag
+        id: version
+        run: echo "VERSION=${GITHUB_REF#refs/tags/v}" >> $GITHUB_OUTPUT
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to GHCR
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: linux/amd64,linux/arm64
+          push: true
+          tags: |
+            massif01/chatraw:${{ steps.version.outputs.VERSION }}
+            massif01/chatraw:latest
+            ghcr.io/${{ github.repository_owner }}/chatraw:${{ steps.version.outputs.VERSION }}
+            ghcr.io/${{ github.repository_owner }}/chatraw:latest
diff --git a/Plugins/Plugin_market/excel-parser/main.js b/Plugins/Plugin_market/excel-parser/main.js
@@ -562,10 +562,12 @@
                 const workbook = xlsxLib.read(arrayBuffer, {
                     type: 'array',
                     cellDates: true,      // Parse dates as Date objects
+                    cellNF: true,         // Include number format (cell.z) for date/currency
                     cellFormula: false,   // Don't need formula text, just results
-                    cellText: true,       // Get formatted text
+                    cellText: true,       // Get formatted text (cell.w)
                     cellStyles: false,    // Don't need styles
                     sheetRows: (settings.max_rows || 1000) + 1,  // +1 for header detection
+                    raw: false,           // Use formatted values where available
                     WTF: false            // Don't throw on unexpected features
                 });
                 
diff --git a/Plugins/Plugin_market/index.json b/Plugins/Plugin_market/index.json
@@ -100,7 +100,7 @@
     },
     {
       "id": "markdown-enhancer",
-      "version": "1.0.0",
+      "version": "1.0.1",
       "name": {
         "en": "Markdown Renderer Plus",
         "zh": "Markdown 渲染增强"
diff --git a/Plugins/Plugin_market/markdown-enhancer/manifest.json b/Plugins/Plugin_market/markdown-enhancer/manifest.json
@@ -1,6 +1,6 @@
 {
   "id": "markdown-enhancer",
-  "version": "1.0.0",
+  "version": "1.0.1",
   "name": {
     "en": "Markdown Renderer Plus",
     "zh": "Markdown 渲染增强"
@@ -15,6 +15,26 @@
   "main": "main.js",
   "type": "message_processor",
   "hooks": ["after_receive"],
+  "dependencies": {
+    "katex-css": "/api/plugins/markdown-enhancer/lib/katex.min.css",
+    "katex-js": "/api/plugins/markdown-enhancer/lib/katex.min.js",
+    "mermaid": "/api/plugins/markdown-enhancer/lib/mermaid.min.js",
+    "hljs-c": "/api/plugins/markdown-enhancer/lib/hljs-c.min.js",
+    "hljs-cpp": "/api/plugins/markdown-enhancer/lib/hljs-cpp.min.js",
+    "hljs-csharp": "/api/plugins/markdown-enhancer/lib/hljs-csharp.min.js",
+    "hljs-go": "/api/plugins/markdown-enhancer/lib/hljs-go.min.js",
+    "hljs-java": "/api/plugins/markdown-enhancer/lib/hljs-java.min.js",
+    "hljs-kotlin": "/api/plugins/markdown-enhancer/lib/hljs-kotlin.min.js",
+    "hljs-php": "/api/plugins/markdown-enhancer/lib/hljs-php.min.js",
+    "hljs-ruby": "/api/plugins/markdown-enhancer/lib/hljs-ruby.min.js",
+    "hljs-rust": "/api/plugins/markdown-enhancer/lib/hljs-rust.min.js",
+    "hljs-shell": "/api/plugins/markdown-enhancer/lib/hljs-shell.min.js",
+    "hljs-sql": "/api/plugins/markdown-enhancer/lib/hljs-sql.min.js",
+    "hljs-swift": "/api/plugins/markdown-enhancer/lib/hljs-swift.min.js",
+    "hljs-typescript": "/api/plugins/markdown-enhancer/lib/hljs-typescript.min.js",
+    "hljs-xml": "/api/plugins/markdown-enhancer/lib/hljs-xml.min.js",
+    "hljs-yaml": "/api/plugins/markdown-enhancer/lib/hljs-yaml.min.js"
+  },
   "settings": [
     {
       "id": "enableKatex",
diff --git a/Plugins/README.md b/Plugins/README.md
@@ -89,7 +89,7 @@ your-plugin/
 | `type` | string | Yes | Plugin type (see below) |
 | `hooks` | array | Yes | List of hooks the plugin uses |
 | `fileTypes` | array | No | File extensions for document_parser type. When plugin is enabled, these extensions are automatically added to the file upload dialog. |
-| `dependencies` | object | No | External JS libraries (name: CDN URL) |
+| `dependencies` | object | No | JS/CSS libraries: CDN URL for remote, or `/api/plugins/{id}/lib/{filename}` for bundled lib. **Required for lib/ plugins when publishing to market** — list all lib files so they are downloaded during install. |
 | `settings` | array | No | Plugin settings schema (for standard settings UI) |
 | `customSettings` | boolean | No | Set to `true` for custom settings UI |
 | `proxy` | array | No | External API services requiring API keys |
@@ -378,7 +378,7 @@ For complex plugins that need full control over settings UI, use `customSettings
 
 ### CSS Variables and Theming
 
-ChatRaw v2.1.1+ uses an HSL-based color token system. All CSS variables automatically adapt to light/dark themes via `[data-theme="dark"]`. Use these variables in your plugin UI for consistent styling.
+ChatRaw v2.1.2+ uses an HSL-based color token system. All CSS variables automatically adapt to light/dark themes via `[data-theme="dark"]`. Use these variables in your plugin UI for consistent styling.
 
 #### Color Variables
 
@@ -718,6 +718,16 @@ To distribute your plugin:
 
 For plugins that need to work completely offline, you can bundle dependencies in the `lib/` directory.
 
+**Important for plugin market**: If your plugin uses `lib/` files and will be installed from the market (GitHub URL), you **must** declare them in manifest `dependencies` using the format `/api/plugins/{plugin_id}/lib/{filename}`. Otherwise users get 404/MIME errors. Example:
+
+```json
+"dependencies": {
+  "katex-css": "/api/plugins/my-plugin/lib/katex.min.css",
+  "katex-js": "/api/plugins/my-plugin/lib/katex.min.js",
+  "mermaid": "/api/plugins/my-plugin/lib/mermaid.min.js"
+}
+```
+
 **Loading CSS files** (the framework only supports JS, CSS must be loaded manually):
 
 ```javascript
@@ -1023,7 +1033,7 @@ your-plugin/
 | `type` | string | 是 | 插件类型（见下表） |
 | `hooks` | array | 是 | 插件使用的钩子列表 |
 | `fileTypes` | array | 否 | document_parser 类型的文件扩展名。插件启用后，这些扩展名会自动添加到文件上传对话框中。 |
-| `dependencies` | object | 否 | 外部 JS 库（名称: CDN URL） |
+| `dependencies` | object | 否 | JS/CSS 库：远程用 CDN URL，本地用 `/api/plugins/{id}/lib/{filename}`。**发布到插件市场且含 lib/ 时必填** — 列出所有 lib 文件以便安装时下载。 |
 | `settings` | array | 否 | 插件设置架构（用于标准设置 UI） |
 | `customSettings` | boolean | 否 | 设为 `true` 启用自定义设置 UI |
 | `proxy` | array | 否 | 需要 API Key 的外部服务 |
@@ -1312,7 +1322,7 @@ your-plugin/
 
 ### CSS 变量与主题系统
 
-ChatRaw v2.1.1+ 使用基于 HSL 的颜色令牌系统。所有 CSS 变量会通过 `[data-theme="dark"]` 自动适配明暗主题。在插件 UI 中使用这些变量即可获得一致的样式。
+ChatRaw v2.1.2+ 使用基于 HSL 的颜色令牌系统。所有 CSS 变量会通过 `[data-theme="dark"]` 自动适配明暗主题。在插件 UI 中使用这些变量即可获得一致的样式。
 
 #### 颜色变量
 
@@ -1652,6 +1662,16 @@ const allData = ChatRaw.storage.getAll(PLUGIN_ID);
 
 对于需要完全离线运行的插件，可以将依赖打包到 `lib/` 目录中。
 
+**插件市场发布须知**：若插件使用 `lib/` 且用户从市场（GitHub URL）安装，**必须在** manifest 的 `dependencies` 中声明所有 lib 文件，格式为 `/api/plugins/{plugin_id}/lib/{filename}`，否则会 404/ MIME 报错。示例：
+
+```json
+"dependencies": {
+  "katex-css": "/api/plugins/my-plugin/lib/katex.min.css",
+  "katex-js": "/api/plugins/my-plugin/lib/katex.min.js",
+  "mermaid": "/api/plugins/my-plugin/lib/mermaid.min.js"
+}
+```
+
 **加载 CSS 文件**（框架仅支持 JS，CSS 需要手动加载）：
 
 ```javascript
diff --git a/README.md b/README.md
@@ -139,7 +139,7 @@ ChatRaw features a complete **plugin system** to extend functionality:
 
 **Prerequisites**: [Docker](https://docs.docker.com/get-docker/) installed.
 
-Docker images are published to **Docker Hub** and **GitHub Container Registry**. To get the **latest** image (not a cached old one), always run `docker pull` with the tag you want before creating the container. Use `:latest` for the current release, or a version tag (e.g. `v2.1.1`) from [Releases](https://github.com/massif-01/ChatRaw/releases) for a fixed version.
+Docker images are published to **Docker Hub** and **GitHub Container Registry**. To get the **latest** image (not a cached old one), always run `docker pull` with the tag you want before creating the container. Use `:latest` for the current release, or a version tag (e.g. `v2.1.2`) from [Releases](https://github.com/massif-01/ChatRaw/releases) for a fixed version.
 
 **Supported platforms**: linux/amd64 (Intel/AMD), linux/arm64 (Apple Silicon, Raspberry Pi 4/5).
 
@@ -210,7 +210,7 @@ python main.py
 | Docker Hub | `docker pull massif01/chatraw:latest` |
 | GitHub Container Registry | `docker pull ghcr.io/massif-01/chatraw:latest` |
 
-Use the same tag for a specific version, e.g. `massif01/chatraw:v2.1.1` (see [Releases](https://github.com/massif-01/ChatRaw/releases)).
+Use the same tag for a specific version, e.g. `massif01/chatraw:v2.1.2` (see [Releases](https://github.com/massif-01/ChatRaw/releases)).
 
 ---
 
@@ -445,7 +445,7 @@ ChatRaw 拥有完整的**插件系统**以扩展功能：
 
 **前置条件**：已安装 [Docker](https://docs.docker.com/get-docker/)。
 
-镜像发布在 **Docker Hub** 和 **GitHub Container Registry**。若想用**最新**镜像（避免用到本地缓存的旧镜像），在创建容器前请先执行一次 `docker pull`。使用 `:latest` 表示当前最新版本；如需固定版本，可使用 [Releases](https://github.com/massif-01/ChatRaw/releases) 中的版本号标签（如 `v2.1.1`）。
+镜像发布在 **Docker Hub** 和 **GitHub Container Registry**。若想用**最新**镜像（避免用到本地缓存的旧镜像），在创建容器前请先执行一次 `docker pull`。使用 `:latest` 表示当前最新版本；如需固定版本，可使用 [Releases](https://github.com/massif-01/ChatRaw/releases) 中的版本号标签（如 `v2.1.2`）。
 
 **支持平台**：linux/amd64（Intel/AMD）、linux/arm64（Apple Silicon、树莓派 4/5）。
 
@@ -516,7 +516,7 @@ python main.py
 | Docker Hub | `docker pull massif01/chatraw:latest` |
 | GitHub Container Registry | `docker pull ghcr.io/massif-01/chatraw:latest` |
 
-需要固定版本时使用相同标签格式，例如 `massif01/chatraw:v2.1.1`，版本号见 [Releases](https://github.com/massif-01/ChatRaw/releases)。
+需要固定版本时使用相同标签格式，例如 `massif01/chatraw:v2.1.2`，版本号见 [Releases](https://github.com/massif-01/ChatRaw/releases)。
 
 ---
 
diff --git a/RELEASE_v2.1.2.md b/RELEASE_v2.1.2.md
@@ -0,0 +1,45 @@
+# ChatRaw v2.1.2
+
+## 插件相关修复 / Plugin Fixes
+
+### Excel 解析器 (v1.0.2)
+- 修复从插件市场安装时 lib/ 文件 404 问题
+- 安装流程会下载 manifest dependencies 中的 lib 文件
+- 修复 BUNDLED_PLUGINS_DIR 路径（支持本地开发）
+- 增加 cellNF、raw 解析选项以提升表格读取准确性
+
+### Markdown 渲染增强 (v1.0.1)
+- 添加 manifest dependencies，解决从市场安装时 KaTeX/Mermaid/lib 404
+- 安装时自动下载全部 18 个 lib 文件
+
+### 插件设置
+- 修复 select 类型 options 为对象数组时的 Alpine x-for key 警告
+- 支持 `{value, label}` 格式的选项
+
+## 文档上下文持久化 / Document Context Persistence
+
+- 上传的表格/网页内容现会保存到对话历史
+- 后续追问时模型仍可访问之前的文档内容
+
+## 其他修复 / Other Fixes
+
+- 修复点击「停止」时的 AbortError（流式响应）
+- 开发者文档：补充 lib/dependencies 在插件市场安装中的说明
+
+## Docker
+
+多平台镜像（linux/amd64, linux/arm64）将发布至：
+- Docker Hub: `massif01/chatraw:v2.1.2`
+- GitHub Container Registry: `ghcr.io/massif-01/chatraw:v2.1.2`
+
+## 如何更新 / How to Update
+
+```bash
+docker pull massif01/chatraw:v2.1.2
+docker stop chatraw && docker rm chatraw
+docker run -d -p 51111:51111 -v chatraw-data:/app/data --name chatraw massif01/chatraw:v2.1.2
+```
+
+---
+
+Full Changelog: [v2.1.1...v2.1.2](https://github.com/massif-01/ChatRaw/compare/v2.1.1...v2.1.2)
diff --git a/backend/main.py b/backend/main.py
@@ -598,29 +598,20 @@ async def chat_stream(self, chat_id: str, message: str, use_rag: bool = False, u
         if use_rag:
             rag_context, rag_references = await self.build_rag_context(message)
         
-        # Web content context
-        web_context = ""
-        if web_content:
-            web_context = f"以下是用户提供的网页内容作为参考 (来源: {web_url}):\n---\n{web_content}\n---\n\n"
-        
-        # User message
-        final_message = message
-        if rag_context:
-            final_message = f"{rag_context}User question: {message}"
-        if web_context:
-            final_message = f"{web_context}{final_message}"
-        
-        # Handle image
-        if image_base64 and config.capability.vision:
-            messages.append({
+        # User message is already in history (saved with web_content). Only add RAG to last message if needed.
+        if rag_context and messages and messages[-1].get("role") == "user":
+            messages[-1] = {"role": "user", "content": f"{rag_context}User question: {messages[-1]['content']}"}
+        
+        # For vision: replace last user message with multimodal format (text + image)
+        if image_base64 and config.capability.vision and messages and messages[-1].get("role") == "user":
+            text_content = messages[-1]["content"]
+            messages[-1] = {
                 "role": "user",
                 "content": [
-                    {"type": "text", "text": final_message},
+                    {"type": "text", "text": text_content},
                     {"type": "image_url", "image_url": {"url": f"data:image/jpeg;base64,{image_base64}"}}
                 ]
-            })
-        else:
-            messages.append({"role": "user", "content": final_message})
+            }
         
         # API request
         url = config.api_url.rstrip("/") + "/chat/completions"
@@ -742,27 +733,20 @@ async def chat_non_stream(self, chat_id: str, message: str, use_rag: bool = Fals
         if use_rag:
             rag_context, rag_references = await self.build_rag_context(message)
         
-        # Web content context
-        web_context = ""
-        if web_content:
-            web_context = f"以下是用户提供的网页内容作为参考 (来源: {web_url}):\n---\n{web_content}\n---\n\n"
-        
-        final_message = message
-        if rag_context:
-            final_message = f"{rag_context}User question: {message}"
-        if web_context:
-            final_message = f"{web_context}{final_message}"
+        # User message is already in history (saved with web_content). Only add RAG to last message if needed.
+        if rag_context and messages and messages[-1].get("role") == "user":
+            messages[-1] = {"role": "user", "content": f"{rag_context}User question: {messages[-1]['content']}"}
         
-        if image_base64 and config.capability.vision:
-            messages.append({
+        # For vision: replace last user message with multimodal format
+        if image_base64 and config.capability.vision and messages and messages[-1].get("role") == "user":
+            text_content = messages[-1]["content"]
+            messages[-1] = {
                 "role": "user",
                 "content": [
-                    {"type": "text", "text": final_message},
+                    {"type": "text", "text": text_content},
                     {"type": "image_url", "image_url": {"url": f"data:image/jpeg;base64,{image_base64}"}}
                 ]
-            })
-        else:
-            messages.append({"role": "user", "content": final_message})
+            }
         
         url = config.api_url.rstrip("/") + "/chat/completions"
         headers = {"Content-Type": "application/json"}
@@ -1354,8 +1338,12 @@ async def chat(request: Request):
         chat_obj = db.create_chat("New Chat")
         chat_id = chat_obj.id
     
-    # Save user message
-    db.add_message(chat_id, "user", message)
+    # Save user message (include web/document content so it persists for follow-up questions)
+    message_to_save = message
+    if web_content:
+        web_context = f"以下是用户提供的网页/文档内容作为参考 (来源: {web_url or '附件'}):\n---\n{web_content}\n---\n\n"
+        message_to_save = f"{web_context}{message}"
+    db.add_message(chat_id, "user", message_to_save)
     
     settings = db.get_settings()
     
diff --git a/backend/static/app.js b/backend/static/app.js
@@ -834,7 +834,7 @@ function app() {
             } catch (e) {
                 if (e.name === 'AbortError') {
                     // User stopped generation, keep partial content
-                    reader.cancel();
+                    try { await reader.cancel(); } catch (_) { /* ignore */ }
                 } else {
                     throw e;
                 }
diff --git a/backend/static/app.min.js b/backend/static/app.min.js
diff --git a/backend/static/index.html b/backend/static/index.html
@@ -851,8 +851,8 @@ <h3 x-text="currentPluginSettings?.name?.[lang] || currentPluginSettings?.name?.
                                 <!-- Select -->
                                 <template x-if="setting.type === 'select'">
                                     <select class="input-minimal" x-model="pluginSettingsValues[setting.id]">
-                                        <template x-for="opt in (setting.options || [])" :key="opt">
-                                            <option :value="opt" x-text="opt"></option>
+                                        <template x-for="(opt, idx) in (setting.options || [])" :key="setting.id + '-' + idx">
+                                            <option :value="(typeof opt === 'object' && opt && 'value' in opt) ? opt.value : opt" x-text="(typeof opt === 'object' && opt && 'label' in opt) ? opt.label : opt"></option>
                                         </template>
                                     </select>
                                 </template>

Original file line number	Diff line number	Diff line change
`@@ -100,7 +100,7 @@`
`100`	`100`	`},`
`101`	`101`	`{`
`102`	`102`	`"id": "markdown-enhancer",`
`103`		`- "version": "1.0.0",`
	`103`	`+ "version": "1.0.1",`
`104`	`104`	`"name": {`
`105`	`105`	`"en": "Markdown Renderer Plus",`
`106`	`106`	`"zh": "Markdown 渲染增强"`
Original file line number	Diff line number	Diff line change
`@@ -834,7 +834,7 @@ function app() {`
`834`	`834`	`} catch (e) {`
`835`	`835`	`if (e.name === 'AbortError') {`
`836`	`836`	`// User stopped generation, keep partial content`
`837`		`- reader.cancel();`
	`837`	`+ try { await reader.cancel(); } catch (_) { /* ignore */ }`
`838`	`838`	`} else {`
`839`	`839`	`throw e;`
`840`	`840`	`}`