Merge pull request #54 from Lab11HQ/chore/rename-request-context

Author: davenpi

src/conduit/client/coordinator.py

@@ -10,7 +10,7 @@
 from collections.abc import Coroutine
 from typing import Any, Awaitable, Callable, TypeVar
 
-from conduit.client.request_context import RequestContext
+from conduit.client.message_context import MessageContext
 from conduit.client.server_manager import ServerManager
 from conduit.protocol.base import (
     INTERNAL_ERROR,
@@ -35,9 +35,9 @@
 TResult = TypeVar("TResult", bound=Result)
 TNotification = TypeVar("TNotification", bound=Notification)
 
-RequestHandler = Callable[[RequestContext, TRequest], Awaitable[TResult | Error]]
+RequestHandler = Callable[[MessageContext, TRequest], Awaitable[TResult | Error]]
 NotificationHandler = Callable[
-    [RequestContext, TNotification], Coroutine[Any, Any, None]
+    [MessageContext, TNotification], Coroutine[Any, Any, None]
 ]
 
 
@@ -137,14 +137,14 @@ def _on_message_loop_done(self, task: asyncio.Task[None]) -> None:
     # Build context
     # ================================
 
-    def _build_context(self, server_id: str) -> RequestContext:
+    def _build_context(self, server_id: str) -> MessageContext:
         """Builds context for a request.
 
         Args:
             server_id: ID of the server making the request
 
         Returns:
-            RequestContext: Context with server state and helpers
+            MessageContext: Context with server state and helpers
 
         Raises:
             ValueError: If the server is not registered with the client
@@ -153,7 +153,7 @@ def _build_context(self, server_id: str) -> RequestContext:
         if server_state is None:
             raise ValueError(f"Server {server_id} not registered")
 
-        return RequestContext(
+        return MessageContext(
             server_id=server_id,
             server_state=server_state,
             server_manager=self.server_manager,
@@ -250,7 +250,7 @@ async def _route_request(
     async def _execute_request_handler(
         self,
         handler: RequestHandler,
-        context: RequestContext,
+        context: MessageContext,
         request_id: str | int,
         request: Request,
     ) -> None:

src/conduit/client/request_context.py src/conduit/client/message_context.pysrc/conduit/client/request_context.py renamed to src/conduit/client/message_context.py

@@ -11,8 +11,8 @@
 
 
 @dataclass
-class RequestContext:
-    """Rich context for handling server -> client requests.
+class MessageContext:
+    """Rich context for handling server -> client messages.
 
     Provides immediate access to server state, capabilities, and helper methods.
     """
@@ -60,6 +60,6 @@ def get_server_display_name(self) -> str:
     def __str__(self) -> str:
         """String representation for logging."""
         return (
-            f"RequestContext(server={self.get_server_display_name()},"
+            f"MessageContext(server={self.get_server_display_name()},"
             f"id={self.server_id})"
         )

src/conduit/client/protocol/elicitation.py

@@ -1,7 +1,7 @@
 import logging
 from typing import Awaitable, Callable
 
-from conduit.client.request_context import RequestContext
+from conduit.client.message_context import MessageContext
 from conduit.protocol.elicitation import ElicitRequest, ElicitResult
 
 
@@ -19,7 +19,7 @@ def __init__(self):
         self.logger = logging.getLogger("conduit.client.protocol.elicitation")
 
     async def handle_elicitation(
-        self, context: RequestContext, request: ElicitRequest
+        self, context: MessageContext, request: ElicitRequest
     ) -> ElicitResult:
         """Elicit a response from the user.
 

src/conduit/client/protocol/roots.py

@@ -1,7 +1,7 @@
 import logging
 from copy import deepcopy
 
-from conduit.client.request_context import RequestContext
+from conduit.client.message_context import MessageContext
 from conduit.protocol.roots import ListRootsRequest, ListRootsResult, Root
 
 
@@ -78,7 +78,7 @@ def cleanup_server(self, server_id: str) -> None:
     # ================================
 
     async def handle_list_roots(
-        self, context: RequestContext, request: ListRootsRequest
+        self, context: MessageContext, request: ListRootsRequest
     ) -> ListRootsResult:
         """List the roots available to the server making the request."""
         roots = self.get_server_roots(context.server_id)

src/conduit/client/protocol/sampling.py

@@ -1,7 +1,7 @@
 import logging
 from typing import Awaitable, Callable
 
-from conduit.client.request_context import RequestContext
+from conduit.client.message_context import MessageContext
 from conduit.protocol.sampling import CreateMessageRequest, CreateMessageResult
 
 
@@ -19,7 +19,7 @@ def __init__(self):
         self.logger = logging.getLogger("conduit.client.protocol.sampling")
 
     async def handle_create_message(
-        self, context: RequestContext, request: CreateMessageRequest
+        self, context: MessageContext, request: CreateMessageRequest
     ) -> CreateMessageResult:
         """Sample the host LLM for the server.
 

src/conduit/client/session.py

@@ -14,13 +14,13 @@
 
 from conduit.client.callbacks import CallbackManager
 from conduit.client.coordinator import MessageCoordinator
+from conduit.client.message_context import MessageContext
 from conduit.client.protocol.elicitation import (
     ElicitationManager,
     ElicitationNotConfiguredError,
 )
 from conduit.client.protocol.roots import RootsManager
 from conduit.client.protocol.sampling import SamplingManager, SamplingNotConfiguredError
-from conduit.client.request_context import RequestContext
 from conduit.client.server_manager import ServerManager
 from conduit.protocol.base import (
     INTERNAL_ERROR,
@@ -293,7 +293,7 @@ def _validate_protocol_version(self, result: InitializeResult) -> None:
     # ================================
 
     async def _handle_ping(
-        self, context: RequestContext, request: PingRequest
+        self, context: MessageContext, request: PingRequest
     ) -> EmptyResult:
         """Returns an empty result."""
 
@@ -304,7 +304,7 @@ async def _handle_ping(
     # ================================
 
     async def _handle_list_roots(
-        self, context: RequestContext, request: ListRootsRequest
+        self, context: MessageContext, request: ListRootsRequest
     ) -> ListRootsResult | Error:
         """Returns the roots available to the server.
 
@@ -324,7 +324,7 @@ async def _handle_list_roots(
     # ================================
 
     async def _handle_sampling(
-        self, context: RequestContext, request: CreateMessageRequest
+        self, context: MessageContext, request: CreateMessageRequest
     ) -> CreateMessageResult | Error:
         """Creates a message using the configured sampling handler.
 
@@ -354,7 +354,7 @@ async def _handle_sampling(
     # ================================
 
     async def _handle_elicitation(
-        self, context: RequestContext, request: ElicitRequest
+        self, context: MessageContext, request: ElicitRequest
     ) -> ElicitResult | Error:
         """Returns an elicitation result using the configured elicitation handler.
 
@@ -384,7 +384,7 @@ async def _handle_elicitation(
     # ================================
 
     async def _handle_cancelled(
-        self, context: RequestContext, notification: CancelledNotification
+        self, context: MessageContext, notification: CancelledNotification
     ) -> None:
         """Cancels a request from the server and calls the registered callback."""
         request_exists = (
@@ -400,13 +400,13 @@ async def _handle_cancelled(
             await self.callbacks.call_cancelled(context.server_id, notification)
 
     async def _handle_progress(
-        self, context: RequestContext, notification: ProgressNotification
+        self, context: MessageContext, notification: ProgressNotification
     ) -> None:
         """Calls the registered callback for progress updates."""
         await self.callbacks.call_progress(context.server_id, notification)
 
     async def _handle_prompts_list_changed(
-        self, context: RequestContext, notification: PromptListChangedNotification
+        self, context: MessageContext, notification: PromptListChangedNotification
     ) -> None:
         """Fetches the updated prompts list and calls the registered callback.
 
@@ -433,7 +433,7 @@ async def _handle_prompts_list_changed(
             )
 
     async def _handle_resources_list_changed(
-        self, context: RequestContext, notification: ResourceListChangedNotification
+        self, context: MessageContext, notification: ResourceListChangedNotification
     ) -> None:
         """Fetches the updated resources/templates and calls the registered callback.
 
@@ -479,7 +479,7 @@ async def _handle_resources_list_changed(
             )
 
     async def _handle_resources_updated(
-        self, context: RequestContext, notification: ResourceUpdatedNotification
+        self, context: MessageContext, notification: ResourceUpdatedNotification
     ) -> None:
         """Reads the updated resource content and calls the registered callback.
 
@@ -502,7 +502,7 @@ async def _handle_resources_updated(
             )
 
     async def _handle_tools_list_changed(
-        self, context: RequestContext, notification: ToolListChangedNotification
+        self, context: MessageContext, notification: ToolListChangedNotification
     ) -> None:
         """Fetches the updated tools list and calls the registered callback.
 
@@ -529,7 +529,7 @@ async def _handle_tools_list_changed(
             )
 
     async def _handle_logging_message(
-        self, context: RequestContext, notification: LoggingMessageNotification
+        self, context: MessageContext, notification: LoggingMessageNotification
     ) -> None:
         """Calls the registered callback for logging messages."""
         await self.callbacks.call_logging_message(context.server_id, notification)

src/conduit/server/coordinator.py

@@ -26,17 +26,17 @@
     JSONRPCResponse,
 )
 from conduit.server.client_manager import ClientManager
-from conduit.server.request_context import RequestContext
+from conduit.server.message_context import MessageContext
 from conduit.shared.message_parser import MessageParser
 from conduit.transport.server import ClientMessage, ServerTransport, TransportContext
 
 TRequest = TypeVar("TRequest", bound=Request)
 TResult = TypeVar("TResult", bound=Result)
 TNotification = TypeVar("TNotification", bound=Notification)
 
-RequestHandler = Callable[[RequestContext, TRequest], Awaitable[TResult | Error]]
+RequestHandler = Callable[[MessageContext, TRequest], Awaitable[TResult | Error]]
 NotificationHandler = Callable[
-    [RequestContext, TNotification], Coroutine[Any, Any, None]
+    [MessageContext, TNotification], Coroutine[Any, Any, None]
 ]
 
 
@@ -140,14 +140,14 @@ def _on_message_loop_done(self, task: asyncio.Task[None]) -> None:
 
     def _build_context(
         self, client_id: str, originating_request_id: str | int | None = None
-    ) -> RequestContext:
-        """Builds context for a request.
+    ) -> MessageContext:
+        """Builds context for handling a message.
 
         Args:
             client_id: ID of the client making the request
 
         Returns:
-            RequestContext: Rich context with client state and helpers
+            MessageContext: Rich context with client state and helpers
 
         Raises:
             ValueError: If client is not registered
@@ -156,7 +156,7 @@ def _build_context(
         if client_state is None:
             raise ValueError(f"Client {client_id} not registered")
 
-        return RequestContext(
+        return MessageContext(
             client_id=client_id,
             client_state=client_state,
             client_manager=self.client_manager,
@@ -256,7 +256,7 @@ async def _route_request(
     async def _execute_request_handler(
         self,
         handler: RequestHandler,
-        context: RequestContext,
+        context: MessageContext,
         request_id: str | int,
         request: Request,
     ) -> None:

src/conduit/server/request_context.py src/conduit/server/message_context.pysrc/conduit/server/request_context.py renamed to src/conduit/server/message_context.py

@@ -18,14 +18,14 @@
 
 
 @dataclass
-class RequestContext:
-    """Rich context for handling client -> server requests.
+class MessageContext:
+    """Rich context for handling client -> server messages.
 
     Provides immediate access to client state, capabilities, and helper methods
     instead of requiring handlers to work with bare client_id strings.
 
     This context is built once at the coordinator level and threaded through
-    the request pipeline, giving handlers everything they need to make
+    the message pipeline, giving handlers everything they need to make
     informed decisions about client capabilities and state.
     """
 
@@ -104,6 +104,6 @@ def get_client_display_name(self) -> str:
     def __str__(self) -> str:
         """String representation for logging."""
         return (
-            f"RequestContext(client={self.get_client_display_name()},"
+            f"MessageContext(client={self.get_client_display_name()},"
             f"id={self.client_id})"
         )

src/conduit/server/protocol/completions.py

@@ -4,7 +4,7 @@
 from conduit.protocol.completions import CompleteRequest, CompleteResult
 
 if TYPE_CHECKING:
-    from conduit.server.request_context import RequestContext
+    from conduit.server.message_context import MessageContext
 
 
 class CompletionNotConfiguredError(Exception):
@@ -14,13 +14,13 @@ class CompletionNotConfiguredError(Exception):
 class CompletionManager:
     def __init__(self):
         self.completion_handler: (
-            Callable[["RequestContext", CompleteRequest], Awaitable[CompleteResult]]
+            Callable[["MessageContext", CompleteRequest], Awaitable[CompleteResult]]
             | None
         ) = None
         self.logger = logging.getLogger("conduit.server.protocol.completions")
 
     async def handle_complete(
-        self, context: "RequestContext", request: CompleteRequest
+        self, context: "MessageContext", request: CompleteRequest
     ) -> CompleteResult:
         """Generate a completion for a given argument.
 

src/conduit/server/protocol/logging.py

@@ -5,7 +5,7 @@
 from conduit.protocol.logging import LoggingLevel, SetLevelRequest
 
 if TYPE_CHECKING:
-    from conduit.server.request_context import RequestContext
+    from conduit.server.message_context import MessageContext
 
 
 class LoggingManager:
@@ -55,7 +55,7 @@ def cleanup_client(self, client_id: str) -> None:
         self._client_log_levels.pop(client_id, None)
 
     async def handle_set_level(
-        self, context: "RequestContext", request: SetLevelRequest
+        self, context: "MessageContext", request: SetLevelRequest
     ) -> EmptyResult:
         """Set the MCP protocol logging level for a specific client.