Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Rebase reuses the existing capped inline pull and detached retry. Amend does not sync; pull preserves explicit disable settings.
Type of Change
Evidence
enabled=falsestill returnedinstalled: true.After: real Git/CLI checks deliver resources before merge and rebase return, deliver only after conflict resolution, ignore amend, and diagnose disabled hooks. Reactivation restores new-worktree delivery; pull keeps
enabled=false.Test Plan
npx tsc --noEmitnpm run lintnpx vitest run: 8,023 passed, 20 skipped; 387 test files passed, 1 skipped.npm run buildnpx vitest run --config vitest.e2e.config.ts src/__tests__/e2e/git-hook-new-worktree.test.ts --retry 0: 32 passed with Git 2.55, local Git remotes and isolated HOME. Covers merge/rebase, configured rebase, conflict continuation, amend, disabled diagnostics/reactivation, lock failure records and uninstall. Detached children are joined before cleanup.9cdd4f28.git diff --checkExtra providers and agent coverage are left to CI; one representative real-CLI run is sufficient. English/Chinese usage guides and affected skill-data are synchronized.
Related Issues
No linked issue.
Merge Danger
Door: two-way
Revert the code. For projects that already pulled this version, also remove
hook.teamai-post-rewritefrom local Git config; on older Git remove only its TeamAI-marked block from.git/hooks/post-rewrite. Preserve the owner's script. Normal uninstall removes the new hook too.Blast Radius: hooks
Project Git synchronization and its doctor check. Named disable settings require Git 2.54+; event disable settings require Git 2.55+. Existing hook managers and explicit disable settings are preserved.
Notes for Reviewers
The new event uses existing install/remove loops and the same synchronization handler. Review the rebase-only guard, effective activation check and preservation of other hooks.