aury-agent 0.0.10__py3-none-any.whl → 0.0.12__py3-none-any.whl

aury/agents/core/base.py

@@ -352,6 +352,13 @@ class BaseAgent(ABC):
             logger.error(f"{self.agent_type}Agent run error, error={type(e).__name__}, invocation_id={self._ctx.invocation_id}", exc_info=True)
             raise
         finally:
+            # Cancel exec_task if still running (e.g., when run() is cancelled externally)
+            if exec_task and not exec_task.done():
+                exec_task.cancel()
+                try:
+                    await exec_task
+                except asyncio.CancelledError:
+                    pass
             _reset_current_ctx(ctx_token)
             _emit_queue_var.reset(queue_token)
             self._run_config = {}  # Clear runtime overrides

aury/agents/core/types/tool.py

@@ -148,6 +148,7 @@ class ToolInvocation:
     args: dict[str, Any] = field(default_factory=dict)
     args_raw: str = ""  # Raw JSON string for streaming
     result: str | None = None
+    truncated_result: str | None = None  # Shortened result for context window
     is_error: bool = False
     
     # Timing
@@ -161,10 +162,22 @@ class ToolInvocation:
         self.state = ToolInvocationState.CALL
         self.time["start"] = datetime.now()
     
-    def mark_result(self, result: str, is_error: bool = False) -> None:
-        """Mark execution complete."""
+    def mark_result(
+        self,
+        result: str,
+        is_error: bool = False,
+        truncated_result: str | None = None,
+    ) -> None:
+        """Mark execution complete.
+        
+        Args:
+            result: Complete result (raw)
+            is_error: Whether this is an error result
+            truncated_result: Shortened result for context window (defaults to result)
+        """
         self.state = ToolInvocationState.RESULT
         self.result = result
+        self.truncated_result = truncated_result if truncated_result is not None else result
         self.is_error = is_error
         self.time["end"] = datetime.now()
     

aury/agents/llm/adapter.py

@@ -261,6 +261,9 @@ class ModelClientProvider:
             case Evt.thinking:
                 return LLMEvent(type="thinking", delta=event.delta)
             
+            case Evt.thinking_completed:
+                return LLMEvent(type="thinking_completed")
+            
             case Evt.tool_call_start:
                 if event.tool_call:
                     return LLMEvent(

aury/agents/llm/provider.py

@@ -134,11 +134,16 @@ class LLMMessage:
         - user: User message (can include images)
         - assistant: Assistant response (can include tool_calls)
         - tool: Tool result (requires tool_call_id and name)
+    
+    Supports dual content for context management:
+        - content: Complete content (raw), for storage and recall
+        - truncated_content: Shortened content for context window (defaults to content)
     """
     role: Literal["system", "user", "assistant", "tool"]
     content: str | list[dict[str, Any]]
     tool_call_id: str | None = None  # Required for tool role
     name: str | None = None  # Tool name, required for Gemini compatibility
+    truncated_content: str | list[dict[str, Any]] | None = None  # Shortened content (defaults to content)
     
     def to_dict(self) -> dict[str, Any]:
         d = {"role": self.role, "content": self.content}
@@ -146,6 +151,8 @@ class LLMMessage:
             d["tool_call_id"] = self.tool_call_id
         if self.name:
             d["name"] = self.name
+        if self.truncated_content is not None:
+            d["truncated_content"] = self.truncated_content
         return d
     
     def get(self, key: str, default: Any = None) -> Any:
@@ -174,15 +181,28 @@ class LLMMessage:
         return cls(role="assistant", content=content)
     
     @classmethod
-    def tool(cls, content: str, tool_call_id: str, name: str | None = None) -> "LLMMessage":
+    def tool(
+        cls,
+        content: str,
+        tool_call_id: str,
+        name: str | None = None,
+        truncated_content: str | None = None,
+    ) -> "LLMMessage":
         """Create tool result message.
         
         Args:
-            content: Tool result content
+            content: Tool result content (complete/raw)
             tool_call_id: ID of the tool call this result is for
             name: Tool name (required for Gemini compatibility)
+            truncated_content: Shortened content for context window (defaults to content)
         """
-        return cls(role="tool", content=content, tool_call_id=tool_call_id, name=name)
+        return cls(
+            role="tool",
+            content=content,
+            tool_call_id=tool_call_id,
+            name=name,
+            truncated_content=truncated_content,
+        )
 
 
 @runtime_checkable

aury/agents/react/persistence.py

@@ -157,7 +157,7 @@ async def save_tool_messages(agent: "ReactAgent") -> None:
     """
     for inv in agent._tool_invocations:
         if inv.result is not None:
-            # Build tool result message
+            # Build tool result message (raw content)
             content: list[dict] = [{
                 "type": "tool_result",
                 "tool_use_id": inv.tool_call_id,
@@ -165,11 +165,21 @@ async def save_tool_messages(agent: "ReactAgent") -> None:
                 "is_error": inv.is_error,
             }]
             
-            message = {
+            message: dict = {
                 "role": "tool",
                 "content": content,
                 "tool_call_id": inv.tool_call_id,
                 "invocation_id": agent._current_invocation.id if agent._current_invocation else "",
             }
             
+            # Add truncated_content if different from raw
+            if inv.truncated_result is not None and inv.truncated_result != inv.result:
+                truncated_content: list[dict] = [{
+                    "type": "tool_result",
+                    "tool_use_id": inv.tool_call_id,
+                    "content": inv.truncated_result,
+                    "is_error": inv.is_error,
+                }]
+                message["truncated_content"] = truncated_content
+            
             await trigger_message_save(agent, message)

aury/agents/react/step.py

@@ -196,6 +196,9 @@ async def execute_step(agent: "ReactAgent") -> str | None:
     agent._current_text_block_id = None
     agent._current_thinking_block_id = None
     
+    # Track if thinking_completed has been emitted (to avoid duplicate)
+    thinking_completed_emitted = False
+    
     # Reset tool call tracking
     agent._call_id_to_tool = {}
     agent._tool_call_blocks = {}
@@ -355,6 +358,17 @@ async def execute_step(agent: "ReactAgent") -> str | None:
                         data={"content": delta},
                     ))
 
+        elif event.type == "thinking_completed":
+            # Thinking completed - emit block completed status
+            if agent._current_thinking_block_id and not thinking_completed_emitted:
+                await agent.ctx.emit(BlockEvent(
+                    block_id=agent._current_thinking_block_id,
+                    kind=BlockKind.THINKING,
+                    op=BlockOp.PATCH,
+                    data={"status": "completed"},
+                ))
+                thinking_completed_emitted = True
+
         elif event.type == "tool_call_start":
             # Tool call started (name known, arguments pending)
             if event.tool_call:
@@ -569,15 +583,6 @@ async def execute_step(agent: "ReactAgent") -> str | None:
                     extra={"invocation_id": agent._current_invocation.id},
                 )
     
-    # Emit text block completed status
-    if agent._current_text_block_id:
-        await agent.ctx.emit(BlockEvent(
-            block_id=agent._current_text_block_id,
-            kind=BlockKind.TEXT,
-            op=BlockOp.PATCH,
-            data={"status": "completed"},
-        ))
-    
     # === Middleware: on_thinking_stream_end (flush buffered thinking) ===
     if agent.middleware:
         thinking_chunks = await agent.middleware.process_thinking_stream_end()
@@ -600,11 +605,11 @@ async def execute_step(agent: "ReactAgent") -> str | None:
                     extra={"invocation_id": agent._current_invocation.id},
                 )
     
-    # Emit thinking block completed status
-    if agent._current_thinking_block_id:
+    # Emit text block completed status
+    if agent._current_text_block_id:
         await agent.ctx.emit(BlockEvent(
-            block_id=agent._current_thinking_block_id,
-            kind=BlockKind.THINKING,
+            block_id=agent._current_text_block_id,
+            kind=BlockKind.TEXT,
             op=BlockOp.PATCH,
             data={"status": "completed"},
         ))

aury/agents/react/tools.py

@@ -276,19 +276,23 @@ async def process_tool_results(agent: "ReactAgent") -> None:
                 # HITL tool - record placeholder result
                 invocation.mark_result(f"[等待用户输入: {suspend_signal.request_type}]", is_error=False)
             else:
-                # Normal tool result
+                # Normal tool result - pass truncated_output
+                output = result.output if hasattr(result, 'output') else str(result)
+                truncated = getattr(result, 'truncated_output', None)
                 invocation.mark_result(
-                    result.output if hasattr(result, 'output') else str(result),
-                    is_error=getattr(result, 'is_error', False)
+                    output,
+                    is_error=getattr(result, 'is_error', False),
+                    truncated_result=truncated,
                 )
             
-            # Add to in-memory history
+            # Add to in-memory history (use truncated for context window)
             agent._message_history.append(
                 LLMMessage(
                     role="tool",
                     content=invocation.result,
                     tool_call_id=invocation.tool_call_id,
                     name=invocation.tool_name,  # Required for Gemini
+                    truncated_content=invocation.truncated_result,
                 )
             )
         
@@ -310,6 +314,13 @@ async def process_tool_results(agent: "ReactAgent") -> None:
             error_msg = f"Tool execution error: {str(result)}"
             invocation.mark_result(error_msg, is_error=True)
             result = ToolResult.error(error_msg)
+        else:
+            # Mark result with truncated_output
+            invocation.mark_result(
+                result.output,
+                is_error=result.is_error,
+                truncated_result=result.truncated_output,
+            )
 
         # Get parent block_id from tool_call mapping
         parent_block_id = agent._tool_call_blocks.get(invocation.tool_call_id)
@@ -342,6 +353,7 @@ async def process_tool_results(agent: "ReactAgent") -> None:
                 "tool_use_id": invocation.tool_call_id,
                 "tool_name": invocation.tool_name,
                 "content": result.output,
+                "truncated_content": result.truncated_output,
                 "is_error": invocation.is_error,
             }
         )
@@ -355,5 +367,6 @@ async def process_tool_results(agent: "ReactAgent") -> None:
                 content=tr["content"],
                 tool_call_id=tr["tool_use_id"],
                 name=tr["tool_name"],  # Required for Gemini
+                truncated_content=tr.get("truncated_content"),
             )
         )

{aury_agent-0.0.10.dist-info → aury_agent-0.0.12.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: aury-agent
-Version: 0.0.10
+Version: 0.0.12
 Summary: Aury Agent Framework - React Agent and Workflow orchestration
 Author: Aury Team
 License: MIT

{aury_agent-0.0.10.dist-info → aury_agent-0.0.12.dist-info}/RECORD

@@ -55,7 +55,7 @@ aury/agents/context_providers/skill.py,sha256=w_R1txvu45ruMjuOtckuD9oG_hqeFGqAa_
 aury/agents/context_providers/subagent.py,sha256=Y-6bYjaq6nbLS9d3siyy5eAt6SzFfk6N3Y1WU209lhI,1364
 aury/agents/context_providers/tool.py,sha256=wQGmcZi_XuB9ukweg5PUVO93GLzley0xftje-iVSfq8,2266
 aury/agents/core/__init__.py,sha256=-euIGAwoe2gU_2xEqJ8YmOMnDOaOlgWXwXxzIQnDG8E,1716
-aury/agents/core/base.py,sha256=nqsQ7fG0HZ08bqJh7KdpBgIxtJzDXZ6qLMf5hZ5vBuc,21279
+aury/agents/core/base.py,sha256=1QgPe50DGajBgRhd8HFrzLaRAqkYioGpvU_ARwtV2DQ,21585
 aury/agents/core/context.py,sha256=co_v6Mz7fYR0jaTlUHlnSBWaOgr_1_84lVO0FPo_tKo,28932
 aury/agents/core/context_builder.py,sha256=HF0hfnKBVCmlcFDmdyj53org90318ixmZl1LYQBl0fM,9075
 aury/agents/core/factory.py,sha256=8rx_2jD9Sj2tK-8_We09fHT1czjbN-yF1ws0hmUX2w4,6829
@@ -79,7 +79,7 @@ aury/agents/core/types/message.py,sha256=W0d8elddcbvW98bejDkHIzKiTigr6O5KxVuVUne
 aury/agents/core/types/recall.py,sha256=BZSDgv8Q0eK7Sshc-jA6ycpFpMHzndZ-lS86MPto9-c,4898
 aury/agents/core/types/session.py,sha256=oRn9jKFe8Tg-12ZFQcGJ0VLaJIWBfk8YQDzXUuXSNEk,9406
 aury/agents/core/types/subagent.py,sha256=vIxDkfekAaHj_V2UdSIaygDKb5RjiLqi8twTnhIUF_o,4651
-aury/agents/core/types/tool.py,sha256=sP0mA_YufOjlPnEKcQSAbp719GkJulNuvQ76yYmahFU,7213
+aury/agents/core/types/tool.py,sha256=Zadqjp2QjNsX617whpWnXJ1XUvPXDl47f8nuCQ1AbaY,7676
 aury/agents/eval/__init__.py,sha256=uRGZN-RBpNlwOmrn66EwZBNKufDVKgMc3tODuMM6WB4,8850
 aury/agents/hitl/__init__.py,sha256=6H8cBU-dSR0eSOGWte_Iy7OvTKGDl4ZMb0E56KrfFkw,1020
 aury/agents/hitl/ask_user.py,sha256=3MAJOo0rI0Wl7ZpZdDSQVBkO0GJFYH6bT7hnrcED4qI,9071
@@ -88,9 +88,9 @@ aury/agents/hitl/exceptions.py,sha256=O1r9OCLwQqo7Ebr5o3kX0p0bvWYKbHapftf1vfnMh0
 aury/agents/hitl/permission.py,sha256=bbwp0heb8YZ_palRCU55QtXm1rfMi9hJ8g3DWKtTc3Q,19117
 aury/agents/hitl/revert.py,sha256=i3F8Zcibuo3fjhJTK-rQEYSPMKxmRQeua5cjoDzAR14,6684
 aury/agents/llm/__init__.py,sha256=teantqedfyQ6IxLD6LayLr2cbgFYbMT2I4TUSfkOrQ4,625
-aury/agents/llm/adapter.py,sha256=icX_RVk738PqxueCFj58WTPVhFXQpgNkjn__u2dZDEM,14916
+aury/agents/llm/adapter.py,sha256=_8FKf_HqJip-oRTgKhai0OBZObSG_wbgigU0oK0bb9k,15029
 aury/agents/llm/openai.py,sha256=v4Qlc5EIJDNcqkGHA2aIEaTTKaPVGMPf1227aKcef58,11192
-aury/agents/llm/provider.py,sha256=oE7sBF64pq8h1-bowSwApmAl3SVlHV_I4aCMePD29Mk,16106
+aury/agents/llm/provider.py,sha256=YRlDY0mSEMb4oTmKusLlj_vh5vhDdOf4yrY3c5vBpfM,16827
 aury/agents/mcp/__init__.py,sha256=7zsY-5LhQBLpiQI-XWe2uUHdTwJrDHrr0pDd_SXfO3o,4355
 aury/agents/memory/__init__.py,sha256=PMGMQ1VE-j3M0n4dIeb9DYO3qrCyv5AMSfMWTyhPARE,816
 aury/agents/memory/compaction.py,sha256=3inOVsbwSgTghcsSLgvUdX8IG2J6_0Qbr36vAqanV0M,12757
@@ -114,9 +114,9 @@ aury/agents/react/agent.py,sha256=DYWxuspMs3srOuxW4Sxis_Hkg4R6YkM0aM-rLRjD9Oo,23
 aury/agents/react/context.py,sha256=Q7pY5j6b-OvKAmI1UsuawC3BmVxFkKN1oXxeBTVFejQ,11067
 aury/agents/react/factory.py,sha256=7aWb2YqSdlIq161Ke0JZwnjpaA9U7Q5xejAnkrmjMUw,10776
 aury/agents/react/pause.py,sha256=bcrhbuoJQUz7WxZSsKr5qjxQlDdpwai54ns_qio0du4,7306
-aury/agents/react/persistence.py,sha256=bwRk5Dq1qIoIbfOsVe6BhGCuXJM5TUX-zyHt9zEVPzw,5845
-aury/agents/react/step.py,sha256=oUvmVUlzGX6aa_YcbhHAmA3UHgKJcMvK3IrMFzEX-IM,28994
-aury/agents/react/tools.py,sha256=VxXec1K8C0h85yQZBVOQt0dhsmhSKCVV7iV_LXlasAs,13368
+aury/agents/react/persistence.py,sha256=4BYmx3Dxu1grEpt4Qw3fUG26LgYyAhRnXVQC03OJDtE,6354
+aury/agents/react/step.py,sha256=LQ9O3tqIITnEfHGfbZ1Sm9wWdkpVKAWPBczjeEi2PUg,29316
+aury/agents/react/tools.py,sha256=RmXImt7jbr8fxc3wmFDAY8XreeHOJGg84GSEK1xtfhI,14013
 aury/agents/sandbox/__init__.py,sha256=adH29NhzpZUIFVCxhRUZxyANKpFauUjsPVd8iktUOaI,635
 aury/agents/sandbox/local.py,sha256=Dl-zJZ5FUz7WONtuze7MdpCDBjm9YZbjLIkGa9lYbwY,8328
 aury/agents/sandbox/remote.py,sha256=6NcYIs_thjyxa5LgIqwoPNsHYpT70DG6xGbjDYV6-X4,6444
@@ -147,7 +147,7 @@ aury/agents/workflow/expression.py,sha256=Hsx2jBigtt5zbJb9uK9pveipqMbBBUUAvlgYjB
 aury/agents/workflow/parser.py,sha256=mfiFZ_TtFq3IxAqPlTGcNkluiZ8ww16y3NYwbmbsrwE,6149
 aury/agents/workflow/state.py,sha256=AxTSo7P9b1DbWjGdQdzFY4_7m6CJGNFo7xkGK28SPZw,4234
 aury/agents/workflow/types.py,sha256=PVvjTQRgTObx5Mq_lXFogyLjGChOi5pUgcJwF5ZzVtg,2354
-aury_agent-0.0.10.dist-info/METADATA,sha256=O36iw-FfvggVYFrIhm5tnHP33J3jS9vsrQCZdMCgCJA,2115
-aury_agent-0.0.10.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-aury_agent-0.0.10.dist-info/entry_points.txt,sha256=7EC5SMAKdC9HZLG8RfPhGno4OKOeSjaGsOWi1gOL-K8,56
-aury_agent-0.0.10.dist-info/RECORD,,
+aury_agent-0.0.12.dist-info/METADATA,sha256=FNI9HTb1CwWuXKdPxWGcHD2PCu8V3QIogdr126INtvU,2115
+aury_agent-0.0.12.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+aury_agent-0.0.12.dist-info/entry_points.txt,sha256=7EC5SMAKdC9HZLG8RfPhGno4OKOeSjaGsOWi1gOL-K8,56
+aury_agent-0.0.12.dist-info/RECORD,,