Skip to main content
skill · Claude Code

improve-codebase-architecture — Claude Code skill

This skill scans a codebase for architectural friction, then builds a visual HTML report with refactoring candidates. Use it before a deeper architecture review.

  • Author Matt Pocock
  • License MIT
  • GitHub ★ 302,251
  • Installs 1,163,035
  • Updated 2026-10-22
  • Source shown below
Open on GitHub ↗

What improve-codebase-architecture does

The skill scans the codebase, recent git log --oneline history, GLOSSARY.md, and relevant ADRs. A sub-agent explores the selected area for shallow modules, leaky seams, hard-to-test code, and concepts that are spread across too many small files.

It writes a self-contained HTML report to the OS temp directory. Each candidate includes the involved files, the problem, a plain-English solution, expected effects on locality and leverage, and a before/after visual. The report can use Tailwind via CDN, Mermaid via CDN, and hand-built CSS or SVG visuals. After presenting the report, the skill asks which candidate to explore.

The chosen candidate enters a grilling loop covering constraints, dependencies, module shape, seams, and surviving tests. Install it when you want architecture review grounded in the repository; skip it for a small isolated edit.

What it helps with

  • spot shallow modules that spread complexity
  • find code that is hard to test through its current interface
  • use commit history to choose review hotspots
  • compare a module’s before and after structure
  • work through constraints for a selected refactoring idea

How to install improve-codebase-architecture

Command from the source

/plugin marketplace add mattpocock/skills

Command from the source

/plugin install mattpocock-skills@mattpocock

Command from the source

npx skills add mattpocock/skills --skill improve-codebase-architecture -a claude-code

With the Skills CLI (Vercel)

npx skills add mattpocock/skills --skill improve-codebase-architecture -a claude-code

Manually

~/.claude/skills/improve-codebase-architecture/SKILL.md

Copy the whole skill folder; for one project use .claude/skills/improve-codebase-architecture/

How to use it: example prompts

  • Scan the codebase and create the HTML architecture report.
  • Review the areas that recur in `git log --oneline` and show deepening opportunities.
  • I picked this candidate. Grill me on its constraints, seams, and surviving tests.

Source text

SKILL.md · MIT
---
name: improve-codebase-architecture
description: Scan a codebase for deepening opportunities, present them as a visual HTML report, then grill through whichever one you pick.
disable-model-invocation: true
---

# Improve Codebase Architecture

Surface architectural friction and propose **deepening opportunities**: refactors that turn shallow modules into deep ones. The aim is testability and AI-navigability.

This command is _informed_ by the project's domain model and built on a shared design vocabulary:

- Call the Skill tool with "codebase-design" for the architecture vocabulary (**module**, **interface**, **depth**, **seam**, **adapter**, **leverage**, **locality**) and its principles (the deletion test, "the interface is the test surface", "one adapter = hypothetical seam, two = real"). Use these terms exactly in every suggestion, and don't drift into "component," "service," "API," or "boundary."
- The domain language in `GLOSSARY.md` gives names to good seams; ADRs in `docs/adr/` record decisions this command should not re-litigate.

## Process

### 1. Explore

**Scope before you scan: YAGNI.** Deepening a module pays off by making future changes to it easier, so put extra weight on the parts of the codebase that have recently changed. Decide *where* to look before you look:

- If the user named a direction (a module, a subsystem, a pain point), take it, and skip the inference below.
- Otherwise, walk back a good stretch of the commit history (`git log --oneline`) to find the codebase's hot spots, the files and areas that keep coming up, and let those paths pull your attention first. If the changes are scattered with no clear hot spot, widen the net.

Read the project's domain glossary (`GLOSSARY.md`) and any ADRs in the area you're touching first.

Then spawn a sub-agent to walk the codebase. Don't follow rigid heuristics; explore organically and note where you experience friction:

- Where does understanding one concept require bouncing between many small modules?
- Where are modules **shallow**, with an interface nearly as complex as the implementation?
- Where have pure functions been extracted just for testability, but the real bugs hide in how they're called (no **locality**)?
- Where do tightly-coupled modules leak across their seams?
- Which parts of the codebase are untested, or hard to test through their current interface?

Apply the **deletion test** to anything you suspect is shallow: would deleting it concentrate complexity, or just move it? A "yes, concentrates" is the signal you want.

### 2. Present candidates as an HTML report

Write a self-contained HTML file to the OS temp directory so nothing lands in the repo. Resolve the temp dir from `$TMPDIR`, falling back to `/tmp` (or `%TEMP%` on Windows), and write to `<tmpdir>/architecture-review-<timestamp>.html` so each run gets a fresh file. Open it for the user (`xdg-open <path>` on Linux, `open <path>` on macOS, `start <path>` on Windows) and tell them the absolute path.

The report uses **Tailwind via CDN** for layout and styling, and **Mermaid via CDN** for diagrams where a graph/flow/sequence reliably communicates the structure. Mix Mermaid with hand-crafted CSS/SVG visuals: use Mermaid when relationships are graph-shaped (call graphs, dependencies, sequences), and hand-built divs/SVG when you want something more editorial (mass diagrams, cross-sections, collapse animations). Each candidate gets a **before/after visualisation**. Be visual.

For each candidate, render a card with:

- **Files**: which files/modules are involved
- **Problem**: why the current architecture is causing friction
- **Solution**: plain English description of what would change
- **Benefits**: explained in terms of locality and leverage, and how tests would improve
- **Before / After diagram**: side-by-side, custom-drawn, illustrating the shallowness and the deepening
- **Recommendation strength**: one of `Strong`, `Worth exploring`, `Speculative`, rendered as a badge

End the report with a **Top recommendation** section: which candidate you'd tackle first and why.

**Use GLOSSARY.md vocabulary for the domain, and the `/codebase-design` vocabulary for the architecture.** If `GLOSSARY.md` defines "Order," talk about "the Order intake module," not "the FooBarHandler," and not "the Order service."

**ADR conflicts**: if a candidate contradicts an existing ADR, only surface it when the friction is real enough to warrant revisiting the ADR. Mark it clearly in the card (e.g. a warning callout: _"contradicts ADR-0007, but worth reopening because…"_). Don't list every theoretical refactor an ADR forbids.

See [HTML-REPORT.md](HTML-REPORT.md) for the full HTML scaffold, diagram patterns, and styling guidance.

Do NOT propose interfaces yet. After the file is written, ask the user: "Which of these would you like to explore?"

### 3. Grilling loop

Once the user picks a candidate, call the Skill tool with "grilling" to walk the decision tree with them: constraints, dependencies, the shape of the deepened module, what sits behind the seam, what tests survive.

Side effects happen inline as decisions crystallize; call the Skill tool with "domain-modeling" to keep the domain model current as you go:

- **Naming a deepened module after a concept not in `GLOSSARY.md`?** Add the term to `GLOSSARY.md`. Create the file lazily if it doesn't exist.
- **Sharpening a fuzzy term during the conversation?** Update `GLOSSARY.md` right there.
- **User rejects the candidate with a load-bearing reason?** Offer an ADR, framed as: _"Want me to record this as an ADR so future architecture reviews don't re-suggest it?"_ Only offer when the reason would actually be needed by a future explorer to avoid re-suggesting the same thing; skip ephemeral reasons ("not worth it right now") and self-evident ones.
- **Want to explore alternative interfaces for the deepened module?** Call the Skill tool with "codebase-design" and use its design-it-twice parallel sub-agent pattern.

© Matt Pocock · MIT · mattpocock/skills

Questions about improve-codebase-architecture

How do I install improve-codebase-architecture in Claude Code?

Add the marketplace with /plugin marketplace add mattpocock/skills, then install the skill with /plugin install mattpocock-skills@mattpocock.

What does improve-codebase-architecture do?

It scans a codebase, creates a visual HTML report of architectural deepening opportunities, and guides a detailed review of the candidate you choose.

What is included in the HTML report?

Each candidate shows its files, the architectural problem, a proposed change, effects on locality and leverage, a before/after diagram, and a recommendation strength.

Similar

See also

Project sponsors

Companies that keep this analytics open
Gold sponsor

Impressions, clicks and code copies — open statistics. We keep the numbers public for the same reason NeBlask itself is public. Become a sponsor