Let the editing-mode label follow its own editor lifetime

.verification/editing-mode-label/author.py

@@ -0,0 +1,40 @@
+import json
+from pathlib import Path
+r=Path.cwd();f=str(r/'src/toad/widgets/prompt.py');ops=[]
+def patch(t,o,n):ops.append(dict(operation='patch_target',file_path=f,target_qualname=t,replacements=[dict(old_source=o,new_source=n)]))
+patch('EditingModeLabel','''class EditingModeLabel(AutoWidth, OneRow, SidePadding, NoWrap, Label):
+    def apply_native_layout''','''class EditingModeLabel(AutoWidth, OneRow, SidePadding, NoWrap, Label):
+    """The label follows its own editor throughout this composition's lifetime."""
+
+    def __init__(self, editor: PromptTextArea):
+        super().__init__("", markup=False)
+        self.editor = editor
+
+    @on(events.Mount)
+    def follow_editor(self) -> None:
+        self.watch(self.editor, "editing_mode", self.update_mode)
+        self.watch(self.editor, "has_focus", self.update_mode)
+
+    def update_mode(self) -> None:
+        self.update((self.editor.editing_mode if self.editor.has_focus else Standard()).label)
+
+    def apply_native_layout''')
+patch('PromptTextArea.on_mount','''        self.call_after_refresh(lambda: self.show_editing_mode(self.editing_mode))\n''','')
+patch('PromptTextArea','''    def show_editing_mode(self, mode: EditingMode) -> None:
+        """Away from the box the Standard keys are in force, so the label says STANDARD."""
+        if self.is_mounted:
+            self.prompt.editing_mode_label.update((mode if self.has_focus else Standard()).label)
+
+    def watch_has_focus(self, focus: bool) -> None:
+        self.show_editing_mode(self.editing_mode)
+
+''','')
+patch('Prompt.compose','''                yield self.TEXT_AREA_CLASS(prompt=self).data_bind(''','''                editor = self.TEXT_AREA_CLASS(prompt=self).data_bind(''')
+patch('Prompt.compose','''                    slash_commands=Prompt.slash_commands,
+                )
+        yield from self.compose_info_popups()''','''                    slash_commands=Prompt.slash_commands,
+                )
+                yield editor
+        yield from self.compose_info_popups()''')
+patch('Prompt.compose','''            yield EditingModeLabel("", markup=False)''','''            yield EditingModeLabel(editor)''')
+Path('.verification/editing-mode-label/fix.plan.json').write_text(json.dumps({'recipes':[{'recipe_id':'label-observes-original-editor-without-sibling-mount-queries','operations':ops}]},indent=2))

.verification/editing-mode-label/fix.plan.json

@@ -0,0 +1,75 @@
+{
+  "recipes": [
+    {
+      "recipe_id": "label-observes-original-editor-without-sibling-mount-queries",
+      "operations": [
+        {
+          "operation": "patch_target",
+          "file_path": "/home/ts/wt/codex-live--P181--toad/src/toad/widgets/prompt.py",
+          "target_qualname": "EditingModeLabel",
+          "replacements": [
+            {
+              "old_source": "class EditingModeLabel(AutoWidth, OneRow, SidePadding, NoWrap, Label):\n    def apply_native_layout",
+              "new_source": "class EditingModeLabel(AutoWidth, OneRow, SidePadding, NoWrap, Label):\n    \"\"\"The label follows its own editor throughout this composition's lifetime.\"\"\"\n\n    def __init__(self, editor: PromptTextArea):\n        super().__init__(\"\", markup=False)\n        self.editor = editor\n\n    @on(events.Mount)\n    def follow_editor(self) -> None:\n        self.watch(self.editor, \"editing_mode\", self.update_mode)\n        self.watch(self.editor, \"has_focus\", self.update_mode)\n\n    def update_mode(self) -> None:\n        self.update((self.editor.editing_mode if self.editor.has_focus else Standard()).label)\n\n    def apply_native_layout"
+            }
+          ]
+        },
+        {
+          "operation": "patch_target",
+          "file_path": "/home/ts/wt/codex-live--P181--toad/src/toad/widgets/prompt.py",
+          "target_qualname": "PromptTextArea.on_mount",
+          "replacements": [
+            {
+              "old_source": "        self.call_after_refresh(lambda: self.show_editing_mode(self.editing_mode))\n",
+              "new_source": ""
+            }
+          ]
+        },
+        {
+          "operation": "patch_target",
+          "file_path": "/home/ts/wt/codex-live--P181--toad/src/toad/widgets/prompt.py",
+          "target_qualname": "PromptTextArea",
+          "replacements": [
+            {
+              "old_source": "    def show_editing_mode(self, mode: EditingMode) -> None:\n        \"\"\"Away from the box the Standard keys are in force, so the label says STANDARD.\"\"\"\n        if self.is_mounted:\n            self.prompt.editing_mode_label.update((mode if self.has_focus else Standard()).label)\n\n    def watch_has_focus(self, focus: bool) -> None:\n        self.show_editing_mode(self.editing_mode)\n\n",
+              "new_source": ""
+            }
+          ]
+        },
+        {
+          "operation": "patch_target",
+          "file_path": "/home/ts/wt/codex-live--P181--toad/src/toad/widgets/prompt.py",
+          "target_qualname": "Prompt.compose",
+          "replacements": [
+            {
+              "old_source": "                yield self.TEXT_AREA_CLASS(prompt=self).data_bind(",
+              "new_source": "                editor = self.TEXT_AREA_CLASS(prompt=self).data_bind("
+            }
+          ]
+        },
+        {
+          "operation": "patch_target",
+          "file_path": "/home/ts/wt/codex-live--P181--toad/src/toad/widgets/prompt.py",
+          "target_qualname": "Prompt.compose",
+          "replacements": [
+            {
+              "old_source": "                    slash_commands=Prompt.slash_commands,\n                )\n        yield from self.compose_info_popups()",
+              "new_source": "                    slash_commands=Prompt.slash_commands,\n                )\n                yield editor\n        yield from self.compose_info_popups()"
+            }
+          ]
+        },
+        {
+          "operation": "patch_target",
+          "file_path": "/home/ts/wt/codex-live--P181--toad/src/toad/widgets/prompt.py",
+          "target_qualname": "Prompt.compose",
+          "replacements": [
+            {
+              "old_source": "            yield EditingModeLabel(\"\", markup=False)",
+              "new_source": "            yield EditingModeLabel(editor)"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

.verification/editing-mode-label/owned-label.plan.json

@@ -0,0 +1,59 @@
+{
+  "recipes": [
+    {
+      "recipe_id": "retain-the-original-editor-label-through-mount-and-mode-updates",
+      "operations": [
+        {
+          "operation": "patch_target",
+          "file_path": "/home/ts/wt/codex-live--P181--toad/src/toad/widgets/prompt.py",
+          "target_qualname": "EditingModeLabel",
+          "replacements": [
+            {
+              "old_source": "    \"\"\"The label follows its own editor throughout this composition's lifetime.\"\"\"\n\n    def __init__(self, editor: PromptTextArea):\n        super().__init__(\"\", markup=False)\n        self.editor = editor\n\n    @on(events.Mount)\n    def follow_editor(self) -> None:\n        self.watch(self.editor, \"editing_mode\", self.update_mode)\n        self.watch(self.editor, \"has_focus\", self.update_mode)\n\n    def update_mode(self) -> None:\n        self.update((self.editor.editing_mode if self.editor.has_focus else Standard()).label)\n\n",
+              "new_source": ""
+            }
+          ]
+        },
+        {
+          "operation": "patch_target",
+          "file_path": "/home/ts/wt/codex-live--P181--toad/src/toad/widgets/prompt.py",
+          "target_qualname": "PromptTextArea.__init__",
+          "replacements": [
+            {
+              "old_source": "        self.prompt = prompt\n",
+              "new_source": "        self.prompt = prompt\n        self.editing_mode_label = EditingModeLabel(\"\", markup=False)\n"
+            }
+          ]
+        },
+        {
+          "operation": "patch_target",
+          "file_path": "/home/ts/wt/codex-live--P181--toad/src/toad/widgets/prompt.py",
+          "target_qualname": "PromptTextArea.on_mount",
+          "replacements": [
+            {
+              "old_source": "        self.apply_keyboard_profile()\n",
+              "new_source": "        self.apply_keyboard_profile()\n        self.call_after_refresh(lambda: self.show_editing_mode(self.editing_mode))\n"
+            }
+          ]
+        },
+        {
+          "operation": "insert_before_target",
+          "file_path": "/home/ts/wt/codex-live--P181--toad/src/toad/widgets/prompt.py",
+          "target_qualname": "PromptTextArea.apply_keyboard_profile",
+          "source": "    def show_editing_mode(self, mode: EditingMode) -> None:\n        \"\"\"The editor owns its label before either widget is mounted.\"\"\"\n        if self.is_mounted:\n            self.editing_mode_label.update((mode if self.has_focus else Standard()).label)\n\n    def watch_has_focus(self, focus: bool) -> None:\n        self.show_editing_mode(self.editing_mode)\n\n"
+        },
+        {
+          "operation": "patch_target",
+          "file_path": "/home/ts/wt/codex-live--P181--toad/src/toad/widgets/prompt.py",
+          "target_qualname": "Prompt.compose",
+          "replacements": [
+            {
+              "old_source": "            yield EditingModeLabel(editor)",
+              "new_source": "            yield editor.editing_mode_label"
+            }
+          ]
+        }
+      ]
+    }
+  ]
+}

.verification/editing-mode-label/owned_label.py

@@ -0,0 +1,36 @@
+import json
+from pathlib import Path
+r=Path.cwd();f=str(r/'src/toad/widgets/prompt.py');ops=[]
+def patch(t,o,n):ops.append(dict(operation='patch_target',file_path=f,target_qualname=t,replacements=[dict(old_source=o,new_source=n)]))
+patch('EditingModeLabel','''    """The label follows its own editor throughout this composition's lifetime."""
+
+    def __init__(self, editor: PromptTextArea):
+        super().__init__("", markup=False)
+        self.editor = editor
+
+    @on(events.Mount)
+    def follow_editor(self) -> None:
+        self.watch(self.editor, "editing_mode", self.update_mode)
+        self.watch(self.editor, "has_focus", self.update_mode)
+
+    def update_mode(self) -> None:
+        self.update((self.editor.editing_mode if self.editor.has_focus else Standard()).label)
+
+''','')
+patch('PromptTextArea.__init__','''        self.prompt = prompt\n''','''        self.prompt = prompt
+        self.editing_mode_label = EditingModeLabel("", markup=False)
+''')
+patch('PromptTextArea.on_mount','''        self.apply_keyboard_profile()\n''','''        self.apply_keyboard_profile()
+        self.call_after_refresh(lambda: self.show_editing_mode(self.editing_mode))
+''')
+ops.append(dict(operation='insert_before_target',file_path=f,target_qualname='PromptTextArea.apply_keyboard_profile',source='''    def show_editing_mode(self, mode: EditingMode) -> None:
+        """The editor owns its label before either widget is mounted."""
+        if self.is_mounted:
+            self.editing_mode_label.update((mode if self.has_focus else Standard()).label)
+
+    def watch_has_focus(self, focus: bool) -> None:
+        self.show_editing_mode(self.editing_mode)
+
+'''))
+patch('Prompt.compose','''            yield EditingModeLabel(editor)''','''            yield editor.editing_mode_label''')
+Path('.verification/editing-mode-label/owned-label.plan.json').write_text(json.dumps({'recipes':[{'recipe_id':'retain-the-original-editor-label-through-mount-and-mode-updates','operations':ops}]},indent=2))

src/toad/widgets/prompt.py

@@ -446,6 +446,7 @@ def __init__(self, *, prompt: Prompt) -> None:
         super().__init__()
         # The composer that built this editor owns its turns, popups and modes.
         self.prompt = prompt
+        self.editing_mode_label = EditingModeLabel("", markup=False)
         self.set_reactive(TextArea.editing_mode, prompt.initial_editing_mode)
         self.set_reactive(PromptTextArea.project_path, prompt.project_path)
 
@@ -494,9 +495,9 @@ def on_mount(self) -> None:
         self.call_after_refresh(lambda: self.show_editing_mode(self.editing_mode))
 
     def show_editing_mode(self, mode: EditingMode) -> None:
-        """Away from the box the Standard keys are in force, so the label says STANDARD."""
+        """The editor owns its label before either widget is mounted."""
         if self.is_mounted:
-            self.prompt.editing_mode_label.update((mode if self.has_focus else Standard()).label)
+            self.editing_mode_label.update((mode if self.has_focus else Standard()).label)
 
     def watch_has_focus(self, focus: bool) -> None:
         self.show_editing_mode(self.editing_mode)
@@ -1082,15 +1083,16 @@ def compose(self) -> ComposeResult:
             yield PromptQuestion()
             with TextPrompt():
                 yield PromptLabel(markup=False)
-                yield self.TEXT_AREA_CLASS(prompt=self).data_bind(
+                editor = self.TEXT_AREA_CLASS(prompt=self).data_bind(
                     shell_mode=Prompt.shell_mode,
                     project_path=Prompt.project_path,
                     working_directory=Prompt.working_directory,
                     slash_commands=Prompt.slash_commands,
                 )
+                yield editor
         yield from self.compose_info_popups()
         with InfoBar():
-            yield EditingModeLabel("", markup=False)
+            yield editor.editing_mode_label
             yield from self.compose_agent_info()
             yield StatusLine(markup=False).data_bind(status=Prompt.status)
             yield from self.compose_mode_controls()