fix: message integration

camel/agents/chat_agent.py

@@ -4468,17 +4468,6 @@ def _clone_tools(
                         # Toolkit doesn't support cloning, use original
                         cloned_toolkits[toolkit_id] = toolkit_instance
 
-                if getattr(
-                    tool.func, "__message_integration_enhanced__", False
-                ):
-                    cloned_tools.append(
-                        FunctionTool(
-                            func=tool.func,
-                            openai_tool_schema=tool.get_openai_tool_schema(),
-                        )
-                    )
-                    continue
-
                 # Get the method from the cloned (or original) toolkit
                 toolkit = cloned_toolkits[toolkit_id]
                 method_name = tool.func.__name__

camel/toolkits/message_integration.py

@@ -283,8 +283,26 @@ def register_functions(
 
             # Check if this function should be enhanced
             if function_names is None or func.__name__ in function_names:
-                enhanced_func = self._add_messaging_to_tool(func)
-                enhanced_tools.append(FunctionTool(enhanced_func))
+                # If func is a bound toolkit method, route to register_toolkits
+                if hasattr(func, '__self__') and isinstance(
+                    func.__self__, BaseToolkit
+                ):
+                    toolkit_instance = func.__self__
+                    method_name = func.__name__
+
+                    # Enhance the specific method on the toolkit instance
+                    enhanced_toolkit = self.register_toolkits(
+                        toolkit_instance, tool_names=[method_name]
+                    )
+
+                    # Fetch the enhanced method back
+                    enhanced_method = getattr(enhanced_toolkit, method_name)
+
+                    enhanced_tools.append(FunctionTool(enhanced_method))
+                else:
+                    # Standalone function: add messaging wrapper directly
+                    enhanced_func = self._add_messaging_to_tool(func)
+                    enhanced_tools.append(FunctionTool(enhanced_func))
             else:
                 # Return as FunctionTool regardless of input type
                 if isinstance(item, FunctionTool):
@@ -300,6 +318,12 @@ def _add_messaging_to_tool(self, func: Callable) -> Callable:
         This internal method modifies the function signature and docstring
         to include optional messaging parameters that trigger status updates.
         """
+        if getattr(func, "__message_integration_enhanced__", False):
+            logger.debug(
+                f"Function {func.__name__} already enhanced, skipping"
+            )
+            return func
+
         # Get the original signature
         original_sig = inspect.signature(func)