Skip to content

chore(structure): split hook modules into role-specific files - #703

Open
RonnyPfannschmidt wants to merge 1 commit into
pytest-dev:mainfrom
RonnyPfannschmidt:refactor/split-hook-modules
Open

RonnyPfannschmidt wants to merge 1 commit into
pytest-dev:mainfrom
RonnyPfannschmidt:refactor/split-hook-modules

Conversation

@RonnyPfannschmidt

@RonnyPfannschmidt RonnyPfannschmidt commented Jul 22, 2026

Copy link
Copy Markdown
Member

Written by Claude Opus 5 via Claude Code for the pluggy maintainers; I prompted it, it did the work, I read it.

Merge PR — step 1 of 7.

This PR targets main and is the bottom of the stack, so it is ready to merge on its own. Review discussion happens in RonnyPfannschmidt#6.

Step Branch Review (downstream) Merge (upstream)
1 refactor/split-hook-modules RonnyPfannschmidt#6 #703
2 refactor/configuration-objects RonnyPfannschmidt#5 #704
3 refactor/markers-attach-config RonnyPfannschmidt#7 #706
4 refactor/hookimpl-wrapper-types RonnyPfannschmidt#8 #707
5 refactor/hookcaller-and-execution RonnyPfannschmidt#9 #708
6 refactor/project-spec RonnyPfannschmidt#10 #709
7 refactor/async-submitter RonnyPfannschmidt#11 #710

Step 1 of 7 — bottom of the stack, targets main, mergeable on its own.

#703#704#706#707#708#709#710

Per-step review discussion lives on the fork: #6 (this step), then #5, #7, #8, #9, #10, #11.


_hooks.py had grown to hold the option types, both markers, HookSpec, HookImpl, and HookCaller at once. This splits it, and _callers.py, along role lines:

module holds
_config HookspecOpts, HookimplOpts, normalize_hookimpl_opts
_decorators HookspecMarker, HookimplMarker, HookSpec, varnames
_impl HookImpl
_caller HookCaller, _SubsetHookCaller, HookRelay
_execution _multicall and the wrapper/teardown helpers

_hooks and _callers stay as re-export shims, so every existing import — including the private ones pytest and others reach for — keeps working.

Pure code movement, no behavior change. The point is to give the later steps (typed config objects, CompletionHook, a Protocol HookCaller) somewhere to land without each one also being a reorganization.

Rebased onto current main, so it carries the subset_hook_caller fix from #695 and the stacklevel fix from #727 into the modules those moved to.

@RonnyPfannschmidt
RonnyPfannschmidt force-pushed the refactor/split-hook-modules branch from 8c3f2f7 to 7489fdb Compare July 24, 2026 16:53
@RonnyPfannschmidt
RonnyPfannschmidt force-pushed the refactor/split-hook-modules branch 3 times, most recently from f795cf2 to fcece74 Compare August 12, 2026 11:14
@RonnyPfannschmidt
RonnyPfannschmidt marked this pull request as ready for review September 9, 2026 20:20
@RonnyPfannschmidt
RonnyPfannschmidt force-pushed the refactor/split-hook-modules branch 2 times, most recently from 451ce94 to d1439c6 Compare September 12, 2026 19:14

@bluetech bluetech left a comment

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The change looks OK to me. Personally I don't much like too many files but it's fine if you want to split some more.

Two comments:

  • The _config.py file seems like not really an independent thing to me. I'd merge it with _decorators.py, such that the specs & markers are together.
  • I'd rename _implementation.py to _impl.py, that would make it clearer it refers to hook impl and some other "implementation".

Also carries design/: the writeups for all seven steps, so the rationale sits next to the code rather than in the PR log.

I would very much prefer if we don't commit these. If a human wants to write a coherent architecture document that'd be cool, but I think huge amounts of AI-generated texts have no place in the repo, as long as humans are working on it at least.

@RonnyPfannschmidt
RonnyPfannschmidt force-pushed the refactor/split-hook-modules branch from d1439c6 to 2c009ff Compare September 21, 2026 18:16
@RonnyPfannschmidt

Copy link
Copy Markdown
Member Author

i dropped the spec and decided against merging the files as followups add to it

Move hook types, markers, callers, implementations, and multicall out of
the monolithic _hooks/_callers modules so later typed-config and
CompletionHook work can land without thrashing one huge file. Keep
_hooks and _callers as re-export shims for import compatibility.

Co-authored-by: Cursor AI <ai@cursor.sh>
Co-authored-by: Cursor Grok 4.5 <grok@cursor.com>
@RonnyPfannschmidt
RonnyPfannschmidt force-pushed the refactor/split-hook-modules branch from 2c009ff to 4e3e55a Compare September 23, 2026 05:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants