codex整理结果

agv_app/utils/mission_executor.py

@@ -84,14 +84,6 @@ class MissionExecutorV3:
         self._step_choice = None  # "confirm", "retry", "abort"
         self._error_mode = False  # True when waiting for error resolution
 
-        # 错误弹窗
-        self._error_choice = None  # "skip" or "abort"
-
-        # 单步执行
-        self._single_step_mode = False
-        self._step_choice = None  # "confirm", "retry", "abort"
-        self._error_mode = False  # True when waiting for error resolution
-
         # 设备
         from .arm_client import ArmClient
         self.arm_client = ArmClient(
@@ -553,14 +545,15 @@ class MissionExecutorV3:
         return grid
 
     @staticmethod
-    def pre_generate_tasks(mission_config: dict) -> list:
+    def pre_generate_tasks(mission_config: dict, machines: list = None) -> list:
         """从网格配置预生成任务列表（用于 UI 展示，无需启动执行器）"""
         rows = int(mission_config.get("rows", 1))
         cols = int(mission_config.get("cols", 1))
         grid = mission_config.get("grid", [])
+        machines = machines or []
 
         # 如果 grid 为空但从 machines 重建
-        if not grid and machines:
+        if (not grid or all(not any(row) if isinstance(row, list) else True for row in grid)) and machines:
             grid = MissionExecutorV3._build_grid_from_machines(rows, cols, machines)
             if grid:
                 rows = len(grid)
@@ -1042,4 +1035,4 @@ class MissionExecutorV3:
         except subprocess.TimeoutExpired:
             return -1, "", "Timeout"
         except Exception as e:
-            return -1, "", str(e)
+            return -1, "", str(e)