claude-dev-env 2.30.1 → 2.31.0

package/hooks/blocking/state_description_blocker.py

@@ -15,28 +15,43 @@ import sys
 from pathlib import Path
 from typing import TextIO
 
-_hooks_dir = str(Path(__file__).resolve().parent.parent)
-if _hooks_dir not in sys.path:
-    sys.path.insert(0, _hooks_dir)
-
-from blocking.code_rules_shared import is_ephemeral_path  # noqa: E402
-from hooks_constants.hook_block_logger import log_hook_block  # noqa: E402
-from hooks_constants.pre_tool_use_stdin import read_hook_input_dictionary_from_stdin  # noqa: E402
-from hooks_constants.state_description_blocker_constants import (  # noqa: E402
-    ALL_BLOCK_COMMENT_EXTENSIONS,
-    ALL_BLOCK_COMMENT_ONLY_EXTENSIONS,
-    ALL_COMMENT_BEARING_EXTENSIONS,
-    ALL_COMMENT_TRANSITION_PATTERNS,
-    ALL_DEFINITION_HEADER_PREFIXES,
-    ALL_HASH_AND_SLASH_EXTENSIONS,
-    ALL_HASH_ONLY_EXTENSIONS,
-    ALL_MARKDOWN_EXTENSIONS,
-    CODE_FENCE_PATTERN,
-    DOUBLE_QUOTED_SPAN_PATTERN,
-    INLINE_CODE_PATTERN,
-    PYTHON_EXTENSION,
-    TRIPLE_QUOTED_BLOCK_PATTERN,
-)
+try:
+    _hooks_dir = str(Path(__file__).resolve().parent.parent)
+    if _hooks_dir not in sys.path:
+        sys.path.insert(0, _hooks_dir)
+
+    from blocking.code_rules_shared import is_ephemeral_path
+    from hooks_constants.hook_block_logger import log_hook_block
+    from hooks_constants.multi_edit_reconstruction import joined_new_strings
+    from hooks_constants.pre_tool_use_stdin import read_hook_input_dictionary_from_stdin
+    from hooks_constants.state_description_blocker_constants import (
+        ALL_BLOCK_COMMENT_EXTENSIONS,
+        ALL_BLOCK_COMMENT_ONLY_EXTENSIONS,
+        ALL_COMMENT_BEARING_EXTENSIONS,
+        ALL_COMMENT_TRANSITION_PATTERNS,
+        ALL_DEFINITION_HEADER_PREFIXES,
+        ALL_HASH_AND_SLASH_EXTENSIONS,
+        ALL_HASH_ONLY_EXTENSIONS,
+        ALL_MARKDOWN_EXTENSIONS,
+        CODE_FENCE_PATTERN,
+        DOUBLE_QUOTED_SPAN_PATTERN,
+        INLINE_CODE_PATTERN,
+        PYTHON_EXTENSION,
+        TRIPLE_QUOTED_BLOCK_PATTERN,
+    )
+except ImportError as import_error:
+    raise ImportError(
+        "state_description_blocker: cannot import its sibling modules"
+    ) from import_error
+
+
+def _content_to_check(tool_name: str, all_tool_input: dict) -> str:
+    """Return the text a Write, Edit, or MultiEdit payload introduces."""
+    if tool_name == "MultiEdit":
+        return joined_new_strings(all_tool_input)
+    content_key = "content" if tool_name == "Write" else "new_string"
+    raw_content = all_tool_input.get(content_key, "")
+    return raw_content if isinstance(raw_content, str) else ""
 
 
 def _get_file_extension(file_path: str) -> str:
@@ -289,7 +304,7 @@ def evaluate(payload_by_key: dict[str, object]) -> str | None:
     """
     raw_tool_name = payload_by_key.get("tool_name", "")
     tool_name = raw_tool_name if isinstance(raw_tool_name, str) else ""
-    if tool_name not in ("Write", "Edit"):
+    if tool_name not in ("Write", "Edit", "MultiEdit"):
         return None
 
     raw_tool_input = payload_by_key.get("tool_input", {})
@@ -303,9 +318,7 @@ def evaluate(payload_by_key: dict[str, object]) -> str | None:
     if not (is_markdown_file(file_path) or is_comment_bearing_file(file_path)):
         return None
 
-    content_key = "content" if tool_name == "Write" else "new_string"
-    raw_content = tool_input.get(content_key, "")
-    content_to_check = raw_content if isinstance(raw_content, str) else ""
+    content_to_check = _content_to_check(tool_name, tool_input)
     if not content_to_check:
         return None
 

package/hooks/blocking/subprocess_budget_completeness.py

@@ -42,55 +42,29 @@ if _blocking_dir not in sys.path:
 if _hooks_dir not in sys.path:
     sys.path.insert(0, _hooks_dir)
 
-from code_rules_shared import is_test_file  # noqa: E402
-
-from hooks_constants.hook_block_logger import log_hook_block  # noqa: E402
-from hooks_constants.pre_tool_use_stdin import (  # noqa: E402
-    read_hook_input_dictionary_from_stdin,
-)
-from hooks_constants.subprocess_budget_completeness_constants import (  # noqa: E402
-    ALL_BUDGET_NAME_MARKERS,
-    BUDGET_ENTRY_POINT_FUNCTION_NAME,
-    SUBPROCESS_TIMEOUT_KEYWORD,
-)
-from hooks_constants.windows_rmtree_blocker_constants import (  # noqa: E402
-    PYTHON_FILE_EXTENSION,
-)
+try:
+    from code_rules_shared import is_test_file
+
+    from hooks_constants.hook_block_logger import log_hook_block
+    from hooks_constants.pre_tool_use_stdin import read_hook_input_dictionary_from_stdin
+    from hooks_constants.subprocess_budget_completeness_constants import (
+        ALL_BUDGET_NAME_MARKERS,
+        BUDGET_ENTRY_POINT_FUNCTION_NAME,
+        SUBPROCESS_TIMEOUT_KEYWORD,
+    )
+    from hooks_constants.subprocess_budget_completeness_content import resolved_content
+    from hooks_constants.windows_rmtree_blocker_constants import PYTHON_FILE_EXTENSION
+except ImportError as import_error:
+    raise ImportError(
+        "subprocess_budget_completeness: cannot import its sibling modules; "
+        "ensure the hooks directory is importable."
+    ) from import_error
 
 
 def is_python_target(file_path: str) -> bool:
     return file_path.endswith(PYTHON_FILE_EXTENSION)
 
 
-def resolved_content(all_tool_input_fields: dict[str, object]) -> str:
-    written_content = all_tool_input_fields.get("content")
-    if isinstance(written_content, str):
-        return written_content
-    return reconstructed_edit_content(all_tool_input_fields)
-
-
-def reconstructed_edit_content(all_tool_input_fields: dict[str, object]) -> str:
-    file_path = all_tool_input_fields.get("file_path")
-    old_string = all_tool_input_fields.get("old_string")
-    new_string = all_tool_input_fields.get("new_string")
-    if not isinstance(file_path, str) or not isinstance(old_string, str):
-        return ""
-    if not isinstance(new_string, str) or not old_string:
-        return ""
-    existing_content = existing_file_content(file_path)
-    if existing_content is None or old_string not in existing_content:
-        return ""
-    return existing_content.replace(old_string, new_string, 1)
-
-
-def existing_file_content(file_path: str) -> str | None:
-    try:
-        with open(file_path, "r", encoding="utf-8") as existing_file:
-            return existing_file.read()
-    except (FileNotFoundError, OSError, UnicodeDecodeError):
-        return None
-
-
 def integer_literal_value(node: ast.expr) -> int | None:
     if (
         isinstance(node, ast.Constant)

package/hooks/blocking/tdd_enforcer.py

@@ -2,6 +2,9 @@
 
 Blocks a write to a production source file when no matching test was modified
 within the freshness window, enforcing "TDD IS NON-NEGOTIABLE" from CLAUDE.md.
+The gate records each candidate test's content hash at every sighting and
+compares that hash on the next write. A first sighting requires content that
+differs from HEAD.
 Each concern lives in a ``tdd_enforcer_parts`` submodule; this entry wires them
 into one PreToolUse gate and re-exports their surface for the test suite.
 """
@@ -21,9 +24,14 @@ try:
         is_ephemeral_script_path,
         is_under_session_scratchpad,
     )
+    from codex_apply_patch import (
+        payload_patch_target_paths,
+    )
+    from hooks_constants.pre_tool_use_dispatcher_constants import APPLY_PATCH_TOOL_NAME
     from tdd_enforcer_parts import (
         candidate_paths,
         content_analysis,
+        content_hash_store,
         decisions,
         freshness,
         git_tracking,
@@ -56,8 +64,8 @@ candidate_test_paths_for = candidate_paths.candidate_test_paths_for
 _ancestor_tests_directories = candidate_paths._ancestor_tests_directories
 _parent_walk_limit = candidate_paths._parent_walk_limit
 _freshness_seconds = freshness._freshness_seconds
-has_fresh_test = freshness.has_fresh_test
 _read_candidate_text = freshness._read_candidate_text
+has_recorded_or_fresh_test = content_hash_store.has_recorded_or_fresh_test
 _is_constants_only_python_content = content_analysis._is_constants_only_python_content
 _is_post_edit_import_only = content_analysis._is_post_edit_import_only
 _is_post_edit_constants_only = content_analysis._is_post_edit_constants_only
@@ -117,29 +125,64 @@ def _write_is_exempt(
     return _edit_is_constants_or_import_only(tool_name, tool_input, path, extension)
 
 
+def _decide_for_target(
+    tool_name: str, tool_input: dict, file_path: str, input_data: dict
+) -> tuple[bool, str] | None:
+    """Return (is_allowed, deny_reason) for one target file, or None to skip silently."""
+    if not file_path:
+        return None
+    if _is_session_scratchpad_write(file_path, input_data):
+        return None
+    path = Path(file_path)
+    extension = path.suffix.lower()
+    if _is_silently_skipped(file_path, extension, path):
+        return None
+    if _write_is_exempt(tool_name, tool_input, path, extension):
+        return True, ""
+    all_candidates = candidate_test_paths_for(path)
+    session_id = str(input_data.get("session_id") or "")
+    repository_root = str(input_data.get("cwd") or "")
+    is_recorded_or_fresh = has_recorded_or_fresh_test(
+        all_candidates, session_id, repository_root, _freshness_seconds()
+    )
+    if is_recorded_or_fresh:
+        return True, ""
+    return False, build_deny_reason(path, all_candidates)
+
+
+def _decide_apply_patch(input_data: dict, tool_input: dict) -> None:
+    """Run the TDD gate over every file a Codex apply_patch payload touches."""
+    for each_file_path in payload_patch_target_paths(input_data, tool_input):
+        decision = _decide_for_target(
+            APPLY_PATCH_TOOL_NAME, tool_input, each_file_path, input_data
+        )
+        if decision is None:
+            continue
+        is_allowed, deny_reason = decision
+        if not is_allowed:
+            emit_deny(deny_reason)
+            return
+    emit_allow()
+
+
 def main() -> None:
-    """Run the TDD gate over one PreToolUse Write, Edit, or MultiEdit payload."""
+    """Run the TDD gate over one PreToolUse Write, Edit, MultiEdit, or apply_patch payload."""
     try:
         input_data = json.load(sys.stdin)
     except json.JSONDecodeError:
         sys.exit(0)
     tool_name, tool_input, file_path = _resolve_payload(input_data)
-    if not file_path:
-        sys.exit(0)
-    if _is_session_scratchpad_write(file_path, input_data):
-        sys.exit(0)
-    path = Path(file_path)
-    extension = path.suffix.lower()
-    if _is_silently_skipped(file_path, extension, path):
+    if tool_name == APPLY_PATCH_TOOL_NAME:
+        _decide_apply_patch(input_data, tool_input)
         sys.exit(0)
-    if _write_is_exempt(tool_name, tool_input, path, extension):
-        emit_allow()
+    decision = _decide_for_target(tool_name, tool_input, file_path, input_data)
+    if decision is None:
         sys.exit(0)
-    all_candidates = candidate_test_paths_for(path)
-    if has_fresh_test(all_candidates, _freshness_seconds()):
+    is_allowed, deny_reason = decision
+    if is_allowed:
         emit_allow()
         sys.exit(0)
-    emit_deny(build_deny_reason(path, all_candidates))
+    emit_deny(deny_reason)
     sys.exit(0)
 
 

package/hooks/blocking/tdd_enforcer_parts/config/tdd_enforcer_constants.py

@@ -1,7 +1,8 @@
 """Constants for the TDD-enforcer hook and its decomposed parts modules.
 
 Centralizes the freshness window, the ancestor-walk limit, the git-tracking
-command tokens, the source-file extension sets, and the join separator.
+and git-diff command tokens, the source-file extension sets, the join
+separator, and the last-observed-hash store's filename shape and JSON keys.
 """
 
 from __future__ import annotations
@@ -9,9 +10,18 @@ from __future__ import annotations
 FRESHNESS_WINDOW_SECONDS: int = 600
 PARENT_WALK_LIMIT: int = 10
 GIT_LS_FILES_TIMEOUT_SECONDS: int = 10
+GIT_DIFF_TIMEOUT_SECONDS: int = 10
 GIT_EXECUTABLE_NAME: str = "git"
 GIT_LS_FILES_SUBCOMMAND: str = "ls-files"
+GIT_DIFF_SUBCOMMAND: str = "diff"
+GIT_DIFF_QUIET_FLAG: str = "--quiet"
+GIT_HEAD_REVISION: str = "HEAD"
 GIT_PATHSPEC_SEPARATOR: str = "--"
+HASH_STATE_FILE_PREFIX: str = "claude-tdd-test-hashes-"
+HASH_STATE_FILE_SUFFIX: str = ".json"
+REPOSITORY_ROOT_DIGEST_LENGTH: int = 16
+STORED_CONTENT_HASH_KEY: str = "hash"
+STORED_CHANGED_AT_KEY: str = "changed_at"
 PYTHON_SOURCE_EXTENSION: str = ".py"
 ENTRY_HOOK_FILE_NAME: str = "tdd_enforcer.py"
 NEWLINE_JOIN_SEPARATOR: str = "\n"

package/hooks/blocking/tdd_enforcer_parts/content_hash_store.py

@@ -0,0 +1,180 @@
+"""Persist each candidate test file's last-observed content hash per session.
+
+The freshness check alone cannot tell a real test edit from a bare touch:
+both refresh the file's mtime, so a touch reopens the TDD gate for every
+production write it looks at afterward. This module remembers what a
+candidate test file contained the last time the gate looked at it, keyed by
+session and repository root, so a touch that leaves the content unchanged no
+longer satisfies the gate.
+
+::
+
+    first sight, dirty + fresh + real test -> allow, record hash + time
+    first sight, otherwise                 -> deny, record nothing
+    seen before, hash now differs          -> allow, record new hash + time
+    seen before, hash matches, in window   -> allow (green/refactor continues)
+    seen before, hash matches, expired     -> deny
+
+The state lives in one JSON file per (session, repository root) pair under the
+OS temp directory, shaped like the per-session tracker in
+hooks/observability/session_file_edit_tracker.py, so two worktrees open in one
+session never share a file.
+"""
+
+from __future__ import annotations
+
+import hashlib
+import json
+import tempfile
+import time
+from pathlib import Path
+
+from atomic_file_writer import write_text_atomically
+from hooks_constants.session_edit_stage_gate_constants import (
+    SESSION_ID_UNSAFE_CHARACTERS_PATTERN,
+    STATE_FILE_ATOMIC_WRITE_SUFFIX,
+    STATE_FILE_DEFAULT_SESSION_ID,
+    STATE_FILE_JSON_INDENT_SPACES,
+)
+from hooks_constants.setup_project_paths_constants import UTF8_ENCODING
+from json_file_reader import read_json_object
+from tdd_enforcer_parts import freshness, git_tracking
+from tdd_enforcer_parts.config.tdd_enforcer_constants import (
+    HASH_STATE_FILE_PREFIX,
+    HASH_STATE_FILE_SUFFIX,
+    REPOSITORY_ROOT_DIGEST_LENGTH,
+    STORED_CHANGED_AT_KEY,
+    STORED_CONTENT_HASH_KEY,
+)
+
+
+def _sanitized_session_id(session_id: str) -> str:
+    sanitized_session_id = SESSION_ID_UNSAFE_CHARACTERS_PATTERN.sub("", session_id)
+    return sanitized_session_id or STATE_FILE_DEFAULT_SESSION_ID
+
+
+def _repository_root_digest(repository_root: str) -> str:
+    full_digest = hashlib.sha256(repository_root.encode("utf-8")).hexdigest()
+    return full_digest[:REPOSITORY_ROOT_DIGEST_LENGTH]
+
+
+def _state_file_path(session_id: str, repository_root: str) -> Path:
+    file_name = (
+        f"{HASH_STATE_FILE_PREFIX}{_sanitized_session_id(session_id)}-"
+        f"{_repository_root_digest(repository_root)}{HASH_STATE_FILE_SUFFIX}"
+    )
+    return Path(tempfile.gettempdir()) / file_name
+
+
+def _state_key_for(candidate_path: Path) -> str:
+    try:
+        return str(candidate_path.resolve())
+    except OSError:
+        return str(candidate_path)
+
+
+def _load_state(state_file: Path) -> dict[str, object]:
+    return read_json_object(state_file, encoding=UTF8_ENCODING) or {}
+
+
+def _atomic_write_state(state_file: Path, all_stored_hashes: dict[str, object]) -> None:
+    write_text_atomically(
+        state_file,
+        json.dumps(all_stored_hashes, indent=STATE_FILE_JSON_INDENT_SPACES),
+        encoding=UTF8_ENCODING,
+        temporary_prefix=HASH_STATE_FILE_PREFIX,
+        temporary_suffix=STATE_FILE_ATOMIC_WRITE_SUFFIX,
+        should_reap_orphans=False,
+    )
+
+
+def _content_hash(candidate_text: str) -> str:
+    return hashlib.sha256(candidate_text.encode(UTF8_ENCODING)).hexdigest()
+
+
+def _recorded_entry(current_hash: str, current_time: float) -> dict[str, object]:
+    return {STORED_CONTENT_HASH_KEY: current_hash, STORED_CHANGED_AT_KEY: current_time}
+
+
+def _is_qualifying_first_sight(
+    candidate_path: Path, candidate_text: str, current_time: float, freshness_seconds: int
+) -> bool:
+    candidate_mtime = freshness._safe_mtime(candidate_path)
+    if candidate_mtime is None or current_time - candidate_mtime > freshness_seconds:
+        return False
+    if not freshness.has_test_evidence_in(candidate_text):
+        return False
+    return git_tracking.has_uncommitted_change_from_head(candidate_path)
+
+
+def _evaluate_candidate(
+    candidate_path: Path,
+    stored_entry: object,
+    current_time: float,
+    freshness_seconds: int,
+) -> tuple[bool, dict[str, object] | None]:
+    candidate_text = freshness._read_candidate_text(candidate_path)
+    if candidate_text is None:
+        return False, None
+    current_hash = _content_hash(candidate_text)
+    if not isinstance(stored_entry, dict):
+        if _is_qualifying_first_sight(
+            candidate_path, candidate_text, current_time, freshness_seconds
+        ):
+            return True, _recorded_entry(current_hash, current_time)
+        return False, None
+    if current_hash != stored_entry.get(STORED_CONTENT_HASH_KEY):
+        return True, _recorded_entry(current_hash, current_time)
+    stored_changed_at = stored_entry.get(STORED_CHANGED_AT_KEY)
+    if not isinstance(stored_changed_at, (int, float)):
+        return False, None
+    return current_time - stored_changed_at <= freshness_seconds, None
+
+
+def _apply_candidate_decisions(
+    all_candidates: list[Path],
+    all_stored_hashes: dict[str, object],
+    current_time: float,
+    freshness_seconds: int,
+) -> tuple[bool, bool]:
+    is_allowed = False
+    state_changed = False
+    for each_candidate in all_candidates:
+        candidate_key = _state_key_for(each_candidate)
+        candidate_allowed, updated_entry = _evaluate_candidate(
+            each_candidate, all_stored_hashes.get(candidate_key), current_time, freshness_seconds
+        )
+        if candidate_allowed:
+            is_allowed = True
+        if updated_entry is not None:
+            all_stored_hashes[candidate_key] = updated_entry
+            state_changed = True
+    return is_allowed, state_changed
+
+
+def has_recorded_or_fresh_test(
+    all_candidates: list[Path],
+    session_id: str,
+    repository_root: str,
+    freshness_seconds: int,
+) -> bool:
+    """Return whether any candidate's tracked content hash satisfies the gate.
+
+    Args:
+        all_candidates: Candidate test paths for the production file.
+        session_id: Raw ``session_id`` from the hook payload.
+        repository_root: Raw ``cwd`` from the hook payload.
+        freshness_seconds: Maximum age, in seconds, a stored hash may have.
+
+    Returns:
+        True when at least one candidate is a fresh, dirty first sighting, a
+        recorded hash that now differs, or a recorded hash still in window.
+    """
+    state_file = _state_file_path(session_id, repository_root)
+    all_stored_hashes = _load_state(state_file)
+    is_allowed, state_changed = _apply_candidate_decisions(
+        all_candidates, all_stored_hashes, time.time(), freshness_seconds
+    )
+    if state_changed:
+        _atomic_write_state(state_file, all_stored_hashes)
+    return is_allowed

package/hooks/blocking/tdd_enforcer_parts/decisions.py

@@ -47,8 +47,12 @@ def build_deny_reason(production_path: Path, all_candidates: list[Path]) -> str:
     hook_source_path = _entry_hook_path()
     return (
         f"[TDD] Blocking write to production file: {production_path}\n"
-        f"No matching test file exists, or it has not been modified within the last "
-        f"{FRESHNESS_WINDOW_SECONDS} seconds.\n"
+        f"No matching test file exists. Or none of them is fresh, carries real test "
+        f"evidence, and holds content HEAD does not have yet. Or a previously "
+        f"recorded test's content has not changed within the last "
+        f"{FRESHNESS_WINDOW_SECONDS} seconds. Write a new test or change an "
+        f"existing one; touching a file without changing its content does not "
+        f"satisfy this gate.\n"
         f"Expected one of:\n{candidate_lines}\n"
         f"Write a failing test first (RED), then the minimum code to pass it (GREEN).\n\n"
         f"If this file legitimately does not need a test (for example, a module containing only "

package/hooks/blocking/tdd_enforcer_parts/freshness.py

@@ -42,13 +42,28 @@ def _read_candidate_text(candidate_path: Path) -> str | None:
         return None
 
 
+def has_test_evidence_in(candidate_text: str) -> bool:
+    """Return whether the given text holds a real test function.
+
+    Takes the text rather than the path, so a caller that has already read the
+    file does not read it a second time.
+
+    Args:
+        candidate_text: The candidate test file's full text.
+
+    Returns:
+        True when the text matches any test-function pattern.
+    """
+    return any(
+        each_pattern.search(candidate_text) for each_pattern in _test_function_patterns()
+    )
+
+
 def _contains_test_evidence(candidate_path: Path) -> bool:
     test_file_content = _read_candidate_text(candidate_path)
     if test_file_content is None:
         return False
-    return any(
-        each_pattern.search(test_file_content) for each_pattern in _test_function_patterns()
-    )
+    return has_test_evidence_in(test_file_content)
 
 
 def _candidate_is_fresh_test(

package/hooks/blocking/tdd_enforcer_parts/git_tracking.py

@@ -1,4 +1,4 @@
-"""Detect a write that restores a tracked-but-absent production file.
+"""Ask git about a candidate path: is it a restore, and does it carry a real edit.
 
 ::
 
@@ -8,13 +8,22 @@
 A full rewrite happens as remove-then-Write, so the file is absent on disk
 between the two steps. Restoring committed code is not new production code, so
 the gate exempts a Write whose target is absent yet tracked in git.
+
+``has_uncommitted_change_from_head`` answers a second, related question the
+content-hash store's first-sight check needs: whether a candidate test file
+already carries content HEAD does not have, so a `touch` on an already-clean,
+committed test cannot pass as a first sighting.
 """
 
 import subprocess
 from pathlib import Path
 
 from tdd_enforcer_parts.config.tdd_enforcer_constants import (
+    GIT_DIFF_QUIET_FLAG,
+    GIT_DIFF_SUBCOMMAND,
+    GIT_DIFF_TIMEOUT_SECONDS,
     GIT_EXECUTABLE_NAME,
+    GIT_HEAD_REVISION,
     GIT_LS_FILES_SUBCOMMAND,
     GIT_LS_FILES_TIMEOUT_SECONDS,
     GIT_PATHSPEC_SEPARATOR,
@@ -25,6 +34,17 @@ def _git_ls_files_command(file_name: str) -> list[str]:
     return [GIT_EXECUTABLE_NAME, GIT_LS_FILES_SUBCOMMAND, GIT_PATHSPEC_SEPARATOR, file_name]
 
 
+def _git_diff_quiet_against_head_command(file_name: str) -> list[str]:
+    return [
+        GIT_EXECUTABLE_NAME,
+        GIT_DIFF_SUBCOMMAND,
+        GIT_DIFF_QUIET_FLAG,
+        GIT_HEAD_REVISION,
+        GIT_PATHSPEC_SEPARATOR,
+        file_name,
+    ]
+
+
 def _git_tracks_path(path: Path) -> bool:
     parent_directory = path.parent
     if not parent_directory.is_dir():
@@ -43,6 +63,29 @@ def _git_tracks_path(path: Path) -> bool:
     return completed.returncode == 0 and bool(completed.stdout.strip())
 
 
+def _working_tree_differs_from_head(path: Path) -> bool:
+    """Compare the working tree to HEAD, not to the index.
+
+    A plain ``git diff`` (no revision argument) compares the working tree to
+    the index, so a file that was just ``git add``-ed reads as unchanged even
+    when it holds content HEAD never had. Naming ``HEAD`` folds the index and
+    the working tree into one comparison against the last commit, catching a
+    staged-but-uncommitted new file and a staged edit alike.
+    """
+    try:
+        completed = subprocess.run(
+            _git_diff_quiet_against_head_command(path.name),
+            cwd=str(path.parent),
+            capture_output=True,
+            text=True,
+            check=False,
+            timeout=GIT_DIFF_TIMEOUT_SECONDS,
+        )
+    except (OSError, subprocess.SubprocessError):
+        return True
+    return completed.returncode != 0
+
+
 def is_absent_but_tracked(path: Path) -> bool:
     """Return whether a write target is absent on disk yet tracked in git.
 
@@ -61,3 +104,25 @@ def is_absent_but_tracked(path: Path) -> bool:
     if path.exists():
         return False
     return _git_tracks_path(path)
+
+
+def has_uncommitted_change_from_head(path: Path) -> bool:
+    """Return whether *path* carries content its git HEAD does not have.
+
+    ::
+
+        untracked file                -> True  (no HEAD entry to match)
+        tracked, working tree != HEAD -> True  (a real edit this session)
+        tracked, working tree == HEAD -> False (clean; a touch cannot pass)
+        git unavailable or errors     -> True  (cannot prove it is clean)
+
+    Args:
+        path: The candidate test file to check.
+
+    Returns:
+        True unless git can positively confirm the file is tracked and its
+        working-tree content matches HEAD exactly.
+    """
+    if not _git_tracks_path(path):
+        return True
+    return _working_tree_differs_from_head(path)