entari-plugin-hyw 3.3.7__py3-none-any.whl → 3.4.0__py3-none-any.whl

entari_plugin_hyw/__init__.py

@@ -58,13 +58,11 @@ class HywConfig(BasicConfModel):
     base_url: str = "https://openrouter.ai/api/v1"
     vision_model_name: Optional[str] = None
     vision_api_key: Optional[str] = None
+    language: str = "Simplified Chinese"
     vision_base_url: Optional[str] = None
-    vision_system_prompt: Optional[str] = None
-    intruct_model_name: Optional[str] = None
-    intruct_api_key: Optional[str] = None
-    intruct_base_url: Optional[str] = None
-    intruct_system_prompt: Optional[str] = None
-    agent_system_prompt: Optional[str] = None
+    instruct_model_name: Optional[str] = None
+    instruct_api_key: Optional[str] = None
+    instruct_base_url: Optional[str] = None
     search_base_url: str = "https://lite.duckduckgo.com/lite/?q={query}"
     image_search_base_url: str = "https://duckduckgo.com/?q={query}&iax=images&ia=images"
     headless: bool = False
@@ -72,8 +70,10 @@ class HywConfig(BasicConfModel):
     icon: str = "openai"
     render_timeout_ms: int = 6000
     extra_body: Optional[Dict[str, Any]] = None
+    vision_extra_body: Optional[Dict[str, Any]] = None
+    instruct_extra_body: Optional[Dict[str, Any]] = None
     enable_browser_fallback: bool = False
-    reaction: bool = True
+    reaction: bool = False
     quote: bool = True
     temperature: float = 0.4
     # Billing configuration (price per million tokens)
@@ -83,14 +83,14 @@ class HywConfig(BasicConfModel):
     vision_input_price: Optional[float] = None
     vision_output_price: Optional[float] = None
     # Instruct model pricing overrides (defaults to main model pricing if not set)
-    intruct_input_price: Optional[float] = None
-    intruct_output_price: Optional[float] = None
+    instruct_input_price: Optional[float] = None
+    instruct_output_price: Optional[float] = None
     # Provider Names
     search_name: str = "DuckDuckGo"
     search_provider: str = "crawl4ai"  # crawl4ai | httpx | ddgs
     model_provider: Optional[str] = None
     vision_model_provider: Optional[str] = None
-    intruct_model_provider: Optional[str] = None
+    instruct_model_provider: Optional[str] = None
 
 
 

entari_plugin_hyw/core/config.py

@@ -12,27 +12,27 @@ class HYWConfig:
     fusion_mode: bool = False 
     save_conversation: bool = False
     headless: bool = True
-    intruct_model_name: Optional[str] = None
-    intruct_api_key: Optional[str] = None
-    intruct_base_url: Optional[str] = None
+    instruct_model_name: Optional[str] = None
+    instruct_api_key: Optional[str] = None
+    instruct_base_url: Optional[str] = None
     search_base_url: str = "https://lite.duckduckgo.com/lite/?q={query}"
     image_search_base_url: str = "https://duckduckgo.com/?q={query}&iax=images&ia=images"
     search_params: Optional[str] = None  # e.g. "&kl=cn-zh" for China region
     search_limit: int = 8 
     extra_body: Optional[Dict[str, Any]] = None
+    vision_extra_body: Optional[Dict[str, Any]] = None
+    instruct_extra_body: Optional[Dict[str, Any]] = None
     temperature: float = 0.4
     max_turns: int = 10
     icon: str = "openai"  # logo for primary model
     vision_icon: Optional[str] = None  # logo for vision model (falls back to icon when absent)
     instruct_icon: Optional[str] = None # logo for instruct model
     enable_browser_fallback: bool = False
-    vision_system_prompt: Optional[str] = None
-    intruct_system_prompt: Optional[str] = None
-    agent_system_prompt: Optional[str] = None
+    language: str = "Simplified Chinese"
     input_price: Optional[float] = None  # $ per 1M input tokens
     output_price: Optional[float] = None  # $ per 1M output tokens
     vision_input_price: Optional[float] = None
     vision_output_price: Optional[float] = None
-    intruct_input_price: Optional[float] = None
-    intruct_output_price: Optional[float] = None
+    instruct_input_price: Optional[float] = None
+    instruct_output_price: Optional[float] = None
   

entari_plugin_hyw/core/pipeline.py

@@ -12,14 +12,14 @@ from .config import HYWConfig
 from ..utils.search import SearchService
 from ..utils.prompts import (
     AGENT_SP,
-    AGENT_SP_INTRUCT_VISION_ADD,
+    AGENT_SP_INSTRUCT_VISION_ADD,
     AGENT_SP_TOOLS_STANDARD_ADD,
     AGENT_SP_TOOLS_AGENT_ADD,
     AGENT_SP_SEARCH_ADD,
     AGENT_SP_PAGE_ADD,
     AGENT_SP_IMAGE_SEARCH_ADD,
-    INTRUCT_SP,
-    INTRUCT_SP_VISION_ADD,
+    INSTRUCT_SP,
+    INSTRUCT_SP_VISION_ADD,
     VISION_SP,
 )
 
@@ -39,10 +39,8 @@ class ProcessingPipeline:
         self.client = AsyncOpenAI(base_url=self.config.base_url, api_key=self.config.api_key)
         self.all_web_results = [] # Cache for search results
         self.current_mode = "standard"  # standard | agent
-        # Independent ID counters for each type
-        self.search_id_counter = 0
-        self.page_id_counter = 0
-        self.image_id_counter = 0
+        # Global ID counter for all types (unified numbering)
+        self.global_id_counter = 0
 
         self.web_search_tool = {
             "type": "function",
@@ -109,7 +107,7 @@ class ProcessingPipeline:
     ) -> Dict[str, Any]:
         """
         1) Vision: summarize images once (no image persistence).
-        2) Intruct: run web_search and decide whether to grant Playwright MCP tools.
+        2) Instruct: run web_search and decide whether to grant Playwright MCP tools.
         3) Agent: normally no tools; if granted, allow Playwright MCP tools (max 6 rounds; step 5 nudge, step 6 forced).
         """
         start_time = time.time()
@@ -133,7 +131,7 @@ class ProcessingPipeline:
 
             trace: Dict[str, Any] = {
                 "vision": None,
-                "intruct": None,
+                "instruct": None,
                 "agent": None,
             }
 
@@ -150,8 +148,7 @@ class ProcessingPipeline:
                     or getattr(self.config, "vision_model_name", None)
                     or active_model
                 )
-                vision_prompt_tpl = getattr(self.config, "vision_system_prompt", None) or VISION_SP
-                vision_prompt = vision_prompt_tpl.format(user_msgs=user_input or "[图片]")
+                vision_prompt = VISION_SP.format(user_msgs=user_input or "[图片]")
                 vision_text, vision_usage = await self._run_vision_stage(
                     user_input=user_input,
                     images=images,
@@ -182,10 +179,10 @@ class ProcessingPipeline:
                     "cost": vision_cost
                 }
 
-            # Intruct + pre-search
+            # Instruct + pre-search
             instruct_start = time.time()
-            instruct_model = getattr(self.config, "intruct_model_name", None) or active_model
-            instruct_text, search_payloads, intruct_trace, intruct_usage, search_time = await self._run_instruct_stage(
+            instruct_model = getattr(self.config, "instruct_model_name", None) or active_model
+            instruct_text, search_payloads, instruct_trace, instruct_usage, search_time = await self._run_instruct_stage(
                 user_input=user_input,
                 vision_text=vision_text,
                 model=instruct_model,
@@ -194,24 +191,24 @@ class ProcessingPipeline:
             
             # Calculate Instruct Cost
             instruct_cost = 0.0
-            i_in_price = float(getattr(self.config, "intruct_input_price", None) or getattr(self.config, "input_price", 0.0) or 0.0)
-            i_out_price = float(getattr(self.config, "intruct_output_price", None) or getattr(self.config, "output_price", 0.0) or 0.0)
+            i_in_price = float(getattr(self.config, "instruct_input_price", None) or getattr(self.config, "input_price", 0.0) or 0.0)
+            i_out_price = float(getattr(self.config, "instruct_output_price", None) or getattr(self.config, "output_price", 0.0) or 0.0)
             if i_in_price > 0 or i_out_price > 0:
-                instruct_cost = (intruct_usage.get("input_tokens", 0) / 1_000_000 * i_in_price) + (intruct_usage.get("output_tokens", 0) / 1_000_000 * i_out_price)
+                instruct_cost = (instruct_usage.get("input_tokens", 0) / 1_000_000 * i_in_price) + (instruct_usage.get("output_tokens", 0) / 1_000_000 * i_out_price)
             
             # Add instruct usage
-            usage_totals["input_tokens"] += intruct_usage.get("input_tokens", 0)
-            usage_totals["output_tokens"] += intruct_usage.get("output_tokens", 0)
+            usage_totals["input_tokens"] += instruct_usage.get("input_tokens", 0)
+            usage_totals["output_tokens"] += instruct_usage.get("output_tokens", 0)
             
-            intruct_trace["time"] = instruct_time
-            intruct_trace["cost"] = instruct_cost
-            trace["intruct"] = intruct_trace
+            instruct_trace["time"] = instruct_time
+            instruct_trace["cost"] = instruct_cost
+            trace["instruct"] = instruct_trace
 
             # Start agent loop
             agent_start_time = time.time()
             current_history.append({"role": "user", "content": user_input or "..."})
 
-            mode = intruct_trace.get("mode", self.current_mode).lower()
+            mode = instruct_trace.get("mode", self.current_mode).lower()
             logger.success(f"Instruct Mode: {mode}")
             self.current_mode = mode
             
@@ -255,18 +252,17 @@ class ProcessingPipeline:
                 has_image_results = any(r.get("_type") == "image" for r in self.all_web_results)
 
                 # Build agent system prompt
-                agent_prompt_tpl = getattr(self.config, "agent_system_prompt", None) or AGENT_SP
-                
                 mode_desc_text = AGENT_SP_TOOLS_AGENT_ADD.format(tools_desc=tools_desc) if mode == "agent" else AGENT_SP_TOOLS_STANDARD_ADD
-                system_prompt = agent_prompt_tpl.format(
+                system_prompt = AGENT_SP.format(
                     user_msgs=user_msgs_text,
                     mode=mode,
-                    mode_desc=mode_desc_text
+                    mode_desc=mode_desc_text,
+                    language=getattr(self.config, "language", "Simplified Chinese")[:128]
                 )
                 
                 # Append vision text if available
                 if vision_text:
-                    system_prompt += AGENT_SP_INTRUCT_VISION_ADD.format(vision_msgs=vision_text)
+                    system_prompt += AGENT_SP_INSTRUCT_VISION_ADD.format(vision_msgs=vision_text)
                 
                 # Append search results
                 if has_search_results and search_msgs_text:
@@ -299,6 +295,7 @@ class ProcessingPipeline:
                     model=active_model,
                     tools=tools_for_step,
                     tool_choice="auto" if tools_for_step else None,
+                    extra_body=self.config.extra_body,
                 )
                 step_llm_time = time.time() - step_llm_start
                 
@@ -366,8 +363,8 @@ class ProcessingPipeline:
             a_in_price = float(getattr(self.config, "input_price", 0.0) or 0.0)
             a_out_price = float(getattr(self.config, "output_price", 0.0) or 0.0)
             
-            agent_input_tokens = usage_totals["input_tokens"] - vision_usage.get("input_tokens", 0) - intruct_usage.get("input_tokens", 0)
-            agent_output_tokens = usage_totals["output_tokens"] - vision_usage.get("output_tokens", 0) - intruct_usage.get("output_tokens", 0)
+            agent_input_tokens = usage_totals["input_tokens"] - vision_usage.get("input_tokens", 0) - instruct_usage.get("input_tokens", 0)
+            agent_output_tokens = usage_totals["output_tokens"] - vision_usage.get("output_tokens", 0) - instruct_usage.get("output_tokens", 0)
             
             if a_in_price > 0 or a_out_price > 0:
                 agent_cost = (max(0, agent_input_tokens) / 1_000_000 * a_in_price) + (max(0, agent_output_tokens) / 1_000_000 * a_out_price)
@@ -436,14 +433,14 @@ class ProcessingPipeline:
                     "cost": v.get("cost", 0.0)
                 })
             
-            if trace.get("intruct"):
-                i = trace["intruct"]
+            if trace.get("instruct"):
+                i = trace["instruct"]
                 i_model = i.get("model", "")
                 i_base_url = i.get("base_url", "") or self.config.base_url
                 stages_used.append({
                     "name": "Instruct",
                     "model": i_model,
-                    "icon_config": getattr(self.config, "instruct_icon", None) or getattr(self.config, "intruct_icon", None) or infer_icon(i_model, i_base_url),
+                    "icon_config": getattr(self.config, "instruct_icon", None) or infer_icon(i_model, i_base_url),
                     "provider": infer_provider(i_base_url),
                     "time": i.get("time", 0),
                     "cost": i.get("cost", 0.0)
@@ -460,9 +457,9 @@ class ProcessingPipeline:
                 })
             
             # Add Crawler stage if Instruct used crawl_page
-            if trace.get("intruct"):
-                intruct_tool_calls = trace["intruct"].get("tool_calls", [])
-                crawl_calls = [tc for tc in intruct_tool_calls if tc.get("name") == "crawl_page"]
+            if trace.get("instruct"):
+                instruct_tool_calls = trace["instruct"].get("tool_calls", [])
+                crawl_calls = [tc for tc in instruct_tool_calls if tc.get("name") == "crawl_page"]
                 if crawl_calls:
                     # Build crawled_pages list for UI
                     crawled_pages = []
@@ -629,7 +626,12 @@ class ProcessingPipeline:
             }
 
     def _parse_tagged_response(self, text: str) -> Dict[str, Any]:
-        """Parse response for references and page references reordered by appearance."""
+        """Parse response and auto-infer references from [N] citations in body text.
+        
+        New simplified format:
+        - Body text uses [1][2] format for citations
+        - No ref code block needed - we auto-infer from citations
+        """
         parsed = {"response": "", "references": [], "page_references": [], "image_references": [], "flow_steps": []}
         if not text:
             return parsed
@@ -647,104 +649,65 @@ class ProcessingPipeline:
         except Exception:
             pass
 
-        # 2. Extract references from text first (Order by appearance)
-        # Pattern matches [search:123], [page:123], [image:123]
-        pattern = re.compile(r'\[(search|page|image):(\d+)\]', re.IGNORECASE)
-        
-        matches = list(pattern.finditer(remaining_text))
+        # 2. Extract all [N] citations from body text (scan left to right for order)
+        body_pattern = re.compile(r'\[(\d+)\]')
+        id_order = []  # Preserve citation order
         
-        search_map = {}  # old_id_str -> new_id (int)
-        page_map = {}
-        image_map = {}
+        for match in body_pattern.finditer(remaining_text):
+            try:
+                id_val = int(match.group(1))
+                if id_val not in id_order:
+                    id_order.append(id_val)
+            except ValueError:
+                pass
+
+        # 3. Build references by looking up cited IDs in all_web_results
+        # Order by appearance in text
+        old_to_new_map = {}  # old_id -> new_id (for search & page only)
         
-        def process_ref(tag_type, old_id):
-            # Find in all_web_results
-            result_item = next((r for r in self.all_web_results if r.get("_id") == old_id and r.get("_type") == tag_type), None)
+        for old_id in id_order:
+            # Find in all_web_results by _id
+            result_item = next((r for r in self.all_web_results if r.get("_id") == old_id), None)
             
-            if not result_item:
-                return
+            if result_item:
+                entry = {
+                    "title": result_item.get("title", ""),
+                    "url": result_item.get("url", ""),
+                    "domain": result_item.get("domain", "")
+                }
                 
-            entry = {
-                "title": result_item.get("title", ""),
-                "url": result_item.get("url", ""),
-                "domain": result_item.get("domain", "")
-            }
-            if tag_type == "image":
-                 entry["thumbnail"] = result_item.get("thumbnail", "")
-
-            # Add to respective list and map
-            # Check maps to avoid duplicates
-            if tag_type == "search":
-                if str(old_id) not in search_map:
+                item_type = result_item.get("_type", "")
+                
+                # Auto-classify by type
+                if item_type == "search":
                     parsed["references"].append(entry)
-                    search_map[str(old_id)] = len(parsed["references"])
-            elif tag_type == "page":
-                if str(old_id) not in page_map:
+                    old_to_new_map[old_id] = len(parsed["references"])
+                elif item_type == "page":
                     parsed["page_references"].append(entry)
-                    page_map[str(old_id)] = len(parsed["page_references"])
-            elif tag_type == "image":
-                if str(old_id) not in image_map:
+                    old_to_new_map[old_id] = len(parsed["page_references"])
+                elif item_type == "image":
+                    # Collect image but don't add to map (will be stripped from text)
+                    entry["thumbnail"] = result_item.get("thumbnail", "")
                     parsed["image_references"].append(entry)
-                    image_map[str(old_id)] = len(parsed["image_references"])
+                    # Note: no old_to_new_map entry - image citations will be removed
 
-        # Pass 1: Text Body
-        for m in matches:
+        # 4. Replace [old_id] with [new_id] in text, or remove if image
+        def replace_id(match):
             try:
-                process_ref(m.group(1).lower(), int(m.group(2)))
-            except ValueError:
-                continue
-
-        # 3. Pass 2: References Block (Capture items missed in text)
-        ref_block_match = re.search(r'```references\s*(.*?)\s*```', remaining_text, re.DOTALL | re.IGNORECASE)
-        if ref_block_match:
-            ref_content = ref_block_match.group(1).strip()
-            remaining_text = remaining_text.replace(ref_block_match.group(0), "").strip()
-            
-            for line in ref_content.split("\n"):
-                line = line.strip()
-                if not line: continue
-                # Match [id] [type]
-                # e.g. [1] [image] ... or [image:1] ...
-                
-                # Check for [id] [type] format
-                id_match = re.match(r"^\[(\d+)\]\s*\[(search|page|image)\]", line, re.IGNORECASE)
-                if id_match:
-                    try:
-                         process_ref(id_match.group(2).lower(), int(id_match.group(1)))
-                    except ValueError:
-                        pass
+                old_id = int(match.group(1))
+                new_id = old_to_new_map.get(old_id)
+                if new_id is not None:
+                    return f"[{new_id}]"
                 else:
-                    # Check for [type:id] format in list
-                    alt_match = re.match(r"^\[(search|page|image):(\d+)\]", line, re.IGNORECASE)
-                    if alt_match:
-                        try:
-                            process_ref(alt_match.group(1).lower(), int(alt_match.group(2)))
-                        except ValueError:
-                            pass
-
-        # 4. Replace tags in text with new sequential IDs
-
-        # 4. Replace tags in text with new sequential IDs
-        def replace_tag(match):
-            tag_type = match.group(1).lower()
-            old_id = match.group(2)
-            
-            new_id = None
-            if tag_type == "search":
-                new_id = search_map.get(old_id)
-            elif tag_type == "page":
-                new_id = page_map.get(old_id)
-            elif tag_type == "image":
-                new_id = image_map.get(old_id)
-            
-            if new_id is not None:
-                if tag_type == "image":
-                    return ""
-                return f"[{tag_type}:{new_id}]"
-            
+                    # Check if it's an image reference (not in map)
+                    item = next((r for r in self.all_web_results if r.get("_id") == old_id), None)
+                    if item and item.get("_type") == "image":
+                        return ""  # Remove image citations from text
+            except ValueError:
+                pass
             return match.group(0)
 
-        remaining_text = pattern.sub(replace_tag, remaining_text)
+        remaining_text = body_pattern.sub(replace_id, remaining_text)
 
         parsed["response"] = remaining_text.strip()
         return parsed
@@ -767,10 +730,10 @@ class ProcessingPipeline:
             query = args.get("query")
             web = await self.search_service.search(query)
             
-            # Cache results and assign search-specific IDs
+            # Cache results and assign global IDs
             for item in web:
-                self.search_id_counter += 1
-                item["_id"] = self.search_id_counter
+                self.global_id_counter += 1
+                item["_id"] = self.global_id_counter
                 item["_type"] = "search"
                 item["query"] = query
                 self.all_web_results.append(item)
@@ -781,10 +744,10 @@ class ProcessingPipeline:
             query = args.get("query")
             images = await self.search_service.image_search(query)
 
-            # Cache results and assign image-specific IDs
+            # Cache results and assign global IDs
             for item in images:
-                self.image_id_counter += 1
-                item["_id"] = self.image_id_counter
+                self.global_id_counter += 1
+                item["_id"] = self.global_id_counter
                 item["_type"] = "image"
                 item["query"] = query
                 item["is_image"] = True
@@ -798,11 +761,11 @@ class ProcessingPipeline:
             # Returns Dict: {content, title, url}
             result_dict = await self.search_service.fetch_page(url)
             
-            # Cache the crawled content with page-specific ID
-            self.page_id_counter += 1
+            # Cache the crawled content with global ID
+            self.global_id_counter += 1
             
             cached_item = {
-                "_id": self.page_id_counter,
+                "_id": self.global_id_counter,
                 "_type": "page",
                 "title": result_dict.get("title", "Page"),
                 "url": result_dict.get("url", url),
@@ -828,10 +791,10 @@ class ProcessingPipeline:
         return f"Unknown tool {name}"
 
 
-    async def _safe_llm_call(self, messages, model, tools=None, tool_choice=None, client: Optional[AsyncOpenAI] = None):
+    async def _safe_llm_call(self, messages, model, tools=None, tool_choice=None, client: Optional[AsyncOpenAI] = None, extra_body: Optional[Dict[str, Any]] = None):
         try:
             return await asyncio.wait_for(
-                self._do_llm_request(messages, model, tools, tool_choice, client=client or self.client),
+                self._do_llm_request(messages, model, tools, tool_choice, client=client or self.client, extra_body=extra_body),
                 timeout=120.0,
             )
         except asyncio.TimeoutError:
@@ -841,7 +804,7 @@ class ProcessingPipeline:
             logger.error(f"LLM Call Failed: {e}")
             return type("obj", (object,), {"content": f"Error: Model failure ({e})", "tool_calls": None})(), {"input_tokens": 0, "output_tokens": 0}
 
-    async def _do_llm_request(self, messages, model, tools, tool_choice, client: AsyncOpenAI):
+    async def _do_llm_request(self, messages, model, tools, tool_choice, client: AsyncOpenAI, extra_body: Optional[Dict[str, Any]] = None):
         try:
             payload_debug = json.dumps(messages)
             logger.info(f"LLM Request Payload Size: {len(payload_debug)} chars")
@@ -856,6 +819,7 @@ class ProcessingPipeline:
             tools=tools,
             tool_choice=tool_choice,
             temperature=self.config.temperature,
+            extra_body=extra_body,
         )
         logger.info(f"LLM Request RECEIVED after {time.time() - t0:.2f}s")
         
@@ -880,6 +844,7 @@ class ProcessingPipeline:
             messages=[{"role": "system", "content": prompt}, {"role": "user", "content": content_payload}],
             model=model,
             client=client,
+            extra_body=getattr(self.config, "vision_extra_body", None),
         )
         return (response.content or "").strip(), usage
 
@@ -891,15 +856,14 @@ class ProcessingPipeline:
         tools = [self.web_search_tool, self.image_search_tool, self.set_mode_tool, self.crawl_page_tool]
         tools_desc = "- internal_web_search: 搜索文本\n- internal_image_search: 搜索图片\n- crawl_page: 获取网页内容\n- set_mode: 设定standard/agent模式"
 
-        prompt_tpl = getattr(self.config, "intruct_system_prompt", None) or INTRUCT_SP
-        prompt = prompt_tpl.format(user_msgs=user_input or "", tools_desc=tools_desc)
+        prompt = INSTRUCT_SP.format(user_msgs=user_input or "", tools_desc=tools_desc)
         
         if vision_text:
-            prompt = f"{prompt}\\n\\n{INTRUCT_SP_VISION_ADD.format(vision_msgs=vision_text)}"
+            prompt = f"{prompt}\\n\\n{INSTRUCT_SP_VISION_ADD.format(vision_msgs=vision_text)}"
 
         client = self._client_for(
-            api_key=getattr(self.config, "intruct_api_key", None),
-            base_url=getattr(self.config, "intruct_base_url", None),
+            api_key=getattr(self.config, "instruct_api_key", None),
+            base_url=getattr(self.config, "instruct_base_url", None),
         )
 
         history: List[Dict[str, Any]] = [
@@ -913,12 +877,13 @@ class ProcessingPipeline:
             tools=tools,
             tool_choice="auto",
             client=client,
+            extra_body=getattr(self.config, "instruct_extra_body", None),
         )
 
         search_payloads: List[str] = []
-        intruct_trace: Dict[str, Any] = {
+        instruct_trace: Dict[str, Any] = {
             "model": model,
-            "base_url": getattr(self.config, "intruct_base_url", None) or self.config.base_url,
+            "base_url": getattr(self.config, "instruct_base_url", None) or self.config.base_url,
             "prompt": prompt,
             "user_input": user_input or "",
             "vision_add": vision_text or "",
@@ -946,8 +911,8 @@ class ProcessingPipeline:
                 history.append(
                     {"tool_call_id": tc.id, "role": "tool", "name": tc.function.name, "content": str(result)}
                 )
-                intruct_trace["tool_calls"].append(self._tool_call_to_trace(tc))
-                intruct_trace["tool_results"].append({"name": tc.function.name, "content": str(result)})
+                instruct_trace["tool_calls"].append(self._tool_call_to_trace(tc))
+                instruct_trace["tool_results"].append({"name": tc.function.name, "content": str(result)})
                 
                 if tc.function.name in ["web_search", "internal_web_search"]:
                     search_payloads.append(str(result))
@@ -959,18 +924,18 @@ class ProcessingPipeline:
                     mode = args.get("mode", mode)
                     mode_reason = args.get("reason", "")
 
-            intruct_trace["mode"] = mode
+            instruct_trace["mode"] = mode
             if mode_reason:
-                intruct_trace["mode_reason"] = mode_reason
+                instruct_trace["mode_reason"] = mode_reason
             
-            intruct_trace["output"] = ""
-            intruct_trace["usage"] = usage
-            return "", search_payloads, intruct_trace, usage, search_time
+            instruct_trace["output"] = ""
+            instruct_trace["usage"] = usage
+            return "", search_payloads, instruct_trace, usage, search_time
 
-        intruct_trace["mode"] = mode
-        intruct_trace["output"] = (response.content or "").strip()
-        intruct_trace["usage"] = usage
-        return "", search_payloads, intruct_trace, usage, 0.0
+        instruct_trace["mode"] = mode
+        instruct_trace["output"] = (response.content or "").strip()
+        instruct_trace["usage"] = usage
+        return "", search_payloads, instruct_trace, usage, 0.0
 
     def _format_search_msgs(self) -> str:
         """Format search snippets only (not crawled pages)."""
@@ -1050,9 +1015,9 @@ class ProcessingPipeline:
             parts.append(fence("text", v.get("output", "")))
             parts.append("")
 
-        if trace.get("intruct"):
-            t = trace["intruct"]
-            parts.append("## Intruct\n")
+        if trace.get("instruct"):
+            t = trace["instruct"]
+            parts.append("## Instruct\n")
             parts.append(f"- model: `{t.get('model')}`")
             parts.append(f"- base_url: `{t.get('base_url')}`\n")
             parts.append("### Prompt\n")

entari_plugin_hyw/core/render.py

@@ -266,18 +266,27 @@ class ContentRenderer:
 
                 content_html = restore_math(content_html)
                 
-                # Convert [search:N] to blue badge
-                content_html = re.sub(
-                    r'\[search:(\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>',
-                    content_html
-                )
-                # Convert [page:N] to orange badge
-                content_html = re.sub(
-                    r'\[page:(\d+)\]',
-                    r'<span class="inline-flex items-center justify-center min-w-[16px] h-4 px-0.5 text-[10px] font-bold text-orange-700 bg-orange-50 border border-orange-200 rounded mx-0.5 align-top relative -top-0.5">\1</span>',
-                    content_html
-                )
+                # Convert [N] to colored badges based on index position
+                # - Numbers 1 to len(references) → blue (search results)
+                # - Numbers len(references)+1 to len(references)+len(page_references) → orange (page content)
+                
+                num_search_refs = len(references) if references else 0
+                num_page_refs = len(page_references) if page_references else 0
+                
+                def replace_badge(match):
+                    n = int(match.group(1))
+                    if 1 <= n <= num_search_refs:
+                        # Blue badge for search results
+                        return 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">{n}</span>'
+                    elif num_search_refs < n <= num_search_refs + num_page_refs:
+                        # Orange badge for page content (renumber from 1)
+                        page_num = n - num_search_refs
+                        return f'<span class="inline-flex items-center justify-center min-w-[16px] h-4 px-0.5 text-[10px] font-bold text-orange-700 bg-orange-50 border border-orange-200 rounded mx-0.5 align-top relative -top-0.5">{page_num}</span>'
+                    else:
+                        # Fallback: keep original if out of range
+                        return match.group(0)
+                
+                content_html = re.sub(r'\[(\d+)\]', replace_badge, content_html)
                 
                 # Strip out the references code block if it leaked into the content
                 content_html = re.sub(r'<pre><code[^>]*>.*?references.*?</code></pre>\s*$', '', content_html, flags=re.DOTALL | re.IGNORECASE)

entari_plugin_hyw/utils/prompts.py

@@ -1,140 +1,116 @@
-VISION_SP = """# 你是一个专业的视觉转文字专家.
+VISION_SP = """# You are a professional vision-to-text expert.
 
-# 核心任务
-- 智能分析图片内容, 转述成文本, 除此之外不要添加任何内容
-- 文字优先: 若包含清晰文字（文档、截图等）, 必须完整准确转录, 不要遗漏.
-- 视觉补充: 解释完文字后, 描述视觉内容总结（物体、场景、氛围）.
-- 用户要求: 根据用户消息中提示侧重转文本的偏向, 若无关联则不理会.
+# Core Tasks
+- Intelligently analyze image content and paraphrase it into text. Do not add any other content.
+- Text Priority: If there is clear text (documents, screenshots, etc.), it must be transcribed completely and accurately, without omission.
+- Visual Supplement: After explaining the text, describe the visual content summary (objects, scenes, atmosphere).
+- User Requirements: Focus on text transcription based on the hint in the user message, ignore if irrelevant.
 
-## 用户消息
+## User Message
 ```text
 {user_msgs}
 ```
 """
 
-INTRUCT_SP = """# 你是一个专业的指导专家.
-
-## 核心任务
-- 决定预处理工具:
-  - 用户消息包含链接: 调用 crawl_page 获取内容, 无需其他工具
-  - 用户消息包含典型名词、可能的专有名词组合: 调用 internal_web_search 
-    - 提炼出关键词搜索关键词本身, 不添加任何其他助词, 搜索效果最好
-    - 如果用户消息关键词清晰, 使用图片搜索能搜索出诸如海报、地标、物品、角色立绘等, 调用 internal_image_search
-  - 用户消息不需要搜索: 不调用工具
-- 调用 set_mode:
-  - 绝大部分常规问题: standard
-  - 用户要求研究/深度搜索: agent
-  - 需要获取页面具体信息才能回答问题: agent
-> 所有工具需要在本次对话同时调用
-
-## 调用工具
-- 使用工具时, 必须通过 function_call / tool_call 机制调用.
+INSTRUCT_SP = """# You are a professional instruction expert.
+
+## Core Tasks
+- Decide on preprocessing tools:
+  - User message contains a link: Call `crawl_page` to get content, no other tools needed.
+  - User message contains typical nouns or possible proper noun combinations: Call `internal_web_search`.
+    - Extract keywords to search for the keywords themselves, do not add any other particles, for best search results.
+    - If user message keywords are clear, and image search can find posters, landmarks, items, character drawings, etc., call `internal_image_search`.
+  - User message does not need search: Do not call tools.
+- Call `set_mode`:
+  - Most routine questions: `standard`.
+  - User requests research / deep search: `agent`.
+  - Need to get specific page information to answer the question: `agent`.
+> All tools need to be called simultaneously in this conversation.
+
+## Call Tools
+- When using tools, you must call them via the `function_call` / `tool_call` mechanism.
 {tools_desc}
 
-## 你的回复
-调用工具后无需回复额外文本节省token.
+## Your Reply
+Do not reply with extra text after calling tools to save tokens.
 
-## 用户消息
+## User Message
 ```
 {user_msgs}
 ```
 """
 
-
-INTRUCT_SP_VISION_ADD = """
-## 视觉专家消息
+INSTRUCT_SP_VISION_ADD = """
+## Vision Expert Message
 ```text
 {vision_msgs}
 ```
 """
 
-AGENT_SP = """# 你是一个 Agent 总控专家, 你需要理解用户意图, 根据已有信息给出最终回复.
-> 请确保你输出的任何消息有着准确的来源, 减少输出错误信息.
-
-当前模式: {mode}, {mode_desc}
-
-
-
-## 过程要求
-当不调用工具发送文本, 即会变成最终回复, 请遵守: 
-- 直接给出一篇报告, 无需回答用户消息
-- 语言: 简体中文, 百科式风格, 语言严谨不啰嗦.
-- 正文格式: 
-  - 使用 Markdown 格式, 支持 hightlight, katex
-  - 最开始给出`# `大标题, 不要有多余废话, 不要直接回答用户的提问.
-  - 内容丰富突出重点.
-- 工具引用: 
-  > 重要: 所有正文内容必须基于实际信息, 保证百分百真实度
-  - 引用规则:
-    - 本次会话中存在对解决此问题有用的信息才加以引用, 不需要的消息可以不引用.
-    - 角标必须真实对应上下文中获取的信息, 同时对应 references 中的内容, 图片按顺序对应.
-  - 正文中的引用规则
-    - 搜索摘要引用: 使用如 [search:3][search:4]
-    - 页面内容引用: 使用如 [page:5][page:6]
-    - 图片引用: 使用如 [image:7][image:8]
-    - search 的意思是你使用 internal_web_search 获取的搜索摘要, 如果没有此工具相关信息则不引用
-    - page 的意思是你使用 crawl_page 获取的页面内容, 如果没有此工具相关信息则不引用
-    - image 的意思是你使用 internal_image_search 获取的图片, 图片按顺序摆放即可, 你无需显式引用
-  - 在正文底部添加 references 代码块:
-    - 用不到的条目不写, 没有专家给信息就不写.
-    ```references
-    [2] [search] [文本描述](url)
-    [8] [search] [文本描述](url)
-    [1] [page] [页面标题](url)
-    [2] [page] [页面标题](url)
-    [1] [image] [来源](url)
-    ```
-
-## 用户消息
+AGENT_SP = """# You are an Agent Control Expert. You need to understand user intent and provide a final reply based on available information.
+> Please ensure that any message you output has an accurate source to reduce misinformation.
+
+Current Mode: {mode}, {mode_desc}
+
+## Process Requirements
+When sending text without calling tools, it means this is the final reply. Please observe:
+- Provide a report directly, no need to explicitly answer the user message.
+- Language: {language}, encyclopedic style, rigorous and concise language.
+- Body Format:
+  - Use Markdown format, supporting highlight, katex.
+  - Give a `# ` main title at the beginning, no extra nonsense, do not directly answer the user's question.
+  - Rich content highlighting key points.
+- Citation:
+  > Important: All body content must be based on actual information, ensuring 100% accuracy.
+  - Information sources are numbered in order of acquisition as [1], [2], [3]...
+  - Use [1][2] format directly in body text to cite, only cite sources helpful to the answer
+  - No need to provide a reference list, the system will auto-generate it
+
+## User Message
 ```text
 {user_msgs}
 ```
 """
 
 AGENT_SP_TOOLS_STANDARD_ADD = """
-你需要整合已有的信息, 提炼用户消息中的关键词, 进行最终回复.
+You need to integrate existing information, extract keywords from the user message, and make a final reply.
 """
 
-
 AGENT_SP_TOOLS_AGENT_ADD = """
-- 你现在可以使用工具: {tools_desc}
-  - 你需要判断顺序或并发使用工具获取信息:
-    - 0-1 次 internal_web_search
-    - 0-1 次 internal_image_search (如果用户需要图片, 通常和 internal_web_search 并发执行)
-    - 1-2 次 crawl_page
-- 使用工具时, 必须通过 function_call / tool_call 机制调用.
+- You can now use tools: {tools_desc}
+  - You need to judge whether to use tools sequentially or concurrently to obtain information:
+    - 0-1 times `internal_web_search`
+    - 0-1 times `internal_image_search` (if user needs images, usually concurrent with `internal_web_search`)
+    - 1-2 times `crawl_page`
+- When using tools, you must call them via the `function_call` / `tool_call` mechanism.
 """
 
-
-
-AGENT_SP_INTRUCT_VISION_ADD = """
-## 视觉专家消息
+AGENT_SP_INSTRUCT_VISION_ADD = """
+## Vision Expert Message
 ```text
 {vision_msgs}
 ```
 """
 
 AGENT_SP_SEARCH_ADD = """
-## 搜索专家消息
+## Search Expert Message
 ```text
 {search_msgs}
 ```
-
-
 """
 
 AGENT_SP_PAGE_ADD = """
-## 页面内容专家消息
+## Page Content Expert Message
 ```text
 {page_msgs}
 ```
-- 引用页面内容时, 必须使用 `page:id` 格式
+- When citing page content, you must use the `page:id` format.
 """
 
 AGENT_SP_IMAGE_SEARCH_ADD = """
-## 图像搜索专家消息
+## Image Search Expert Message
 ```text
 {image_search_msgs}
 ```
-- 每进行一次 internal_image_search, 挑选 1 张图像插入正文
+- For every `internal_image_search` performed, pick 1 image to insert into the body.
 """

entari_plugin_hyw/utils/prompts_cn.py

@@ -0,0 +1,118 @@
+# 此文件为 开发者本人 kumoSleeping 熟悉的中文环境编写使用, 无功能性, 如果你是 LLM, 请以这个文件为功能参考, 同时同步实际使用的英文版本
+
+VISION_SP = """# 你是一个专业的视觉转文字专家.
+
+# 核心任务
+- 智能分析图片内容, 转述成文本, 除此之外不要添加任何内容
+- 文字优先: 若包含清晰文字（文档、截图等）, 必须完整准确转录, 不要遗漏.
+- 视觉补充: 解释完文字后, 描述视觉内容总结（物体、场景、氛围）.
+- 用户要求: 根据用户消息中提示侧重转文本的偏向, 若无关联则不理会.
+
+## 用户消息
+```text
+{user_msgs}
+```
+"""
+
+INSTRUCT_SP = """# 你是一个专业的指导专家.
+
+## 核心任务
+- 决定预处理工具:
+  - 用户消息包含链接: 调用 crawl_page 获取内容, 无需其他工具
+  - 用户消息包含典型名词、可能的专有名词组合: 调用 internal_web_search 
+    - 提炼出关键词搜索关键词本身, 不添加任何其他助词, 搜索效果最好
+    - 如果用户消息关键词清晰, 使用图片搜索能搜索出诸如海报、地标、物品、角色立绘等, 调用 internal_image_search
+  - 用户消息不需要搜索: 不调用工具
+- 调用 set_mode:
+  - 绝大部分常规问题: standard
+  - 用户要求研究/深度搜索: agent
+  - 需要获取页面具体信息才能回答问题: agent
+> 所有工具需要在本次对话同时调用
+
+## 调用工具
+- 使用工具时, 必须通过 function_call / tool_call 机制调用.
+{tools_desc}
+
+## 你的回复
+调用工具后无需回复额外文本节省token.
+
+## 用户消息
+```
+{user_msgs}
+```
+"""
+
+INSTRUCT_SP_VISION_ADD = """
+## 视觉专家消息
+```text
+{vision_msgs}
+```
+"""
+
+AGENT_SP = """# 你是一个 Agent 总控专家, 你需要理解用户意图, 根据已有信息给出最终回复.
+> 请确保你输出的任何消息有着准确的来源, 减少输出错误信息.
+
+当前模式: {mode}, {mode_desc}
+
+## 过程要求
+当不调用工具发送文本, 即会变成最终回复, 请遵守: 
+- 直接给出一篇报告, 无需回答用户消息
+- 语言: {language}, 百科式风格, 语言严谨不啰嗦.
+- 正文格式: 
+  - 使用 Markdown 格式, 支持 hightlight, katex
+  - 最开始给出`# `大标题, 不要有多余废话, 不要直接回答用户的提问.
+  - 内容丰富突出重点.
+- 引用:
+  > 重要: 所有正文内容必须基于实际信息, 保证百分百真实度
+  - 信息来源已按获取顺序编号为 [1], [2], [3]...
+  - 正文中直接使用 [1][2] 格式引用, 只引用对回答有帮助的来源
+  - 无需给出参考文献列表, 系统会自动生成
+
+## 用户消息
+```text
+{user_msgs}
+```
+"""
+
+AGENT_SP_TOOLS_STANDARD_ADD = """
+你需要整合已有的信息, 提炼用户消息中的关键词, 进行最终回复.
+"""
+
+AGENT_SP_TOOLS_AGENT_ADD = """
+- 你现在可以使用工具: {tools_desc}
+  - 你需要判断顺序或并发使用工具获取信息:
+    - 0-1 次 internal_web_search
+    - 0-1 次 internal_image_search (如果用户需要图片, 通常和 internal_web_search 并发执行)
+    - 1-2 次 crawl_page
+- 使用工具时, 必须通过 function_call / tool_call 机制调用.
+"""
+
+AGENT_SP_INSTRUCT_VISION_ADD = """
+## 视觉专家消息
+```text
+{vision_msgs}
+```
+"""
+
+AGENT_SP_SEARCH_ADD = """
+## 搜索专家消息
+```text
+{search_msgs}
+```
+"""
+
+AGENT_SP_PAGE_ADD = """
+## 页面内容专家消息
+```text
+{page_msgs}
+```
+- 引用页面内容时, 必须使用 `page:id` 格式
+"""
+
+AGENT_SP_IMAGE_SEARCH_ADD = """
+## 图像搜索专家消息
+```text
+{image_search_msgs}
+```
+- 每进行一次 internal_image_search, 挑选 1 张图像插入正文
+"""

entari_plugin_hyw-3.4.0.dist-info/METADATA

@@ -0,0 +1,113 @@
+Metadata-Version: 2.4
+Name: entari_plugin_hyw
+Version: 3.4.0
+Summary: Use large language models to interpret chat messages
+Author-email: kumoSleeping <zjr2992@outlook.com>
+License: MIT
+Project-URL: Homepage, https://github.com/kumoSleeping/entari-plugin-hyw
+Project-URL: Repository, https://github.com/kumoSleeping/entari-plugin-hyw
+Project-URL: Issue Tracker, https://github.com/kumoSleeping/entari-plugin-hyw/issues
+Keywords: entari,llm,ai,bot,chat
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: Developers
+Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Requires-Python: >=3.10
+Description-Content-Type: text/markdown
+Requires-Dist: arclet-entari[full]>=0.16.5
+Requires-Dist: openai
+Requires-Dist: httpx
+Requires-Dist: markdown>=3.10
+Requires-Dist: crawl4ai>=0.7.8
+Requires-Dist: jinja2>=3.0
+Requires-Dist: ddgs>=9.10.0
+Provides-Extra: dev
+Requires-Dist: entari-plugin-server>=0.5.0; extra == "dev"
+Requires-Dist: satori-python-adapter-onebot11>=0.2.5; extra == "dev"
+
+# Entari Plugin HYW
+
+[![PyPI version](https://badge.fury.io/py/entari-plugin-hyw.svg)](https://badge.fury.io/py/entari-plugin-hyw)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
+[![Python Versions](https://img.shields.io/pypi/pyversions/entari-plugin-hyw.svg)](https://pypi.org/project/entari-plugin-hyw/)
+
+**English** | [简体中文](docs/README_CN.md)
+
+**Entari Plugin HYW** is an advanced agentic chat plugin for the [Entari](https://github.com/entari-org/entari) framework. It leverages Large Language Models (LLMs) to provide intelligent, context-aware, and multi-modal responses within instant messaging environments (OneBot 11, Satori).
+
+The plugin implements a three-stage pipeline (**Vision**, **Instruct**, **Agent**) to autonomously decide when to search the web, crawl pages, or analyze images to answer user queries effectively.
+
+<p align="center">
+  <img src="docs/demo_mockup.svg" width="800" />
+</p>
+
+## Features
+
+- 📖 **Agentic Workflow**  
+  Autonomous decision-making process to search, browse, and reason.
+
+- 🎑 **Multi-Modal Support**  
+  Native support for image analysis using Vision Language Models (VLMs).
+
+- 🔍 **Web Search & Crawling**  
+  Integrated **DuckDuckGo** and **Crawl4AI** for real-time information retrieval.
+
+- 🎨 **Rich Rendering**  
+  Responses are rendered as images containing Markdown, syntax-highlighted code, LaTeX math, and citation badges.
+
+- 🔌 **Protocol Support**  
+  Deep integration with OneBot 11 and Satori protocols, handling reply context and JSON cards perfectly.
+
+## Installation
+
+```bash
+pip install entari-plugin-hyw
+```
+
+## Configuration
+
+Configure the plugin in your `entari.yml`.
+
+### Minimal Configuration
+
+```yaml
+plugins:
+  entari_plugin_hyw:
+    model_name: google/gemini-3-flash-preview
+    api_key: "your-or-api-key-here"
+```
+
+## Usage
+
+### Commands
+
+- **Text Query**
+  ```text
+  /q What's the latest news on Rust 1.83?
+  ```
+
+- **Image Analysis**
+  *(Send an image with command, or reply to an image)*
+  ```text
+  /q [Image] Explain this error.
+  ```
+- **Quote Query**
+  ```text
+  [quote: User Message] /q
+  ```
+
+- **Follow-up**
+  *Reply to the bot's message to continue the conversation.*
+
+## Documentation for AI/LLMs
+
+- [Instruction Guide (English)](docs/README_LLM_EN.md)
+- [指导手册 (简体中文)](docs/README_LLM_CN.md)
+
+---
+
+## License
+
+This project is licensed under the MIT License.

{entari_plugin_hyw-3.3.7.dist-info → entari_plugin_hyw-3.4.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-entari_plugin_hyw/__init__.py,sha256=K5WW4usKpP38CTxQHpm693brIhsbxBRsD0ojwekmMGE,19689
+entari_plugin_hyw/__init__.py,sha256=BwlY42IJj51Oo8hHrTxbCDItRA3bMr7Z1G-3HUEyWhQ,19708
 entari_plugin_hyw/assets/package-lock.json,sha256=TIrLM-wLWZTrp3LKfzhEVuduhvBJmI93NdQEKYLW2W0,33172
 entari_plugin_hyw/assets/package.json,sha256=Y4H8JGtp3nv2WUtI20tXoXWddR-dwwKJhqQVLercpiw,306
 entari_plugin_hyw/assets/tailwind.config.js,sha256=S8I9X8hI8IaQRczWK9hTW-zl4oVpAXw5ykeksrzHjpU,382
@@ -11,6 +11,7 @@ entari_plugin_hyw/assets/icon/deepseek.png,sha256=KWWAr9aeYMc6I07U_1qo7zcXO6e7-k
 entari_plugin_hyw/assets/icon/gemini.svg,sha256=H74CoVmx5opcCtr3Ay3M09dpqL9cd9Whkx-M6an3t7s,599
 entari_plugin_hyw/assets/icon/google.svg,sha256=H74CoVmx5opcCtr3Ay3M09dpqL9cd9Whkx-M6an3t7s,599
 entari_plugin_hyw/assets/icon/grok.png,sha256=uSulvvDVqoA4RUOW0ZAkdvBVM2rpyGJRZIbn5dEFspw,362
+entari_plugin_hyw/assets/icon/huggingface.png,sha256=8eAudeftUDO11jf0coOscPeRkskCb7l9TNMx78q61mY,24564
 entari_plugin_hyw/assets/icon/microsoft.svg,sha256=-am_6N3UEQYSzldDg-xrdGYjTWsagH-3v4Q_eia1ymE,684
 entari_plugin_hyw/assets/icon/minimax.png,sha256=tWqVlMdFNPpP8zWWX9tvIsWXI9q76P7O3t3CEZO7NU0,1525
 entari_plugin_hyw/assets/icon/mistral.png,sha256=0vv7jPmPKiBRYVYYJxVL_wIH_qa_ZssIdV3NDO5vbmk,869
@@ -20,6 +21,7 @@ entari_plugin_hyw/assets/icon/openrouter.png,sha256=exxfjWGDWpYH-Vc8xJDbhNVeXFEV
 entari_plugin_hyw/assets/icon/perplexity.svg,sha256=mHWZFoeWmDYXOIDzm9pj6_sRotaI8xNy5Lkeg5Vzu70,555
 entari_plugin_hyw/assets/icon/qwen.png,sha256=eqLbnIPbjh2_PsODU_mmqjeD82xXj8fV_kN0fDrNaD0,38419
 entari_plugin_hyw/assets/icon/xai.png,sha256=uSulvvDVqoA4RUOW0ZAkdvBVM2rpyGJRZIbn5dEFspw,362
+entari_plugin_hyw/assets/icon/xiaomi.png,sha256=WHxlDFGU5FCjb-ure3ngdGG18-efYZUUfqA3_lqCUN0,4084
 entari_plugin_hyw/assets/icon/zai.png,sha256=K-gnabdsjMLInppHA1Op7Nyt33iegrx1x-yNlvCZ0Tc,2351
 entari_plugin_hyw/assets/libs/highlight.css,sha256=Oppd74ucMR5a5Dq96FxjEzGF7tTw2fZ_6ksAqDCM8GY,1309
 entari_plugin_hyw/assets/libs/highlight.js,sha256=g3pvpbDHNrUrveKythkPMF2j_J7UFoHbUyFQcFe1yEY,121727
@@ -28,18 +30,19 @@ entari_plugin_hyw/assets/libs/katex.css,sha256=UF1fgpAiu3tPJN_uCqEUHNe7pnr-QR0SQ
 entari_plugin_hyw/assets/libs/katex.js,sha256=3ISyluw-iE3gkxWPdg_Z1Ftser5YtTgVV_ThOPRqWK4,277038
 entari_plugin_hyw/assets/libs/tailwind.css,sha256=ee_3txpnxhChZOjSJQUX0XiL1Nq0U2KLTvSGJLZBlaA,19916
 entari_plugin_hyw/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-entari_plugin_hyw/core/config.py,sha256=rN2hVI964D7eM6xPuOthEIpXyFGZpRSYNrl1xdKHJ1s,1636
+entari_plugin_hyw/core/config.py,sha256=uKZOuK9bG1W-E5UzhKX-EcYu2nFdxfl9EEaSwVgFtK4,1653
 entari_plugin_hyw/core/history.py,sha256=vqp7itwR5-KaqC4Ftmq6GOz7OM9GsiFJnSN9JJ2P6L4,5894
 entari_plugin_hyw/core/hyw.py,sha256=RCRjV9uYmvXysiliztphLP3VyUabrf0LY2Bk66W5JGA,1927
-entari_plugin_hyw/core/pipeline.py,sha256=t1nIjQlMKqTb7wpY7Dn1rbWDD2kl8WWUnPQBY5MQO4E,49071
-entari_plugin_hyw/core/render.py,sha256=rUhv2R5fdtsMIGg-Q1qe8hhUWC1_E50BODLA78u4_SI,28948
+entari_plugin_hyw/core/pipeline.py,sha256=5pU7K8q8jYMJVdudUtpz0Pq4bI1MUpBX0Jdrkc0vswE,47868
+entari_plugin_hyw/core/render.py,sha256=3tgmB3Pntbcr4YcyvF8tzaihNdol9sitFkXPrgmQXVQ,29696
 entari_plugin_hyw/utils/__init__.py,sha256=TnkxDqYr0zgRE7TC92tVbUaY8m1UyyoLg2zvzQ8nMVI,84
 entari_plugin_hyw/utils/browser.py,sha256=LJlFh-oSqt9mQBpMALxbYGUG__t1YLUo7RxUAslsWUc,1416
 entari_plugin_hyw/utils/misc.py,sha256=_7iHVYj_mJ6OGq6FU1s_cFeS1Ao-neBjZYd6eI2p95U,3482
 entari_plugin_hyw/utils/playwright_tool.py,sha256=ZZNkzFtUt_Gxny3Od4boBAgNF9J0N84uySatzn1Bwe4,1272
-entari_plugin_hyw/utils/prompts.py,sha256=oJpgNvRQ_Lmr2Ca-B6fcpysMT2i0obioBC1DuH_Z1MY,4430
+entari_plugin_hyw/utils/prompts.py,sha256=Jp94gc0BE6Kn-5N2soXDo66ySX7NxrczCcuS16nGaMU,4035
+entari_plugin_hyw/utils/prompts_cn.py,sha256=DNSd4U6htUGcFXbywEX4d-WXnQL57CZsq-vba-T6hHw,3695
 entari_plugin_hyw/utils/search.py,sha256=Bvz2KFw3Gr2nuvmlo_8ExLHvO353NKX-YN35A2FCsBw,19047
-entari_plugin_hyw-3.3.7.dist-info/METADATA,sha256=ZQ_HfsEQKXUPkEf2KaPSO9hPm1bYgHSfCo-GRV-f9l8,6340
-entari_plugin_hyw-3.3.7.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-entari_plugin_hyw-3.3.7.dist-info/top_level.txt,sha256=TIDsn6XPs6KA5e3ezsE65JoXsy03ejDdrB41I4SPjmo,18
-entari_plugin_hyw-3.3.7.dist-info/RECORD,,
+entari_plugin_hyw-3.4.0.dist-info/METADATA,sha256=iLjguVLoNWNm3eMhE2cmGqDcZyW25wn3fUCHmU4idwE,3598
+entari_plugin_hyw-3.4.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+entari_plugin_hyw-3.4.0.dist-info/top_level.txt,sha256=TIDsn6XPs6KA5e3ezsE65JoXsy03ejDdrB41I4SPjmo,18
+entari_plugin_hyw-3.4.0.dist-info/RECORD,,

entari_plugin_hyw-3.3.7.dist-info/METADATA

@@ -1,142 +0,0 @@
-Metadata-Version: 2.4
-Name: entari_plugin_hyw
-Version: 3.3.7
-Summary: Use large language models to interpret chat messages
-Author-email: kumoSleeping <zjr2992@outlook.com>
-License: MIT
-Project-URL: Homepage, https://github.com/kumoSleeping/entari-plugin-hyw
-Project-URL: Repository, https://github.com/kumoSleeping/entari-plugin-hyw
-Project-URL: Issue Tracker, https://github.com/kumoSleeping/entari-plugin-hyw/issues
-Keywords: entari,llm,ai,bot,chat
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: MIT License
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Requires-Python: >=3.10
-Description-Content-Type: text/markdown
-Requires-Dist: arclet-entari[full]>=0.16.5
-Requires-Dist: openai
-Requires-Dist: httpx
-Requires-Dist: markdown>=3.10
-Requires-Dist: crawl4ai>=0.7.8
-Requires-Dist: jinja2>=3.0
-Requires-Dist: ddgs>=9.10.0
-Provides-Extra: dev
-Requires-Dist: entari-plugin-server>=0.5.0; extra == "dev"
-Requires-Dist: satori-python-adapter-onebot11>=0.2.5; extra == "dev"
-
-
-# Entari Plugin HYW
-
-
-[![PyPI version](https://badge.fury.io/py/entari-plugin-hyw.svg)](https://badge.fury.io/py/entari-plugin-hyw)
-[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
-[![Python Versions](https://img.shields.io/pypi/pyversions/entari-plugin-hyw.svg)](https://pypi.org/project/entari-plugin-hyw/)
-
-**Entari Plugin HYW** is an advanced agentic chat plugin for the [Entari](https://github.com/entari-org/entari) framework. It leverages Large Language Models (LLMs) to provide intelligent, context-aware, and multi-modal responses within instant messaging environments (OneBot 11, Satori).
-
-**Entari Plugin HYW** 是 Entari 框架的高级智能体聊天插件。它利用大语言模型（LLM）在即时通讯环境（OneBot 11, Satori）中提供智能、上下文感知和多模态的回复体验。
-
-The plugin implements a three-stage pipeline (**Vision**, **Instruct**, **Agent**) to autonomously decide when to search the web, crawl pages, or analyze images to answer user queries effectively.
-
-插件实现了三阶段流水线（**视觉**、**指令**、**代理**），能够自主决定何时搜索网络、抓取网页或分析图片，从而高效地回答用户问题。
-
-<img src="demo.jpg" width="300" />
-
-## Features / 功能特性
-
-- 📖 **Agentic Workflow (智能工作流)**  
-  Autonomous decision-making process to search, browse, and reason.  
-  具备自主决策能力，能够自动进行搜索、网页浏览和逻辑推理。
-
-- 🎑 **Multi-Modal Support (多模态支持)**  
-  Native support for image analysis using Vision Language Models (VLMs).  
-  原生支持图片分析，利用视觉语言模型（VLM）理解图像内容。
-
-- 🔍 **Web Search & Crawling (搜索与抓取)**  
-  Integrated **DuckDuckGo** and **Crawl4AI** for real-time information retrieval.  
-  集成 DuckDuckGo 搜索与 Crawl4AI 网页抓取，实时获取互联网信息。
-
-- 🎨 **Rich Rendering (富媒体渲染)**  
-  Responses are rendered as images containing Markdown, syntax-highlighted code, LaTeX math, and citation badges.  
-  回答将渲染为包含 Markdown、代码高亮、LaTeX 公式及引用角标的精美图片。
-
-- 🔌 **Protocol Support (多协议适配)**  
-  Deep integration with OneBot 11 and Satori protocols.  
-  深度适配 OneBot 11 和 Satori 协议，完美处理回复上下文与 JSON 卡片。
-
-## Installation / 安装
-
-```bash
-pip install entari-plugin-hyw
-```
-
-## Configuration / 配置
-
-Configure the plugin in your `entari.yml`.  
-在 `entari.yml` 中进行配置。
-
-### Minimal Configuration / 最小配置
-
-```yaml
-plugins:
-  entari_plugin_hyw:
-    # Trigger command / 触发指令
-    question_command: ".q"
-    
-    # Main Model (Required) / 主模型（必需）
-    model_name: "google/gemini-2.0-flash-exp"
-    api_key: "your-api-key-here"
-    base_url: "https://generativelanguage.googleapis.com/v1beta/openai/"
-```
-
-### Configuration Reference / 配置详解
-
-| Option (选项) | Type | Default | Description (说明) |
-| :--- | :--- | :--- | :--- |
-| **Basic** | | | |
-| `question_command` | `str` | `/q` | The command to trigger the bot. <br> 触发机器人的指令前缀。 |
-| `reaction` | `bool` | `true` | React with emoji on start(now only lagrange ob extension). <br> 收到指令时是否回应表情(目前只支持拉格兰ob扩展)。 |
-| `quote` | `bool` | `true` | Quote the user's message in reply. <br> 回复时是否引用原消息。 |
-| **Models** | | | |
-| `model_name` | `str` | *None* | **Required.** Main Agent model ID. <br> **必需。** 主代理模型 ID。 |
-| `api_key` | `str` | *None* | **Required.** API key. <br> **必需。** API 密钥。 |
-| `base_url` | `str` | `...` | OpenAI-compatible API base URL. <br> 兼容 OpenAI 的 API 地址。 |
-| `extra_body` | `dict` | `null` | Extra parameters (e.g. `reasoning_effort`). <br> 传递给 LLM 的额外参数。 |
-| **Specialized** | | | |
-| `vision_model_name`| `str` | *None* | Model for images. Defaults to `model_name`. <br> 处理图片的模型，默认同主模型。 |
-| `intruct_model_name`| `str` | *None* | Model for intent. Defaults to `model_name`. <br> 意图识别模型，默认同主模型。 |
-| **Tools** | | | |
-| `search_provider` | `str` | `ddgs`| `ddgs` (DuckDuckGo), `crawl4ai`, `httpx`. <br> 搜索后端提供商。 |
-| `search_limit` | `int` | `8` | Max search results. <br> 搜索结果数量限制。 |
-| `headless` | `bool` | `true` | Browser headless mode. <br> 浏览器无头模式。 |
-
-## Usage / 使用方法
-
-### Commands / 指令
-
-- **Text Query (文本问答)**
-  ```text
-  .q What's the latest news on Rust 1.83?
-  .q Rust 1.83 有什么新特性？
-  ```
-
-- **Image Analysis (图片分析)**
-  *(Send an image with command, or reply to an image)*  
-  *(发送带图片的指令，或回复一张图片)*
-  ```text
-  .q [Image] Explain this error.
-  .q [图片] 解释一下这个报错。
-  ```
-
-- **Follow-up (追问)**
-  *Reply to the bot's message to continue the conversation.*  
-  *直接回复机器人的消息即可进行连续对话。*
-
------
-
-## License
-
-This project is licensed under the MIT License.