Revert "fix: auto-sync workflow to properly pull from main branch"

This reverts commit 860b9a6.

Author: Agent Communication MCP Server

.github/workflows/auto-sync-test-branch.yml

@@ -1,17 +1,13 @@
 name: Auto-Sync Test Branch
 
 on:
-  # Trigger after successful release or publication workflows
+  # Trigger after successful merge to main, after semver workflows complete
   workflow_run:
-    workflows: ["Automated Release", "Automated Publication"]
+    workflows: ["Release Workflow"]
     types:
       - completed
     branches: [main]
-
-  # Also trigger on direct pushes to main (for hotfixes or manual commits)
-  push:
-    branches: [main]
-
+  
   # Manual trigger for testing and maintenance
   workflow_dispatch:
     inputs:
@@ -125,46 +121,22 @@ jobs:
         if: steps.validation.outputs.VALIDATION_ISSUES != 'true' || github.event.inputs.force_sync == 'true'
         run: |
           echo "Proceeding with test branch synchronization..."
-
-          # Fetch latest changes from both branches
-          git fetch origin main:main --force
-          git fetch origin test:test --force
-
+          
           # Switch to test branch
           git checkout test
-
-          # Show current status
-          echo "Current test branch commit:"
-          git log --oneline -1
-          echo "Latest main branch commit:"
-          git log --oneline main -1
-
-          # Check if test is already up to date with main
-          if git merge-base --is-ancestor main test; then
-            echo "Test branch is already up to date with main"
-            echo "ALREADY_UP_TO_DATE=true" >> $GITHUB_OUTPUT
-            exit 0
-          fi
-
+          git pull origin test
+          
           # Attempt merge with main
-          if git merge main --no-edit -m "chore: auto-sync test branch with main
-
-          Automated synchronization of test branch with latest main branch changes.
-
-          🤖 Generated by Auto-Sync workflow run #${{ github.run_number }}"; then
+          if git merge origin/main --no-edit; then
             echo "MERGE_SUCCESS=true" >> $GITHUB_OUTPUT
             echo "Merge completed successfully"
-
-            # Show what was merged
-            echo "Changes merged from main:"
-            git log --oneline test^..test
           else
             echo "MERGE_CONFLICT=true" >> $GITHUB_OUTPUT
             echo "Merge conflicts detected"
-
+            
             # Get conflict files for reporting
             git status --porcelain | grep "^UU" | cut -c4- > conflict_files.txt || echo "No conflict files detected"
-
+            
             # Abort the merge
             git merge --abort
           fi
@@ -229,22 +201,12 @@ jobs:
           echo "## Auto-Sync Summary" >> $GITHUB_STEP_SUMMARY
           echo "- **Trigger**: ${{ github.event_name }}" >> $GITHUB_STEP_SUMMARY
           echo "- **Main branch validation**: ${{ steps.validation.outputs.VALIDATION_ISSUES == 'true' && '❌ Failed' || '✅ Passed' }}" >> $GITHUB_STEP_SUMMARY
-
-          # Determine sync status
-          if [ "${{ steps.sync.outputs.ALREADY_UP_TO_DATE }}" == "true" ]; then
-            echo "- **Sync status**: ✅ Already up to date" >> $GITHUB_STEP_SUMMARY
-          elif [ "${{ steps.sync.outputs.MERGE_SUCCESS }}" == "true" ]; then
-            echo "- **Sync status**: ✅ Successfully synchronized" >> $GITHUB_STEP_SUMMARY
-          elif [ "${{ steps.sync.outputs.MERGE_CONFLICT }}" == "true" ]; then
-            echo "- **Sync status**: ⚠️ Merge conflicts detected" >> $GITHUB_STEP_SUMMARY
-          else
-            echo "- **Sync status**: ⏭️ Skipped (validation issues)" >> $GITHUB_STEP_SUMMARY
-          fi
-
+          echo "- **Sync attempt**: ${{ steps.sync.outputs.MERGE_SUCCESS == 'true' && '✅ Success' || steps.sync.outputs.MERGE_CONFLICT == 'true' && '⚠️ Conflicts' || '⏭️ Skipped' }}" >> $GITHUB_STEP_SUMMARY
+          
           if [ "${{ steps.validation.outputs.ANY_TYPES_COUNT }}" -gt 0 ]; then
             echo "- **'any' types detected**: ${{ steps.validation.outputs.ANY_TYPES_COUNT }}" >> $GITHUB_STEP_SUMMARY
           fi
-
+          
           if [ "${{ steps.sync.outputs.MERGE_CONFLICT }}" == "true" ]; then
             echo "- **Manual intervention required**: Merge conflicts need resolution" >> $GITHUB_STEP_SUMMARY
           fi