echotools 2.3.89__tar.gz → 2.3.90__tar.gz

{echotools-2.3.89 → echotools-2.3.90}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.3.89
+Version: 2.3.90
 Summary: 通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链
 Home-page: https://github.com/nichengfuben/echotools
 Author: nichengfuben

{echotools-2.3.89 → echotools-2.3.90}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "echotools"
-version = "2.3.89"
+version = "2.3.90"
 description = "通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链"
 readme = "README.md"
 requires-python = ">=3.8"

{echotools-2.3.89 → echotools-2.3.90}/src/echotools/exec/fncall/prompt/templates.py

@@ -118,14 +118,24 @@ _HISTORY_CLARIFY_EN = (
     "The user's latest message follows below."
 )
 
-_HISTORY_TOOL_INVOKE_REMINDER_EN = (
-    "IMPORTANT: Completed tool turns in conversation history are context only — "
-    "never re-invoke them and never use the history `<tool>` block notation in "
-    "your reply. To execute a tool in this turn, you must output a valid "
-    "`<entml:invoke>` block exactly as specified in the tool instructions at "
-    "the top of this prompt."
+_TOOL_INVOKE_REMINDER_EN = (
+    "IMPORTANT — Tool invocation format for THIS reply (mandatory):\n"
+    "1. To execute a tool, output a literal `<entml:invoke name=\"TOOL_NAME\">` block "
+    "exactly as shown at the top of this prompt. The opening tag MUST close with `>`; "
+    "`TOOL_NAME` MUST be one of the available functions listed above (not a placeholder "
+    "or invented name).\n"
+    "2. Each argument goes in "
+    "`<entml:parameter name=\"PARAMETER_NAME\">VALUE</entml:parameter>` inside the invoke; "
+    "close with `</entml:invoke>`. String/scalar values as-is; lists and objects as JSON.\n"
+    "3. Do NOT copy `<tool>` blocks or `{ToolName: ...}` lines from conversation history — "
+    "those turns are already executed. History is context only; never re-invoke completed tools.\n"
+    "4. When mentioning `<entml:invoke>` in prose without executing, use backticks or otherwise "
+    "avoid a closed tag with a real tool name."
 )
 
+# Back-compat alias
+_HISTORY_TOOL_INVOKE_REMINDER_EN = _TOOL_INVOKE_REMINDER_EN
+
 _HISTORY_CLARIFY_ZH = (
     "以下是已完成的交互记录。"
     "此处展示的所有工具调用及其结果均已执行完毕，请勿重复调用。"

{echotools-2.3.89 → echotools-2.3.90}/src/echotools/exec/fncall/protocols/entml.py

@@ -13,7 +13,7 @@ from typing import Any, Dict, List, Optional, Tuple
 
 from echotools.exec.fncall.prompt.templates import (
     _HISTORY_CLARIFY_EN,
-    _HISTORY_TOOL_INVOKE_REMINDER_EN,
+    _TOOL_INVOKE_REMINDER_EN,
 )
 from echotools.exec.fncall.protocols.entml_invoke import (
     parse_entml_tool_calls,
@@ -194,8 +194,6 @@ class EntmlProtocol(ToolProtocol):
             sections.append(
                 format_entml_conversation_history(history_text, _HISTORY_CLARIFY_EN)
             )
-            if tool_descs and history_has_tool_calls:
-                sections.append(_HISTORY_TOOL_INVOKE_REMINDER_EN)
 
         if loop_warning:
             sections.append(f"<loop_warning>\n{loop_warning}\n</loop_warning>")
@@ -208,6 +206,9 @@ class EntmlProtocol(ToolProtocol):
         if current_user_message is not None:
             sections.append(format_entml_current_user_message(current_user_message))
 
+        if tool_descs:
+            sections.append(_TOOL_INVOKE_REMINDER_EN)
+
         # thinking 放在最后，超限截断时优先保留在 send_text 尾部
         thinking_section = build_entml_thinking_section(
             protocol_options, has_tools=bool(tool_descs), history_text=history_text

{echotools-2.3.89 → echotools-2.3.90}/src/echotools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: echotools
-Version: 2.3.89
+Version: 2.3.90
 Summary: 通用基础设施 SDK：配置、日志、事件、调度、插件、协议、调用链
 Home-page: https://github.com/nichengfuben/echotools
 Author: nichengfuben

{echotools-2.3.89 → echotools-2.3.90}/src/tests/test_entml_protocol.py

@@ -510,12 +510,12 @@ def test_entml_history_tool_invoke_reminder_when_tools_in_history() -> None:
     assert "{search: docs}" in content or '"query": "docs"' in content
     assert "<tool>" in content
     assert "found 3" in content
-    assert "IMPORTANT: Completed tool turns in conversation history" in content
-    assert "`<entml:invoke>` block" in content
+    assert "IMPORTANT — Tool invocation format for THIS reply" in content
+    assert "`<entml:invoke name=\"TOOL_NAME\">`" in content
     hist_idx = content.index("<entml:conversation_history>")
-    reminder_idx = content.index("IMPORTANT: Completed tool turns")
+    reminder_idx = content.index("IMPORTANT — Tool invocation format")
     user_idx = content.index("<current_user_message>")
-    assert hist_idx < reminder_idx < user_idx
+    assert hist_idx < user_idx < reminder_idx
 
 
 def test_strip_entml_from_user_content() -> None:

{echotools-2.3.89 → echotools-2.3.90}/src/tests/test_entml_tool_pipeline.py

@@ -756,11 +756,11 @@ class TestBuildMechanisms:
         idx_tools = prompt.index("### search")
         idx_sys = prompt.index("<user_system_prompt>")
         idx_hist = prompt.index("<entml:conversation_history>")
-        idx_remind = prompt.index("IMPORTANT:")
         idx_loop = prompt.index("<loop_warning>")
         idx_user = prompt.index("<current_user_message>")
+        idx_remind = prompt.index("IMPORTANT — Tool invocation format")
         idx_think = prompt.index("<entml:thinking_mode>")
-        assert idx_tools < idx_sys < idx_hist < idx_remind < idx_loop < idx_user < idx_think
+        assert idx_tools < idx_sys < idx_hist < idx_loop < idx_user < idx_remind < idx_think
 
     def test_inject_builds_history_tool_blocks(self) -> None:
         proto = _proto()
@@ -788,7 +788,7 @@ class TestBuildMechanisms:
         assert "{search: q}" in content
         assert "found" in content
         assert "<current_user_message>\nnext\n</current_user_message>" in content
-        assert "IMPORTANT:" in content
+        assert "IMPORTANT — Tool invocation format" in content
 
     def test_build_then_parse_multi_tool_roundtrip(self) -> None:
         rendered = format_entml_tool_calls(