fix(iam-mcp-server): inject ctx instead of requiring it

list_users, get_user, and create_user annotated ctx as CallToolResult, so
the SDK treated it as a required argument and every call failed with
"ctx Field required". Annotate ctx as the MCP Context so the server
injects it.

Author: mangeshraut712

src/iam-mcp-server/awslabs/iam_mcp_server/server.py

@@ -39,8 +39,8 @@
     UsersListResponse,
 )
 from loguru import logger
+from mcp.server.mcpserver import Context as McpContext
 from mcp.server.mcpserver import MCPServer
-from mcp.types import CallToolResult
 from pydantic import Field
 from typing import Any, Dict, List, Optional, Union
 
@@ -271,7 +271,7 @@ def _require_confirmation(operation: str, details: str) -> None:
 
 @mcp.tool()
 async def list_users(
-    ctx: CallToolResult,
+    ctx: McpContext,
     path_prefix: Optional[str] = Field(
         description='Path prefix to filter users (e.g., "/division_abc/")', default=None
     ),
@@ -339,7 +339,7 @@ async def list_users(
 
 @mcp.tool()
 async def get_user(
-    ctx: CallToolResult, user_name: str = Field(description='The name of the IAM user to retrieve')
+    ctx: McpContext, user_name: str = Field(description='The name of the IAM user to retrieve')
 ) -> UserDetailsResponse:
     """Get detailed information about a specific IAM user.
 
@@ -427,7 +427,7 @@ async def get_user(
 
 @mcp.tool()
 async def create_user(
-    ctx: CallToolResult,
+    ctx: McpContext,
     user_name: str = Field(description='The name of the new IAM user'),
     path: str = Field(description='The path for the user', default='/'),
     permissions_boundary: Optional[str] = Field(

src/iam-mcp-server/tests/test_server.py

@@ -138,6 +138,62 @@ async def test_list_users_mock():
         assert result.is_truncated is False
 
 
+@pytest.mark.asyncio
+async def test_user_tools_do_not_require_ctx():
+    """Context is injected for list_users, get_user, and create_user, not a client argument."""
+    from awslabs.iam_mcp_server.server import mcp
+    from mcp.types import CallToolResult, TextContent
+
+    tools = {tool.name: tool for tool in await mcp.list_tools()}
+    for name in ('list_users', 'get_user', 'create_user'):
+        schema = tools[name].input_schema
+        assert 'ctx' not in schema.get('properties', {})
+        assert 'ctx' not in (schema.get('required') or [])
+
+    assert not tools['list_users'].input_schema.get('required')
+    assert tools['get_user'].input_schema.get('required') == ['user_name']
+    assert tools['create_user'].input_schema.get('required') == ['user_name']
+
+    created = datetime(2023, 1, 1)
+    user = {
+        'UserName': 'test-user',
+        'UserId': 'AIDACKCEVSQ6C2EXAMPLE',
+        'Arn': 'arn:aws:iam::123456789012:user/test-user',
+        'Path': '/',
+        'CreateDate': created,
+    }
+    mock_client = Mock()
+    mock_client.list_users.return_value = {'Users': [user], 'IsTruncated': False}
+    mock_client.get_user.return_value = {'User': user}
+    mock_client.list_attached_user_policies.return_value = {'AttachedPolicies': []}
+    mock_client.list_user_policies.return_value = {'PolicyNames': []}
+    mock_client.list_groups_for_user.return_value = {'Groups': []}
+    mock_client.list_access_keys.return_value = {'AccessKeyMetadata': []}
+    mock_client.create_user.return_value = {'User': user}
+
+    Context.initialize(readonly=False, require_confirmation=False)
+    try:
+        with patch('awslabs.iam_mcp_server.server.get_iam_client', return_value=mock_client):
+            listed = await mcp.call_tool('list_users', {})
+            fetched = await mcp.call_tool('get_user', {'user_name': 'test-user'})
+            created_user = await mcp.call_tool(
+                'create_user', {'user_name': 'test-user', 'confirmed': True}
+            )
+    finally:
+        Context.initialize()
+
+    for result in (listed, fetched, created_user):
+        assert isinstance(result, CallToolResult)
+        assert result.is_error is False
+        text = result.content[0]
+        assert isinstance(text, TextContent)
+        assert 'Field required' not in text.text
+
+    mock_client.list_users.assert_called_once()
+    mock_client.get_user.assert_called_once_with(UserName='test-user')
+    mock_client.create_user.assert_called_once()
+
+
 @pytest.mark.asyncio
 async def test_create_user_readonly_mode():
     """Test create_user function in readonly mode."""