fix(core): use tool-result id

Author: gusye1234

src/server/core/acontext_core/llm/agent/task.py

@@ -31,6 +31,7 @@ def pack_previous_messages_section(
 ) -> str:
     task_ids = [m.task_id for m in messages]
     mappings = {t.id: t for t in tasks}
+    tool_mappings = {}
     task_descs = []
     for ti in task_ids:
         if ti is None:
@@ -45,15 +46,19 @@ def pack_previous_messages_section(
             task_descs.append("(no task linked)")
     return "\n---\n".join(
         [
-            f"{td}\n{m.to_string(truncate_chars=256)}"
+            f"{td}\n{m.to_string(tool_mappings, truncate_chars=256)}"
             for td, m in zip(task_descs, messages)
         ]
     )
 
 
 def pack_current_message_with_ids(messages: list[MessageBlob]) -> str:
+    tool_mappings = {}
     return "\n".join(
-        [f"<message id={i}> {m.to_string()} </message>" for i, m in enumerate(messages)]
+        [
+            f"<message id={i}> {m.to_string(tool_mappings, truncate_chars=1024)} </message>"
+            for i, m in enumerate(messages)
+        ]
     )
 
 

src/server/core/acontext_core/llm/agent/task_sop.py

@@ -15,10 +15,13 @@
 def pack_task_data(
     task: TaskSchema, message_blobs: list[MessageBlob]
 ) -> tuple[str, str, str]:
+    tool_mappings = {}
     return (
         task.data.task_description,
         "\n".join([f"- {p}" for p in (task.data.user_preferences or [])]),
-        "\n".join([m.to_string(truncate_chars=1024) for m in message_blobs]),
+        "\n".join(
+            [m.to_string(tool_mappings, truncate_chars=1024) for m in message_blobs]
+        ),
     )
 
 

src/server/core/acontext_core/schema/orm/block.py

@@ -1,4 +1,3 @@
-import uuid
 from dataclasses import dataclass, field
 from sqlalchemy import (
     String,
@@ -9,7 +8,7 @@
     Boolean,
     BigInteger,
 )
-from sqlalchemy.orm import relationship, foreign, remote
+from sqlalchemy.orm import relationship
 from sqlalchemy.dialects.postgresql import JSONB, UUID
 from typing import TYPE_CHECKING, Optional, List, Dict, Any
 from .base import ORM_BASE, CommonMixin

src/server/core/acontext_core/schema/orm/message.py

@@ -27,11 +27,11 @@ class Asset(BaseModel):
 class ToolCallMeta(BaseModel):
     name: str
     arguments: dict | str
+    id: Optional[str] = None
 
 
 class ToolResultMeta(BaseModel):
-    name: str
-    result: str
+    tool_call_id: str
 
 
 class Part(BaseModel):

src/server/core/acontext_core/schema/session/message.py

@@ -10,7 +10,12 @@
 ROLE_REPLACE_NAME = {"assistant": "agent"}
 
 
-def pack_part_line(role: str, part: Part, truncate_chars: int = None) -> str:
+def pack_part_line(
+    role: str,
+    part: Part,
+    tool_mapping: dict[str, ToolCallMeta],
+    truncate_chars: int = None,
+) -> str:
     role = ROLE_REPLACE_NAME.get(role, role)
     header = f"<{role}>({part.type})"
     if part.type not in STRING_TYPES:
@@ -25,15 +30,25 @@ def pack_part_line(role: str, part: Part, truncate_chars: int = None) -> str:
                 "arguments": tool_call_meta.arguments,
             }
         )
+        if tool_call_meta.id is not None:
+            tool_mapping[tool_call_meta.id] = tool_call_meta
         r = f"{header} {tool_data}"
     elif part.type == "tool-result":
         tool_result_meta = ToolResultMeta(**part.meta)
-        tool_data = json.dumps(
-            {
-                "tool_name": tool_result_meta.name,
-                "result": tool_result_meta.result,
-            }
-        )
+        if tool_result_meta.tool_call_id not in tool_mapping:
+            tool_data = json.dumps(
+                {
+                    "result": part.text,
+                }
+            )
+        else:
+            tool_data = tool_mapping[tool_result_meta.tool_call_id]
+            tool_data = json.dumps(
+                {
+                    "tool_name": tool_data.name,
+                    "result": part.text,
+                }
+            )
         r = f"{header} {tool_data}"
     else:
         LOG.warning(f"Unknown message part type: {part.type}")
@@ -49,9 +64,16 @@ class MessageBlob(BaseModel):
     parts: List[Part]
     task_id: Optional[asUUID] = None
 
-    def to_string(self, truncate_chars: int = None, **kwargs) -> str:
+    def to_string(
+        self,
+        tool_mapping: dict[str, ToolCallMeta],
+        truncate_chars: int = None,
+        **kwargs,
+    ) -> str:
         lines = [
-            pack_part_line(self.role, p, truncate_chars=truncate_chars, **kwargs)
+            pack_part_line(
+                self.role, p, tool_mapping, truncate_chars=truncate_chars, **kwargs
+            )
             for p in self.parts
         ]
         return "\n".join(lines)