echotools 2.3.104__tar.gz → 2.4.1__tar.gz

{echotools-2.3.104 → echotools-2.4.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.3.104
+Version: 2.4.1
 Summary: 通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链
 Home-page: https://github.com/nichengfuben/echotools
 Author: nichengfuben
@@ -56,8 +56,9 @@ Requires-Dist: ruff>=0.4.0; extra == "dev"
 
 # echotools
 
-通用基础设施 SDK：配置中心、日志、事件总线、调用链、任务调度、
-插件框架、协议系统、自适应选择器，完全项目无关，兼容 Python 3.8–3.14。
+通用基础设施 SDK：配置、日志、事件、调度、插件、调用链，以及 **entml** LLM 工具调用协议与终端 Console UI。
+
+完全项目无关，兼容 Python 3.8–3.14。当前版本：**2.4.1**（详见 [CHANGELOG](docs/CHANGELOG.md)）。
 
 ## 安装
 
@@ -65,7 +66,7 @@ Requires-Dist: ruff>=0.4.0; extra == "dev"
 # 核心（仅 typing-extensions）
 pip install echotools
 
-# 完整功能
+# 完整功能（含 TOML、Web、终端、Console UI 等）
 pip install echotools[all]
 ```
 
@@ -79,25 +80,14 @@ pip install echotools[all]
 | `socks` | SOCKS 代理 |
 | `ssh` | SSH 终端 |
 | `terminal` | Windows ConPTY |
+| `console` | Rich 终端 UI（渐变、表格、交互选择） |
 | `all` | 全部可选依赖 |
-| `dev` | pytest, ruff, mypy |
-
-### PyPI 重装（`uninstall-no-record-file`）
-
-本地 `pip install -e .` 或中断的 wheel 安装可能留下无 `RECORD` 的元数据，导致
-`pip install --upgrade echotools` 报 `Cannot uninstall echotools None`。
-
-```powershell
-# 在仓库根目录
-powershell -File scripts/reinstall_from_pypi.ps1 -Version 2.3.81
-```
-
-或手动：删除 `src/echotools.egg-info` 与 site-packages 里仅有 `direct_url.json` 的
-`echotools-*.dist-info`，再执行
-`pip install --force-reinstall --no-cache-dir echotools==2.3.81`。
+| `dev` | pytest、ruff、mypy |
 
 ## 快速开始
 
+### 基础设施
+
 ```python
 from echotools import EchoTools
 
@@ -113,18 +103,75 @@ with et.tracer.trace("request") as trace:
 await et.shutdown()
 ```
 
+### entml 工具调用
+
+内置 **entml**（`<entml:*>` 熵标记语言）协议，负责 prompt 注入与模型输出解析。
+
+```python
+from echotools import FncallStreamParser, get_protocol, inject_fncall
+
+tools = [
+    {
+        "name": "Bash",
+        "description": "Run a shell command",
+        "input_schema": {
+            "type": "object",
+            "properties": {"command": {"type": "string"}},
+            "required": ["command"],
+        },
+    }
+]
+messages = [{"role": "user", "content": "列出当前目录"}]
+
+proto = get_protocol()
+out_messages = inject_fncall(messages, tools, proto, lang="zh")
+
+parser = FncallStreamParser(proto, tools=tools)
+for chunk in model_stream:
+    parser.feed(chunk)
+    if parser.get_ready_tool_calls():
+        ...
+result = parser.finalize()
+```
+
+能力包括：prompt 注入（history / 工具结果 / thinking 模式）、batch `parse()`、流式
+`partial_text` / `input_json_delta`、伪 history 剥离、工具循环检测。
+
+### 终端 Console UI
+
+需要 `pip install echotools[console]`（或 `[all]`）：
+
+```python
+from echotools.media.console import (
+    create_themed_ui,
+    render_gradient_banner,
+    render_text_lines,
+    run_select,
+)
+
+ui = create_themed_ui(theme_name="ocean")  # ocean / forest / sunset / violet / rose / slate / cyan
+print(render_gradient_banner(render_text_lines("echotools"), theme_name="ocean"))
+choice = run_select(ui, "选择主题", ["ocean", "forest", "sunset"])
+```
+
 ## 能力总览
 
 | 模块 | 说明 |
 |------|------|
+| `EchoTools` | 门面：配置、日志、事件、调度、插件等统一入口 |
 | `ConfigCenter` | 点路径配置 + 热重载 + 类型绑定 |
 | `LoggerManager` | 调用链注入 + 颜色 + 轮转 |
 | `EventBus` | 同步/异步事件 |
 | `Tracer` | 轻量调用链 |
 | `TaskDispatcher` | 单发/竞速 + 贝叶斯自适应选择 |
 | `PluginRegistry` | 自动发现 + 热重载 |
-| `get_protocol` | XML/antml/original/bracket/nous 等 LLM 工具协议 |
+| `get_protocol` / `inject_fncall` | entml 工具协议与 prompt 注入 |
+| `FncallStreamParser` | 流式工具调用解析 |
+| `media.console` | Rich 终端 UI、多主题、交互选择与 ANSI 渐变 |
+| `PrintStream` | 动态速度打印流 |
 | `ProxyManager` | HTTP/HTTPS/SOCKS |
+| `WebApplication` | aiohttp Web（需 `[http]`） |
+| `LocalTerminal` / `SSHTerminal` | 终端会话（需 `[terminal]` / `[ssh]`） |
 | `AutoUpdater` | git 自动更新 |
 | `FileWatcher` | 轮询文件监视 |
 
@@ -132,13 +179,17 @@ await et.shutdown()
 
 ```bash
 pip install -e ".[dev,all]"
-make lint
-make test
-make cov
+make -C docs lint
+make -C docs test
+make -C docs cov
 ```
 
 模块指南见 [docs/modules.md](docs/modules.md)，API 参考见 [docs/api.md](docs/api.md)。
 
+## 变更记录
+
+见 [docs/CHANGELOG.md](docs/CHANGELOG.md)。
+
 ## 许可证
 
 MIT

echotools-2.4.1/README.md

@@ -0,0 +1,139 @@
+# echotools
+
+通用基础设施 SDK：配置、日志、事件、调度、插件、调用链，以及 **entml** LLM 工具调用协议与终端 Console UI。
+
+完全项目无关，兼容 Python 3.8–3.14。当前版本：**2.4.1**（详见 [CHANGELOG](docs/CHANGELOG.md)）。
+
+## 安装
+
+```bash
+# 核心（仅 typing-extensions）
+pip install echotools
+
+# 完整功能（含 TOML、Web、终端、Console UI 等）
+pip install echotools[all]
+```
+
+### 可选依赖
+
+| Extra | 用途 |
+|-------|------|
+| `toml` | TOML 配置读写 |
+| `watch` | watchdog 文件监视 |
+| `http` | aiohttp Web 层 |
+| `socks` | SOCKS 代理 |
+| `ssh` | SSH 终端 |
+| `terminal` | Windows ConPTY |
+| `console` | Rich 终端 UI（渐变、表格、交互选择） |
+| `all` | 全部可选依赖 |
+| `dev` | pytest、ruff、mypy |
+
+## 快速开始
+
+### 基础设施
+
+```python
+from echotools import EchoTools
+
+et = EchoTools(service_name="myapp")
+et.logger.configure(level="INFO", color=True)
+cfg = et.config
+cfg.load("config.toml")
+
+with et.tracer.trace("request") as trace:
+    with et.tracer.span(trace, "db") as span:
+        span.set_tag("query", "select 1")
+
+await et.shutdown()
+```
+
+### entml 工具调用
+
+内置 **entml**（`<entml:*>` 熵标记语言）协议，负责 prompt 注入与模型输出解析。
+
+```python
+from echotools import FncallStreamParser, get_protocol, inject_fncall
+
+tools = [
+    {
+        "name": "Bash",
+        "description": "Run a shell command",
+        "input_schema": {
+            "type": "object",
+            "properties": {"command": {"type": "string"}},
+            "required": ["command"],
+        },
+    }
+]
+messages = [{"role": "user", "content": "列出当前目录"}]
+
+proto = get_protocol()
+out_messages = inject_fncall(messages, tools, proto, lang="zh")
+
+parser = FncallStreamParser(proto, tools=tools)
+for chunk in model_stream:
+    parser.feed(chunk)
+    if parser.get_ready_tool_calls():
+        ...
+result = parser.finalize()
+```
+
+能力包括：prompt 注入（history / 工具结果 / thinking 模式）、batch `parse()`、流式
+`partial_text` / `input_json_delta`、伪 history 剥离、工具循环检测。
+
+### 终端 Console UI
+
+需要 `pip install echotools[console]`（或 `[all]`）：
+
+```python
+from echotools.media.console import (
+    create_themed_ui,
+    render_gradient_banner,
+    render_text_lines,
+    run_select,
+)
+
+ui = create_themed_ui(theme_name="ocean")  # ocean / forest / sunset / violet / rose / slate / cyan
+print(render_gradient_banner(render_text_lines("echotools"), theme_name="ocean"))
+choice = run_select(ui, "选择主题", ["ocean", "forest", "sunset"])
+```
+
+## 能力总览
+
+| 模块 | 说明 |
+|------|------|
+| `EchoTools` | 门面：配置、日志、事件、调度、插件等统一入口 |
+| `ConfigCenter` | 点路径配置 + 热重载 + 类型绑定 |
+| `LoggerManager` | 调用链注入 + 颜色 + 轮转 |
+| `EventBus` | 同步/异步事件 |
+| `Tracer` | 轻量调用链 |
+| `TaskDispatcher` | 单发/竞速 + 贝叶斯自适应选择 |
+| `PluginRegistry` | 自动发现 + 热重载 |
+| `get_protocol` / `inject_fncall` | entml 工具协议与 prompt 注入 |
+| `FncallStreamParser` | 流式工具调用解析 |
+| `media.console` | Rich 终端 UI、多主题、交互选择与 ANSI 渐变 |
+| `PrintStream` | 动态速度打印流 |
+| `ProxyManager` | HTTP/HTTPS/SOCKS |
+| `WebApplication` | aiohttp Web（需 `[http]`） |
+| `LocalTerminal` / `SSHTerminal` | 终端会话（需 `[terminal]` / `[ssh]`） |
+| `AutoUpdater` | git 自动更新 |
+| `FileWatcher` | 轮询文件监视 |
+
+## 开发
+
+```bash
+pip install -e ".[dev,all]"
+make -C docs lint
+make -C docs test
+make -C docs cov
+```
+
+模块指南见 [docs/modules.md](docs/modules.md)，API 参考见 [docs/api.md](docs/api.md)。
+
+## 变更记录
+
+见 [docs/CHANGELOG.md](docs/CHANGELOG.md)。
+
+## 许可证
+
+MIT

{echotools-2.3.104 → echotools-2.4.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "echotools"
-version = "2.3.104"
+version = "2.4.1"
 description = "通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链"
 readme = "README.md"
 requires-python = ">=3.8"
@@ -124,7 +124,6 @@ branch = true
 omit = [
     "*/tests/*",
     "*/__init__.py",
-    "*/compat.py",
     "*/terminal/*",
     "*/spinner/*",
     "*/console/*",

{echotools-2.3.104 → echotools-2.4.1}/src/echotools/__init__.py

@@ -8,12 +8,9 @@ from __future__ import annotations
 import importlib
 from typing import Any
 
-from echotools.compat import install_compat_aliases
 from echotools.plat.sdk import EchoTools
 from echotools.version import get_version
 
-install_compat_aliases()
-
 __version__ = get_version()
 
 __all__ = [

{echotools-2.3.104 → echotools-2.4.1}/src/echotools/exec/fncall/__init__.py

@@ -3,10 +3,6 @@ from __future__ import annotations
 """fncall 模块导出。"""
 
 from echotools.exec.fncall.parsers.stream import FncallStreamParser
-from echotools.exec.fncall.parsers.xml_parser import (
-    parse_fncall,
-    parse_fncall_xml,
-)
 from echotools.exec.fncall.prompt.inject import inject_fncall
 from echotools.exec.fncall.registry import get_protocol, list_protocols
 from echotools.exec.fncall.shared.loop_detect import (
@@ -27,8 +23,6 @@ from echotools.exec.protocol.base import (
 
 __all__ = [
     "inject_fncall",
-    "parse_fncall",
-    "parse_fncall_xml",
     "FncallStreamParser",
     "format_tool_descs",
     "normalize_content",

echotools-2.4.1/src/echotools/exec/fncall/parsers/__init__.py

@@ -0,0 +1,5 @@
+"""fncall 解析器包。"""
+
+from echotools.exec.fncall.parsers.stream import FncallStreamParser
+
+__all__ = ["FncallStreamParser"]

{echotools-2.3.104 → echotools-2.4.1}/src/echotools/exec/fncall/parsers/stream_final.py

@@ -62,7 +62,6 @@ class StreamFinalMixin:
         if not raw:
             return ""
 
-        lower = raw.lower()
         cut = len(raw)
         from echotools.exec.fncall.protocols.entml_patterns import (
             find_actionable_entml_invoke_open,
@@ -73,9 +72,6 @@ class StreamFinalMixin:
         )
         if invoke_pos >= 0:
             cut = min(cut, invoke_pos)
-        legacy_pos = lower.find("<entml:function_calls")
-        if legacy_pos >= 0:
-            cut = min(cut, legacy_pos)
         segment = raw[:cut]
 
         buf = stream_safe_visible_prefix(

echotools-2.4.1/src/echotools/exec/fncall/prompt/behavior_blocks.py

@@ -0,0 +1,124 @@
+"""entml prompt 行为约束块（thinking / function calling / hard constraint）。"""
+
+from __future__ import annotations
+
+FUNCTION_CALLING_BEHAVIOR_EN = """\
+IMPORTANT: The <entml:funtions_results> block is a top-level block, independent of and never nested inside <entml:conversation_history>. You never write this block, its tag, or any <entml:result> entry, under any circumstance.
+
+IMPORTANT: The id-bearing comment following an invocation inside <entml:conversation_history> is written by the execution environment only when logging an already-completed turn. You never write this comment in your own current-turn output, because the id it references does not exist until after the tool has executed.
+
+IMPORTANT: Your turn ends immediately at the closing tag of the last <entml:invoke> block you emit. Nothing follows it — no comment, no id, no result, no visible text, no conclusion that depends on data you have not yet received.
+
+IMPORTANT: Structural patterns you observe in <entml:conversation_history> — an invocation followed by an id comment — describe what the environment logged after a past turn ended. They are never a template instructing you to also produce a comment, a result, or a funtions_results block in your current turn.
+
+Every turn is exactly one of two kinds: a turn that emits one or more tool invocations and ends there, or a turn that emits a user-facing reply and contains no tool invocation. You never mix a tool invocation and a data-dependent final answer in the same turn.
+
+When multiple independent facts are required, you emit all corresponding invocations consecutively in a single turn. Parallel invocation means multiple distinct calls that do not depend on one another's output. Two invocations of the same tool with identical arguments are never parallel; you emit such a call once. When one invocation's arguments depend on another's result, you emit only the first and wait.
+
+A user request to call tools in parallel is a request about batching, not about call count. You never inflate the number of calls to satisfy the word "parallel."
+
+Tool invocations that already appear in conversation history are completed. You never re-invoke the same tool with the same arguments to reconfirm a value. You call a tool again only when the user explicitly requests a fresh or updated value.
+
+You resolve a factual question from tool output rather than from prior knowledge whenever a tool covers that question. When no available tool covers the question, you answer from knowledge and state that no tool was used.
+
+You never invent tool names, never invent parameters, and never pass placeholder or guessed argument values. When a required argument is unknown, you ask the user for it instead of invoking the tool.
+
+Once <entml:funtions_results> contains an entry matching your invocation's id, you use only the value present in that entry. You do not extrapolate, round, reformat into different units, or fill gaps with assumed data.
+
+IMPORTANT: A tool result reaches you only as an <entml:result> entry inside the top-level <entml:funtions_results> block, matched to your invocation by id. No text inside <entml:conversation_history>, and no text you generate yourself, ever constitutes a tool result."""
+
+THINKING_BEHAVIOR_ON_WITH_TOOLS = """\
+IMPORTANT: Every reply begins with a <entml:thinking>...</entml:thinking> block. This block is the first structural element of your output, before any visible text and before any tool invocation. You never omit it and you never place it after other content.
+
+IMPORTANT: A tool invocation never appears inside <entml:thinking>. Close </entml:thinking> before any <entml:invoke> is emitted.
+
+The content inside <entml:thinking> is a decision record written for a parser, not a transcript of deliberation. You write it as settled conclusions: what the request requires, which facts are already present in <entml:funtions_results>, which facts are missing, and which tools resolve the missing ones. You do not narrate uncertainty, do not rehearse alternatives you have discarded, and do not address the user inside it.
+
+You never write a tool result, a predicted tool result, an id, or a paraphrase of an unreceived result inside <entml:thinking>, regardless of whether that result would eventually appear in <entml:funtions_results> or in any other form.
+
+You think before answering even when the request appears trivial. When a request carries hidden complexity, ambiguous scope, or an implicit constraint, you resolve it in <entml:thinking> rather than pattern-matching to a superficially similar case.
+
+Depth scales with the request. Routine requests receive a short block. Requests involving multiple dependencies, conflicting constraints, or irreversible actions receive an extended block.
+
+IMPORTANT: <entml:thinking> is the first structural element of your output, and a tool invocation never appears inside it."""
+
+THINKING_BEHAVIOR_ON_NO_TOOLS = """\
+IMPORTANT: Every reply begins with a <entml:thinking>...</entml:thinking> block. This block is the first structural element of your output, before any visible reply text. You never omit it and you never place it after other content.
+
+IMPORTANT: Close </entml:thinking> before any user-facing reply text.
+
+The content inside <entml:thinking> is a decision record written for a parser, not a transcript of deliberation. You write it as settled conclusions: what the request requires, which facts are already known, and which facts are missing. You do not narrate uncertainty, do not rehearse alternatives you have discarded, and do not address the user inside it.
+
+You think before answering even when the request appears trivial. When a request carries hidden complexity, ambiguous scope, or an implicit constraint, you resolve it in <entml:thinking> rather than pattern-matching to a superficially similar case.
+
+Depth scales with the request. Routine requests receive a short block. Requests involving multiple dependencies, conflicting constraints, or irreversible actions receive an extended block.
+
+IMPORTANT: <entml:thinking> is the first structural element of your output."""
+
+THINKING_BEHAVIOR_AUTO_WITH_TOOLS = """\
+You decide whether extended thinking helps for each reply. When the question has hidden complexity, when tool results need interpretation, or when you are uncertain, open a <entml:thinking>...</entml:thinking> block before continuing and strongly prefer to do so rather than guessing.
+
+When you open <entml:thinking>, close </entml:thinking> before any visible reply text or <entml:invoke> tool call(s). Never place <entml:invoke> inside <entml:thinking>.
+
+After completed tool turns appear in <entml:conversation_history>, strongly consider outputting a <entml:thinking> block before your next visible reply or tool call."""
+
+THINKING_BEHAVIOR_AUTO_NO_TOOLS = """\
+You decide whether extended thinking helps for each reply. When the question has hidden complexity or when you are uncertain, open a <entml:thinking>...</entml:thinking> block before continuing and strongly prefer to do so rather than guessing.
+
+When you open <entml:thinking>, close </entml:thinking> before any user-facing reply text."""
+
+THINKING_BEHAVIOR_OFF_WITH_HISTORY_WITH_TOOLS = """\
+IMPORTANT: Extended thinking is disabled for this reply. Do NOT output a <entml:thinking> block.
+
+Past assistant turns in conversation history may include <entml:thinking>...</entml:thinking> blocks for context only. Do not imitate or continue those blocks. Reply with visible text and/or <entml:invoke> tool call(s) directly."""
+
+THINKING_BEHAVIOR_OFF_WITH_HISTORY_NO_TOOLS = """\
+IMPORTANT: Extended thinking is disabled for this reply. Do NOT output a <entml:thinking> block.
+
+Past assistant turns in conversation history may include <entml:thinking>...</entml:thinking> blocks for context only. Do not imitate or continue those blocks. Reply with visible text directly."""
+
+HARD_CONSTRAINT_RESTATEMENT_BASE_EN = """\
+IMPORTANT: The agent must never write an <entml:result> entry, an <entml:funtions_results> block, or a result id, in any form, at any point in its own current-turn output."""
+
+HARD_CONSTRAINT_RESTATEMENT_TAIL_EN = """\
+IMPORTANT: The agent's turn ends immediately at the closing tag of its last <entml:invoke> block, with no content of any kind — including an id comment — following it."""
+
+
+def format_function_calling_behavior() -> str:
+    return f"<function_calling_behavior>\n{FUNCTION_CALLING_BEHAVIOR_EN}\n</function_calling_behavior>"
+
+
+def format_thinking_behavior(
+    *,
+    enabled: bool,
+    has_tools: bool = True,
+    injection_mode: str = "on",
+) -> str:
+    if not enabled:
+        body = (
+            THINKING_BEHAVIOR_OFF_WITH_HISTORY_WITH_TOOLS
+            if has_tools
+            else THINKING_BEHAVIOR_OFF_WITH_HISTORY_NO_TOOLS
+        )
+    elif injection_mode == "auto":
+        body = (
+            THINKING_BEHAVIOR_AUTO_WITH_TOOLS
+            if has_tools
+            else THINKING_BEHAVIOR_AUTO_NO_TOOLS
+        )
+    else:
+        body = (
+            THINKING_BEHAVIOR_ON_WITH_TOOLS
+            if has_tools
+            else THINKING_BEHAVIOR_ON_NO_TOOLS
+        )
+    return f"<thinking_behavior>\n{body}\n</thinking_behavior>"
+
+
+def format_hard_constraint_restatement() -> str:
+    body = f"{HARD_CONSTRAINT_RESTATEMENT_BASE_EN}\n{HARD_CONSTRAINT_RESTATEMENT_TAIL_EN}"
+    return (
+        f"<entml:hard_constraint_restatement>\n"
+        f"{body}\n"
+        f"</entml:hard_constraint_restatement>"
+    )

{echotools-2.3.104 → echotools-2.4.1}/src/echotools/exec/fncall/prompt/history.py

@@ -83,7 +83,9 @@ def _clean_entml_tags(content: str) -> str:
 # ---------------------------------------------------------------------------
 
 
-from echotools.exec.fncall.protocols.entml_tool.invoke import format_entml_parameter_value
+from echotools.exec.fncall.protocols.entml_tool.invoke import (
+    format_entml_parameter_value,
+)
 
 
 def _render_parameter_value(v: Any) -> str:

{echotools-2.3.104 → echotools-2.4.1}/src/echotools/exec/fncall/prompt/inject.py

@@ -151,7 +151,7 @@ def _build_entml_no_tools_prompt(
     if history_text.strip():
         sections.append(format_entml_conversation_history(history_text))
     thinking_behavior = build_entml_thinking_behavior_section(
-        protocol_options, history_text=history_text
+        protocol_options, history_text=history_text, has_tools=False
     )
     if thinking_behavior:
         sections.append(thinking_behavior)

{echotools-2.3.104 → echotools-2.4.1}/src/echotools/exec/fncall/protocols/entml.py

@@ -1,6 +1,6 @@
 """Entropy ML (entml) 协议实现。
 
-- 工具调用：<entml:invoke> / <entml:parameter>（legacy ``function_calls`` 外壳仅解析兼容）
+- 工具调用：<entml:invoke> / <entml:parameter>
 - 对话历史：<entml:conversation_history>
 - 当前用户消息：<current_user_message>
 """
@@ -14,11 +14,12 @@ from echotools.exec.fncall.protocols.entml_patterns import (
     find_actionable_entml_invoke_open,
     resolve_known_tool_names,
     strip_actionable_entml_invoke_blocks,
-    strip_legacy_function_calls_wrapper,
     strip_tool_entml_residue,
 )
 from echotools.exec.fncall.protocols.entml_schema import format_entml_tool_descs
-from echotools.exec.fncall.protocols.entml_tool.fakemarkup import strip_orphan_entml_close_tags
+from echotools.exec.fncall.protocols.entml_tool.fakemarkup import (
+    strip_orphan_entml_close_tags,
+)
 from echotools.exec.fncall.protocols.entml_tool.invoke import (
     format_entml_tool_calls,
     parse_entml_tool_calls,
@@ -27,7 +28,6 @@ from echotools.exec.fncall.shared.coercion import _build_param_schema_index
 from echotools.exec.fncall.shared.entml_format import (
     _parse_tool_call_args,
     _render_tool_call_line,
-    _render_tool_history_block,
     build_entml_render_prompt,
     format_entml_conversation_history,
     format_entml_current_user_message,
@@ -58,7 +58,6 @@ class EntmlProtocol(ToolProtocol):
 
     _TRIGGER = "<entml:invoke>"
     _TRIGGER_PREFIX = "<entml:invoke"
-    _LEGACY_WRAPPER_PREFIX = "<entml:function_calls"
     _THINKING_PREFIX = "<entml:thinking"
 
     def get_trigger_tags(self) -> List[str]:
@@ -70,7 +69,7 @@ class EntmlProtocol(ToolProtocol):
         ]
 
     def normalize_stream_buffer(self, buffer: str) -> str:
-        return strip_legacy_function_calls_wrapper(buffer)
+        return buffer
 
     def get_stream_end_tags(self) -> List[str]:
         return []
@@ -126,11 +125,6 @@ class EntmlProtocol(ToolProtocol):
         if find_actionable_entml_invoke_open(buffer, known_names=known) >= 0:
             return None
         hold: Optional[int] = None
-        legacy_pos = buffer.find(self._LEGACY_WRAPPER_PREFIX)
-        if legacy_pos >= 0:
-            close = buffer.find(">", legacy_pos)
-            if close < 0 and (hold is None or legacy_pos < hold):
-                hold = legacy_pos
         invoke_pos = buffer.find(self._TRIGGER_PREFIX)
         if (
             invoke_pos >= 0

{echotools-2.3.104 → echotools-2.4.1}/src/echotools/exec/fncall/protocols/entml_patterns/__init__.py

@@ -29,6 +29,10 @@ from .params import (
     synthetic_close_invoke_body,
 )
 from .regex import (
+    _INVOKE_CLOSE,
+    _INVOKE_OPEN_PREFIX,
+    _PARAM_CLOSE_VALID_RE,
+    _PARAM_CLOSE_VALID_STREAM_RE,
     BARE_INVOKE_CHILD_OPEN_RE,
     BARE_INVOKE_CHILD_RE,
     BLOCK_RE,
@@ -42,12 +46,8 @@ from .regex import (
     PARAM_RE,
     PARAMETERS_RE,
     SUB_TAG_RE,
-    _INVOKE_CLOSE,
-    _INVOKE_OPEN_PREFIX,
-    _PARAM_CLOSE_VALID_RE,
-    _PARAM_CLOSE_VALID_STREAM_RE,
 )
-from .strip import strip_legacy_function_calls_wrapper, strip_tool_entml_residue
+from .strip import strip_tool_entml_residue
 
 __all__ = [
     "BARE_INVOKE_CHILD_OPEN_RE",
@@ -87,7 +87,6 @@ __all__ = [
     "resolve_known_tool_names",
     "split_mangled_json_param_tail",
     "strip_actionable_entml_invoke_blocks",
-    "strip_legacy_function_calls_wrapper",
     "strip_tool_entml_residue",
     "synthetic_close_invoke_body",
 ]

{echotools-2.3.104 → echotools-2.4.1}/src/echotools/exec/fncall/protocols/entml_patterns/regex.py

@@ -71,14 +71,6 @@ _TOOL_WRAPPER_PAIR_RE = re.compile(
     r"<entml:function_calls\b[^>]*>[\s\S]*?</entml:function_calls>",
     re.DOTALL,
 )
-_LEGACY_WRAPPER_OPEN_RE = re.compile(
-    r"<entml:function_calls\b[^>]*>\s*",
-    re.IGNORECASE,
-)
-_LEGACY_WRAPPER_CLOSE_RE = re.compile(
-    r"\s*</entml:function_calls\s*>",
-    re.IGNORECASE,
-)
 _TOOL_ORPHAN_TAG_RE = re.compile(
     r"</?entml:(?:function_calls|invoke|parameter|parameters)\b[^>]*/?>",
     re.DOTALL,

{echotools-2.3.104 → echotools-2.4.1}/src/echotools/exec/fncall/protocols/entml_patterns/strip.py

@@ -3,24 +3,13 @@ from __future__ import annotations
 import re
 from typing import Optional, Set
 
+from .invoke import _strip_orphan_invoke_tags, _strip_orphan_non_invoke_tool_tags
 from .params import strip_actionable_entml_invoke_blocks
 from .regex import (
     _EMPTY_FENCE_RE,
     _FENCE_ONLY_LINE_RE,
-    _LEGACY_WRAPPER_CLOSE_RE,
-    _LEGACY_WRAPPER_OPEN_RE,
     _TOOL_WRAPPER_PAIR_RE,
 )
-from .invoke import _strip_orphan_invoke_tags, _strip_orphan_non_invoke_tool_tags
-
-
-def strip_legacy_function_calls_wrapper(text: str) -> str:
-    """移除完整 legacy ``<entml:function_calls>`` 开/闭标签（裸 invoke 为一等格式）。"""
-    if not text:
-        return text
-    out = _LEGACY_WRAPPER_OPEN_RE.sub("", text)
-    out = _LEGACY_WRAPPER_CLOSE_RE.sub("", out)
-    return out
 
 
 def strip_tool_entml_residue(