fix(common): compare against brnach changes

Author: PanGan21

.github/hooks/pre-push-coverage

@@ -12,15 +12,12 @@ REPO_ROOT=$(git rev-parse --show-toplevel)
 REPORT_FILE="$REPO_ROOT/coprocessor/fhevm-engine/coverage-report.txt"
 COPROCESSOR_DIR="coprocessor/fhevm-engine/"
 
-# Determine the merge base to compare against (what's being pushed)
-MERGE_BASE=$(git merge-base main HEAD 2>/dev/null || true)
-if [ -z "$MERGE_BASE" ]; then
-    exit 0
-fi
+# Fetch latest remote to ensure accurate comparison
+git fetch origin main --quiet 2>/dev/null || true
 
-# Get changed files on this branch, filtered to actual crate directories only
+# Get changed files on this branch vs origin/main, filtered to actual crate directories only
 # (ignores root-level config: Makefile, scripts/, Cargo.toml, etc.)
-CRATE_CHANGES=$(git diff --name-only "$MERGE_BASE"...HEAD -- "$COPROCESSOR_DIR" 2>/dev/null | \
+CRATE_CHANGES=$(git diff --name-only "origin/main"...HEAD -- "$COPROCESSOR_DIR" 2>/dev/null | \
     while read -r f; do
         rel=$(echo "$f" | sed "s|^$COPROCESSOR_DIR||")
         crate_name=$(echo "$rel" | cut -d/ -f1)
@@ -33,19 +30,6 @@ if [ -z "$CRATE_CHANGES" ]; then
     exit 0
 fi
 
-# Get the timestamp of the latest crate-related commit on this branch
-LAST_COMMIT_TIME=""
-for crate in $CRATE_CHANGES; do
-    t=$(git log -1 --format=%ct "$MERGE_BASE"..HEAD -- "$COPROCESSOR_DIR$crate/" 2>/dev/null)
-    if [ -n "$t" ] && { [ -z "$LAST_COMMIT_TIME" ] || [ "$t" -gt "$LAST_COMMIT_TIME" ]; }; then
-        LAST_COMMIT_TIME="$t"
-    fi
-done
-
-if [ -z "$LAST_COMMIT_TIME" ]; then
-    exit 0
-fi
-
 # Check if coverage report exists
 if [ ! -f "$REPORT_FILE" ]; then
     echo ""
@@ -55,18 +39,33 @@ if [ ! -f "$REPORT_FILE" ]; then
     exit 0
 fi
 
-# Check report freshness
-if stat -f %m "$REPORT_FILE" >/dev/null 2>&1; then
-    REPORT_TIME=$(stat -f %m "$REPORT_FILE")
-else
-    REPORT_TIME=$(stat -c %Y "$REPORT_FILE" 2>/dev/null)
+# Check report freshness via embedded commit hash
+REPORT_COMMIT=$(grep "^# commit:" "$REPORT_FILE" 2>/dev/null | awk '{print $3}')
+if [ -z "$REPORT_COMMIT" ]; then
+    echo ""
+    echo "WARNING: Coverage report has no commit metadata (regenerate with latest tooling)."
+    echo "  Run 'make coverage-changed' in coprocessor/fhevm-engine/ to regenerate."
+    echo ""
+    exit 0
 fi
 
-if [ -z "$REPORT_TIME" ]; then
+# Get the latest crate-related commit on this branch
+LATEST_CRATE_COMMIT=""
+for crate in $CRATE_CHANGES; do
+    c=$(git log -1 --format=%H "origin/main"..HEAD -- "$COPROCESSOR_DIR$crate/" 2>/dev/null)
+    if [ -n "$c" ]; then
+        if [ -z "$LATEST_CRATE_COMMIT" ] || [ "$(git log -1 --format=%ct "$c")" -gt "$(git log -1 --format=%ct "$LATEST_CRATE_COMMIT")" ]; then
+            LATEST_CRATE_COMMIT="$c"
+        fi
+    fi
+done
+
+if [ -z "$LATEST_CRATE_COMMIT" ]; then
     exit 0
 fi
 
-if [ "$REPORT_TIME" -lt "$LAST_COMMIT_TIME" ]; then
+# Check if the report was generated at or after the latest crate commit
+if ! git merge-base --is-ancestor "$LATEST_CRATE_COMMIT" "$REPORT_COMMIT" 2>/dev/null; then
     echo ""
     echo "WARNING: Coverage report is stale (generated before latest coprocessor commit)."
     echo "  Run 'make coverage-changed' in coprocessor/fhevm-engine/ to regenerate."

coprocessor/fhevm-engine/Makefile

@@ -7,9 +7,10 @@ coverage:
 	TEST_GLOBAL_LOCALSTACK=1 \
 	cargo llvm-cov --no-report --workspace --profile coverage -- --test-threads=1
 	cargo llvm-cov report --profile coverage 2>&1 | tee coverage-report.txt
+	@echo "# commit: $$(git rev-parse HEAD)" >> coverage-report.txt
 	@echo ""
 	@echo "Coverage report saved to coverage-report.txt"
-	@tail -1 coverage-report.txt
+	@tail -2 coverage-report.txt
 
 # Run coverage for a specific crate
 # Usage: make coverage-crate CRATE=host-listener
@@ -20,9 +21,10 @@ coverage-crate:
 	TEST_GLOBAL_LOCALSTACK=1 \
 	cargo llvm-cov --no-report --package $(CRATE) --profile coverage -- --test-threads=1
 	cargo llvm-cov report --profile coverage 2>&1 | tee coverage-report.txt
+	@echo "# commit: $$(git rev-parse HEAD)" >> coverage-report.txt
 	@echo ""
 	@echo "Coverage report saved to coverage-report.txt"
-	@tail -1 coverage-report.txt
+	@tail -2 coverage-report.txt
 
 # Auto-detect changed crates vs main and run coverage only for them
 coverage-changed:

coprocessor/fhevm-engine/scripts/coverage-changed.sh

@@ -11,63 +11,60 @@ ENGINE_DIR="$REPO_ROOT/coprocessor/fhevm-engine"
 
 cd "$ENGINE_DIR"
 
-# Get changed files relative to the engine directory
-CHANGED_FILES=$(git diff --name-only "$BASE_BRANCH"...HEAD -- "$ENGINE_DIR" 2>/dev/null | \
-                sed "s|^coprocessor/fhevm-engine/||" || true)
+# Fetch latest remote to ensure accurate comparison
+git fetch origin "$BASE_BRANCH" --quiet 2>/dev/null || true
 
-if [ -z "$CHANGED_FILES" ]; then
-    # Fallback: compare working tree if no commits ahead
-    CHANGED_FILES=$(git diff --name-only "$BASE_BRANCH" -- "$ENGINE_DIR" 2>/dev/null | \
-                    sed "s|^coprocessor/fhevm-engine/||" || true)
-fi
+# Compare only your branch's changes against the remote base branch
+# Uses three-dot diff against origin/ to exclude changes already on main
+CHANGED_FILES=$(git diff --name-only "origin/$BASE_BRANCH"...HEAD -- "$ENGINE_DIR" 2>/dev/null | \
+                sed "s|^coprocessor/fhevm-engine/||" || true)
 
 if [ -z "$CHANGED_FILES" ]; then
     echo "No changes detected vs $BASE_BRANCH. Nothing to cover."
     exit 0
 fi
 
-# Extract unique crate names from changed file paths
-# e.g. "host-listener/src/cmd/mod.rs" → "host-listener"
-# Root-level files (Cargo.toml, etc.) don't match and are skipped
-CHANGED_CRATES=$(echo "$CHANGED_FILES" | sed -n 's|^\([^/]*\)/.*|\1|p' | sort -u)
+# Extract unique directory names from changed file paths, filtered to actual crates
+# e.g. "host-listener/src/cmd/mod.rs" → "host-listener" (only if host-listener/Cargo.toml exists)
+# Root-level files (Cargo.toml, Makefile, etc.) are skipped by the sed filter
+ALL_DIRS=$(echo "$CHANGED_FILES" | sed -n 's|^\([^/]*\)/.*|\1|p' | sort -u)
 
-# Check for root-level changes that affect all crates (e.g. Cargo.lock)
-# Cargo.toml profile/toolchain changes don't require full workspace coverage
-ROOT_CRITICAL=$(echo "$CHANGED_FILES" | grep -v '/' | grep -v '\.toml$' || true)
+# Only Cargo.lock affects all crates — other root-level files are ignored
 if echo "$CHANGED_FILES" | grep -q '^Cargo\.lock$'; then
-    ROOT_CRITICAL="Cargo.lock"
-fi
-if [ -n "$ROOT_CRITICAL" ]; then
-    echo "Workspace config changed ($ROOT_CRITICAL) — running full workspace coverage."
+    echo "Cargo.lock changed — running full workspace coverage."
     echo ""
     exec make coverage
 fi
 
+# Filter to actual crates (directories with Cargo.toml)
+CHANGED_CRATES=""
+for dir in $ALL_DIRS; do
+    if [ -f "$dir/Cargo.toml" ]; then
+        CHANGED_CRATES="$CHANGED_CRATES $dir"
+    fi
+done
+CHANGED_CRATES=$(echo "$CHANGED_CRATES" | xargs)
+
 if [ -z "$CHANGED_CRATES" ]; then
     echo "No crate-level changes detected. Nothing to cover."
     exit 0
 fi
 
 echo "Changed crates:"
-echo "$CHANGED_CRATES" | sed 's/^/  - /'
+echo "$CHANGED_CRATES" | tr ' ' '\n' | sed 's/^/  - /'
 echo ""
 
 # If fhevm-engine-common changed, run full workspace (all crates depend on it)
-if echo "$CHANGED_CRATES" | grep -q "^fhevm-engine-common$"; then
+if echo "$CHANGED_CRATES" | grep -q "fhevm-engine-common"; then
     echo "fhevm-engine-common changed — running full workspace coverage."
     echo ""
     exec make coverage
 fi
 
-# Build --package flags for each changed crate
+# Build --package flags
 PKG_FLAGS=""
 for crate in $CHANGED_CRATES; do
-    # Skip non-crate directories (e.g. db-migration, scripts)
-    if [ -f "$crate/Cargo.toml" ]; then
-        PKG_FLAGS="$PKG_FLAGS --package $crate"
-    else
-        echo "  Skipping $crate (not a Cargo crate)"
-    fi
+    PKG_FLAGS="$PKG_FLAGS --package $crate"
 done
 
 if [ -z "$PKG_FLAGS" ]; then
@@ -85,7 +82,8 @@ TEST_GLOBAL_LOCALSTACK=1 \
 cargo llvm-cov --no-report $PKG_FLAGS --profile coverage -- --test-threads=1
 
 cargo llvm-cov report --profile coverage 2>&1 | tee coverage-report.txt
+echo "# commit: $(git rev-parse HEAD)" >> coverage-report.txt
 
 echo ""
 echo "Coverage report saved to coverage-report.txt"
-tail -1 coverage-report.txt
+tail -2 coverage-report.txt