Jetpack CLI: Add Docker-based git hooks support #46462

kraftbj · 2026-01-06T18:14:34Z

Proposed changes:

Add jp init-hooks command to install Docker-aware git hooks
Add jp git-hook <hook-name> command to run git hooks inside Docker container
Automatically call jp init-hooks during jp init for new installations
Detect and unset core.hooksPath if configured (e.g., from husky) to ensure jp hooks are used
Add TTY detection to monorepo script to avoid "input device is not a TTY" errors when running in non-interactive contexts
Pass CI=true environment variable when running git hooks to prevent pnpm from requiring TTY
Add JETPACK_MONOREPO_ENV=1 to Docker container to allow hooks to detect when running inside Docker
Read hook commands from .husky/ files to stay in sync with husky configuration

Other information:

Have you written new tests for your changes, if applicable? (N/A - shell/JS infrastructure change)
Have you checked the E2E test CI results, and verified that your changes do not break them?
Have you tested your changes on WordPress.com, if applicable? (N/A)

Jetpack product discussion

N/A - Internal developer tooling improvement

Does this pull request change what data or activity we track or use?

No

⚠️ Additional Testing Required Before Merge

The following edge cases need manual testing:

Auto-fix flow: When pre-commit hook catches a fixable linting issue, auto-fixes the file, and commits the fix—verify the original commit proceeds correctly
Pre-push with required fixes: When pre-push hook fails and requires fixes before pushing—verify the workflow handles this gracefully
Container git operations: Verify that running git commands inside the container (where husky's hooks would fire) still works correctly

Testing instructions:

Prerequisites:

Checkout this branch: git checkout update/jetpack-cli-git-hooks
Link the updated jp CLI globally: cd projects/js-packages/jetpack-cli && npm install && npm link
Return to monorepo root: cd ../../..

Test 1: Install jp hooks

Run: jp init-hooks
Verify you see "Setting up jp git hooks..."
If you had husky configured, verify you see "Detected custom git hooks path: .husky/_" and "Resetting to use .git/hooks/"
Verify you see "Created pre-commit hook", "Created pre-push hook", "Created post-checkout hook", "Created post-merge hook"
Verify: ls -la .git/hooks/ shows executable hook files with recent timestamps

Test 2: Test hooks run in Docker

Make a trivial change: echo "# test" >> README.md
Stage it: git add README.md
Commit: git commit -m "Test hooks"
Verify you see:
- "✓ Using jp hooks (delegating to Docker)"
- "Running pre-commit hook in Docker..."
- Hook runs successfully (linter may auto-format files)
If hook modified files, add them and commit again
Clean up: git reset HEAD~1 && git restore README.md

Test 3: Verify normal jp commands remain interactive

Run: jp install
Verify the command works normally (doesn't show CI warnings or TTY errors)
Verify you can see interactive output from pnpm

Test 4: Verify hooks work without host pnpm install

This should already be the case if you're using jp CLI as intended
Make a change and commit
Verify hooks still run successfully in Docker despite no host pnpm install

Copilot

Copilot wasn't able to review any files in this pull request.

github-actions · 2026-01-06T18:15:44Z

Thank you for your PR!

When contributing to Jetpack, we have a few suggestions that can help us test and review your patch:

✅ Include a description of your PR changes.
✅ Add a "[Status]" label (In Progress, Needs Review, ...).
✅ Add a "[Type]" label (Bug, Enhancement, Janitorial, Task).
✅ Add testing instructions.
✅ Specify whether this PR includes any changes to data or privacy.
✅ Add changelog entries to affected projects

This comment will be updated as you work on your PR and make changes. If you think that some of those checks are not needed for your PR, please explain why you think so. Thanks for cooperation 🤖

Follow this PR Review Process:

Ensure all required checks appearing at the bottom of this PR are passing.
Make sure to test your changes on all platforms that it applies to. You're responsible for the quality of the code you ship.
You can use GitHub's Reviewers functionality to request a review.
When it's reviewed and merged, you will be pinged in Slack to deploy the changes to WordPress.com simple once the build is done.

If you have questions about anything, reach out in #jetpack-developers for guidance!

Copilot

Pull request overview

Copilot reviewed 2 out of 4 changed files in this pull request and generated no new comments.

- Reformat chalk.yellow call to single line to match code style - Update changelog for 1.1.0-beta.0 release

Follow bash best practices by using [[ ]] builtin syntax for the TTY check conditional, consistent with bash scripting conventions.

The post-checkout hook was failing when checking out with no previous ref (e.g., fresh clone or initial checkout) because it tried to run git diff-tree with an empty argument. Added a check to skip the hook if the previous ref is empty or is the null SHA (all zeros), which git uses to indicate no previous ref exists.

kraftbj · 2026-01-07T18:07:29Z

What do you think of this approach? My intent is people who are already setup can continue to use husky fine (and pnpm install locally will set them up, etc), but new folks using jp init or existing who switch over via jp init-hooks can use regular git commands that respect our hooks. For people using the jp dev environment, those hooks would run within docker so local versions of anything doesn't matter.

I tested it by deleting pnpm off my local system and able to switch back. I feel like this might be the way to do it without any of the previous ideas I had (wrapping git for the jp or something like that).

anomiex

Looks reasonable, except for one thing flagged inline.

What stops any later pnpm install from re-initializing husky (and re-setting core.hookspath) though?

projects/js-packages/jetpack-cli/bin/jp.js

projects/js-packages/jetpack-cli/CHANGELOG.md

kraftbj · 2026-01-07T20:20:16Z

What stops any later pnpm install from re-initializing husky (and re-setting core.hookspath) though?

Nothing at this point. Intentional to not force a change to using jp that couldn't be undone. pnpm install would require the node_modules dir to be recreated so it would just work as it did before. If you use a jp command, it'd realize that it doesn't work and ask you to re-create as well. It's a flow that I want to test more before advertising this.

anomiex · 2026-01-07T20:22:39Z

I meant even a pnpm install inside the container, like from jp install.

- Revert package.json version from 1.1.0-beta.0 to 1.0.2 - Remove premature changelog entry from CHANGELOG.md - Add runtime detection to display alpha version when running from source - Add proper changelog entry files for changelogger

Address review feedback to avoid repeating hook command data. Now both initHooks and runGitHook use getHookCommand() to read the actual commands from .husky/ files, staying in sync with husky.

kraftbj · 2026-01-07T21:02:47Z

Good point. jp install does run pnpm install in the container, which triggers husky and sets core.hooksPath=.husky/ in the container's git config. But this doesn't affect the host:

The jp hooks live in the host's .git/hooks/ directory
Git operations on the host use the host's git config (where we unset core.hooksPath)
Host hooks delegate to jp git-hook <name> which runs the actual command inside the container

So the container's git config can point to .husky/—we don't run git inside the container normally. If someone did run git inside the container, husky's hooks would fire there, which is fine since they run the same underlying scripts (thanks for the suggestion to read from .husky/ directly—that ensures they actually stay in sync).

Still need to test some edge cases though—particularly when pre-commit catches a fixable linting issue, auto-fixes and commits it, then signals to continue with the original operation. Adding those test cases now.

kraftbj · 2026-01-07T22:07:25Z

But this doesn't affect the host

Seems to in my testing. There aren't separate "host" and "container" .git directories, the whole checkout is mounted into the container .git and all.

I've avoided installing jp globally, but this seems equivalent:

Hmm, I think my test of all this by just deleting pnpm is insufficient... I'll keep working on it. Thanks.

kraftbj · 2026-01-07T22:29:52Z

Looking at the docs ( https://typicode.github.io/husky/how-to.html#ci-server-and-docker ), there are a few options I'm going to explore.

Instead of extracting commands from .husky files, run them directly via `sh .husky/<hookname>`. This is more maintainable and handles all the shell logic (like TTY handling in pre-push) properly.

Set HUSKY=0 to prevent husky from modifying the shared .git/config when pnpm install runs in the container. Since .git is bind-mounted, husky's prepare script would otherwise set core.hooksPath and bypass the jp hooks installed in .git/hooks/.

kraftbj · 2026-01-07T23:21:48Z

Good points on both counts:

Running .husky files directly — Done! Simplified to just run sh .husky/<hookname> instead of extracting commands. This is cleaner and properly handles all the shell logic (like TTY handling in pre-push).
Shared .git config issue — You're right that the .git directory is bind-mounted, so husky's prepare script during pnpm install was modifying core.hooksPath on the host. I tested before the fix and confirmed the behavior you described — after jp init-hooks cleared core.hooksPath, running jp install -r caused husky to set it back to .husky/_. Fixed by adding HUSKY=0 to the monorepo script's Docker environment. This is likely only needed for pnpm install commands, but I can't think of a reason why disabling husky globally within Docker would be problematic. Tested and confirmed:
- jp init-hooks → core.hooksPath unset ✓
- jp install -r → core.hooksPath still unset ✓

Copilot

Pull request overview

Copilot reviewed 4 out of 6 changed files in this pull request and generated no new comments.

…it-hooks

- Remove shell: true from spawnSync to preserve argument quoting (fixes changelog entries with spaces being split) - Only set CI=true when no TTY available, allowing interactive prompts like changelog creation during git push

kraftbj · 2026-01-08T17:12:32Z

I tested the various git hooks that auto-commit, prompt the interactive changelog, etc and made a few changes. I believe this is ready for review and merge.

Copilot

Pull request overview

Copilot reviewed 4 out of 6 changed files in this pull request and generated 1 comment.

tools/js-tools/git-hooks/post-merge-checkout-hook.sh

projects/js-packages/jetpack-cli/bin/jp.js

tools/docker/bin/monorepo

tools/js-tools/git-hooks/post-merge-checkout-hook.sh

- Read git hooks dynamically from .husky/ directory instead of hardcoding - Add existence check in generated hooks for graceful degradation - Minor style improvement for TTY check condition

TTY detection is already handled by the monorepo script, which reconnects to /dev/tty when available.

Copilot

Pull request overview

Copilot reviewed 4 out of 6 changed files in this pull request and generated no new comments.

Add jp init-hooks and git-hook commands for Docker-based git hooks

10ad78c

Copilot AI review requested due to automatic review settings January 6, 2026 18:14

Copilot AI reviewed Jan 6, 2026

View reviewed changes

kraftbj self-assigned this Jan 6, 2026

kraftbj added [Status] In Progress [Type] Enhancement Changes to an existing feature — removing, adding, or changing parts of it labels Jan 6, 2026

github-actions bot added [JS Package] Jetpack CLI Docker RNA labels Jan 6, 2026

kraftbj added 2 commits January 6, 2026 13:17

Bump jetpack-cli version to 1.1.0-beta.0

983cf3c

Add changelog entry for git hooks feature

6708605

Copilot AI review requested due to automatic review settings January 6, 2026 18:32

Copilot started reviewing on behalf of kraftbj January 6, 2026 18:32 View session

Copilot AI reviewed Jan 6, 2026

View reviewed changes

kraftbj added 2 commits January 6, 2026 13:58

Fix prettier formatting in jp.js and update changelog

28022c5

- Reformat chalk.yellow call to single line to match code style - Update changelog for 1.1.0-beta.0 release

Use [[ ]] instead of [ ] for TTY check

c75ae0e

Follow bash best practices by using [[ ]] builtin syntax for the TTY check conditional, consistent with bash scripting conventions.

Copilot AI review requested due to automatic review settings January 6, 2026 19:18

Copilot started reviewing on behalf of kraftbj January 6, 2026 19:19 View session

This comment was marked as resolved.

Sign in to view

kraftbj requested a review from anomiex January 7, 2026 18:04

kraftbj mentioned this pull request Jan 7, 2026

Jetpack CLI: Mount host pnpm store in Docker for better performance #46487

Open

3 tasks

anomiex reviewed Jan 7, 2026

View reviewed changes

projects/js-packages/jetpack-cli/bin/jp.js Outdated Show resolved Hide resolved

projects/js-packages/jetpack-cli/bin/jp.js Outdated Show resolved Hide resolved

projects/js-packages/jetpack-cli/CHANGELOG.md Outdated Show resolved Hide resolved

kraftbj added 2 commits January 7, 2026 15:49

Refactor: read hook commands from .husky/ files instead of hardcoding

4ef6a6e

Address review feedback to avoid repeating hook command data. Now both initHooks and runGitHook use getHookCommand() to read the actual commands from .husky/ files, staying in sync with husky.

Fix eslint line length in getHookCommand conditional

119932e

kraftbj added 2 commits January 7, 2026 17:36

Simplify hook execution to run .husky files directly

c738e36

Instead of extracting commands from .husky files, run them directly via `sh .husky/<hookname>`. This is more maintainable and handles all the shell logic (like TTY handling in pre-push) properly.

Disable husky in Docker container

accfe12

Set HUSKY=0 to prevent husky from modifying the shared .git/config when pnpm install runs in the container. Since .git is bind-mounted, husky's prepare script would otherwise set core.hooksPath and bypass the jp hooks installed in .git/hooks/.

Copilot AI review requested due to automatic review settings January 7, 2026 23:18

Copilot started reviewing on behalf of kraftbj January 7, 2026 23:19 View session

Copilot AI reviewed Jan 7, 2026

View reviewed changes

kraftbj added 5 commits January 8, 2026 00:52

Fix TTY detection in git hooks by removing shell: true

f355213

Merge remote-tracking branch 'origin/trunk' into update/jetpack-cli-g…

cccbb9d

…it-hooks

Jetpack CLI: Fix argument quoting and interactive prompts

997e9f4

- Remove shell: true from spawnSync to preserve argument quoting (fixes changelog entries with spaces being split) - Only set CI=true when no TTY available, allowing interactive prompts like changelog creation during git push

Pass host git user config to Docker for commits

6a369d5

Merge origin/trunk

1acf203

Copilot AI review requested due to automatic review settings January 8, 2026 17:10

kraftbj removed the DO NOT MERGE don't merge it! label Jan 8, 2026

Copilot started reviewing on behalf of kraftbj January 8, 2026 17:11 View session

kraftbj added [Status] Needs Review This PR is ready for review. and removed [Status] In Progress labels Jan 8, 2026

kraftbj requested a review from anomiex January 8, 2026 17:12

Copilot AI reviewed Jan 8, 2026

View reviewed changes

tools/js-tools/git-hooks/post-merge-checkout-hook.sh Outdated Show resolved Hide resolved

anomiex reviewed Jan 8, 2026

View reviewed changes

Jetpack CLI: Address PR review feedback

ba1c1d8

- Read git hooks dynamically from .husky/ directory instead of hardcoding - Add existence check in generated hooks for graceful degradation - Minor style improvement for TTY check condition

kraftbj requested a review from anomiex January 9, 2026 16:32

kraftbj added 2 commits January 9, 2026 15:27

Add actual use case in inline comment

0c6d60a

Remove redundant CI=true logic in git hook runner

c518081

TTY detection is already handled by the monorepo script, which reconnects to /dev/tty when available.

Copilot AI review requested due to automatic review settings January 9, 2026 20:36

Copilot started reviewing on behalf of kraftbj January 9, 2026 20:36 View session

Copilot AI reviewed Jan 9, 2026

View reviewed changes

Jetpack CLI: Add Docker-based git hooks support #46462

Are you sure you want to change the base?

Jetpack CLI: Add Docker-based git hooks support #46462

Conversation

kraftbj commented Jan 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Proposed changes:

Other information:

Jetpack product discussion

Does this pull request change what data or activity we track or use?

⚠️ Additional Testing Required Before Merge

Testing instructions:

Prerequisites:

Test 1: Install jp hooks

Test 2: Test hooks run in Docker

Test 3: Verify normal jp commands remain interactive

Test 4: Verify hooks work without host pnpm install

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Jan 6, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

This comment was marked as resolved.

Uh oh!

kraftbj commented Jan 7, 2026

Uh oh!

anomiex left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

kraftbj commented Jan 7, 2026

Uh oh!

anomiex commented Jan 7, 2026

Uh oh!

kraftbj commented Jan 7, 2026

Uh oh!

kraftbj commented Jan 7, 2026

Uh oh!

kraftbj commented Jan 7, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

kraftbj commented Jan 7, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

kraftbj commented Jan 8, 2026

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

kraftbj commented Jan 6, 2026 •

edited

Loading

github-actions bot commented Jan 6, 2026 •

edited

Loading

kraftbj commented Jan 7, 2026 •

edited

Loading