Skip to content
This repository was archived by the owner on Jan 23, 2026. It is now read-only.

Fix Amp MCP config parsing to support JSON with comments#386

Merged
jhaynie merged 2 commits intomainfrom
devin/1749815994-investigate-amp-mcp-config-error
Jun 13, 2025
Merged

Fix Amp MCP config parsing to support JSON with comments#386
jhaynie merged 2 commits intomainfrom
devin/1749815994-investigate-amp-mcp-config-error

Conversation

@devin-ai-integration
Copy link
Copy Markdown
Contributor

Fix Amp MCP Config Parsing to Support JSON with Comments

Problem

The Agentuity CLI was failing to load MCP config for Amp (VS Code) with the error:

failed to load MCP config for Amp (VS Code): invalid character '/' looking for beginning of value

This error occurred because Amp configurations attempt to parse VS Code's settings.json file, which contains comments that are valid in VS Code but invalid in strict JSON parsing.

Solution

  • Added loadConfigForAmp function that uses the existing github.com/marcozac/go-jsonc library to parse JSON with comments
  • Modified Detect and Uninstall functions to conditionally use JSONC parsing for Amp configs (identified by IsAMP: true)
  • Maintained backward compatibility by continuing to use strict JSON parsing for non-Amp MCP configs

Changes

  • Added import for github.com/marcozac/go-jsonc
  • Created loadConfigForAmp() function using JSONC parsing
  • Updated config loading logic in Detect() and Uninstall() functions to use appropriate parser based on config.IsAMP flag

Testing

  • ✅ Code compiles successfully with go build -v
  • ✅ Follows existing code patterns and uses established JSONC library already in the codebase
  • ✅ Maintains backward compatibility for existing MCP configs

Link to Devin run

https://app.devin.ai/sessions/7144f22861c54068a3f3690e22c3bf60

Requested by: jhaynie@agentuity.com

- Add loadConfigForAmp function using github.com/marcozac/go-jsonc library
- Modify Detect and Uninstall functions to use JSONC parsing for IsAMP configs
- Resolves 'invalid character \'/\' looking for beginning of value' error
- Maintains backward compatibility for non-Amp MCP configs

Co-Authored-By: Rick Blalock <rickblalock@mac.com>
@devin-ai-integration
Copy link
Copy Markdown
Contributor Author

🤖 Devin AI Engineer

I'll be helping with this pull request! Here's what you should know:

✅ I will automatically:

  • Address comments on this PR. Add '(aside)' to your comment to have me ignore it.
  • Look at CI failures and help fix them

Note: I can only respond to comments from users who have write access to this repository.

⚙️ Control Options:

  • Disable automatic comment and CI monitoring

@coderabbitai
Copy link
Copy Markdown
Contributor

coderabbitai Bot commented Jun 13, 2025

Important

Review skipped

Bot user detected.

To trigger a single review, invoke the @coderabbitai review command.

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.


🪧 Tips

Chat

There are 3 ways to chat with CodeRabbit:

  • Review comments: Directly reply to a review comment made by CodeRabbit. Example:
    • I pushed a fix in commit <commit_id>, please review it.
    • Explain this complex logic.
    • Open a follow-up GitHub issue for this discussion.
  • Files and specific lines of code (under the "Files changed" tab): Tag @coderabbitai in a new review comment at the desired location with your query. Examples:
    • @coderabbitai explain this code block.
    • @coderabbitai modularize this function.
  • PR comments: Tag @coderabbitai in a new PR comment to ask questions about the PR branch. For the best results, please provide a very specific query, as very limited context is provided in this mode. Examples:
    • @coderabbitai gather interesting stats about this repository and render them as a table. Additionally, render a pie chart showing the language distribution in the codebase.
    • @coderabbitai read src/utils.ts and explain its main purpose.
    • @coderabbitai read the files in the src/scheduler package and generate a class diagram using mermaid and a README in the markdown format.
    • @coderabbitai help me debug CodeRabbit configuration file.

Support

Need help? Join our Discord community for assistance with any issues or questions.

Note: Be mindful of the bot's finite context window. It's strongly recommended to break down tasks such as reading entire modules into smaller chunks. For a focused discussion, use review comments to chat about specific files and their changes, instead of using the PR comments.

CodeRabbit Commands (Invoked using PR comments)

  • @coderabbitai pause to pause the reviews on a PR.
  • @coderabbitai resume to resume the paused reviews.
  • @coderabbitai review to trigger an incremental review. This is useful when automatic reviews are disabled for the repository.
  • @coderabbitai full review to do a full review from scratch and review all the files again.
  • @coderabbitai summary to regenerate the summary of the PR.
  • @coderabbitai generate sequence diagram to generate a sequence diagram of the changes in this PR.
  • @coderabbitai resolve resolve all the CodeRabbit review comments.
  • @coderabbitai configuration to show the current CodeRabbit configuration for the repository.
  • @coderabbitai help to get help.

Other keywords and placeholders

  • Add @coderabbitai ignore anywhere in the PR description to prevent this PR from being reviewed.
  • Add @coderabbitai summary to generate the high-level summary at a specific location in the PR description.
  • Add @coderabbitai anywhere in the PR title to generate the title automatically.

CodeRabbit Configuration File (.coderabbit.yaml)

  • You can programmatically configure CodeRabbit by adding a .coderabbit.yaml file to the root of your repository.
  • Please see the configuration documentation for more information.
  • If your editor has YAML language server enabled, you can add the path at the top of this file to enable auto-completion and validation: # yaml-language-server: $schema=https://coderabbit.ai/integrations/schema.v2.json

Documentation and Community

  • Visit our Documentation for detailed information on how to use CodeRabbit.
  • Join our Discord Community to get help, request features, and share feedback.
  • Follow us on X/Twitter for updates and announcements.

Comment thread internal/mcp/config.go Outdated
return &config, nil
}

func loadConfigForAmp(path string) (*MCPConfig, error) {
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lets just use this for loadConfig not just for AMP that way we can have JSON comments in other mcp configs too

- Replace loadConfig function to use jsonc.Unmarshal for all configs
- Remove loadConfigForAmp function and conditional logic
- All MCP configs now support JSON with comments, not just Amp configs
- Addresses GitHub PR feedback to enable comments in all MCP configs

Co-Authored-By: Rick Blalock <rickblalock@mac.com>
@jhaynie jhaynie merged commit 169e5a4 into main Jun 13, 2025
20 of 26 checks passed
@jhaynie jhaynie deleted the devin/1749815994-investigate-amp-mcp-config-error branch June 13, 2025 14:30
devin-ai-integration Bot added a commit that referenced this pull request Jun 13, 2025
This completes the JSONC parsing fix started in PR #386. While the loadConfig
function was updated to use jsonc.Unmarshal, the custom MCPConfig.UnmarshalJSON
method still used json.Unmarshal in three locations, causing the 'invalid
character \'/\' looking for beginning of value' error to persist when parsing
VS Code settings with comments.

Updated all three json.Unmarshal calls to jsonc.Unmarshal:
- Line 69: Unmarshaling into auxiliary struct
- Line 74: Unmarshaling into map for extra fields
- Line 85: Unmarshaling individual values in extra fields

This ensures consistent JSONC parsing throughout the MCP config system.

Co-Authored-By: Rick Blalock <rickblalock@mac.com>
jhaynie pushed a commit that referenced this pull request Jun 13, 2025
* Fix MCPConfig.UnmarshalJSON to use JSONC parsing for comment support

This completes the JSONC parsing fix started in PR #386. While the loadConfig
function was updated to use jsonc.Unmarshal, the custom MCPConfig.UnmarshalJSON
method still used json.Unmarshal in three locations, causing the 'invalid
character \'/\' looking for beginning of value' error to persist when parsing
VS Code settings with comments.

Updated all three json.Unmarshal calls to jsonc.Unmarshal:
- Line 69: Unmarshaling into auxiliary struct
- Line 74: Unmarshaling into map for extra fields
- Line 85: Unmarshaling individual values in extra fields

This ensures consistent JSONC parsing throughout the MCP config system.

Co-Authored-By: Rick Blalock <rickblalock@mac.com>

* Complete JSONC parsing fix: convert MarshalJSON method and add comprehensive tests

- Fix remaining json.Unmarshal call in MarshalJSON method to use jsonc.Unmarshal
- Add comprehensive test cases for JSONC comment support including:
  - User's exact case: /* test */ comment at top of JSON
  - Single line comments (//)
  - Multi-line comments (/* */)
  - Mixed comment types
  - Empty JSON with comments
  - Comments at end of JSON
  - Complete load-save cycle testing
  - Cursor settings with comments testing

This completes the JSONC parsing implementation throughout the entire MCP config system,
resolving the persistent 'unexpected end of JSON input' error when parsing VS Code/Cursor
settings files containing comments.

Co-Authored-By: Rick Blalock <rickblalock@mac.com>

---------

Co-authored-by: Devin AI <158243242+devin-ai-integration[bot]@users.noreply.github.com>
Co-authored-by: Rick Blalock <rickblalock@mac.com>
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants