diff --git a/packages/extensions/gemini-cli-ux/GEMINI.md b/packages/extensions/gemini-cli-ux/GEMINI.md index 76fa5a7131..3f98796654 100644 --- a/packages/extensions/gemini-cli-ux/GEMINI.md +++ b/packages/extensions/gemini-cli-ux/GEMINI.md @@ -65,6 +65,10 @@ underlying "rigor." pushing a PR. 9. **Copyright Headers**: NEVER modify or update the copyright header comments (e.g., year) in existing files. +10. **Strict Scoping**: Keep work tightly scoped to the user's explicit request + to ensure PRs remain tight and clean. Do not make sweeping, loosely tied + changes or opportunistic refactors. If a scope change or expansion is + recommended, you MUST ask the user for input and receive approval FIRST. ## Mandatory Workflow Triggers diff --git a/packages/extensions/gemini-cli-ux/skills/ux-git-workflow/SKILL.md b/packages/extensions/gemini-cli-ux/skills/ux-git-workflow/SKILL.md index 9f579646d2..4b8734790a 100644 --- a/packages/extensions/gemini-cli-ux/skills/ux-git-workflow/SKILL.md +++ b/packages/extensions/gemini-cli-ux/skills/ux-git-workflow/SKILL.md @@ -105,6 +105,7 @@ If operating in a sibling worktree (e.g., `feature-xyz/`): - **Diff Verification**: After reverting, run `git diff origin/main...HEAD` on the specific reverted files to ensure their diff is completely empty. #### 7. Diff Minimization & Refactor Isolation (Jacob's Protocol) +- **Strict Scoping**: Keep work tightly scoped to the user's explicit request to ensure PRs remain tight and clean. Do not make sweeping, loosely tied changes or opportunistic refactors. If a scope change/expansion is recommended, ask the user for input and receive approval FIRST. - **Mandatory Two-Step Process**: Never move code between files AND make logic changes in the same commit. - **Refactor Commit**: If your task requires moving code or reorganization, create a "zero-modification" commit first. Verify that `npm run typecheck` passes but no functional logic has changed. - **Logic Commit**: Apply logic changes or new features in a separate, follow-up commit.