fix: add warning for conflicting auto_merge settings in batched workflows

When multiple workflows target the same repo with different auto_merge
settings, log a warning and use AND logic (any false wins) for safety.

Author: cbullinger

services/github_write_to_source.go

@@ -74,14 +74,42 @@ func UpdateDeprecationFile(ctx context.Context, config *configs.Config, filesToD
 		}
 	}
 
+	// Build a set of existing entries for duplicate detection
+	// Key format: "filename|repo|branch" to identify unique entries
+	existingEntries := make(map[string]bool)
+	for _, entry := range deprecationFile {
+		key := entry.FileName + "|" + entry.Repo + "|" + entry.Branch
+		existingEntries[key] = true
+	}
+
+	entriesAdded := 0
 	for key, value := range filesToDeprecate {
+		// Check for duplicates before appending (prevents issues with webhook redelivery)
+		entryKey := key + "|" + value.TargetRepo + "|" + value.TargetBranch
+		if existingEntries[entryKey] {
+			LogInfo("Skipping duplicate deprecation entry",
+				"filename", key,
+				"repo", value.TargetRepo,
+				"branch", value.TargetBranch,
+			)
+			continue
+		}
+
 		newDeprecatedFileEntry := types.DeprecatedFileEntry{
 			FileName:  key,
 			Repo:      value.TargetRepo,
 			Branch:    value.TargetBranch,
 			DeletedOn: time.Now().Format(time.RFC3339),
 		}
 		deprecationFile = append(deprecationFile, newDeprecatedFileEntry)
+		existingEntries[entryKey] = true // Mark as added to prevent duplicates within current batch
+		entriesAdded++
+	}
+
+	// Early return if all entries were duplicates
+	if entriesAdded == 0 {
+		LogInfo("All deprecation entries already exist; skipping update")
+		return
 	}
 
 	updatedJSON, err := json.MarshalIndent(deprecationFile, "", "  ")

services/webhook_handler_new.go

@@ -382,7 +382,7 @@ func handleMergedPRWithContainer(ctx context.Context, prNumber int, sourceCommit
 
 	// 5. Process workflows independently, collecting per-workflow errors (#6)
 	workflowErrors := processFilesWithWorkflows(ctx, prNumber, sourceCommitSHA, changedFiles, yamlConfig, config, container)
-	uploadAndDeprecateFiles(ctx, config, container, repoOwner, repoName, baseBranch)
+	uploadAndDeprecateFiles(ctx, config, container, repoOwner, repoName, baseBranch, prNumber)
 
 	// 6. Collect unique target repos for notification
 	targetRepos := collectTargetRepos(yamlConfig)
@@ -459,7 +459,7 @@ func fetchChangedFiles(ctx context.Context, config *configs.Config, container *S
 
 // uploadAndDeprecateFiles drains the file-state queues, uploading files to target
 // repos and updating the deprecation file in the source repo.
-func uploadAndDeprecateFiles(ctx context.Context, config *configs.Config, container *ServiceContainer, sourceRepoOwner, sourceRepoName, sourceBranch string) {
+func uploadAndDeprecateFiles(ctx context.Context, config *configs.Config, container *ServiceContainer, sourceRepoOwner, sourceRepoName, sourceBranch string, prNumber int) {
 	// Upload queued files
 	filesToUpload := container.FileStateService.GetFilesToUpload()
 	AddFilesToTargetRepos(ctx, config, filesToUpload, container.PRTemplateFetcher, container.MetricsCollector)
@@ -468,16 +468,31 @@ func uploadAndDeprecateFiles(ctx context.Context, config *configs.Config, contai
 	// Build deprecation map and update file in the source repo
 	deprecationMap := container.FileStateService.GetFilesToDeprecate()
 	filesToDeprecate := make(map[string]types.Configs)
+	var deprecatedFiles []string
 	for _, entries := range deprecationMap {
 		for _, entry := range entries {
 			filesToDeprecate[entry.FileName] = types.Configs{
 				TargetRepo:   entry.Repo,
 				TargetBranch: entry.Branch,
 			}
+			deprecatedFiles = append(deprecatedFiles, entry.FileName)
 		}
 	}
 	UpdateDeprecationFile(ctx, config, filesToDeprecate, sourceRepoOwner, sourceRepoName, sourceBranch)
 	container.FileStateService.ClearFilesToDeprecate()
+
+	// Send Slack notification if files were deprecated
+	if len(deprecatedFiles) > 0 {
+		sourceRepo := fmt.Sprintf("%s/%s", sourceRepoOwner, sourceRepoName)
+		if notifyErr := container.SlackNotifier.NotifyDeprecation(ctx, &DeprecationEvent{
+			PRNumber:   prNumber,
+			SourceRepo: sourceRepo,
+			FileCount:  len(deprecatedFiles),
+			Files:      deprecatedFiles,
+		}); notifyErr != nil {
+			LogWarningCtx(ctx, "failed to send Slack deprecation notification", map[string]interface{}{"error": notifyErr.Error()})
+		}
+	}
 }
 
 // reportCompletion calculates processing metrics and sends a Slack notification.

services/workflow_processor.go

@@ -142,7 +142,7 @@ func (wp *workflowProcessor) ProcessWorkflow(
 	for i := range matches {
 		mr := &matches[i]
 		if mr.isDelete {
-			wp.addToDeprecationMap(mr.workflow, mr.targetPath)
+			wp.addToDeprecationMap(mr.workflow, mr.targetPath, mr.file.Path, mr.prNumber)
 			filesMatched++
 			continue
 		}
@@ -379,17 +379,24 @@ func (wp *workflowProcessor) isExcluded(path string, excludePatterns []string) b
 	return false
 }
 
-// addToDeprecationMap adds a file to the deprecation map
-func (wp *workflowProcessor) addToDeprecationMap(workflow types.Workflow, targetPath string) {
+// addToDeprecationMap adds a file to the deprecation map if deprecation tracking is enabled
+func (wp *workflowProcessor) addToDeprecationMap(workflow types.Workflow, targetPath string, sourcePath string, prNumber int) {
+	// Only track deprecations if explicitly enabled
+	if workflow.DeprecationCheck == nil || !workflow.DeprecationCheck.Enabled {
+		return
+	}
+
 	deprecationFile := "deprecated_examples.json"
-	if workflow.DeprecationCheck != nil && workflow.DeprecationCheck.File != "" {
+	if workflow.DeprecationCheck.File != "" {
 		deprecationFile = workflow.DeprecationCheck.File
 	}
 
 	entry := types.DeprecatedFileEntry{
-		FileName: targetPath,
-		Repo:     workflow.Destination.Repo,
-		Branch:   workflow.Destination.Branch,
+		FileName:   targetPath,
+		Repo:       workflow.Destination.Repo,
+		Branch:     workflow.Destination.Branch,
+		SourcePath: sourcePath,
+		PRNumber:   prNumber,
 	}
 
 	wp.fileStateService.AddFileToDeprecate(deprecationFile, entry)
@@ -424,6 +431,25 @@ func (wp *workflowProcessor) queueUpload(
 			UsePRTemplate:  getUsePRTemplate(workflow),
 			AutoMergePR:    getAutoMerge(workflow),
 		}
+	} else {
+		// When batching multiple workflows, use AND logic for auto-merge (conservative):
+		// auto-merge is only enabled if ALL workflows in the batch want it.
+		// Log a warning when workflows have conflicting auto-merge settings.
+		workflowAutoMerge := getAutoMerge(workflow)
+		if workflowAutoMerge != content.AutoMergePR {
+			LogWarning("Workflows in batch have conflicting auto_merge settings; using AND logic (auto-merge disabled)",
+				"workflow", workflow.Name,
+				"target", key.RepoName,
+				"workflow_auto_merge", workflowAutoMerge,
+				"batch_auto_merge", content.AutoMergePR,
+			)
+			// AND logic: if either is false, result is false
+			content.AutoMergePR = false
+		}
+		// For PR template, use OR logic - if any workflow wants it, use it
+		if getUsePRTemplate(workflow) && !content.UsePRTemplate {
+			content.UsePRTemplate = true
+		}
 	}
 
 	// Add file to content