Merge PR #1048: feat(slack): isolate session context per thread

This commit is contained in:
Re-bin
2026-02-23 13:10:55 +00:00
3 changed files with 12 additions and 4 deletions

View File

@@ -16,11 +16,12 @@ class InboundMessage:
timestamp: datetime = field(default_factory=datetime.now) timestamp: datetime = field(default_factory=datetime.now)
media: list[str] = field(default_factory=list) # Media URLs media: list[str] = field(default_factory=list) # Media URLs
metadata: dict[str, Any] = field(default_factory=dict) # Channel-specific data metadata: dict[str, Any] = field(default_factory=dict) # Channel-specific data
session_key_override: str | None = None # Optional override for thread-scoped sessions
@property @property
def session_key(self) -> str: def session_key(self) -> str:
"""Unique key for session identification.""" """Unique key for session identification."""
return f"{self.channel}:{self.chat_id}" return self.session_key_override or f"{self.channel}:{self.chat_id}"
@dataclass @dataclass

View File

@@ -89,7 +89,8 @@ class BaseChannel(ABC):
chat_id: str, chat_id: str,
content: str, content: str,
media: list[str] | None = None, media: list[str] | None = None,
metadata: dict[str, Any] | None = None metadata: dict[str, Any] | None = None,
session_key: str | None = None,
) -> None: ) -> None:
""" """
Handle an incoming message from the chat platform. Handle an incoming message from the chat platform.
@@ -102,6 +103,7 @@ class BaseChannel(ABC):
content: Message text content. content: Message text content.
media: Optional list of media URLs. media: Optional list of media URLs.
metadata: Optional channel-specific metadata. metadata: Optional channel-specific metadata.
session_key: Optional session key override (e.g. thread-scoped sessions).
""" """
if not self.is_allowed(sender_id): if not self.is_allowed(sender_id):
logger.warning( logger.warning(
@@ -117,7 +119,8 @@ class BaseChannel(ABC):
chat_id=str(chat_id), chat_id=str(chat_id),
content=content, content=content,
media=media or [], media=media or [],
metadata=metadata or {} metadata=metadata or {},
session_key_override=session_key,
) )
await self.bus.publish_inbound(msg) await self.bus.publish_inbound(msg)

View File

@@ -179,6 +179,9 @@ class SlackChannel(BaseChannel):
except Exception as e: except Exception as e:
logger.debug("Slack reactions_add failed: {}", e) logger.debug("Slack reactions_add failed: {}", e)
# Thread-scoped session key for channel/group messages
session_key = f"slack:{chat_id}:{thread_ts}" if thread_ts and channel_type != "im" else None
try: try:
await self._handle_message( await self._handle_message(
sender_id=sender_id, sender_id=sender_id,
@@ -189,8 +192,9 @@ class SlackChannel(BaseChannel):
"event": event, "event": event,
"thread_ts": thread_ts, "thread_ts": thread_ts,
"channel_type": channel_type, "channel_type": channel_type,
} },
}, },
session_key=session_key,
) )
except Exception: except Exception:
logger.exception("Error handling Slack message from {}", sender_id) logger.exception("Error handling Slack message from {}", sender_id)