amazon-bedrock-agentcore-mcp-server: get_memory_guide returns text with unresolved git merge conflict markers
Author: pppqwe52Created Sep 16, 2026Updated Sep 16, 2026
Describe the bug
get_memory_guide (no arguments) returns its reference text with unresolved git merge conflict markers embedded in the "Prerequisites → For CLI commands referenced in this guide" section. Three nested conflict markers appear verbatim in the tool output, including commit short hashes and commit messages from the source repo's history.
Expected Behavior
The guide text returned by get_memory_guide should be clean prose with no git conflict markers — i.e. the merge that produced the current guide content should have been fully resolved before release/publish.
Current Behavior
Calling the get_memory_guide MCP tool returns (excerpt):
### For CLI commands referenced in this guide
The `agentcore` CLI is a separate tool for project scaffolding, deployment,
and management. Install it before using any `agentcore` commands:
```bash
<<<<<<< HEAD
<<<<<<< HEAD
npm install -g @aws/agentcore-cli
=======
npm install -g @anthropic-ai/agentcore-cli
>>>>>>> 66f98ac2 (feat: add User agent file to track usage metrics)
=======
npm install -g @aws/agentcore-cli
>>>>>>> 45897c56 (fix: update cli install command)
The rest of the guide (Memory strategies, IAM permissions, cost tiers, common patterns, etc.) reads as normal prose with no conflict markers — only this one CLI-install snippet is affected.
### Reproduction Steps
1. Configure the `amazon-bedrock-agentcore` MCP server (as distributed via `awslabs/mcp`, `src/amazon-bedrock-agentcore-mcp-server`).
2. Call the `get_memory_guide` tool with no arguments.
3. Inspect the returned guide text's "Prerequisites" section — the CLI install command block contains the conflict markers shown above.
### Possible Solution
Looks like a merge/rebase in the guide's source markdown was never resolved before being packaged into the server's static reference text. Re-diffing the guide source against its git history around commits `66f98ac2` and `45897c56` should surface the actual intended install command (likely `npm install -g @aws/agentcore-cli`, since both conflict layers converge on that same line, but this should be confirmed against the correct package name history).
### Additional Information/Context
Discovered while querying AgentCore Memory capabilities (isolation model, cost tiers) to inform an architecture decision on an unrelated project — not blocking, since the rest of the guide's content was usable, but it's a data-integrity smell that suggests the guide's build/publish pipeline for `get_memory_guide` doesn't validate for leftover conflict markers before shipping.
### OS
Linux (Amazon Linux 2023, kernel 6.1.172)
### Server
amazon-bedrock-agentcore-mcp-server
### Server Version
Unknown — accessed via a bundled MCP integration; the exact pinned server version was not exposed to the calling client.
### Region experiencing the issue
N/A — `get_memory_guide` is a static reference/documentation tool with no AWS API call or region involved.
### Other information
None.
### Service quota
- [x] I have reviewed the service quotas for this construct (N/A — no AWS resources are provisioned by this bug or its reproduction).Source: awslabs/mcp