@elizaos/python 2.0.0-alpha.10 → 2.0.0-alpha.11

package/elizaos/bootstrap/actions/send_message.py

@@ -2,12 +2,12 @@ from __future__ import annotations
 
 import contextlib
 from dataclasses import dataclass, field
-from typing import TYPE_CHECKING
-from uuid import UUID
+from typing import TYPE_CHECKING, Any
 
 from elizaos.generated.spec_helpers import require_action_spec
 from elizaos.types import Action, ActionExample, ActionResult, Content
 from elizaos.types.memory import Memory as MemoryType
+from elizaos.types.primitives import UUID, as_uuid
 
 if TYPE_CHECKING:
     from elizaos.types import HandlerCallback, HandlerOptions, IAgentRuntime, Memory, State
@@ -36,6 +36,54 @@ def _convert_spec_examples() -> list[list[ActionExample]]:
     return []
 
 
+def _parse_uuid(value: object) -> UUID | None:
+    if not isinstance(value, str) or not value.strip():
+        return None
+    with contextlib.suppress(Exception):
+        return as_uuid(value.strip())
+    return None
+
+
+def _normalize_parameters(options: HandlerOptions | None) -> dict[str, Any]:
+    raw = getattr(options, "parameters", None)
+    if isinstance(raw, dict):
+        return raw
+
+    if raw is None:
+        return {}
+
+    if hasattr(raw, "items"):
+        try:
+            return {str(k): v for k, v in raw.items()}
+        except Exception:
+            return {}
+
+    return {}
+
+
+def _coerce_entity_name(entity: object) -> list[str]:
+    if isinstance(entity, dict):
+        names = entity.get("names")
+        if isinstance(names, list):
+            return [str(n).strip() for n in names if isinstance(n, str) and n.strip()]
+        name = entity.get("name")
+        if isinstance(name, str) and name.strip():
+            return [name.strip()]
+        return []
+
+    names = getattr(entity, "names", None)
+    if isinstance(names, list):
+        clean = [str(n).strip() for n in names if isinstance(n, str) and str(n).strip()]
+        if clean:
+            return clean
+
+    name = getattr(entity, "name", None)
+    if isinstance(name, str) and name.strip():
+        return [name.strip()]
+
+    return []
+
+
 @dataclass
 class SendMessageAction:
     name: str = _spec["name"]
@@ -58,9 +106,14 @@ class SendMessageAction:
         callback: HandlerCallback | None = None,
         responses: list[Memory] | None = None,
     ) -> ActionResult:
-        message_text = ""
-        if responses and responses[0].content:
-            message_text = str(responses[0].content.text or "")
+        params = _normalize_parameters(options)
+
+        text_param = params.get("text")
+        message_text = str(text_param).strip() if isinstance(text_param, str) else ""
+        if not message_text and responses and responses[0].content:
+            message_text = str(responses[0].content.text or "").strip()
+        if not message_text and message.content and isinstance(message.content.text, str):
+            message_text = message.content.text.strip()
 
         if not message_text:
             return ActionResult(
@@ -72,18 +125,91 @@ class SendMessageAction:
 
         target_room_id = message.room_id
         target_entity_id: UUID | None = None
+        target_type = "room"
+
+        target_type_param = params.get("targetType") or params.get("target_type")
+        target_param = params.get("target")
+        source_param = params.get("source")
+
+        source = (
+            source_param.strip()
+            if isinstance(source_param, str) and source_param.strip()
+            else (
+                message.content.source
+                if message.content and isinstance(message.content.source, str)
+                else "agent"
+            )
+        )
+
+        if isinstance(target_type_param, str):
+            normalized_target_type = target_type_param.strip().lower()
+            if normalized_target_type in {"user", "entity"}:
+                target_type = "user"
+            elif normalized_target_type == "room":
+                target_type = "room"
+
+        if isinstance(target_param, str) and target_param.strip():
+            target_value = target_param.strip()
+            if target_type == "room":
+                parsed_room = _parse_uuid(target_value)
+                if parsed_room:
+                    target_room_id = parsed_room
+                else:
+                    world_id = None
+                    room_data = (
+                        getattr(getattr(state, "data", None), "room", None) if state else None
+                    )
+                    if room_data is not None:
+                        world_id = getattr(room_data, "world_id", None) or getattr(
+                            room_data, "worldId", None
+                        )
+                    if world_id is None:
+                        with contextlib.suppress(Exception):
+                            current_room = await runtime.get_room(message.room_id)
+                            if current_room:
+                                world_id = getattr(current_room, "world_id", None) or getattr(
+                                    current_room, "worldId", None
+                                )
+
+                    if world_id is not None:
+                        with contextlib.suppress(Exception):
+                            rooms = await runtime.get_rooms(world_id)
+                            for room in rooms:
+                                room_name = getattr(room, "name", None)
+                                if (
+                                    isinstance(room_name, str)
+                                    and room_name.strip().lower() == target_value.lower()
+                                ):
+                                    room_id = getattr(room, "id", None)
+                                    if room_id is not None:
+                                        target_room_id = as_uuid(str(room_id))
+                                        break
+            else:
+                parsed_entity = _parse_uuid(target_value)
+                if parsed_entity:
+                    target_entity_id = parsed_entity
+                else:
+                    with contextlib.suppress(Exception):
+                        entities = await runtime.get_entities_for_room(message.room_id)
+                        for entity in entities:
+                            names = _coerce_entity_name(entity)
+                            if any(name.lower() == target_value.lower() for name in names):
+                                entity_id = getattr(entity, "id", None)
+                                if entity_id is not None:
+                                    target_entity_id = as_uuid(str(entity_id))
+                                    break
 
         if message.content and message.content.target:
             target = message.content.target
             if isinstance(target, dict):
                 room_str = target.get("roomId")
                 entity_str = target.get("entityId")
-                if room_str:
-                    with contextlib.suppress(ValueError):
-                        target_room_id = UUID(room_str)
-                if entity_str:
-                    with contextlib.suppress(ValueError):
-                        target_entity_id = UUID(entity_str)
+                if room_str and target_type == "room":
+                    with contextlib.suppress(Exception):
+                        target_room_id = as_uuid(room_str)
+                if entity_str and target_type == "user":
+                    with contextlib.suppress(Exception):
+                        target_entity_id = as_uuid(entity_str)
 
         if not target_room_id:
             return ActionResult(
@@ -95,16 +221,28 @@ class SendMessageAction:
 
         message_content = Content(
             text=message_text,
-            source="agent",
+            source=source,
             actions=["SEND_MESSAGE"],
         )
 
+        send_message_to_target = getattr(runtime, "send_message_to_target", None)
+        if callable(send_message_to_target):
+            with contextlib.suppress(Exception):
+                from elizaos.types.runtime import TargetInfo
+
+                await send_message_to_target(
+                    TargetInfo(
+                        roomId=str(target_room_id),
+                        entityId=str(target_entity_id) if target_entity_id else None,
+                        source=source,
+                    ),
+                    message_content,
+                )
+
         # Create the message memory
         import time
         import uuid as uuid_module
 
-        from elizaos.types.primitives import as_uuid
-
         message_memory = MemoryType(
             id=as_uuid(str(uuid_module.uuid4())),
             entity_id=runtime.agent_id,
@@ -142,16 +280,25 @@ class SendMessageAction:
         if callback:
             await callback(response_content)
 
+        target_id = (
+            target_entity_id if target_type == "user" and target_entity_id else target_room_id
+        )
         return ActionResult(
-            text="Message sent to room",
+            text="Message sent",
             values={
                 "success": True,
                 "messageSent": True,
+                "targetType": target_type,
+                "target": str(target_id),
+                "source": source,
                 "targetRoomId": str(target_room_id),
                 "targetEntityId": str(target_entity_id) if target_entity_id else None,
             },
             data={
                 "actionName": "SEND_MESSAGE",
+                "targetType": target_type,
+                "target": str(target_id),
+                "source": source,
                 "targetRoomId": str(target_room_id),
                 "messagePreview": message_text[:100],
             },

package/elizaos/bootstrap/autonomy/service.py

@@ -11,6 +11,7 @@ import contextlib
 import logging
 import time
 import uuid
+from collections.abc import Iterable
 from typing import TYPE_CHECKING, Any
 
 from elizaos.bootstrap.services.task import Task
@@ -23,7 +24,7 @@ from elizaos.prompts import (
 from elizaos.types.environment import Room, World
 from elizaos.types.events import EventType
 from elizaos.types.memory import Memory
-from elizaos.types.primitives import UUID, Content, as_uuid
+from elizaos.types.primitives import UUID, Content, as_uuid, string_to_uuid
 from elizaos.types.service import Service
 
 from .types import AutonomyStatus
@@ -40,8 +41,7 @@ AUTONOMY_SERVICE_TYPE = "AUTONOMY"
 AUTONOMY_TASK_NAME = "AUTONOMY_THINK"
 
 # Tags used for autonomy tasks (parity with TypeScript).
-# Note: TypeScript uses ["repeat", "autonomy", "internal"] without "queue".
-AUTONOMY_TASK_TAGS = ["repeat", "autonomy", "internal"]
+AUTONOMY_TASK_TAGS = ["queue", "repeat", "autonomy"]
 
 # Default interval in milliseconds
 DEFAULT_INTERVAL_MS = 30_000
@@ -112,8 +112,10 @@ class AutonomyService(Service):
         self._interval_ms = DEFAULT_INTERVAL_MS
         self._task_registered = False
         self._settings_monitor_task: asyncio.Task[None] | None = None
-        self._autonomous_room_id = as_uuid(str(uuid.uuid4()))
+        # Placeholder; replaced with a deterministic ID during _initialize().
+        self._autonomous_room_id = as_uuid("00000000-0000-0000-0000-000000000000")
         self._autonomous_world_id = as_uuid("00000000-0000-0000-0000-000000000001")
+        self._autonomy_entity_id = as_uuid("00000000-0000-0000-0000-000000000002")
 
     def _log(self, level: str, msg: str) -> None:
         if self._runtime:
@@ -135,6 +137,9 @@ class AutonomyService(Service):
         if not self._runtime:
             return
 
+        self._autonomous_room_id = as_uuid(
+            string_to_uuid(f"autonomy-room-{self._runtime.agent_id}")
+        )
         self._log("info", f"Using autonomous room ID: {self._autonomous_room_id}")
 
         # Ensure autonomous context exists
@@ -289,35 +294,223 @@ class AutonomyService(Service):
         except Exception:
             return None
 
+    @staticmethod
+    def _coerce_name(entity: object) -> str | None:
+        if isinstance(entity, dict):
+            names = entity.get("names")
+            if isinstance(names, list):
+                for name in names:
+                    if isinstance(name, str) and name.strip():
+                        return name.strip()
+            name = entity.get("name")
+            if isinstance(name, str) and name.strip():
+                return name.strip()
+            return None
+
+        names = getattr(entity, "names", None)
+        if isinstance(names, list):
+            for name in names:
+                if isinstance(name, str) and name.strip():
+                    return name.strip()
+
+        name = getattr(entity, "name", None)
+        if isinstance(name, str) and name.strip():
+            return name.strip()
+
+        return None
+
+    @staticmethod
+    def _memory_text(memory: Memory) -> str:
+        if memory.content and isinstance(memory.content.text, str):
+            return memory.content.text.strip()
+        return ""
+
+    async def _build_entity_name_lookup(self, entity_ids: Iterable[UUID]) -> dict[UUID, str]:
+        if not self._runtime:
+            return {}
+
+        ids = list({entity_id for entity_id in entity_ids if entity_id})
+        if not ids:
+            return {}
+
+        getter = getattr(self._runtime, "get_entities_by_ids", None)
+        if not callable(getter):
+            return {}
+
+        try:
+            entities = await getter(ids)
+        except Exception:
+            return {}
+
+        name_by_id: dict[UUID, str] = {}
+        for entity in entities or []:
+            entity_id = None
+            if isinstance(entity, dict):
+                raw_id = entity.get("id")
+                if isinstance(raw_id, str):
+                    with contextlib.suppress(Exception):
+                        entity_id = as_uuid(raw_id)
+            else:
+                raw_id = getattr(entity, "id", None)
+                if raw_id is not None:
+                    with contextlib.suppress(Exception):
+                        entity_id = as_uuid(str(raw_id))
+
+            if not entity_id:
+                continue
+
+            entity_name = self._coerce_name(entity)
+            if entity_name:
+                name_by_id[entity_id] = entity_name
+
+        return name_by_id
+
+    @staticmethod
+    def _dedupe_memories_by_id_keep_earliest(memories: list[Memory]) -> list[Memory]:
+        by_id: dict[str, Memory] = {}
+        without_id: list[Memory] = []
+
+        for memory in memories:
+            mem_id = str(memory.id) if memory.id else ""
+            if not mem_id:
+                without_id.append(memory)
+                continue
+
+            existing = by_id.get(mem_id)
+            if existing is None or (memory.created_at or 0) < (existing.created_at or 0):
+                by_id[mem_id] = memory
+
+        return [*without_id, *by_id.values()]
+
     async def _get_target_room_context_text(self) -> str:
         if not self._runtime:
-            return "(no target room configured)"
+            return "(no rooms configured)"
+
         target_room_id = self._get_target_room_id()
-        if not target_room_id:
-            return "(no target room configured)"
-        memories_table = await self._runtime.get_memories(
-            {"roomId": target_room_id, "count": 15, "tableName": "memories"}
+
+        ordered_room_ids: list[UUID] = []
+        if target_room_id:
+            ordered_room_ids.append(target_room_id)
+
+        get_participant_rooms = getattr(self._runtime, "get_rooms_for_participant", None)
+        if callable(get_participant_rooms):
+            with contextlib.suppress(Exception):
+                participant_rooms = await get_participant_rooms(self._runtime.agent_id)
+                for room_id in participant_rooms or []:
+                    if room_id not in ordered_room_ids:
+                        ordered_room_ids.append(room_id)
+
+        if not ordered_room_ids:
+            return "(no rooms configured)"
+
+        room_name_by_id: dict[UUID, str] = {}
+        get_rooms_by_ids = getattr(self._runtime, "get_rooms_by_ids", None)
+        if callable(get_rooms_by_ids):
+            with contextlib.suppress(Exception):
+                rooms = await get_rooms_by_ids(ordered_room_ids)
+                for room in rooms or []:
+                    if room and room.id:
+                        room_name_by_id[room.id] = (
+                            room.name if isinstance(room.name, str) and room.name else str(room.id)
+                        )
+
+        message_room_ids = [rid for rid in ordered_room_ids if rid != self._autonomous_room_id]
+        per_room_limit = 10
+
+        fetched_messages: list[Memory] = []
+        if message_room_ids:
+            get_memories_by_room_ids = getattr(self._runtime, "get_memories_by_room_ids", None)
+            if callable(get_memories_by_room_ids):
+                with contextlib.suppress(Exception):
+                    fetched_messages = await get_memories_by_room_ids(
+                        {
+                            "roomIds": message_room_ids,
+                            "limit": per_room_limit * len(message_room_ids),
+                            "tableName": "messages",
+                        }
+                    )
+            if not fetched_messages:
+                for room_id in message_room_ids:
+                    with contextlib.suppress(Exception):
+                        fetched_messages.extend(
+                            await self._runtime.get_memories(
+                                {
+                                    "roomId": room_id,
+                                    "count": per_room_limit,
+                                    "tableName": "messages",
+                                }
+                            )
+                        )
+
+        autonomy_memories = await self._runtime.get_memories(
+            {"roomId": self._autonomous_room_id, "count": per_room_limit, "tableName": "memories"}
         )
-        messages_table = await self._runtime.get_memories(
-            {"roomId": target_room_id, "count": 15, "tableName": "messages"}
+
+        external_messages = [
+            m
+            for m in fetched_messages
+            if m and m.entity_id and m.entity_id != self._runtime.agent_id
+        ]
+        entity_name_by_id = await self._build_entity_name_lookup(
+            memory.entity_id for memory in external_messages
         )
-        by_id: dict[str, Memory] = {}
-        for m in [*memories_table, *messages_table]:
-            mem_id = m.id or ""
-            if not mem_id:
+
+        messages_by_room: dict[UUID, list[Memory]] = {}
+        sorted_messages = sorted(
+            self._dedupe_memories_by_id_keep_earliest(external_messages),
+            key=lambda m: m.created_at or 0,
+            reverse=True,
+        )
+        for memory in sorted_messages:
+            bucket = messages_by_room.setdefault(memory.room_id, [])
+            if len(bucket) >= per_room_limit:
                 continue
-            created_at = m.created_at or 0
-            existing = by_id.get(mem_id)
-            if existing is None or created_at < (existing.created_at or 0):
-                by_id[mem_id] = m
-        ordered = sorted(by_id.values(), key=lambda m: m.created_at or 0)
-        lines: list[str] = []
-        for m in ordered:
-            role = "Agent" if m.entity_id == self._runtime.agent_id else "User"
-            text = m.content.text if m.content and isinstance(m.content.text, str) else ""
-            if text.strip():
-                lines.append(f"{role}: {text}")
-        return "\n".join(lines) if lines else "(no recent messages)"
+            bucket.append(memory)
+
+        room_sections: list[str] = []
+        for room_id in message_room_ids:
+            room_name = room_name_by_id.get(room_id, str(room_id))
+            room_messages = list(reversed(messages_by_room.get(room_id, [])))
+            if not room_messages:
+                room_sections.append(f"Room: {room_name}\n(no recent messages)")
+                continue
+
+            lines: list[str] = []
+            for memory in room_messages:
+                text = self._memory_text(memory)
+                if not text:
+                    continue
+                author = entity_name_by_id.get(memory.entity_id, str(memory.entity_id))
+                lines.append(f"{author}: {text}")
+
+            if lines:
+                room_sections.append(f"Room: {room_name}\n" + "\n".join(lines))
+            else:
+                room_sections.append(f"Room: {room_name}\n(no recent messages)")
+
+        autonomy_entries: list[str] = []
+        for memory in autonomy_memories:
+            text = self._memory_text(memory)
+            if not text:
+                continue
+
+            metadata_obj = memory.content.data if memory.content else None
+            metadata: dict[str, object] = metadata_obj if isinstance(metadata_obj, dict) else {}
+            entry_type = metadata.get("type")
+
+            if memory.entity_id == self._runtime.agent_id and entry_type == "autonomous-response":
+                autonomy_entries.append(f"Thought: {text}")
+            elif (
+                memory.entity_id == self._autonomy_entity_id and entry_type == "autonomous-trigger"
+            ):
+                autonomy_entries.append(f"Trigger: {text}")
+
+        if autonomy_entries:
+            autonomy_section = "Autonomous context:\n" + "\n".join(autonomy_entries)
+        else:
+            autonomy_section = "Autonomous context: (none)"
+
+        return "\n\n".join([*room_sections, autonomy_section])
 
     async def _settings_monitoring(self) -> None:
         while not self._is_stopped:
@@ -412,7 +605,7 @@ class AutonomyService(Service):
             else self._create_continuous_prompt(last_thought, is_first_thought, target_context)
         )
 
-        entity_id = agent_entity.id if agent_entity.id else self._runtime.agent_id
+        entity_id = self._autonomy_entity_id
         current_time_ms = int(time.time() * 1000)
         autonomous_message = Memory(
             id=as_uuid(str(uuid.uuid4())),
@@ -420,6 +613,15 @@ class AutonomyService(Service):
             content=Content(
                 text=autonomy_prompt,
                 source="autonomy-service",
+                data={
+                    "type": "autonomous-prompt",
+                    "isAutonomous": True,
+                    "isInternalThought": True,
+                    "autonomyMode": mode,
+                    "channelId": "autonomous",
+                    "timestamp": current_time_ms,
+                    "isContinuation": not is_first_thought,
+                },
             ),
             room_id=self._autonomous_room_id,
             agent_id=self._runtime.agent_id,