miscs

copienator_gui/app.py

@@ -2129,6 +2129,9 @@ class CopienatorApp(tk.Tk):
                 return
             if step_id == "fetch_batches":
                 self.after_idle(self._select_batch_integration)
+            elif (step_id == "correction"
+                    and self.state_store.step(step_id).get("last_run_variant") == "integrate"):
+                self.after_idle(self._select_after_batch_integration)
             elif step_id == "manual_resolution":
                 self.after_idle(self._select_refaire_correction)
             else:
@@ -2241,6 +2244,24 @@ class CopienatorApp(tk.Tk):
         self.tree.selection_set("correction")
         self.tree.see("correction")
 
+    def _select_after_batch_integration(self) -> None:
+        """Continue integration with conflict resolution or correction cleanup."""
+        evaluation = self.state_store.evaluation
+        if self.runner.running or self.active_step_id or evaluation is None:
+            return
+        if has_manual_conflicts(evaluation / "manual_resolutions.txt"):
+            target = "manual_resolution"
+        else:
+            self.state_store.update_step("manual_resolution", status="success")
+            self.state_store.add_history({
+                "step": "manual_resolution", "status": "success",
+                "manual": False, "reason": "Aucun conflit manuel après l’intégration batch.",
+            })
+            self._populate_tree()
+            target = "post_correction"
+        self.tree.selection_set(target)
+        self.tree.see(target)
+
     def _select_refaire_correction(self) -> None:
         """Return from manual conflict resolution to the main redo correction."""
         if self.runner.running or self.active_step_id or not self.state_store.evaluation: