Which do you think
The AI divides it's units by operation - settle, offense, defence, workers, patrol/explore, garrison, sentry. It only considers civilians when looking for workers. I've modified that code so I can control if it looks for civilians or combat units (but not both) and changed the operation sequence to - settle, offense, defence, workers(civilian), patrol/explore, garrison, workers(combat), sentry. Which makes any combat unit capable of doing a relevant task that is otherwise on sentry duty (ie running from hill to hill) perform that task. Combat workers are limited to looking for tasks within three tiles of themselves (configured in XML as it may need to be two or even one) - this is to stop all the units supposedly on homeland defence piling into one area and leaving the borders undefended. The changes should also work for the Samurai's new ability, but I've not tested that. Combat workers won't dedicate themselves to a task - they may half build a fort, leave it if something more important comes their way, and then come back to it later. Workers will also remove forts in they need to build farms, etc.
W