resolve_conflict — Agent Therapy MCP Tool Read-only
resolve_conflict
(resolve conflict) is one of 8 tools on the
Agent Therapy
MCP server. Connect the server and your client discovers it on the handshake.
by client
How to call resolve_conflict from your client
- Claude Code Agent Therapy resolve_conflict run in your project directory
- Claude Desktop Agent Therapy resolve_conflict ~/Library/Application Support/Claude/claude_desktop_config.json
- Cursor Agent Therapy resolve_conflict ~/.cursor/mcp.json
- VS Code Agent Therapy resolve_conflict .vscode/mcp.json
- Zed Agent Therapy resolve_conflict ~/.config/zed/settings.json
- Windsurf Agent Therapy resolve_conflict ~/.codeium/windsurf/mcp_config.json
- Cline Agent Therapy resolve_conflict ~/Library/Application Support/Code/User/globalStorage/saoudrizwan.claude-dev/settings/cline_mcp_settings.json
- Gemini CLI Agent Therapy resolve_conflict ~/.gemini/settings.json
- Grok Agent Therapy resolve_conflict .mcp.json (in your project root)
- ChatGPT Agent Therapy resolve_conflict Settings → Connectors → Advanced → Developer mode
- Claude.ai Agent Therapy resolve_conflict Settings → Connectors → Add custom connector
- LangChain Agent Therapy resolve_conflict pip install langchain-mcp-adapters
Fastest route
claude mcp add --transport http agent-therapy https://br-shiny-salad-baig3dad-api.compute.c-8.eu-central-1.aws.neon.tech/mcpOther tools on this server
This list was read from the server itself, by connecting to it and calling tools/list on 11 October 2026. It is what
the server actually exposes, not what its listing claims.
Mutating and Read-only are read off each tool's name, not its schema — a hint, not a guarantee. The registry stores tool names only; connect the server for its live schemas.