entari-plugin-hyw 3.2.107__tar.gz → 3.2.109__tar.gz

{entari_plugin_hyw-3.2.107/src/entari_plugin_hyw.egg-info → entari_plugin_hyw-3.2.109}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: entari_plugin_hyw
-Version: 3.2.107
+Version: 3.2.109
 Summary: Use large language models to interpret chat messages
 Author-email: kumoSleeping <zjr2992@outlook.com>
 License: MIT

{entari_plugin_hyw-3.2.107 → entari_plugin_hyw-3.2.109}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "entari_plugin_hyw"
-version = "3.2.107"
+version = "3.2.109"
 description = "Use large language models to interpret chat messages"
 authors = [{name = "kumoSleeping", email = "zjr2992@outlook.com"}]
 dependencies = [

{entari_plugin_hyw-3.2.107 → entari_plugin_hyw-3.2.109}/src/entari_plugin_hyw/core/render.py

@@ -221,14 +221,32 @@ class ContentRenderer:
                 content_html = restore_math(content_html)
                 
                 # Post-process to style citation markers
+                # We split by code blocks to avoid messing up real code, BUT our citations ARE code blocks now.
+                # So we need to look at the code blocks themselves.
                 parts = re.split(r'(<code.*?>.*?</code>)', content_html, flags=re.DOTALL)
                 for i, part in enumerate(parts):
-                    if not part.startswith('<code'):
-                        # 1. Numeric Citations [1] -> Blue Style (References)
-                        part = re.sub(r'\[(\d+)\](?![^<]*>)', r'<span class="inline-flex items-center justify-center min-w-[16px] h-4 px-0.5 text-[10px] font-bold text-blue-600 bg-blue-50 border border-blue-200 rounded mx-0.5 align-top relative -top-0.5">\1</span>', part)
-                        # 2. Alphabetical Citations [a] -> Orange Style (MCP Flow)
-                        part = re.sub(r'\[([a-zA-Z]+)\](?![^<]*>)', r'<span class="inline-flex items-center justify-center min-w-[16px] h-4 px-0.5 text-[10px] font-bold text-orange-600 bg-orange-50 border border-orange-200 rounded mx-0.5 align-top relative -top-0.5">\1</span>', part)
-                        parts[i] = part
+                    # Check if this part is a code block containing our specific citation format
+                    if part.startswith('<code'):
+                        # Match <code>ref:123</code> or <code>mcp:abc</code>
+                        # Note: attributes like class might be present if we are unlucky, but `ref:` inside usually means inline code.
+                        
+                        # 1. Numeric: <code>ref:123</code>
+                        ref_match = re.match(r'^<code.*?>ref:(\d+)</code>$', part)
+                        if ref_match:
+                            citation_id = ref_match.group(1)
+                            parts[i] = f'<span class="inline-flex items-center justify-center min-w-[16px] h-4 px-0.5 text-[10px] font-bold text-blue-600 bg-blue-50 border border-blue-200 rounded mx-0.5 align-top relative -top-0.5">{citation_id}</span>'
+                            continue
+
+                        # 2. Alpha: <code>mcp:abc</code>
+                        mcp_match = re.match(r'^<code.*?>mcp:([a-zA-Z]+)</code>$', part)
+                        if mcp_match:
+                            mcp_id = mcp_match.group(1)
+                            parts[i] = f'<span class="inline-flex items-center justify-center min-w-[16px] h-4 px-0.5 text-[10px] font-bold text-orange-600 bg-orange-50 border border-orange-200 rounded mx-0.5 align-top relative -top-0.5">{mcp_id}</span>'
+                            continue
+                            
+                    # If it's NOT a code block, or a code block we didn't transform, we leave it alone.
+                    # (Previous logic was to regex replace inside non-code blocks. We don't need that anymore 
+                    # because the prompt now enforces code spans).
                 content_html = "".join(parts)
                 
                 # Strip out the structured JSON blocks if they leaked into the content

{entari_plugin_hyw-3.2.107 → entari_plugin_hyw-3.2.109}/src/entari_plugin_hyw/utils/prompts.py

@@ -60,7 +60,7 @@ AGENT_SYSTEM_PROMPT_SEARCH_ADD = """
 
 [最终回复]
 - 图片: 如果本次回答适合配图, 对搜索到的图片, 选择 1-3 张合适的尽量类型、来源、不同、主题契合的图片, 美观分布嵌入正文 `![alt](url)`.
-- 搜索引用: 在正文中使用 `[数字id]` 如 `[1]` 标注来源, 并在文末通过 `references` 代码块列出.
+- 搜索引用: 在正文中使用 `ref:数字id` (代码形式) 如 `ref:1` 标注来源, 并在文末通过 `references` 代码块列出.
 - 你需要在最终回复底部添加 `references` 代码块.
 
 ```references
@@ -75,9 +75,9 @@ AGENT_SYSTEM_PROMPT_MCP_ADD = """
 {tools_desc}
 
 > 积极使用工具完成任务，工具优先于文本回复。
-
+秧根扭起来，我们喜羊羊大东北是我的家乡，我就在这一个人
 [最终回复格式]
-- 工具引用: 在正文中使用 `[字母id]` 如 `[a]` 标注来源, 并在文末通过 `mcp` 代码块列出.
+- 工具引用: 在正文中使用 `mcp:字母顺序` (代码形式) 如 `mcp:a` 标注来源, 并在文末通过 `mcp` 代码块列出.
 - 底部添加 `mcp` 代码块列出工具调用流程:
 - 格式: `[图标] 工具名称` + 文本描述
 - 图标: navigate, snapshot, click, type, code, wait, default

{entari_plugin_hyw-3.2.107 → entari_plugin_hyw-3.2.109/src/entari_plugin_hyw.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: entari_plugin_hyw
-Version: 3.2.107
+Version: 3.2.109
 Summary: Use large language models to interpret chat messages
 Author-email: kumoSleeping <zjr2992@outlook.com>
 License: MIT