From 972b5ffb863be6b95fbe7ce9551494f0a0ebb14a Mon Sep 17 00:00:00 2001
From: Soulter <905617992@qq.com>
Date: Fri, 3 Oct 2025 00:46:02 +0800
Subject: [PATCH] fix: update tool call logging to include tool call IDs and
 enhance sandbox ship creation parameters

---
 astrbot/core/agent/runners/tool_loop_agent_runner.py |  6 ++++--
 packages/astrbot_agent/sandbox_client.py             | 10 +++++++---
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/astrbot/core/agent/runners/tool_loop_agent_runner.py b/astrbot/core/agent/runners/tool_loop_agent_runner.py
index ac5f77a89..3f10bc686 100644
--- a/astrbot/core/agent/runners/tool_loop_agent_runner.py
+++ b/astrbot/core/agent/runners/tool_loop_agent_runner.py
@@ -151,11 +151,13 @@ class ToolLoopAgentRunner(BaseAgentRunner[TContext]):
         # 如果有工具调用，还需处理工具调用
         if llm_resp.tools_call_name:
             tool_call_result_blocks = []
-            for tool_call_name in llm_resp.tools_call_name:
+            for tool_call_name, tool_call_id in zip(
+                llm_resp.tools_call_name, llm_resp.tools_call_ids
+            ):
                 yield AgentResponse(
                     type="tool_call",
                     data=AgentResponseData(
-                        chain=MessageChain().message(f"🔨 调用工具: {tool_call_name}")
+                        chain=MessageChain().message(f"🔨 正在使用工具: {tool_call_name} ({tool_call_id})")
                     ),
                 )
             async for result in self._handle_function_tools(self.req, llm_resp):
diff --git a/packages/astrbot_agent/sandbox_client.py b/packages/astrbot_agent/sandbox_client.py
index 8436471a0..b49137fc5 100644
--- a/packages/astrbot_agent/sandbox_client.py
+++ b/packages/astrbot_agent/sandbox_client.py
@@ -1,5 +1,7 @@
 import os
+import uuid
 from shipyard import ShipyardClient, SessionShip, Spec
+from astrbot.api import logger
 
 
 class SandboxClient:
@@ -23,12 +25,14 @@ class SandboxClient:
 
     async def get_ship(self, session_id: str) -> SessionShip:
         if session_id not in self.session_ship:
+            uuid_str = uuid.uuid5(uuid.NAMESPACE_DNS, session_id).hex
             ship = await self.client.create_ship(
                 ttl=3600,
-                spec=Spec(cpus=0.5, memory="256m"),
-                max_session_num=2,
-                session_id=session_id,
+                spec=Spec(cpus=1.0, memory="512m"),
+                max_session_num=3,
+                session_id=uuid_str,
             )
+            logger.info(f"Got sandbox ship: {ship.id} for session: {session_id}")
             self.session_ship[session_id] = ship
         return self.session_ship[session_id]