began to go through the files and organize imports and gui_2.py's new context defs

still a bunch to sift through after the last ai passes

src/patch_modal.py

@@ -1,5 +1,6 @@
-from typing import Optional, Callable, List
 from dataclasses import dataclass, field
+from typing      import Optional, Callable, List
+
 
 @dataclass
 class PendingPatch: