Works with the AI Agents you already use

    Claude CodeClaude CodeCursorCursorCodex CLICodex CLIMuseMuseDotsDots+22 more

    Git Conflict Hotspot Refactor Mapper

    1

    Mine Git history to rank high-churn, high-cochange files, estimate merge pressure, map ownership, and turn recurring coordination hotspots into evidence-backed refactor candidates.

    Free

    Security scanned
    Git Conflict Hotspot Refactor Mapper

    Git Conflict Hotspot Refactor Mapper

    Example session with this skill installed

    Analyze this repository for recurring Git coordination hotspots.

    Repository
    ./

    Time window
    Last 180 days

    Requirements

    • mine the local Git history;
    • rank files by commit frequency, churn, co-change, merge pressure, and author spread;
    • calculate ownership concentration;
    • detect strong co-change relationships across module boundaries;
    • treat merge overlap as a conflict-pressure proxy, not as an exact historical conflict count;
    • exclude generated/vendor/build directories;
    • keep lockfiles visible in the raw analysis but do not recommend refactoring them;
    • inspect the top 10 hotspot files structurally;
    • identify files that mix unrelated responsibilities;
    • propose evidence-backed module splits or boundary changes;
    • explain which co-change relationships each refactor is expected to reduce;
    • do not make architecture recommendations based only on file size;
    • do not modify source code;
    • generate hotspot rankings, co-change data, ownership data, a refactor plan, and a JSON summary.
    • Read your context and instructions
    • Compiled the git conflict hotspot
    • Generated the data export

    Git hotspot analysis complete

    History window
    Last 180 days

    Commits analyzed
    2,418

    Merge commits analyzed
    186

    Files analyzed
    1,327

    Authors observed
    43

    Top coordination hotspots

    1. src/app/config.ts
      Hotspot score: 96.2
      Commits: 141
      Churn: 8,944
      Authors: 24
      Merge-overlap count: 18

    2. src/api/router.ts
      Hotspot score: 91.7
      Commits: 116
      Churn: 6,211
      Authors: 19
      Merge-overlap count: 14

    3. src/domain/customer/service.ts
      Hotspot score: 86.4
      Commits: 98
      Churn: 5,804
      Authors: 12
      Merge-overlap count: 10

    Strongest co-change relationships

    src/app/config.ts ↔ src/features/billing/config.ts
    Normalized strength: 0.44

    src/app/config.ts ↔ src/features/auth/config.ts
    Normalized strength: 0.39

    src/api/router.ts ↔ src/features/orders/routes.ts
    Normalized strength: 0.36

    src/api/router.ts ↔ src/features/customers/routes.ts
    Normalized strength: 0.34

    Hotspot #1 — src/app/config.ts

    Commit count
    141

    Unique authors
    24

    Ownership concentration
    0.18

    Merge-overlap count
    18

    Strong cross-module co-change
    billing, auth, notifications, feature flags

    Structural review

    The file combines application bootstrap configuration, billing settings, authentication providers, notification defaults, and feature flag registration.

    Recommended refactor

    Priority
    HIGH

    Extract domain-local configuration modules:

    src/features/billing/config.ts
    src/features/auth/config.ts
    src/features/notifications/config.ts
    src/features/flags/config.ts

    Keep src/app/config.ts as a small composition layer.

    Expected effect

    • reduce unrelated feature edits to the central configuration file;
    • reduce billing/auth co-change through src/app/config.ts;
    • lower merge-pressure proxy on application configuration;
    • clarify ownership boundaries.

    Hotspot #2 — src/api/router.ts

    Authors
    19

    Co-change degree
    31

    Merge-overlap count
    14

    Structural finding

    The central router imports and registers routes from nearly every product domain.

    Recommended refactor

    Move route registration into domain-local route registries and compose them through a stable router interface.

    Expected effect

    Feature teams can add or modify routes without editing the same central switchboard.

    Ownership observation

    Several top hotspots combine high churn, more than 15 active authors, and ownership concentration below 0.25.

    These are coordination hotspots rather than single-owner specialist modules.

    No developer-performance conclusions were drawn from authorship data.

    Important limitation

    merge_overlap_count is a conflict-pressure proxy.

    It means both sides of a merge modified the same file relative to their merge base.

    It does not prove Git raised a merge conflict in every case.

    Files generated

    • hotspots.csv
    • cochange_edges.csv
    • ownership.csv
    • merge_pressure.csv
    • hotspot_summary.json
    • refactor_plan.md

    Git history identifies coordination pressure, not architectural truth. Use these hotspots as evidence for targeted review, then validate proposed boundaries with tests and team context before refactoring.

    hotspots.csv

    CSV · data export

    Generated

    Example file from a real run - the skill writes it into your workspace.

    Connects securely to your tools. The creator never sees your data.

    About this skill

    The problem

    Some files become permanent coordination bottlenecks.

    They are edited by many developers, change alongside unrelated modules, and repeatedly sit in the middle of merges because they have accumulated too many responsibilities.

    What it does

    Git Conflict Hotspot Refactor Mapper mines repository history and turns coordination pressure into a ranked refactor map.

    • Measures commit frequency and code churn
    • Builds file-to-file co-change relationships
    • Estimates merge pressure from overlapping merge-parent changes
    • Calculates ownership concentration and author spread
    • Ranks repository hotspots
    • Highlights cross-module coupling
    • Separates generated/noisy files from useful refactor candidates
    • Produces evidence-backed modularization recommendations
    • Creates a baseline for measuring whether the refactor actually improves coordination

    Why this beats prompting it yourself

    A normal prompt can review a file.

    This skill analyzes the repository's history as a system:

    Git History → Churn → Co-change → Merge Pressure → Ownership → Hotspots → Structural Review → Refactor Plan

    Honest conflict analysis

    Git does not preserve a perfect historical record of every resolved merge conflict.

    The skill therefore uses merge-overlap and coordination metrics as a conflict-pressure proxy instead of pretending to know exact historical conflict counts.

    Team-level value

    The output targets recurring coordination cost across the team rather than one isolated bug or pull request.

    How to use

    1. 1

      Connect your agent to the Agensi MCP

      Copy the prompt and paste it into Claude, ChatGPT, Cursor or any agent that supports MCP. It sets up the connection for you. Manual setup

    2. 2

      Sign in to Agensi

      Your agent shows a sign-in link. Sign in and click Allow.

    3. 3

      Ask for what you need

      Your agent loads this skill and uses it on your task. It always asks before any payment.

    Reviews

    No reviews yet

    Be one of the first to try it. Every listed skill passes our trust checks below.

    Security scanned

    Passed our 8-point scan before listing

    Fresh listing

    Recently published to Agensi

    Free forever

    No account required to browse

    Trust & safety

    Security scanned

    Verified clean 18 days ago

    • Free to download with an account

    Listed18 days ago

    What's inside

    Frequently Asked Questions