fix(wf10_batch): fix add/add conflict

Closes: #10861

.forgejo/workflows/ci.yml

@@ -327,11 +327,13 @@ jobs:
                   GOOGLE_API_KEY: ${{ secrets.GOOGLE_API_KEY }}
 
             - name: Upload E2E tests log artifact
-              if: always()
+              if: failure()
               uses: actions/upload-artifact@v3
               with:
                   name: ci-logs-e2e-tests
-                  path: build/nox-e2e-tests-output.log
+                  path: |
+                      build/nox-e2e-tests-output.log
+                      build/reports/robot-e2e/
                   retention-days: 30
 
     coverage:

robot/e2e/wf10_batch.robot

@@ -92,6 +92,23 @@ Write Action Config
     Create File    ${yaml_path}    ${config}\n
     RETURN    ${yaml_path}
 
+Clean Workspace Template Files
+    [Documentation]    Remove template files from the workspace that the LLM
+    ...                may regenerate during formatting, to prevent add/add
+    ...                merge conflicts during plan apply.
+    @{conflicting}=    Create List
+    ...    .pre-commit-config.yaml
+    ...    pyproject.toml
+    ...    requirements-dev.txt
+    ...    requirements.txt
+    ...    setup.py
+    ...    setup.cfg
+    ...    tox.ini
+    FOR    ${file}    IN    @{conflicting}
+        ${path}=    Set Variable    ${SUITE_HOME}${/}${file}
+        Run Keyword And Ignore Error    Remove File    ${path}
+    END
+
 Write Broken Action Config
     [Documentation]    Write a deliberately broken action YAML that uses a non-existent
     ...                LLM actor.  Plans created with this action will fail during
@@ -226,7 +243,8 @@ Apply Batch Plans
         ...    timeout=${PLAN_TIMEOUT}    expected_rc=None
         Log    Apply ${plan_id} rc=${apply.rc}: ${apply.stdout}
         IF    ${apply.rc} != 0
-            Log    Plan ${plan_id} failed during apply (rc=${apply.rc}): ${apply.stderr}    WARN
+            Log    Plan ${plan_id} failed during apply (rc=${apply.rc}) stdout: ${apply.stdout}    WARN
+            Log    Plan ${plan_id} failed during apply (rc=${apply.rc}) stderr: ${apply.stderr}    WARN
             CONTINUE
         END
         Append To List    ${applied_ids}    ${plan_id}
@@ -253,6 +271,10 @@ Workflow 10 Full-Auto Batch Formatting
     [Teardown]    Run CleverAgents Command    config    set    core.automation-profile    manual    expected_rc=None
     Skip If No LLM Keys
 
+    # Prevent add/add merge conflicts during plan apply by removing workspace
+    # template files that the LLM may regenerate.
+    Clean Workspace Template Files
+
     # --- Step 1: Create temp monorepo with badly-formatted packages ---
     ${monorepo}    ${branch}=    Create Temp Monorepo
     Log    Monorepo created at: ${monorepo} (branch: ${branch})