diff --git a/mcp/src/openisle_mcp/server.py b/mcp/src/openisle_mcp/server.py
index 25a8f8331..e93652c89 100644
--- a/mcp/src/openisle_mcp/server.py
+++ b/mcp/src/openisle_mcp/server.py
@@ -57,7 +57,9 @@ class SessionTokenManager:
     def __init__(self) -> None:
         self._tokens: WeakKeyDictionary[Any, str] = WeakKeyDictionary()
 
-    def resolve(self, ctx: Context | None, token: str | None) -> str | None:
+    def resolve(
+        self, ctx: Context | None, token: str | None = None
+    ) -> str | None:
         """Resolve and optionally persist the token for the current session."""
 
         session = self._get_session(ctx)
@@ -127,8 +129,8 @@ async def lifespan(_: FastMCP):
 app = FastMCP(
     name="openisle-mcp",
     instructions=(
-        "Use this server to search OpenIsle content, reply to posts and comments with an "
-        "authentication token, retrieve details for a specific post, list posts created "
+        "Use this server to search OpenIsle content, reply to posts and comments with "
+        "session-managed authentication, retrieve details for a specific post, list posts created "
         "within a recent time window, and review unread notification messages."
     ),
     host=settings.host,
@@ -190,7 +192,7 @@ async def search(
 
 @app.tool(
     name="reply_to_post",
-    description="Create a comment on a post using an authentication token.",
+    description="Create a comment on a post using session authentication.",
     structured_output=True,
 )
 async def reply_to_post(
@@ -209,15 +211,6 @@ async def reply_to_post(
             description="Optional captcha solution if the backend requires it.",
         ),
     ] = None,
-    token: Annotated[
-        str | None,
-        PydanticField(
-            default=None,
-            description=(
-                "Optional JWT bearer token. When omitted the configured access token is used."
-            ),
-        ),
-    ] = None,
     ctx: Context | None = None,
 ) -> CommentCreateResult:
     """Create a comment on a post and return the backend payload."""
@@ -228,7 +221,7 @@ async def reply_to_post(
 
     sanitized_captcha = captcha.strip() if isinstance(captcha, str) else None
 
-    resolved_token = session_token_manager.resolve(ctx, token)
+    resolved_token = session_token_manager.resolve(ctx)
 
     try:
         logger.info(
@@ -297,7 +290,7 @@ async def reply_to_post(
 
 @app.tool(
     name="reply_to_comment",
-    description="Reply to an existing comment using an authentication token.",
+    description="Reply to an existing comment using session authentication.",
     structured_output=True,
 )
 async def reply_to_comment(
@@ -316,15 +309,6 @@ async def reply_to_comment(
             description="Optional captcha solution if the backend requires it.",
         ),
     ] = None,
-    token: Annotated[
-        str | None,
-        PydanticField(
-            default=None,
-            description=(
-                "Optional JWT bearer token. When omitted the configured access token is used."
-            ),
-        ),
-    ] = None,
     ctx: Context | None = None,
 ) -> CommentReplyResult:
     """Create a reply for a comment and return the backend payload."""
@@ -335,7 +319,7 @@ async def reply_to_comment(
 
     sanitized_captcha = captcha.strip() if isinstance(captcha, str) else None
 
-    resolved_token = session_token_manager.resolve(ctx, token)
+    resolved_token = session_token_manager.resolve(ctx)
 
     try:
         logger.info(
@@ -462,18 +446,11 @@ async def get_post(
         int,
         PydanticField(ge=1, description="Identifier of the post to retrieve."),
     ],
-    token: Annotated[
-        str | None,
-        PydanticField(
-            default=None,
-            description="Optional JWT bearer token to view the post as an authenticated user.",
-        ),
-    ] = None,
     ctx: Context | None = None,
 ) -> PostDetail:
     """Fetch post details from the backend and validate the response."""
 
-    resolved_token = session_token_manager.resolve(ctx, token)
+    resolved_token = session_token_manager.resolve(ctx)
 
     try:
         logger.info("Fetching post details for post_id=%s", post_id)
@@ -542,20 +519,11 @@ async def list_unread_messages(
             description="Number of unread notifications to include per page.",
         ),
     ] = 30,
-    token: Annotated[
-        str | None,
-        PydanticField(
-            default=None,
-            description=(
-                "Optional JWT bearer token. When omitted the configured access token is used."
-            ),
-        ),
-    ] = None,
     ctx: Context | None = None,
 ) -> UnreadNotificationsResponse:
     """Retrieve unread notifications and return structured data."""
 
-    resolved_token = session_token_manager.resolve(ctx, token)
+    resolved_token = session_token_manager.resolve(ctx)
 
     try:
         logger.info(