Merge branch 'awslabs:main' into main

Author: im-michaelc

.github/CODEOWNERS

@@ -33,7 +33,7 @@ NOTICE                                           @awslabs/mcp-admins
 /src/aws-bedrock-data-automation-mcp-server      @awslabs/mcp-admins @awslabs/mcp-maintainers  @krokoko @theagenticguy @alexa-perlov # @ayush987goyal
 /src/aws-dataprocessing-mcp-server               @awslabs/mcp-admins @awslabs/mcp-maintainers  @naikvaib @LiyuanLD @ckha2000 @raghav1397 @chappidim @yuxiaorun
 /src/aws-diagram-mcp-server                      @awslabs/mcp-admins @awslabs/mcp-maintainers  @MichaelWalker-git
-/src/aws-documentation-mcp-server                @awslabs/mcp-admins @awslabs/mcp-maintainers  @Lavoiedavidw @JonLim @tuanknguyen
+/src/aws-documentation-mcp-server                @awslabs/mcp-admins @awslabs/mcp-maintainers  @Lavoiedavidw @JonLim @tuanknguyen @AadityaBhoota @artb30 @alexisareyn
 /src/document-loader-mcp-server                  @awslabs/mcp-admins @awslabs/mcp-maintainers  @andywidjaja @hvital @HaoOliv
 /src/aws-healthomics-mcp-server                  @awslabs/mcp-admins @awslabs/mcp-maintainers  @markjschreiber @WIIASD @a-li @alxawan
 /src/aws-iac-mcp-server                          @awslabs/mcp-admins @awslabs/mcp-maintainers  @kdbrogan @vishaalmehrishi @aemada-aws @kumvprat

src/aws-api-mcp-server/CHANGELOG.md

@@ -7,8 +7,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
-### Fixed
+### Changed
+
+- Updated default AWS API connect and read timeout (#1876)
+- Upgrade AWS CLI to v1.43.10 (#1891)
+- Support `aws login` (#1873)
+- AWS CLI operations 'help' command support (#1858)
 
+## [1.1.8] - 2025-11-28
+
+### Fixed
 - Origin header parsing (#1851)
 
 ## [1.1.7] - 2025-11-20

src/aws-api-mcp-server/README.md

@@ -17,9 +17,9 @@ This server acts as a bridge between AI assistants and AWS services, allowing yo
 
 Choose the installation method that best fits your workflow and get started with your favorite assistant with MCP support, like Q CLI, Cursor or Cline.
 
-| Cursor | VS Code |
-|:------:|:-------:|
-| [![Install MCP Server](https://cursor.com/deeplink/mcp-install-light.svg)](https://cursor.com/en/install-mcp?name=awslabs.aws-api-mcp-server&config=eyJjb21tYW5kIjoidXZ4IGF3c2xhYnMuYXdzLWFwaS1tY3Atc2VydmVyQGxhdGVzdCIsImVudiI6eyJBV1NfUkVHSU9OIjoidXMtZWFzdC0xIn0sImRpc2FibGVkIjpmYWxzZSwiYXV0b0FwcHJvdmUiOltdfQ%3D%3D) | [![Install on VS Code](https://img.shields.io/badge/Install_on-VS_Code-FF9900?style=flat-square&logo=visualstudiocode&logoColor=white)](https://insiders.vscode.dev/redirect/mcp/install?name=AWS%20API%20MCP%20Server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.aws-api-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22AWS_REGION%22%3A%22us-east-1%22%7D%2C%22type%22%3A%22stdio%22%7D) |
+| Cursor | VS Code | Kiro |
+|:------:|:-------:|:----:|
+| [![Install MCP Server](https://cursor.com/deeplink/mcp-install-light.svg)](https://cursor.com/en/install-mcp?name=awslabs.aws-api-mcp-server&config=eyJjb21tYW5kIjoidXZ4IGF3c2xhYnMuYXdzLWFwaS1tY3Atc2VydmVyQGxhdGVzdCIsImVudiI6eyJBV1NfUkVHSU9OIjoidXMtZWFzdC0xIn0sImRpc2FibGVkIjpmYWxzZSwiYXV0b0FwcHJvdmUiOltdfQ%3D%3D) | [![Install on VS Code](https://img.shields.io/badge/Install_on-VS_Code-FF9900?style=flat-square&logo=visualstudiocode&logoColor=white)](https://insiders.vscode.dev/redirect/mcp/install?name=AWS%20API%20MCP%20Server&config=%7B%22command%22%3A%22uvx%22%2C%22args%22%3A%5B%22awslabs.aws-api-mcp-server%40latest%22%5D%2C%22env%22%3A%7B%22AWS_REGION%22%3A%22us-east-1%22%7D%2C%22type%22%3A%22stdio%22%7D) | [![Add to Kiro](https://kiro.dev/images/add-to-kiro.svg)](https://kiro.dev/launch/mcp/add?name=awslabs.aws-api-mcp-server&config=%7B%22command%22%3A%20%22uvx%22%2C%20%22args%22%3A%20%5B%22awslabs.aws-api-mcp-server%40latest%22%5D%2C%20%22disabled%22%3A%20false%2C%20%22autoApprove%22%3A%20%5B%5D%7D) |
 
 
 

src/aws-api-mcp-server/awslabs/aws_api_mcp_server/__init__.py

@@ -14,4 +14,4 @@
 
 """awslabs.aws-api-mcp-server"""
 
-__version__ = '1.1.8'
+__version__ = '1.2.0'

src/aws-api-mcp-server/awslabs/aws_api_mcp_server/core/aws/service.py

@@ -16,6 +16,7 @@
 from ..aws.services import get_awscli_driver
 from ..common.config import AWS_API_MCP_PROFILE_NAME, DEFAULT_REGION
 from ..common.errors import AwsApiMcpError, Failure
+from ..common.help_command import generate_help_document
 from ..common.models import (
     AwsCliAliasResponse,
     Consent,
@@ -36,7 +37,7 @@
 from ..security.policy import PolicyDecision, SecurityPolicy
 from .driver import interpret_command as _interpret_command
 from awslabs.aws_api_mcp_server.core.common.command import IRCommand
-from awslabs.aws_api_mcp_server.core.common.helpers import operation_timer
+from awslabs.aws_api_mcp_server.core.common.helpers import as_json, operation_timer
 from fastmcp import Context
 from fastmcp.server.elicitation import AcceptedElicitation
 from io import StringIO
@@ -124,6 +125,24 @@ def validate(ir: IRTranslation) -> ProgramValidationResponse:
     )
 
 
+async def get_help_document(
+    cli_command: str,
+    ctx: Context,
+) -> ProgramInterpretationResponse:
+    """Get help command response."""
+    args = split_cli_command(cli_command)[1:]
+    service_name = args[0]
+    operation_name = args[1]
+    help_document = generate_help_document(service_name, operation_name)
+    if help_document is None:
+        error_message = 'Failed to generate help document'
+        await ctx.error(error_message)
+        raise AwsApiMcpError(error_message)
+    return ProgramInterpretationResponse(
+        response=InterpretationResponse(json=as_json(help_document), status_code=200, error=None)
+    )
+
+
 def execute_awscli_customization(
     cli_command: str,
     ir_command: IRCommand,

src/aws-api-mcp-server/awslabs/aws_api_mcp_server/core/common/command.py

@@ -45,6 +45,7 @@ class IRCommand:
     profile: str | None = None
     client_side_filter: ParsedResult | None = None
     is_awscli_customization: bool = False
+    is_help_operation: bool = False
     output_file: OutputFile | None = None
     endpoint_url: str | None = None
 

src/aws-api-mcp-server/awslabs/aws_api_mcp_server/core/common/config.py

@@ -117,7 +117,7 @@ def get_user_agent_extra() -> str:
 
         if client_params := ctx.session.client_params:
             user_agent_extra += (
-                f' MCPClient/{client_params.clientInfo.name}-{client_params.clientInfo.version}'
+                f' MCPClient/{client_params.clientInfo.name}#{client_params.clientInfo.version}'
             )
     except RuntimeError:
         pass  # get_context throws a RuntimeError when called outside of a server request, we can safely ingore that
@@ -150,3 +150,5 @@ def get_user_agent_extra() -> str:
 ENDPOINT_SUGGEST_AWS_COMMANDS = os.getenv(
     'ENDPOINT_SUGGEST_AWS_COMMANDS', 'https://api-mcp.global.api.aws/suggest-aws-commands'
 )
+CONNECT_TIMEOUT_SECONDS = 10
+READ_TIMEOUT_SECONDS = 60

src/aws-api-mcp-server/awslabs/aws_api_mcp_server/core/common/help_command.py

@@ -0,0 +1,84 @@
+# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+import re
+from ..parser.parser import driver
+from awscli.bcdoc.restdoc import ReSTDocument
+from awscli.clidriver import ServiceCommand
+from awscli.customizations.commands import BasicCommand
+from loguru import logger
+from typing import Any
+
+
+IGNORED_ARGUMENTS = frozenset({'cli-input-json', 'generate-cli-skeleton'})
+
+
+def _clean_text(text: str) -> str:
+    text = re.sub(r'\s+', ' ', text)  # Normalize whitespace
+    return text.strip()
+
+
+def _clean_description(description: str) -> str:
+    """This removes the section title added by the help event handlers."""
+    description = re.sub(r'=+\s*Description\s*=+\s', '', description)
+    return _clean_text(description)
+
+
+def generate_help_document(service_name: str, operation_name: str) -> dict[str, Any] | None:
+    """Generate a document for a single AWS API operation."""
+    command = driver._get_command_table()[service_name]
+    if isinstance(command, BasicCommand):
+        command_table = command.subcommand_table
+    elif isinstance(command, ServiceCommand):
+        command_table = command._get_command_table()
+    else:
+        logger.warning(f'Unknown command type {service_name} {command}')
+        return None
+
+    operation = command_table[operation_name]
+
+    help_command = operation.create_help_command()
+    event_handler = help_command.EventHandlerClass(help_command)
+
+    # Get description
+    event_handler.doc_description(help_command)
+    description = _clean_description(help_command.doc.getvalue().decode('utf-8')).strip()
+
+    # Get parameters
+    params = {}
+    seen_arg_groups = set()
+    for arg_name, arg in help_command.arg_table.items():
+        if getattr(arg, '_UNDOCUMENTED', False) or arg_name in IGNORED_ARGUMENTS:
+            continue
+        if arg.group_name in seen_arg_groups:
+            continue
+        help_command.doc = ReSTDocument()
+        if hasattr(event_handler, 'doc'):
+            event_handler.doc = help_command.doc
+        event_handler.doc_option(help_command=help_command, arg_name=arg_name)
+        key = arg.group_name if arg.group_name else arg_name
+        params[key] = _clean_text(help_command.doc.getvalue().decode('utf-8').strip())
+        params[key] = params[key][:500] if len(params[key]) > 500 else params[key]
+        if arg.group_name:
+            # To avoid adding arguments like --disable-rollback and --no-disable-rollback separately
+            # we need to make sure a group name is only processed once
+            # event_handler.doc_option takes care of mentioning all arguments in a group
+            # so we can safely skip the remaining arguments in the group
+            seen_arg_groups.add(arg.group_name)
+
+    return {
+        'command': f'aws {service_name} {operation_name}',
+        'description': description,
+        'parameters': params,
+    }

src/aws-api-mcp-server/awslabs/aws_api_mcp_server/core/common/helpers.py

@@ -65,6 +65,11 @@ def expand_user_home_directory(args: list[str]) -> list[str]:
     return [os.path.expanduser(arg) for arg in args]
 
 
+def is_help_operation(args: list[Any]) -> bool:
+    """Check if the command is a help operation."""
+    return any(str(arg).lower() in ['help', '--help'] for arg in args)
+
+
 def validate_aws_region(region: str):
     """Checks if provided region is a valid AWS Region."""
     aws_region_pattern = '^(\\w{1,10})-(\\w{1,10}-)?(\\w{1,10})-\\d{1,2}$'

src/aws-api-mcp-server/awslabs/aws_api_mcp_server/core/parser/interpretation.py

@@ -18,7 +18,7 @@
     extract_pagination_config,
 )
 from ..common.command import IRCommand, OutputFile
-from ..common.config import get_user_agent_extra
+from ..common.config import CONNECT_TIMEOUT_SECONDS, READ_TIMEOUT_SECONDS, get_user_agent_extra
 from ..common.file_system_controls import validate_file_path
 from ..common.helpers import operation_timer
 from botocore.config import Config
@@ -51,8 +51,8 @@ def interpret(
 
     config = Config(
         region_name=region,
-        connect_timeout=TIMEOUT_AFTER_SECONDS,
-        read_timeout=TIMEOUT_AFTER_SECONDS,
+        connect_timeout=CONNECT_TIMEOUT_SECONDS,
+        read_timeout=READ_TIMEOUT_SECONDS,
         retries={'max_attempts': 3, 'mode': 'adaptive'},
         user_agent_extra=get_user_agent_extra(),
     )