feat(FN-4307): complete Step 2 — suppress transient failure surfacing

Fusion-Task-Id: FN-4307 Fusion-Task-Lineage: 00140a5a-af93-4905-8570-32d7ecb8a874
2026-05-13 15:36:04 -07:00
parent 74f069b57f
commit 6bf90f1cac
2 changed files with 22 additions and 4 deletions
--- a/packages/engine/src/project-engine.ts
+++ b/packages/engine/src/project-engine.ts
@@ -1816,10 +1816,10 @@ export class ProjectEngine {
                  mergeRetries: ProjectEngine.MAX_AUTO_MERGE_RETRIES,
                  error: errorMsg,
                });
-                await store.addTaskComment(
+                await store.logEntry(
                  taskId,
                  `Auto-merge failed with a non-conflict error and stopped retrying: ${errorMsg}`,
-                  "agent",
+                  "MergeNonConflictFailure",
                );
              } catch (recoveryErr) {
                runtimeLog.error(