claude-dev-env 1.85.0 → 1.86.1

package/_shared/pr-loop/scripts/tests/test_code_rules_gate.py

@@ -64,6 +64,7 @@ def run_git_in_repository(repository_root: Path, *arguments: str) -> str:
         encoding="utf-8",
         errors="replace",
         check=True,
+        env=gate_module.repository_environment(),
     )
     return completion.stdout
 
@@ -2329,3 +2330,91 @@ def test_parse_arguments_applies_documented_defaults() -> None:
     assert parsed_arguments.repo_root is None
     assert parsed_arguments.only_under == []
     assert parsed_arguments.paths == []
+
+
+def test_staged_mode_resolves_scan_roots_from_outside_the_repository(
+    temporary_git_repository: Path,
+    monkeypatch: pytest.MonkeyPatch,
+    tmp_path_factory: pytest.TempPathFactory,
+) -> None:
+    package_directory = temporary_git_repository / "pkg"
+    config_directory = package_directory / "config"
+    write_file(package_directory / "__init__.py", "")
+    write_file(config_directory / "__init__.py", "")
+    write_file(
+        config_directory / "pkg_constants.py",
+        '"""Frame constants."""\n\nFRAME_COUNT: int = 9\n',
+    )
+    write_file(
+        package_directory / "consumer.py",
+        '"""Consumer of the frame constants."""\n\n'
+        "from pkg.config.pkg_constants import FRAME_COUNT\n\n"
+        "frame_total = FRAME_COUNT\n",
+    )
+    commit_all_files(temporary_git_repository, "initial")
+    write_file(
+        config_directory / "pkg_constants.py",
+        '"""Frame constants."""\n\nFRAME_COUNT: int = 9\nPLATE_COUNT: int = 4\n',
+    )
+    write_file(
+        package_directory / "consumer.py",
+        '"""Consumer of the frame constants."""\n\n'
+        "from pkg.config.pkg_constants import FRAME_COUNT, PLATE_COUNT\n\n"
+        "frame_total = FRAME_COUNT + PLATE_COUNT\n",
+    )
+    stage_file(temporary_git_repository, "pkg/config/pkg_constants.py")
+    stage_file(temporary_git_repository, "pkg/consumer.py")
+
+    monkeypatch.chdir(tmp_path_factory.mktemp("elsewhere"))
+    exit_code = gate_module.main(
+        ["--repo-root", str(temporary_git_repository), "--staged"]
+    )
+
+    assert exit_code == 0
+
+
+def test_paths_from_git_staged_ignores_inherited_git_environment(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    target_repository = tmp_path / "target_repository"
+    target_repository.mkdir()
+    initialize_git_repository(target_repository)
+    write_file(target_repository / "pkg" / "example_module.py", "EXAMPLE = 1\n")
+    stage_file(target_repository, "pkg/example_module.py")
+    victim_repository = tmp_path / "victim_repository"
+    victim_repository.mkdir()
+    initialize_git_repository(victim_repository)
+    monkeypatch.setenv("GIT_DIR", str(victim_repository / ".git"))
+    monkeypatch.setenv("GIT_WORK_TREE", str(victim_repository))
+    monkeypatch.setenv("GIT_INDEX_FILE", str(victim_repository / ".git" / "index"))
+
+    all_staged_names = [
+        each_path.name
+        for each_path in gate_module.paths_from_git_staged(target_repository)
+    ]
+
+    assert all_staged_names == ["example_module.py"]
+
+
+def test_run_staged_test_files_runs_pytest_without_git_environment(
+    tmp_path: Path, monkeypatch: pytest.MonkeyPatch
+) -> None:
+    repository_root = tmp_path / "repository_under_test"
+    repository_root.mkdir()
+    initialize_git_repository(repository_root)
+    staged_test_body = (
+        "import os\n"
+        "\n"
+        "\n"
+        "def test_environment_carries_no_git_variables() -> None:\n"
+        "    all_git_names = sorted(\n"
+        "        each_name for each_name in os.environ"
+        " if each_name.startswith('GIT_')\n"
+        "    )\n"
+        "    assert all_git_names == []\n"
+    )
+    write_file(repository_root / "test_environment_scrub.py", staged_test_body)
+    stage_file(repository_root, "test_environment_scrub.py")
+    monkeypatch.setenv("GIT_AUTHOR_NAME", "Hostile Hook Environment")
+
+    assert gate_module.run_staged_test_files(repository_root) == 0

package/_shared/pr-loop/scripts/tests/test_terminology_sweep.py

@@ -5,6 +5,8 @@ import subprocess
 from pathlib import Path
 from types import ModuleType
 
+import pytest
+
 
 def _load_sweep_module() -> ModuleType:
     module_path = Path(__file__).parent.parent / "terminology_sweep.py"
@@ -23,7 +25,7 @@ main = sweep_module.main
 parse_added_lines = sweep_module._parse_added_lines
 
 
-_git_environment = sweep_module._git_environment
+_hermetic_git_environment = sweep_module.repository_environment
 
 
 def _init_git_repository(repository_path: Path) -> None:
@@ -37,7 +39,7 @@ def _init_git_repository(repository_path: Path) -> None:
             cwd=repository_path,
             check=True,
             capture_output=True,
-            env=_git_environment(),
+            env=_hermetic_git_environment(),
         )
 
 
@@ -200,7 +202,7 @@ def test_does_not_flag_y_to_ies_plural_variant() -> None:
     assert sweep_diff(diff) == []
 
 
-def test_does_not_flag_spaced_prose_sharing_identifier_prefix() -> None:
+def test_still_flags_non_plural_divergent_tail() -> None:
     diff = (
         "diff --git a/api/quota.py b/api/quota.py\n"
         "--- a/api/quota.py\n"
@@ -213,102 +215,23 @@ def test_does_not_flag_spaced_prose_sharing_identifier_prefix() -> None:
         "@@ -0,0 +1,1 @@\n"
         "+The premium request budget gates the run.\n"
     )
-    assert sweep_diff(diff) == []
-
-
-def test_does_not_flag_ordinary_sentence_sharing_loop_variable_prefix() -> None:
-    diff = (
-        "diff --git a/api/scan.py b/api/scan.py\n"
-        "--- a/api/scan.py\n"
-        "+++ b/api/scan.py\n"
-        "@@ -0,0 +1,2 @@\n"
-        "+each_node = walk(tree)\n"
-        '+DESCRIPTION = "Each attempt polls the review endpoint once."\n'
-    )
-    assert sweep_diff(diff) == []
-
-
-def test_flags_near_miss_inside_code_comment() -> None:
-    diff = (
-        "diff --git a/api/quota.mjs b/api/quota.mjs\n"
-        "--- a/api/quota.mjs\n"
-        "+++ b/api/quota.mjs\n"
-        "@@ -0,0 +1,2 @@\n"
-        "+const premium_interactions = 5\n"
-        "+// the premium-request path resets the counter\n"
-    )
     findings = sweep_diff(diff)
     assert len(findings) == 1
-    assert "premium-request" in findings[0]
-
+    assert "premium request" in findings[0]
 
-def test_flags_near_miss_inside_code_string_literal() -> None:
-    diff = (
-        "diff --git a/api/quota.mjs b/api/quota.mjs\n"
-        "--- a/api/quota.mjs\n"
-        "+++ b/api/quota.mjs\n"
-        "@@ -0,0 +1,2 @@\n"
-        "+const premium_interactions = 5\n"
-        '+throw new Error("the premium-request budget")\n'
-    )
-    findings = sweep_diff(diff)
-    assert len(findings) == 1
-    assert "premium-request" in findings[0]
 
-
-def test_does_not_flag_prose_inside_code_string_literal() -> None:
-    diff = (
-        "diff --git a/api/quota.py b/api/quota.py\n"
-        "--- a/api/quota.py\n"
-        "+++ b/api/quota.py\n"
-        "@@ -0,0 +1,2 @@\n"
-        "+premium_interactions = 5\n"
-        '+message = "the premium-request budget"\n'
-    )
-    assert sweep_diff(diff) == []
-
-
-def test_does_not_flag_prose_inside_code_docstring() -> None:
+def test_flags_near_miss_inside_code_comment() -> None:
     diff = (
         "diff --git a/api/quota.py b/api/quota.py\n"
         "--- a/api/quota.py\n"
         "+++ b/api/quota.py\n"
         "@@ -0,0 +1,2 @@\n"
         "+premium_interactions = 5\n"
-        '+    """Gate the run on the premium-request budget."""\n'
-    )
-    assert sweep_diff(diff) == []
-
-
-def test_does_not_flag_prose_in_test_file() -> None:
-    diff = (
-        "diff --git a/api/quota.test.mjs b/api/quota.test.mjs\n"
-        "--- a/api/quota.test.mjs\n"
-        "+++ b/api/quota.test.mjs\n"
-        "@@ -0,0 +1,2 @@\n"
-        "+const premium_interactions = 5\n"
-        "+// the premium-request path resets the counter\n"
-    )
-    assert sweep_diff(diff) == []
-
-
-def test_flags_prose_in_test_named_markdown_doc() -> None:
-    diff = (
-        "diff --git a/api/quota.py b/api/quota.py\n"
-        "--- a/api/quota.py\n"
-        "+++ b/api/quota.py\n"
-        "@@ -0,0 +1,1 @@\n"
-        "+premium_interactions = 5\n"
-        "diff --git a/docs/test_plan.md b/docs/test_plan.md\n"
-        "--- a/docs/test_plan.md\n"
-        "+++ b/docs/test_plan.md\n"
-        "@@ -0,0 +1,1 @@\n"
-        "+The premium-request budget gates the run.\n"
+        "+# the premium-request path resets the counter\n"
     )
     findings = sweep_diff(diff)
     assert len(findings) == 1
     assert "premium-request" in findings[0]
-    assert "test_plan.md" in findings[0]
 
 
 def test_no_findings_when_no_multiword_identifier_introduced() -> None:
@@ -345,9 +268,7 @@ def test_main_exits_zero_when_clean(tmp_path: Path) -> None:
 
 def test_staged_terminology_findings_flags_staged_prose(tmp_path: Path) -> None:
     _init_git_repository(tmp_path)
-    (tmp_path / "quota.py").write_text(
-        "premium_interactions = 5\n", encoding="utf-8"
-    )
+    (tmp_path / "quota.py").write_text("premium_interactions = 5\n", encoding="utf-8")
     (tmp_path / "README.md").write_text(
         "The premium-request budget gates the run.\n", encoding="utf-8"
     )
@@ -356,7 +277,7 @@ def test_staged_terminology_findings_flags_staged_prose(tmp_path: Path) -> None:
         cwd=tmp_path,
         check=True,
         capture_output=True,
-        env=_git_environment(),
+        env=_hermetic_git_environment(),
     )
     findings = staged_terminology_findings(tmp_path)
     assert any("premium-request" in each_finding for each_finding in findings)
@@ -370,7 +291,7 @@ def test_staged_terminology_findings_empty_when_clean(tmp_path: Path) -> None:
         cwd=tmp_path,
         check=True,
         capture_output=True,
-        env=_git_environment(),
+        env=_hermetic_git_environment(),
     )
     assert staged_terminology_findings(tmp_path) == []
 
@@ -389,9 +310,177 @@ def test_parse_added_lines_counts_pre_increment_content_as_added_line() -> None:
     all_added_lines = parse_added_lines(diff_with_pre_increment)
 
     assert [
-        (each_line_number, each_text) for _, each_line_number, each_text in all_added_lines
+        (each_line_number, each_text)
+        for _, each_line_number, each_text in all_added_lines
     ] == [
         (1, "++counter;"),
         (2, "let first_total = read_first_value();"),
         (3, "let second_total = read_second_value();"),
     ]
+
+
+def test_does_not_flag_window_containing_a_stopword() -> None:
+    diff = (
+        "diff --git a/api/quota.py b/api/quota.py\n"
+        "--- a/api/quota.py\n"
+        "+++ b/api/quota.py\n"
+        "@@ -0,0 +1,1 @@\n"
+        "+to_path = destination\n"
+        "diff --git a/docs/README.md b/docs/README.md\n"
+        "--- a/docs/README.md\n"
+        "+++ b/docs/README.md\n"
+        "@@ -0,0 +1,1 @@\n"
+        "+Writes the report to a fresh location.\n"
+    )
+    assert sweep_diff(diff) == []
+
+
+def test_does_not_flag_tail_word_that_is_identifier_vocabulary() -> None:
+    diff = (
+        "diff --git a/api/layout.py b/api/layout.py\n"
+        "--- a/api/layout.py\n"
+        "+++ b/api/layout.py\n"
+        "@@ -0,0 +1,1 @@\n"
+        "+target_width = box_height\n"
+        "diff --git a/docs/README.md b/docs/README.md\n"
+        "--- a/docs/README.md\n"
+        "+++ b/docs/README.md\n"
+        "@@ -0,0 +1,1 @@\n"
+        "+Scale the art until it covers the target box.\n"
+    )
+    assert sweep_diff(diff) == []
+
+
+def test_staged_skips_identifier_already_in_base_tree(tmp_path: Path) -> None:
+    _init_git_repository(tmp_path)
+    (tmp_path / "api.py").write_text("box_height = 4\n", encoding="utf-8")
+    subprocess.run(
+        ["git", "add", "."],
+        cwd=tmp_path,
+        check=True,
+        capture_output=True,
+        env=_hermetic_git_environment(),
+    )
+    subprocess.run(
+        ["git", "commit", "-m", "base"],
+        cwd=tmp_path,
+        check=True,
+        capture_output=True,
+        env=_hermetic_git_environment(),
+    )
+    all_api_lines = ("box_height = 4", "box_frame_total = box_height")
+    (tmp_path / "api.py").write_text(chr(10).join(all_api_lines), encoding="utf-8")
+    (tmp_path / "README.md").write_text(
+        "The box is read from the capture.", encoding="utf-8"
+    )
+    subprocess.run(
+        ["git", "add", "."],
+        cwd=tmp_path,
+        check=True,
+        capture_output=True,
+        env=_hermetic_git_environment(),
+    )
+    assert staged_terminology_findings(tmp_path) == []
+
+
+def test_does_not_flag_escape_sequence_letter_as_prose() -> None:
+    diff = (
+        "diff --git a/api/quota.py b/api/quota.py\n"
+        "--- a/api/quota.py\n"
+        "+++ b/api/quota.py\n"
+        "@@ -0,0 +1,2 @@\n"
+        "+box_frame_total = 5\n"
+        '+content = "box_height = 4\\nbox_frame_total = 5\\n"\n'
+    )
+    assert sweep_diff(diff) == []
+
+
+def test_skips_string_literal_fragments_in_test_files() -> None:
+    diff = (
+        "diff --git a/api/quota.py b/api/quota.py\n"
+        "--- a/api/quota.py\n"
+        "+++ b/api/quota.py\n"
+        "@@ -0,0 +1,1 @@\n"
+        "+premium_interactions = 5\n"
+        "diff --git a/tests/test_quota.py b/tests/test_quota.py\n"
+        "--- a/tests/test_quota.py\n"
+        "+++ b/tests/test_quota.py\n"
+        "@@ -0,0 +1,2 @@\n"
+        '+fixture_text = "the premium-request budget gates the run"\n'
+        "+# the premium-request path resets the counter\n"
+    )
+    findings = sweep_diff(diff)
+    assert len(findings) == 1
+    assert "test_quota.py:2" in findings[0]
+
+
+def test_repository_environment_strips_every_git_variable(
+    monkeypatch: pytest.MonkeyPatch,
+) -> None:
+    monkeypatch.setenv("GIT_DIR", "hostile-git-dir")
+    monkeypatch.setenv("PRESERVED_SETTING", "kept")
+
+    scrubbed_environment = sweep_module.repository_environment()
+
+    assert "GIT_DIR" not in scrubbed_environment
+    assert scrubbed_environment["PRESERVED_SETTING"] == "kept"
+
+
+def test_skips_markdown_inline_code_spans() -> None:
+    diff = (
+        "diff --git a/api/quota.py b/api/quota.py\n"
+        "--- a/api/quota.py\n"
+        "+++ b/api/quota.py\n"
+        "@@ -0,0 +1,1 @@\n"
+        "+scale_expression_reference = 1\n"
+        "diff --git a/docs/guide.md b/docs/guide.md\n"
+        "--- a/docs/guide.md\n"
+        "+++ b/docs/guide.md\n"
+        "@@ -0,0 +1,1 @@\n"
+        "+Its `scale_expression.py` evaluates the layer's `scale` prop here.\n"
+    )
+    assert sweep_diff(diff) == []
+
+
+def test_skips_identifier_shaped_string_literals() -> None:
+    diff = (
+        "diff --git a/api/quota.py b/api/quota.py\n"
+        "--- a/api/quota.py\n"
+        "+++ b/api/quota.py\n"
+        "@@ -0,0 +1,2 @@\n"
+        "+icon_entry = 1\n"
+        '+MASTER_UID = "HOMESCREEN_APPICONS_APP_ICON_IMAGE"\n'
+    )
+    assert sweep_diff(diff) == []
+
+
+def test_skips_string_literal_fragments_in_dot_test_named_files() -> None:
+    diff = (
+        "diff --git a/api/quota.py b/api/quota.py\n"
+        "--- a/api/quota.py\n"
+        "+++ b/api/quota.py\n"
+        "@@ -0,0 +1,1 @@\n"
+        "+premium_interactions = 5\n"
+        "diff --git a/api/quota.test.mjs b/api/quota.test.mjs\n"
+        "--- a/api/quota.test.mjs\n"
+        "+++ b/api/quota.test.mjs\n"
+        "@@ -0,0 +1,1 @@\n"
+        '+const fixture_line = "the premium-request budget gates the run"\n'
+    )
+    assert sweep_diff(diff) == []
+
+
+def test_skips_string_literal_fragments_in_tests_directory_files() -> None:
+    diff = (
+        "diff --git a/api/quota.py b/api/quota.py\n"
+        "--- a/api/quota.py\n"
+        "+++ b/api/quota.py\n"
+        "@@ -0,0 +1,1 @@\n"
+        "+premium_interactions = 5\n"
+        "diff --git a/tests/fixtures.py b/tests/fixtures.py\n"
+        "--- a/tests/fixtures.py\n"
+        "+++ b/tests/fixtures.py\n"
+        "@@ -0,0 +1,1 @@\n"
+        '+sample_line = "the premium-request budget gates the run"\n'
+    )
+    assert sweep_diff(diff) == []

package/agents/code-quality-agent.md

@@ -1,7 +1,7 @@
 ---
 name: code-quality-agent
 description: Use this agent for comprehensive code quality reviews across multiple files.
-model: inherit
+model: opus
 color: red
 ---
 

package/hooks/blocking/CLAUDE.md

@@ -88,6 +88,7 @@ The check modules it calls are the `code_rules_<concern>.py` files below.
 | `reviewer_spawn_gate.py` | PreToolUse (Bash) | A sentinel-marked autoconverge reviewer-spawn command (Copilot review request, Bugbot rerun comment) run while `reviewer_availability.py` reports that reviewer down or out of quota |
 | `send_user_file_open_locally_blocker.py` | PreToolUse (SendUserFile) | A desk-side file attach (`SendUserFile` with `status` not `proactive`); points to opening the file locally via `Show-Asset.ps1` |
 | `sensitive_file_protector.py` | PreToolUse (Write/Edit) | Writes to sensitive credential or config files |
+| `session_edit_stage_gate.py` | PreToolUse (Bash) | A `git commit` that would drop files edited this session because they are tracked but left unstaged |
 | `session_handoff_blocker.py` | Stop | Responses suggesting a new session mid-task |
 | `stale_comment_reference_blocker.py` | PreToolUse (Edit) | An Edit that rewrites a Python code line while keeping the standalone comment directly above it, when that comment names an identifier the rewrite removes from the line |
 | `state_description_blocker.py` | PreToolUse (Write/Edit) | Historical/comparative language in documentation |

package/hooks/blocking/code_rules_dead_module_constant.py

@@ -501,13 +501,16 @@ def check_dead_module_constants(
 
     Returns:
         One violation message per dead module-level constant, capped at the
-        configured maximum. Returns an empty list when the file is exempt, no
-        constant is in scope (none defined, or none exported when ``__all__`` is
-        declared), the scan exceeds the file cap, or a SyntaxError prevents
-        parsing.
+        configured maximum. Returns an empty list when the file is exempt, the
+        path is relative (the scan root cannot be resolved against a known
+        base, so the check cannot prove a constant dead), no constant is in
+        scope (none defined, or none exported when ``__all__`` is declared),
+        the scan exceeds the file cap, or a SyntaxError prevents parsing.
     """
     if _module_is_exempt_from_constant_check(file_path):
         return []
+    if not Path(file_path).is_absolute():
+        return []
     effective_content = content if full_file_content is None else full_file_content
     try:
         tree = ast.parse(effective_content)