Skip to main content
Glama
Sign In
Kiln

Kiln

by codeofaxel
OverviewSchemaSourceRelated ServersDiscussionsAdmin
Python

detect_feature_merge_conflicts

Read-only

Detects three-way semantic merge conflicts between feature versions by comparing source, target, and common ancestor so you can resolve design changes before merging.

Instructions

Three-way semantic-merge conflict detection for features.

Needs Kiln Pro.

Tool call template

Replace each placeholder with a value matching the input schema. Only required parameters are included; add optional parameters as needed.

{
  "id": 1,
  "jsonrpc": "2.0",
  "method": "tools/call",
  "params": {
    "arguments": {
      "ancestor_feature_version_id": "<ancestor_feature_version_id>",
      "source_feature_version_id": "<source_feature_version_id>",
      "target_feature_version_id": "<target_feature_version_id>"
    },
    "name": "detect_feature_merge_conflicts"
  }
}

Input Schema

NameRequiredDescriptionDefault
source_feature_version_idYesFeature version id of the side being merged in.
target_feature_version_idYesFeature version id of the side being merged into. All three must exist (``FEATURE_NOT_FOUND``).
ancestor_feature_version_idYesFeature version id of the common ancestor both sides started from.

Schema Changelog

Changes observed during successful MCP inspections.

  1. Changed3 schema fields changedv1.5.1
    • addedInput schema / properties / ancestor_feature_version_id / description
      Added value: +"Feature version id of the common ancestor both sides started from."
    • addedInput schema / properties / source_feature_version_id / description
      Added value: +"Feature version id of the side being merged in."
    • addedInput schema / properties / target_feature_version_id / description
      Added value: +"Feature version id of the side being merged into.  All three must exist (``FEATURE_NOT_FOUND``)."
  2. Addedv1.5.0

TDQS

B3.4/5.0
Behavior3/5

Does the description disclose side effects, auth requirements, rate limits, or destructive behavior?

Annotations already declare readOnlyHint=true, destructiveHint=false and openWorldHint=false, so safety is covered. The description adds genuinely new context: detection is semantic rather than textual, and the tool is gated behind Kiln Pro. It says nothing about what a detected conflict looks like or whether all three versions must resolve, leaving the return side opaque.

Agents need to know what a tool does to the world before calling it. Descriptions should go beyond structured annotations to explain consequences.

Conciseness4/5

Is the description appropriately sized, front-loaded, and free of redundancy?

Two short sentences with zero filler, and the core verb-plus-resource phrase is front-loaded. It is arguably too terse for a merge-conflict tool, but nothing in it is wasted.

Shorter descriptions cost fewer tokens and are easier for agents to parse. Every sentence should earn its place.

Completeness3/5

Given the tool's complexity, does the description cover enough for an agent to succeed on first attempt?

Read-only detection with three fully documented parameters and no output schema, so the description need not explain param syntax. Still, it leaves the agent without the result shape (a conflict list?) or the natural next step, which matters given adjacent tools like merge_feature_branches and source_merge_three_way.

Complex tools with many parameters or behaviors need more documentation. Simple tools need less. This dimension scales expectations accordingly.

Parameters3/5

Does the description clarify parameter syntax, constraints, interactions, or defaults beyond what the schema provides?

Schema coverage is 100%, with each of the three version ids individually documented including the FEATURE_NOT_FOUND condition, so the schema does the heavy lifting. The description adds no meaning about the ancestor/source/target triad or how a missing or mismatched ancestor is handled, so baseline 3 applies.

Input schemas describe structure but not intent. Descriptions should explain non-obvious parameter relationships and valid value ranges.

Purpose4/5

Does the description clearly state what the tool does and how it differs from similar tools?

The description states a specific verb and resource ('conflict detection for features') and qualifies it as 'three-way semantic-merge', which meaningfully separates it from the generic detect_merge_conflicts and from detect_decoration_preset_merge_conflicts. It stops short of naming those siblings explicitly, so differentiation is inferable rather than stated.

Agents choose between tools based on descriptions. A clear purpose with a specific verb and resource helps agents select the right tool.

Usage Guidelines3/5

Does the description explain when to use this tool, when not to, or what alternatives exist?

'Needs Kiln Pro' gives a real prerequisite that affects whether an agent should call this at all, which is more than most definitions offer. However, there is no guidance on when to use this versus detect_merge_conflicts, merge_feature_branches, or source_merge_three_way, so the workflow positioning is only implied.

Agents often have multiple tools that could apply. Explicit usage guidance like "use X instead of Y when Z" prevents misuse.

Deploy Server

Other Tools