fix: normalize Gemini fallback tool call ids

Author: SunmiJJW

astrbot/core/agent/runners/tool_loop_agent_runner.py

@@ -1098,7 +1098,7 @@ async def _handle_function_tools(
         def _append_tool_call_result(tool_call_id: str, content: str) -> None:
             content = self._merge_follow_up_notice(content)
             if (
-                tool_call_result_blocks
+                len(tool_call_result_blocks) > tool_result_blocks_start
                 and tool_call_result_blocks[-1].tool_call_id == tool_call_id
             ):
                 previous = tool_call_result_blocks[-1]

astrbot/core/provider/sources/gemini_source.py

@@ -322,6 +322,7 @@ def append_or_extend(
                 contents.append(content_cls(parts=part))
 
         gemini_contents: list[types.Content] = []
+        tool_name_by_call_id: dict[str, str] = {}
         for message in payloads["messages"]:
             role, content = message["role"], message.get("content")
 
@@ -392,6 +393,11 @@ def append_or_extend(
 
                 if "tool_calls" in message:
                     for tool in message["tool_calls"]:
+                        tool_call_id = tool.get("id")
+                        if isinstance(tool_call_id, str) and tool_call_id:
+                            tool_name_by_call_id[tool_call_id] = tool["function"][
+                                "name"
+                            ]
                         part = types.Part.from_function_call(
                             name=tool["function"]["name"],
                             args=json.loads(tool["function"]["arguments"]),
@@ -415,7 +421,12 @@ def append_or_extend(
                 append_or_extend(gemini_contents, parts, types.ModelContent)
 
             elif role == "tool":
-                func_name = message.get("name", message["tool_call_id"])
+                tool_call_id = message["tool_call_id"]
+                func_name = (
+                    message.get("name")
+                    or tool_name_by_call_id.get(tool_call_id)
+                    or tool_call_id
+                )
                 part = types.Part.from_function_response(
                     name=func_name,
                     response={
@@ -547,8 +558,13 @@ def _process_content_parts(
                 llm_response.role = "tool"
                 llm_response.tools_call_name.append(part.function_call.name)
                 llm_response.tools_call_args.append(part.function_call.args)
-                # function_call.id might be None, use name as fallback
-                tool_call_id = part.function_call.id or part.function_call.name
+                # function_call.id might be None, use a unique name-based fallback.
+                base_tool_call_id = part.function_call.id or part.function_call.name
+                tool_call_id = base_tool_call_id
+                duplicate_index = 2
+                while tool_call_id in llm_response.tools_call_ids:
+                    tool_call_id = f"{base_tool_call_id}__astrbot_{duplicate_index}"
+                    duplicate_index += 1
                 llm_response.tools_call_ids.append(tool_call_id)
                 # extra_content
                 if part.thought_signature:

tests/test_gemini_source.py

@@ -2,6 +2,7 @@
 
 import httpx
 import pytest
+from google.genai import types
 
 from astrbot.core.exceptions import EmptyModelOutputError
 import astrbot.core.provider.sources.request_retry as request_retry
@@ -33,6 +34,71 @@ def test_gemini_reasoning_only_output_is_allowed():
     )
 
 
+def test_gemini_parallel_same_function_fallback_ids_are_unique():
+    provider = ProviderGoogleGenAI.__new__(ProviderGoogleGenAI)
+    candidate = types.Candidate(
+        content=types.Content(
+            parts=[
+                types.Part.from_function_call(name="weather", args={"city": "A"}),
+                types.Part.from_function_call(name="weather", args={"city": "B"}),
+            ]
+        ),
+        finish_reason=types.FinishReason.STOP,
+    )
+    llm_response = LLMResponse(role="assistant")
+
+    provider._process_content_parts(candidate, llm_response)
+
+    assert llm_response.tools_call_ids == ["weather", "weather__astrbot_2"]
+
+
+def test_gemini_tool_responses_restore_function_name_from_unique_call_ids():
+    provider = ProviderGoogleGenAI.__new__(ProviderGoogleGenAI)
+    payloads = {
+        "messages": [
+            {"role": "user", "content": "Check both cities"},
+            {
+                "role": "assistant",
+                "content": "",
+                "tool_calls": [
+                    {
+                        "id": "weather",
+                        "type": "function",
+                        "function": {
+                            "name": "weather",
+                            "arguments": '{"city":"A"}',
+                        },
+                    },
+                    {
+                        "id": "weather__astrbot_2",
+                        "type": "function",
+                        "function": {
+                            "name": "weather",
+                            "arguments": '{"city":"B"}',
+                        },
+                    },
+                ],
+            },
+            {"role": "tool", "tool_call_id": "weather", "content": "city A"},
+            {
+                "role": "tool",
+                "tool_call_id": "weather__astrbot_2",
+                "content": "city B",
+            },
+        ]
+    }
+
+    contents = provider._prepare_conversation(payloads)
+    function_response_names = [
+        part.function_response.name
+        for content in contents
+        for part in content.parts or []
+        if part.function_response
+    ]
+
+    assert function_response_names == ["weather", "weather"]
+
+
 @pytest.mark.asyncio
 async def test_gemini_get_models_retries_transient_request_error(monkeypatch):
     monkeypatch.setattr(request_retry, "REQUEST_RETRY_WAIT_MIN_S", 0)