fix: exclude untracked files from record-review.sh overlap check (merge worktree-20260324-211622)

Author: JoeOakhartNava

plugins/dso/hooks/record-review.sh

@@ -246,27 +246,18 @@ if [[ -n "$CFG_UNIT_SNAPSHOT_PATH" ]]; then
     _RR_EXCLUDE+=(":!${CFG_UNIT_SNAPSHOT_PATH}*.html")
 fi
 
-# Build grep exclusion pattern for untracked files
-_RR_GREP_PATTERN='^\.checkpoint-needs-review$|^\.sync-state\.json$'
-if [[ -n "$CFG_VISUAL_BASELINE_PATH" ]]; then
-    _VBP_ESC="${CFG_VISUAL_BASELINE_PATH//./\\.}"
-    _RR_GREP_PATTERN="${_RR_GREP_PATTERN}|^${_VBP_ESC}.*\\.png$"
-fi
-if [[ -n "$CFG_UNIT_SNAPSHOT_PATH" ]]; then
-    _USP_ESC="${CFG_UNIT_SNAPSHOT_PATH//./\\.}"
-    _RR_GREP_PATTERN="${_RR_GREP_PATTERN}|^${_USP_ESC}.*\\.html$"
-fi
-
 # Allow tests to inject changed files without writing to the repo.
 # isolation-ok: test-only override for overlap check
 if [[ -n "${RECORD_REVIEW_CHANGED_FILES:-}" ]]; then
     CHANGED_FILES="$RECORD_REVIEW_CHANGED_FILES"
 else
+    # Only include tracked file changes (staged + unstaged). Untracked files are
+    # excluded because compute-diff-hash.sh excludes them — the overlap check
+    # must match the scope of the reviewed diff. (Bug dso-lm92)
     CHANGED_FILES=$(
         {
             git diff --name-only HEAD -- "${_RR_EXCLUDE[@]}" 2>/dev/null || true
             git diff --cached --name-only HEAD -- "${_RR_EXCLUDE[@]}" 2>/dev/null || true
-            git ls-files --others --exclude-standard 2>/dev/null | { grep -v -E "$_RR_GREP_PATTERN" || true; }
         } | sort -u | { grep -v '^$' || true; }
     )
 fi

plugins/dso/scripts/acli-integration.py

@@ -274,7 +274,7 @@ def update_issue(
         transition_issue(jira_key, status, acli_cmd=acli_cmd)
 
     if not kwargs:
-        # Only a status change was requested — return the transition result
+        # No editable fields remain (status/priority were already handled above)
         if status is not None:
             return {"key": jira_key, "status": status}
         return {"key": jira_key}

tests/hooks/test-record-review.sh

@@ -149,4 +149,22 @@ EXIT_CODE=0
 bash "$HOOK" "--reviewer-hash=${HASH}" 2>/dev/null || EXIT_CODE=$?
 assert_eq "test_record_review_equals_style_reviewer_hash: --reviewer-hash=VALUE accepted" "0" "$EXIT_CODE"
 
+# ---------------------------------------------------------------------------
+# test_record_review_changed_files_excludes_untracked
+# Bug dso-lm92: CHANGED_FILES overlap check must not include untracked files.
+# The review diff (compute-diff-hash.sh) excludes untracked files, so the
+# overlap check in record-review.sh must match that scope. Including untracked
+# files can cause false-positive overlap matches against files not in the
+# reviewed diff.
+# ---------------------------------------------------------------------------
+# Check the CHANGED_FILES computation block (not the diagnostic dump which
+# legitimately uses ls-files --others for mismatch forensics).
+# The CHANGED_FILES block is between "CHANGED_FILES=$(" and the closing ")".
+if sed -n '/CHANGED_FILES=$(/,/^[[:space:]]*)/p' "$HOOK" | grep -q 'ls-files.*--others'; then
+    actual="includes_untracked"
+else
+    actual="excludes_untracked"
+fi
+assert_eq "test_record_review_changed_files_excludes_untracked" "excludes_untracked" "$actual"
+
 print_summary