Check for merge conflicts in a worktree or the main repository
AI agents call treehouse_conflicts to retrieve information from Treehouse Worktree without modifying anything — typically the context-gathering step in research, monitoring, and reporting workflows, before the agent takes action elsewhere.
This tool reads and reports the state of merge conflicts in a worktree or repository. It performs a read-only inspection with no side effects. Severity is low because it only surfaces information and cannot cause damage if misused.
From the tool's definition "Check for merge conflicts" — purely retrieves/queries conflict status without modifying anything
Attacks that exploit this kind of access
Check for merge conflicts in a worktree or the main repository. It is categorised as a Read tool in the Treehouse Worktree MCP Server, which means it retrieves data without modifying state.
Register the Treehouse Worktree MCP server in PolicyLayer and add a rule for treehouse_conflicts: allow, deny, rate-limit, or require approval. Point your MCP client at the PolicyLayer proxy URL and the rule is enforced on every call, before it reaches Treehouse Worktree. Nothing to install.
treehouse_conflicts is a Read tool with low risk. Read-only tools are generally safe to allow by default.
Yes. Add a rate_limit block to the treehouse_conflicts rule in your PolicyLayer policy. For example, setting max: 10 and window: 60 limits the tool to 10 calls per minute. Rate limits are tracked per agent session and reset automatically.
Set action: deny in the PolicyLayer policy for treehouse_conflicts. The AI agent will receive a policy violation error and cannot call the tool. You can also include a reason field to explain why the tool is blocked.
treehouse_conflicts is provided by the Treehouse Worktree MCP server (mark-hingston/treehouse-worktree). PolicyLayer sits as a proxy in front of this server to enforce policies before tool calls reach the server.
Every MCP server has a record like this.
Type a name, get the same breakdown: verified identity, auth posture, risk grade, capabilities, recommended policy.
Teams ship this data inside their own products. See what a licence covers →