diff --git a/entrypoint.sh b/entrypoint.sh
index 89e231d..33cb340 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -1,48 +1,227 @@
 #!/bin/sh
 set -e
-trap 'rm -f result.txt >/dev/null 2>&1' EXIT
+
+CODENARC_RESULT="result.txt"
+LINE_VIOLATIONS="line_violations.txt"
+FILE_VIOLATIONS="file_violations.txt"
+VIOLATIONS_FLAG="/tmp/found_violations.txt"
+ALL_DIFF="/tmp/all_diff.txt"
+CHANGED_LINES_CACHE="/tmp/changed_lines.txt"
+CHANGED_FILES_CACHE="/tmp/changed_files.txt"
+
+cleanup_temp_files() {
+  rm -f "$CODENARC_RESULT" "$LINE_VIOLATIONS" "$FILE_VIOLATIONS" "$VIOLATIONS_FLAG" \
+        "$ALL_DIFF" "$CHANGED_LINES_CACHE" "$CHANGED_FILES_CACHE" \
+        "${FILE_VIOLATIONS}.formatted" >/dev/null 2>&1
+}
+
+trap 'cleanup_temp_files' EXIT
 
 run_codenarc() {
   report="${INPUT_REPORT:-compact:stdout}"
   includes_arg=""
-
-  if [ -n "$INPUT_SOURCE_FILES" ]; then
-    includes_arg="-includes=${INPUT_SOURCE_FILES}"
-  fi
-
+  
+  [ -n "$INPUT_SOURCE_FILES" ] && includes_arg="-includes=${INPUT_SOURCE_FILES}"
+  
   echo "🔍 Executando CodeNarc..."
   java -jar /lib/codenarc-all.jar \
     -report="$report" \
     -rulesetfiles="${INPUT_RULESETFILES}" \
     -basedir="." \
     $includes_arg \
-    > result.txt
+    > "$CODENARC_RESULT"
+}
+
+run_reviewdog_with_config() {
+  input_file="$1"
+  efm="$2"
+  reporter="$3"
+  name="$4"
+  filter_mode="$5"
+  level="$6"
+  
+  < "$input_file" reviewdog \
+    -efm="$efm" \
+    -reporter="$reporter" \
+    -name="$name" \
+    -filter-mode="$filter_mode" \
+    -fail-on-error="false" \
+    -level="$level" \
+    ${INPUT_REVIEWDOG_FLAGS} || true
+}
+
+separate_violations() {
+  grep -E ':[0-9]+:' "$CODENARC_RESULT" > "$LINE_VIOLATIONS" || true
+  grep -E ':null:|\|\|' "$CODENARC_RESULT" > "$FILE_VIOLATIONS" || true
 }
 
 run_reviewdog() {
   echo "📤 Enviando resultados para reviewdog..."
-  < result.txt reviewdog -efm="%f:%l:%m" -efm="%f:%r:%m" \
-    -name="codenarc" \
-    -reporter="${INPUT_REPORTER:-github-pr-check}" \
-    -filter-mode="${INPUT_FILTER_MODE}" \
-    -fail-on-error="${INPUT_FAIL_ON_ERROR}" \
-    -level="${INPUT_LEVEL}" \
-    ${INPUT_REVIEWDOG_FLAGS}
+  
+  separate_violations
+  
+  if [ -s "$LINE_VIOLATIONS" ]; then
+    echo "📤 Enviando violações line-based (${INPUT_REPORTER:-github-pr-check})..."
+    run_reviewdog_with_config "$LINE_VIOLATIONS" "%f:%l:%m" \
+      "${INPUT_REPORTER:-github-pr-check}" "codenarc" \
+      "${INPUT_FILTER_MODE}" "${INPUT_LEVEL}"
+  fi
+  
+  if [ -s "$FILE_VIOLATIONS" ]; then
+    true > "${FILE_VIOLATIONS}.formatted"
+    while read -r violation; do
+      if echo "$violation" | grep -q '||'; then
+        echo "$violation" | sed 's/||/::/'
+      else
+        echo "$violation" | sed 's/:null:/::/'
+      fi
+    done < "$FILE_VIOLATIONS" > "${FILE_VIOLATIONS}.formatted"
+    
+    if [ "${INPUT_REPORTER}" = "local" ]; then
+      echo "📤 Enviando violações file-based (local)..."
+      run_reviewdog_with_config "${FILE_VIOLATIONS}.formatted" "%f::%m" \
+        "local" "codenarc" "nofilter" "${INPUT_LEVEL}"
+    else
+      echo "📤 Enviando violações file-based (github-pr-check)..."
+      run_reviewdog_with_config "${FILE_VIOLATIONS}.formatted" "%f::%m" \
+        "github-pr-check" "codenarc" "nofilter" "warning"
+    fi
+  fi
+  
+  # fallback se nao houver violacoes categorizadas
+  if [ ! -s "$LINE_VIOLATIONS" ] && [ ! -s "$FILE_VIOLATIONS" ]; then
+    echo "📝 Executando reviewdog padrão..."
+    run_reviewdog_with_config "$CODENARC_RESULT" "%f:%l:%m" \
+      "${INPUT_REPORTER:-github-pr-check}" "codenarc" \
+      "${INPUT_FILTER_MODE}" "${INPUT_LEVEL}"
+  fi
 }
 
-check_blocking_rules() {
-  echo "🔎 Verificando violacoes bloqueantes (priority 1)..."
+generate_git_diff() {
+  if [ -n "$GITHUB_BASE_SHA" ] && [ -n "$GITHUB_HEAD_SHA" ]; then
+    git fetch origin "$GITHUB_BASE_SHA" --depth=1 2>/dev/null || true
+    git fetch origin "$GITHUB_HEAD_SHA" --depth=1 2>/dev/null || true
+    git diff -U0 "$GITHUB_BASE_SHA" "$GITHUB_HEAD_SHA" -- '*.groovy'
+  else
+    git diff -U0 HEAD~1 -- '*.groovy'
+  fi
+}
+
+parse_diff_range() {
+  range="$1"
+  if echo "$range" | grep -q ","; then
+    echo "$(echo "$range" | cut -d',' -f1) $(echo "$range" | cut -d',' -f2)"
+  else
+    echo "$range 1"
+  fi
+}
+
+build_changed_lines_cache() {
+  true > "$CHANGED_LINES_CACHE"
+  true > "$CHANGED_FILES_CACHE"
+  
+  generate_git_diff > "$ALL_DIFF" 2>/dev/null || true
+  [ ! -s "$ALL_DIFF" ] && return 0
+  
+  current_file=""
+  while read -r line; do
+    case "$line" in
+      "diff --git"*)
+        current_file=$(echo "$line" | sed 's|^diff --git a/\(.*\) b/.*|\1|')
+        [ -n "$current_file" ] && echo "$current_file" >> "$CHANGED_FILES_CACHE"
+        ;;
+      "@@"*)
+        [ -z "$current_file" ] && continue
+        range=$(echo "$line" | sed 's/.*+\([0-9,]*\).*/\1/')
+        range_info=$(parse_diff_range "$range")
+        start=$(echo "$range_info" | cut -d' ' -f1)
+        count=$(echo "$range_info" | cut -d' ' -f2)
+        
+        case "$start" in ''|*[!0-9]*) continue ;; esac
+        case "$count" in ''|*[!0-9]*) continue ;; esac
+        
+        i="$start"
+        while [ "$i" -lt "$((start + count))" ]; do
+          echo "$current_file:$i" >> "$CHANGED_LINES_CACHE"
+          i=$((i + 1))
+        done
+        ;;
+    esac
+  done < "$ALL_DIFF"
+}
+
+get_p1_count() {
+  p1_count=$(grep -Eo "p1=[0-9]+" "$CODENARC_RESULT" | cut -d'=' -f2 | head -1)
+  echo "${p1_count:-0}"
+}
+
+get_allowed_patterns() {
+  [ -n "$INPUT_SOURCE_FILES" ] && echo "$INPUT_SOURCE_FILES" | tr ',' '\n' | sed 's/\*\*/.*/g'
+}
+
+file_matches_patterns() {
+  file="$1"
+  patterns="$2"
+  
+  [ -z "$patterns" ] && return 0
+  
+  for pattern in $patterns; do
+    echo "$file" | grep -Eq "$pattern" && return 0
+  done
+  return 1
+}
 
-  p1_count=$(grep -Eo "p1=[0-9]+" result.txt | cut -d'=' -f2 | head -1)
-  p1_count=${p1_count:-0}
+is_line_changed() {
+  grep -q "^$2:$1$" "$CHANGED_LINES_CACHE"
+}
 
-  echo "📊 Resumo CodeNarc → priority 1=${p1_count}"
+is_file_changed() {
+  grep -q "^$1$" "$CHANGED_FILES_CACHE"
+}
 
-  if [ "$p1_count" -gt 0 ]; then
-    echo "⛔ Foram encontradas violacoes bloqueantes (priority 1)."
-    echo "💡 Corrija as violacoes ou use o bypass autorizado pelo coordenador."
+check_blocking_rules() {
+  echo "🔎 Verificando violações bloqueantes (priority 1)..."
+  
+  [ ! -f "$CODENARC_RESULT" ] && echo "❌ Resultado não encontrado" && return 1
+  
+  p1_count=$(get_p1_count)
+  echo "📊 Total de P1 encontradas: $p1_count"
+  
+  [ "$p1_count" -eq 0 ] && echo "✅ Nenhuma P1 detectada → merge permitido" && return 0
+  
+  echo "⚠️  Verificando P1s em linhas alteradas..."
+  build_changed_lines_cache
+  
+  allowed_patterns=$(get_allowed_patterns)
+  [ -n "$allowed_patterns" ] && echo "🧩 Analisando apenas arquivos filtrados por INPUT_SOURCE_FILES"
+  
+  echo "0" > "$VIOLATIONS_FLAG"
+  
+  grep -E ':[0-9]+:|:null:|\|\|' "$CODENARC_RESULT" | while IFS=: read -r file line rest; do
+    if echo "$file" | grep -q '||'; then
+      file=$(echo "$file" | cut -d'|' -f1)
+      line=""
+    fi
+    [ -z "$file" ] && continue
+    file_matches_patterns "$file" "$allowed_patterns" || continue
+    
+    if [ -z "$line" ] || [ "$line" = "null" ]; then
+      if is_file_changed "$file"; then
+        echo "📍 Violação file-based em arquivo alterado: $file"
+        echo "1" > "$VIOLATIONS_FLAG" && break
+      fi
+    elif is_line_changed "$line" "$file"; then
+      echo "📍 Violação em linha alterada: $file:$line"
+      echo "1" > "$VIOLATIONS_FLAG" && break
+    fi
+  done
+  
+  if [ "$(cat "$VIOLATIONS_FLAG")" -eq 1 ]; then
+    echo "⛔ P1s existem E há violações em linhas alteradas → DEVERIA bloquear merge"
+    echo "🔧 Exit desabilitado temporariamente para monitoramento"
+    # exit 1
   else
-    echo "✅ Nenhuma violacao bloqueante (priority 1) encontrada."
+    echo "✅ P1s existem mas fora das linhas alteradas → merge permitido"
   fi
 }
 
@@ -57,4 +236,4 @@ run_codenarc
 run_reviewdog
 check_blocking_rules
 
-echo "🏁 Finalizado com sucesso."
+echo "🏁 Concluído com sucesso"
\ No newline at end of file