claude-dev-env 2.32.0 → 2.33.1

package/hooks/validators/test_git_checks.py

@@ -1,215 +1,17 @@
 """Tests for git and GitHub validation checks."""
 
-import json
 import subprocess
-from pathlib import Path
-from typing import List
 from unittest.mock import MagicMock, patch
 
 import pytest
 
 from .git_checks import (
     Violation,
-    check_single_commit_when_pr_exists,
     check_draft_pr_state,
     main,
 )
 
 
-class TestSingleCommitWhenPrExists:
-    """Test that PR branches have exactly 1 commit ahead of base."""
-
-    @patch("validators.git_checks.subprocess.run")
-    def test_no_pr_returns_empty(self, mock_run: MagicMock) -> None:
-        """When no PR exists, check should return empty list."""
-        mock_run.side_effect = [
-            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
-            MagicMock(returncode=0, stdout="[]", stderr=""),
-        ]
-
-        violations = check_single_commit_when_pr_exists()
-
-        assert violations == []
-
-    @patch("validators.git_checks.subprocess.run")
-    def test_single_commit_ahead_passes(self, mock_run: MagicMock) -> None:
-        """Exactly 1 commit ahead should pass."""
-        mock_run.side_effect = [
-            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
-            MagicMock(returncode=0, stdout='[{"baseRefName": "main", "number": 123}]', stderr=""),
-            MagicMock(returncode=0, stdout="1", stderr=""),
-        ]
-
-        violations = check_single_commit_when_pr_exists()
-
-        assert violations == []
-
-    @patch("validators.git_checks.subprocess.run")
-    def test_zero_commits_ahead_fails(self, mock_run: MagicMock) -> None:
-        """Zero commits ahead should fail."""
-        mock_run.side_effect = [
-            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
-            MagicMock(returncode=0, stdout='[{"baseRefName": "main", "number": 123}]', stderr=""),
-            MagicMock(returncode=0, stdout="0", stderr=""),
-        ]
-
-        violations = check_single_commit_when_pr_exists()
-
-        assert len(violations) == 1
-        assert violations[0].file == ""
-        assert violations[0].line == 0
-        assert "exactly 1 commit" in violations[0].message
-        assert "0 commits" in violations[0].message
-
-    @patch("validators.git_checks.subprocess.run")
-    def test_multiple_commits_ahead_fails(self, mock_run: MagicMock) -> None:
-        """More than 1 commit ahead should fail."""
-        mock_run.side_effect = [
-            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
-            MagicMock(returncode=0, stdout='[{"baseRefName": "main", "number": 123}]', stderr=""),
-            MagicMock(returncode=0, stdout="3", stderr=""),
-        ]
-
-        violations = check_single_commit_when_pr_exists()
-
-        assert len(violations) == 1
-        assert "exactly 1 commit" in violations[0].message
-        assert "3 commits" in violations[0].message
-
-    @patch("validators.git_checks.subprocess.run")
-    def test_gh_cli_not_available_returns_empty(self, mock_run: MagicMock) -> None:
-        """When gh CLI not available, should return empty (warning, not failure)."""
-        mock_run.side_effect = [
-            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
-            FileNotFoundError("gh not found"),
-        ]
-
-        violations = check_single_commit_when_pr_exists()
-
-        assert violations == []
-
-    @patch("validators.git_checks.subprocess.run")
-    def test_git_not_available_returns_empty(self, mock_run: MagicMock) -> None:
-        """When git not available, should return empty."""
-        mock_run.side_effect = [
-            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
-            MagicMock(returncode=0, stdout='[{"baseRefName": "main", "number": 123}]', stderr=""),
-            FileNotFoundError("git not found"),
-        ]
-
-        violations = check_single_commit_when_pr_exists()
-
-        assert violations == []
-
-    @patch("validators.git_checks.subprocess.run")
-    def test_extracts_base_branch_from_pr_info(self, mock_run: MagicMock) -> None:
-        """Should extract base branch name from gh pr list JSON output, falling back to main when absent."""
-        mock_run.side_effect = [
-            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
-            MagicMock(returncode=0, stdout='[{"baseRefName": "develop", "number": 123}]', stderr=""),
-            MagicMock(returncode=0, stdout="2", stderr=""),
-        ]
-
-        violations = check_single_commit_when_pr_exists()
-
-        assert len(violations) == 1
-        mock_run.assert_any_call(
-            ["git", "rev-list", "--count", "develop..HEAD"],
-            capture_output=True,
-            text=True,
-            check=True,
-            timeout=30,
-        )
-
-        mock_run.reset_mock()
-        mock_run.side_effect = [
-            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
-            MagicMock(returncode=0, stdout='[{"number": 123}]', stderr=""),
-            MagicMock(returncode=0, stdout="2", stderr=""),
-        ]
-
-        fallback_violations = check_single_commit_when_pr_exists()
-
-        assert len(fallback_violations) == 1
-        assert "main" in fallback_violations[0].message
-        mock_run.assert_any_call(
-            ["git", "rev-list", "--count", "main..HEAD"],
-            capture_output=True,
-            text=True,
-            check=True,
-            timeout=30,
-        )
-
-    @patch("validators.git_checks.subprocess.run")
-    def test_non_numeric_commit_count_returns_empty(self, mock_run: MagicMock) -> None:
-        """When git rev-list returns non-numeric output, should return empty."""
-        mock_run.side_effect = [
-            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
-            MagicMock(returncode=0, stdout='[{"baseRefName": "main", "number": 123}]', stderr=""),
-            MagicMock(returncode=0, stdout="not a number\n", stderr=""),
-        ]
-
-        violations = check_single_commit_when_pr_exists()
-
-        assert violations == []
-
-    @patch("validators.git_checks.subprocess.run")
-    def test_gh_timeout_returns_empty(self, mock_run: MagicMock) -> None:
-        """When gh CLI times out, should return empty (warning, not failure)."""
-        mock_run.side_effect = [
-            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
-            subprocess.TimeoutExpired(cmd=["gh", "pr", "list"], timeout=30),
-        ]
-
-        violations = check_single_commit_when_pr_exists()
-
-        assert violations == []
-
-    @patch("validators.git_checks.subprocess.run")
-    def test_git_timeout_returns_empty(self, mock_run: MagicMock) -> None:
-        """When git times out, should return empty (warning, not failure)."""
-        mock_run.side_effect = [
-            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
-            MagicMock(returncode=0, stdout='[{"baseRefName": "main", "number": 123}]', stderr=""),
-            subprocess.TimeoutExpired(cmd=["git", "rev-list"], timeout=30),
-        ]
-
-        violations = check_single_commit_when_pr_exists()
-
-        assert violations == []
-
-    @patch("validators.git_checks.subprocess.run")
-    def test_passes_resolved_branch_name_to_gh(self, mock_run: MagicMock) -> None:
-        """gh pr list must receive the resolved branch name, never the literal 'HEAD'."""
-        mock_run.side_effect = [
-            MagicMock(returncode=0, stdout="feature/my-branch\n", stderr=""),
-            MagicMock(returncode=0, stdout='[{"baseRefName": "main", "number": 123}]', stderr=""),
-            MagicMock(returncode=0, stdout="1", stderr=""),
-        ]
-
-        check_single_commit_when_pr_exists()
-
-        mock_run.assert_any_call(
-            ["gh", "pr", "list", "--head", "feature/my-branch", "--json", "baseRefName,number"],
-            capture_output=True,
-            text=True,
-            check=True,
-            timeout=30,
-        )
-
-    @patch("validators.git_checks.subprocess.run")
-    def test_unresolved_branch_returns_empty(self, mock_run: MagicMock) -> None:
-        """When current branch cannot be resolved, should return empty."""
-        mock_run.side_effect = [
-            MagicMock(returncode=0, stdout="\n", stderr=""),
-        ]
-
-        violations = check_single_commit_when_pr_exists()
-
-        assert violations == []
-        mock_run.assert_called_once()
-
-
 class TestDraftPrState:
     """Test that PR is in draft state when pushing review fixes."""
 
@@ -274,16 +76,13 @@ class TestDraftPrState:
 class TestMain:
     """Test main function integration."""
 
-    @patch("validators.git_checks.check_single_commit_when_pr_exists")
     @patch("validators.git_checks.check_draft_pr_state")
     def test_main_no_violations_exits_zero(
         self,
         mock_draft: MagicMock,
-        mock_commit: MagicMock,
         capsys,
     ) -> None:
         """main() should exit 0 when no violations found."""
-        mock_commit.return_value = []
         mock_draft.return_value = []
 
         with pytest.raises(SystemExit) as exc_info:
@@ -293,37 +92,13 @@ class TestMain:
         captured = capsys.readouterr()
         assert captured.out == ""
 
-    @patch("validators.git_checks.check_single_commit_when_pr_exists")
-    @patch("validators.git_checks.check_draft_pr_state")
-    def test_main_with_violations_exits_one(
-        self,
-        mock_draft: MagicMock,
-        mock_commit: MagicMock,
-        capsys,
-    ) -> None:
-        """main() should exit 1 and print violations when found."""
-        mock_commit.return_value = [
-            Violation(file="", line=0, message="Branch has 3 commits ahead")
-        ]
-        mock_draft.return_value = []
-
-        with pytest.raises(SystemExit) as exc_info:
-            main()
-
-        assert exc_info.value.code == 1
-        captured = capsys.readouterr()
-        assert "Branch has 3 commits ahead" in captured.out
-
-    @patch("validators.git_checks.check_single_commit_when_pr_exists")
     @patch("validators.git_checks.check_draft_pr_state")
     def test_main_prints_violations_without_file_line(
         self,
         mock_draft: MagicMock,
-        mock_commit: MagicMock,
         capsys,
     ) -> None:
         """main() should print git violations without file:line: prefix."""
-        mock_commit.return_value = []
         mock_draft.return_value = [
             Violation(file="", line=0, message="PR must be in draft state")
         ]
@@ -335,27 +110,3 @@ class TestMain:
         captured = capsys.readouterr()
         assert captured.out == "PR must be in draft state\n"
         assert ":0:" not in captured.out
-
-    @patch("validators.git_checks.check_single_commit_when_pr_exists")
-    @patch("validators.git_checks.check_draft_pr_state")
-    def test_main_prints_all_violations(
-        self,
-        mock_draft: MagicMock,
-        mock_commit: MagicMock,
-        capsys,
-    ) -> None:
-        """main() should print all violations."""
-        mock_commit.return_value = [
-            Violation(file="", line=0, message="Branch has 2 commits")
-        ]
-        mock_draft.return_value = [
-            Violation(file="", line=0, message="PR not in draft")
-        ]
-
-        with pytest.raises(SystemExit) as exc_info:
-            main()
-
-        assert exc_info.value.code == 1
-        captured = capsys.readouterr()
-        assert "Branch has 2 commits" in captured.out
-        assert "PR not in draft" in captured.out

package/hooks/validators/test_todo_checks.py

@@ -27,6 +27,7 @@ class TestUntrackedTodos:
         violations = check_untracked_todos(code, "test.py")
         assert len(violations) == 1
         assert "TODO" in violations[0].message
+        assert "remove it from source code and track the work outside the file" in violations[0].message
 
     def test_todo_with_issue_passes(self) -> None:
         code = "# TODO #123: fix this later\ndef foo(): pass"

package/hooks/validators/todo_checks.py

@@ -24,7 +24,7 @@ def check_untracked_todos(source: str, filename: str) -> List[Violation]:
                 Violation(
                     filename,
                     line_num,
-                    "TODO/FIXME without issue reference - add #<issue_number>",
+                    "TODO/FIXME marker found - remove it from source code and track the work outside the file",
                 )
             )
 

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "claude-dev-env",
-    "version": "2.32.0",
+    "version": "2.33.1",
     "description": "Claude Code development standards — rules, hooks, agents, commands, and skills",
     "type": "module",
     "bin": {

package/rules/git-workflow.md

@@ -25,13 +25,6 @@ User-level rule: applies to **every** git repo that uses GitHub with `gh` (no ex
    - Before push: `gh pr ready --undo`
    - After review approved: `gh pr ready`
 
-2. **ONE COMMIT PER REVIEW STAGE**: Each review round gets exactly ONE commit
-   - Initial feature: 1 commit
-   - After review #1: 2 commits (initial + review #1 fixes)
-   - After review #2: 3 commits (initial + review #1 fixes + review #2 fixes)
-   - NEVER squash multiple review stages into one commit
-   - NEVER have multiple commits for the same review stage
-
 ## Never Commit Working Documents or Images
 
 **NEVER commit these files to the repo:**
@@ -53,7 +46,6 @@ An image a PR needs as visual evidence is not an exception to that row. Upload i
 2. Create a TodoWrite checklist with one item per comment.
 3. Fix systematically, marking each todo complete.
 4. Reply to each comment inline.
-5. Create one review-fix commit. Do not squash it with the original.
 
 Repair only reported findings, then re-verify after every repair.
 

package/scripts/check.ps1

@@ -25,6 +25,9 @@
 .PARAMETER SkipRuff
     Skip the ruff run.
 
+.PARAMETER CommentPolicyBase
+    Optional git reference used as the comment-policy baseline.
+
 .OUTPUTS
     Per-tool status lines on stdout. Final summary line:
         CHECK: OK
@@ -34,12 +37,14 @@
 param(
     [switch]$SkipTests,
     [switch]$SkipMypy,
-    [switch]$SkipRuff
+    [switch]$SkipRuff,
+    [string]$CommentPolicyBase
 )
 
 $ErrorActionPreference = 'Stop'
 
 $hooksRoot = Resolve-Path (Join-Path $PSScriptRoot '..' 'hooks')
+$repositoryRoot = Resolve-Path (Join-Path $PSScriptRoot '..' '..' '..')
 $blockingRoot = Join-Path $hooksRoot 'blocking'
 $prLoopScriptsRoot = Resolve-Path (Join-Path $PSScriptRoot '..' '_shared' 'pr-loop' 'scripts')
 $processTreeScriptsRoot = Resolve-Path (Join-Path $PSScriptRoot '..' '_shared' 'process-tree' 'scripts')
@@ -47,6 +52,26 @@ $processTreeScriptsRoot = Resolve-Path (Join-Path $PSScriptRoot '..' '_shared' '
 $failedTools = @()
 $firstNonZeroExitCode = 0
 
+function Resolve-CommentPolicyBase {
+    param([string]$ExplicitBase)
+    if ($ExplicitBase) {
+        $resolvedExplicitBase = & git -C $repositoryRoot rev-parse --verify --quiet "${ExplicitBase}^{commit}" 2>$null
+        if ($LASTEXITCODE -eq 0 -and $resolvedExplicitBase) {
+            return $ExplicitBase
+        }
+        throw "Comment-policy baseline '$ExplicitBase' does not resolve in the repository."
+    }
+    foreach ($candidateBase in @('origin/main', 'HEAD^1')) {
+        $resolvedCandidateBase = & git -C $repositoryRoot rev-parse --verify --quiet "${candidateBase}^{commit}" 2>$null
+        if ($LASTEXITCODE -eq 0 -and $resolvedCandidateBase) {
+            return $candidateBase
+        }
+    }
+    throw 'Comment-policy baseline does not resolve to origin/main or HEAD^1.'
+}
+
+$commentPolicyBase = Resolve-CommentPolicyBase -ExplicitBase $CommentPolicyBase
+
 function Invoke-Tool {
     param(
         [string]$Label,
@@ -78,6 +103,15 @@ if (-not $SkipRuff) {
     }
 }
 
+Invoke-Tool -Label 'comment-policy' -Action {
+    Push-Location $prLoopScriptsRoot
+    try {
+        python code_rules_gate.py --base $commentPolicyBase --comment-policy --repo-root $repositoryRoot
+    } finally {
+        Pop-Location
+    }
+}
+
 if (-not $SkipMypy) {
     Invoke-Tool -Label 'mypy' -Action {
         Push-Location $hooksRoot

package/scripts/codex_compat_materializer.py

@@ -62,6 +62,7 @@ codex_hook_dependency_manifest = (
     "hooks/blocking/code_rules_boolean_mustcheck.py",
     "hooks/blocking/code_rules_command_dispatch.py",
     "hooks/blocking/code_rules_comments.py",
+    "hooks/blocking/javascript_comment_scanner.py",
     "hooks/blocking/code_rules_constants_config.py",
     "hooks/blocking/codex_apply_patch.py",
     "hooks/blocking/config/__init__.py",

package/scripts/tests/test_rules.py

@@ -76,3 +76,131 @@ def test_every_shipped_claude_rule_maps_to_an_mdc() -> None:
         if each_rule_file.name in _SKIPPED_RULE_FILE_NAMES:
             continue
         assert each_rule_file.name in output_name_by_rule_file, each_rule_file.name
+
+
+def _comment_policy_phrases() -> tuple[str, ...]:
+    return (
+        "when a change touches code that an existing comment describes or is attached to",
+        "leave comments tied to untouched code unchanged",
+        "keep comment cleanup inside the requested task",
+        "production and tests follow one rule",
+        "changed directive, todo, fixme, hack, xxx, and type-ignore comments are removed rather than added or justified",
+    )
+
+
+def _comment_policy_surfaces(package_root: Path) -> tuple[Path, ...]:
+    return (
+        package_root.parent.parent / "AGENTS.md",
+        package_root / "AGENTS.md",
+        package_root / "docs" / "CODE_RULES.md",
+        package_root / "system-prompts" / "software-engineer.xml",
+        package_root / ".agents" / "agents" / "clean-coder.md",
+        package_root / ".agents" / "agents" / "code-quality-agent.md",
+        package_root / "_shared" / "pr-loop" / "code-rules-gate.md",
+        package_root / "audit-rubrics" / "category_rubrics" / "category-j-code-rules-compliance.md",
+        package_root / "audit-rubrics" / "prompts" / "category-j-code-rules-compliance.md",
+        package_root / "audit-rubrics" / "category_rubrics" / "category-l-behavior-equivalence.md",
+        package_root / "audit-rubrics" / "prompts" / "category-l-behavior-equivalence.md",
+        package_root / ".agents" / "skills" / "grok-spawn" / "reference" / "worker-briefs.md",
+        package_root.parent.parent / ".github" / "copilot-instructions.md",
+    )
+
+
+def _worker_policy_phrases() -> tuple[str, ...]:
+    return (
+        "do not add code comments.",
+        "preserve existing comments.",
+        "docstrings remain allowed.",
+    )
+
+
+def _worker_policy_surfaces(package_root: Path) -> tuple[Path, ...]:
+    return (
+        package_root.parent.parent / "AGENTS.md",
+        package_root / "AGENTS.md",
+        package_root / "docs" / "CODE_RULES.md",
+        package_root / "system-prompts" / "software-engineer.xml",
+        package_root / ".agents" / "agents" / "clean-coder.md",
+        package_root / ".agents" / "skills" / "grok-spawn" / "reference" / "worker-briefs.md",
+        package_root.parent.parent / ".github" / "copilot-instructions.md",
+    )
+
+
+def test_comment_guidance_reaches_installed_instruction_surfaces() -> None:
+    expected_phrases = _comment_policy_phrases()
+    all_surface_paths = _comment_policy_surfaces(_PACKAGE_ROOT)
+
+    for each_surface_path in all_surface_paths:
+        surface_text = each_surface_path.read_text(encoding="utf-8").lower()
+        for each_phrase in expected_phrases:
+            assert each_phrase in surface_text, each_surface_path
+    for each_surface_path in _worker_policy_surfaces(_PACKAGE_ROOT):
+        surface_text = each_surface_path.read_text(encoding="utf-8").lower()
+        for each_phrase in _worker_policy_phrases():
+            assert each_phrase in surface_text, each_surface_path
+
+
+def _category_l_policy_texts() -> tuple[str, str, str]:
+    category_l_rubric = (
+        _PACKAGE_ROOT
+        / "audit-rubrics"
+        / "category_rubrics"
+        / "category-l-behavior-equivalence.md"
+    )
+    category_l_prompt = (
+        _PACKAGE_ROOT
+        / "audit-rubrics"
+        / "prompts"
+        / "category-l-behavior-equivalence.md"
+    )
+    audit_categories = _PACKAGE_ROOT / "audit-rubrics" / "audit-categories.json"
+    return tuple(
+        each_path.read_text(encoding="utf-8").lower()
+        for each_path in (category_l_rubric, category_l_prompt, audit_categories)
+    )
+
+
+def _comment_policy_summary_texts() -> tuple[str, str, str, str]:
+    clean_coder = _PACKAGE_ROOT / ".agents" / "agents" / "clean-coder.md"
+    category_j = (
+        _PACKAGE_ROOT
+        / "audit-rubrics"
+        / "category_rubrics"
+        / "category-j-code-rules-compliance.md"
+    )
+    code_quality = _PACKAGE_ROOT / ".agents" / "agents" / "code-quality-agent.md"
+    gate = _PACKAGE_ROOT / "_shared" / "pr-loop" / "code-rules-gate.md"
+    return tuple(
+        each_path.read_text(encoding="utf-8").lower()
+        for each_path in (clean_coder, category_j, code_quality, gate)
+    )
+
+
+def test_comment_policy_uses_changed_comment_names_and_type_directives() -> None:
+    category_l_rubric, category_l_prompt, audit_categories = _category_l_policy_texts()
+    clean_coder, category_j, code_quality, gate = _comment_policy_summary_texts()
+    assert "| l7 | changed-comment handling" in category_l_rubric
+    assert "**l7. changed-comment handling**" in category_l_prompt
+    assert '"axis_name": "changed-comment handling"' in audit_categories
+    assert "no type-ignore directives" in clean_coder
+    assert "no `# type: ignore` directives" in category_j
+    assert "production and test code" in code_quality
+    assert "comments tied to touched code are removed" in gate
+    assert "comments tied to untouched code remain unchanged" in gate
+
+
+def test_comment_policy_removes_directive_justification_guidance() -> None:
+    react_patterns = (
+        _PACKAGE_ROOT / "docs" / "REACT_PATTERNS.md"
+    ).read_text(encoding="utf-8").lower()
+    category_e_prompt = (
+        _PACKAGE_ROOT
+        / "audit-rubrics"
+        / "prompts"
+        / "category-e-dead-code.md"
+    ).read_text(encoding="utf-8").lower()
+
+    assert "resolve `@ts-ignore` and `@ts-expect-error`" in react_patterns
+    assert "without clear justification" not in react_patterns
+    assert "changed `# noqa` directives are removed or resolved" in category_e_prompt
+    assert "every `# noqa` on an import line must be justified" not in category_e_prompt

package/system-prompts/software-engineer.xml

@@ -115,8 +115,7 @@
   Types — complete coverage required:
   - Every parameter and return value carries an explicit type hint
   - Replace Any with the most specific type available
-  - Prefer a real type over `# type: ignore`; when an ignore is required, add a second
-    trailing `#` justification of at least five characters (AGENTS Types)
+  - Avoid `# type: ignore`; remove it and use a typed boundary or real type (AGENTS Types)
 
   Configuration — one source of truth:
   - Every constant lives in config/ only
@@ -124,10 +123,12 @@
   - UPPER_SNAKE names belong in config/ only
 
   Comments — preservation, add-time blocking:
-  - Keep every comment on an untouched line untouched; removing one prints a stderr advisory and lets the edit through
-  - Adding a new inline comment in production code blocks the edit
+  - Preserve existing comments.
+  - Do not add code comments.
+  - When a change touches code that an existing comment describes or is attached to, remove that comment in the same change and carry its meaning through clear names and structure. Leave comments tied to untouched code unchanged. Keep comment cleanup inside the requested task.
+  - Production and tests follow one rule. Changed directive, TODO, FIXME, HACK, XXX, and type-ignore comments are removed rather than added or justified.
   - Express new explanations through self-documenting names
-  - Docstrings on new files, methods, and classes are permitted
+  - Docstrings remain allowed.
 
   Style — enforced at write time:
   - Imports belong at the top of the file
@@ -197,11 +198,6 @@
 </scope_discipline>
 
 <git_workflow>
-  Maintain one commit per review stage. The initial feature is one commit. Each subsequent
-  review round adds exactly one commit. Each round's fixes belong in a single, dedicated
-  commit; keep the initial feature commit and each review-fix commit separate to preserve
-  the full review history.
-
   Keep working documents and image files out of the repository. Files matching these patterns
   belong outside the repo:
   - docs/plans/*.md — working planning documents
@@ -212,13 +208,6 @@
   When multiple features need shared infrastructure, extract the shared infrastructure into
   its own PR, get it reviewed and merged, then launch parallel feature PRs that import it.
 
-  When running as a GitHub Action (detected via the GITHUB_ACTIONS=true environment variable),
-  commit and push each logical change as it completes rather than batching the full session
-  into a single commit at the end. Each incremental commit carries a focused message
-  describing only that change. This gives PR observers real-time progress and lets them
-  intervene mid-run. The "one commit per review stage" rule above applies to interactive
-  local sessions; in the GitHub Actions context the entire run is the review stage, and
-  incremental commits within it are the expected shape.
 </git_workflow>
 
 <agent_workflow>
@@ -251,8 +240,6 @@
 
   Reply to each comment inline on the PR after the fix is in place.
 
-  Produce one review-fix commit per review round. Each round gets exactly one commit covering
-  all fixes for that round.
 </code_review_response>
 
 <documentation>