improve-codebase-architecture
Find deepening opportunities in a codebase, informed by the domain language in CONTEXT.md and the decisions in docs/adr/.
Skill by som1shi
Install
Works with Claude Code, Claude apps, Codex, Cursor, Gemini CLI, GitHub Copilot, VS Code, OpenCode, Goose, Windsurf. Read the repository before you give any tool access to your data.
npx agentmarket install skill/som1shi-improve-codebase-architecture
Asks which of your tools to add it to (Claude Code, Codex, Cursor, VS Code, Windsurf, Gemini CLI, Claude Desktop) and shows the change first. See https://agentmart.dev/cli.
Get the weekly diff
The weekly diff: one email a week with new agent tools, notable updates and grade changes, plus security alerts for tools you follow. Double opt-in, one-click unsubscribe.
About
Reviews
Write a reviewNo reviews yet. Installed it? Reviews come from verified installers only. How reviews work
Permissions: not checked yet.
What's inside
- Skill name
improve-codebase-architecture- Description
- Find deepening opportunities in a codebase, informed by the domain language in CONTEXT.md and the decisions in docs/adr/. Use when the user wants to improve architecture, find refactoring opportunities, consolidate tightly-coupled modules, or make a codebase more testable and AI-navigable.
- License
- MIT
- Instructions
- 73 lines in SKILL.md · view on GitHub
Files (4)
- DEEPENING.md
- INTERFACE-DESIGN.md
- LANGUAGE.md
- SKILL.md
SKILL.md (first lines)
# 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.
## Glossary
Use these terms exactly in every suggestion. Consistent language is the point — don't drift into "component," "service," "API," or "boundary." Full definitions in [LANGUAGE.md](LANGUAGE.md).
- **Module** — anything with an interface and an implementation (function, class, package, slice).
- **Interface** — everything a caller must know to use the module: types, invariants, error modes, ordering, config. Not just the type signature.
- **Implementation** — the code inside.
- **Depth** — leverage at the interface: a lot of behaviour behind a small interface. **Deep** = high leverage. **Shallow** = interface nearly as complex as the implementation.
- **Seam** — where an interface lives; a place behaviour can be altered without editing in place. (Use this, not "boundary.")
- **Adapter** — a concrete thing satisfying an interface at a seam.
- **Leverage** — what callers get from depth.
- **Locality** — what maintainers get from depth: change, bugs, knowledge concentrated in one place.
Key principles (see [LANGUAGE.md](LANGUAGE.md) for the full list):
- **Deletion test**: imagine deleting the module. If complexity vanishes, it was a pass-through. If complexity reappears across N callers, it was earning its keep.
- **The interface is the test surface.**
- **One adapter = hypothetical seam. Two adapters = real seam.**
This skill is _informed_ by the project's domain model. The domain language gives names to good seams; ADRs record decisions the skill should not re-litigate.
## Process
### 1. Explore
Read the project's domain glossary and any ADRs in the area you're touching first.
Then use the Agent tool with `subagent_type=Explore` 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** — 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
Present a numbered list of deepening opportunities. For each candidate:
- **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 also in how tests would improve
**Use CONTEXT.md vocabulary for the domain, and [LANGUAGE.md](LANGUAGE.md) vocabulary for the architecture.** If `CONTEXT.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 (e.g. _"contradicts ADR-0007 — but worth reopening because…"_). Don't list every theoretical refactor an ADR forbids.
Do NOT propose interfaces yet. Ask the user: "Which of these would you like to explore?"
### 3. Grilling loop
Once the user picks a candidate, drop into a grilling conversation. Walk the design 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:
- **Naming a deepened module after a concept not in `CONTEXT.md`?** Add the term to `CONTEXT.md` — same discipline as `/grill-with-docs` (see [CONTEXT-FORMAT.md](../grill-with-docs/CONTEXT-FORMAT.md)). Create the file lazily if it doesn't exist.
- **Sharpening a fuzzy term during the conversation?** Update `CONTEXT.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. See [ADR-FORMAT.md](../grill-with-docs/ADR-FORMAT.md).
- **Want to explore alternative interfaces for the deepened module?** See [INTERFACE-DESIGN.md](INTERFACE-DESIGN.md).
---
_Vendored from [mattpocock/skills](https://github.com/mattpocock/skills) @ `b843cb5` — MIT License. See [skills/UPSTREAM-CREDITS.md](../UPSTREAM-CREDITS.md) for refresh instructions._From som1shi/pi-config, MIT.
More from som1shi/pi-config
- 0.524score
commit
som1shi
Git commit and branch naming conventions only — ss/ branch prefix, terse imperative commit messages.
SkillBFreshness: BClaude Code +9 - 0.521score
delegation
som1shi
Use subagents for nontrivial work, review support, research, reconnaissance, validation, and exceptional isolated implementation.
SkillBFreshness: BClaude Code +9 - 0.521score
brainstorming
som1shi
Use for unclear intent or a material goal, behavior, placement, or design choice unresolved after inspection.
SkillBFreshness: BClaude Code +9 - 0.521score
code-intelligence
som1shi
Use for code ownership, structure, symbols, types, references, call relationships, structural patterns, and diagnostics.
SkillBFreshness: BClaude Code +9 - 0.521score
code-quality-review
som1shi
Deep code-quality and simplification review for explicit review requests or concrete useful background quality checks.
SkillBFreshness: BClaude Code +9 - 0.521score
context-mode
som1shi
Use Context Mode for large command, test, log, API, document, data, browser, or MCP output that would otherwise flood the model context.
SkillBFreshness: BClaude Code +9 - 0.471score
behavioral-proof
som1shi
Selects proportionate evidence for material behavior changes and bug fixes.
SkillCFreshness: CClaude Code +9 - 0.455score
diagnose
som1shi
Disciplined diagnosis loop for hard bugs and performance regressions.
SkillCFreshness: CClaude Code +9 - 0.450score
grill-with-docs
som1shi
Grilling session that challenges your plan against the existing domain model, sharpens terminology, and updates documentation (CONTEXT.md, ADRs) inline as…
SkillCFreshness: CClaude Code +9 - 0.450score
tdd
som1shi
Test-driven development with red-green-refactor loop.
SkillCFreshness: CClaude Code +9 - 0.445score
grill-me
som1shi
Interview the user relentlessly about a plan or design until reaching shared understanding, resolving each branch of the decision tree.
SkillCFreshness: CClaude Code +9
Signals
- Stars
- 0
- Forks
- 0
- Open issues
- 0
- Last commit (this folder)
- May 27, 2026 (5 months ago)
From GitHub (fetched Oct 24, 2026).
Details
- License
- MIT
- Repository
- github.com/som1shi/pi-config
- First seen
- Oct 24, 2026
- Last checked
- Oct 24, 2026
- Source
- GitHubgithub-graphql
More from som1shi
- 0.524score
commit
som1shi
Git commit and branch naming conventions only — ss/ branch prefix, terse imperative commit messages.
SkillBFreshness: BClaude Code +9 - 0.521score
delegation
som1shi
Use subagents for nontrivial work, review support, research, reconnaissance, validation, and exceptional isolated implementation.
SkillBFreshness: BClaude Code +9 - 0.521score
brainstorming
som1shi
Use for unclear intent or a material goal, behavior, placement, or design choice unresolved after inspection.
SkillBFreshness: BClaude Code +9 - 0.521score
code-intelligence
som1shi
Use for code ownership, structure, symbols, types, references, call relationships, structural patterns, and diagnostics.
SkillBFreshness: BClaude Code +9 - 0.521score
code-quality-review
som1shi
Deep code-quality and simplification review for explicit review requests or concrete useful background quality checks.
SkillBFreshness: BClaude Code +9 - 0.521score
context-mode
som1shi
Use Context Mode for large command, test, log, API, document, data, browser, or MCP output that would otherwise flood the model context.
SkillBFreshness: BClaude Code +9
Cite this page
improve-codebase-architecture skill. Agent Mart. https://agentmart.dev/skills/som1shi-improve-codebase-architecture (last updated 2026-10-24)