ommlds 0.0.0.dev512__py3-none-any.whl → 0.0.0.dev514__py3-none-any.whl

ommlds/cli/sessions/chat/interfaces/textual/app.py

@@ -59,6 +59,12 @@ class ChatAppScreen(tx.Screen):
             'Copy selected text',
             show=False,
         ),
+
+        tx.Binding(
+            'f10',
+            'app.confirm_all_pending_tool_uses',
+            'Confirms all pending tool uses',
+        ),
     ]
 
     @classmethod
@@ -110,6 +116,8 @@ class ChatApp(
 
         self._input_focused_key_events: weakref.WeakSet[tx.Key] = weakref.WeakSet()
 
+        self._pending_tool_confirmations: set[ToolConfirmationMessage] = set()
+
     def get_driver_class(self) -> type[tx.Driver]:
         return tx.get_pending_writes_driver_class(super().get_driver_class())
 
@@ -409,6 +417,10 @@ class ChatApp(
             fut,
         )
 
+        fut.add_done_callback(lambda _: self._pending_tool_confirmations.discard(tcm))
+
+        self._pending_tool_confirmations.add(tcm)
+
         async def inner() -> None:
             await self._mount_messages(tcm)
 
@@ -427,3 +439,13 @@ class ChatApp(
     async def action_cancel(self) -> None:
         if (cat := self._cur_chat_action) is not None:
             cat.cancel()
+
+    async def action_confirm_all_pending_tool_uses(self) -> None:
+        for tcm in list(self._pending_tool_confirmations):
+            if not tcm.has_rendered:
+                continue
+
+            if not tcm.has_confirmed:
+                await tcm.confirm()
+
+            self._pending_tool_confirmations.discard(tcm)

ommlds/cli/sessions/chat/interfaces/textual/widgets/messages.py

@@ -3,6 +3,7 @@ import asyncio
 import typing as ta
 
 from omdev.tui import textual as tx
+from omlish import check
 from omlish import lang
 
 
@@ -145,14 +146,14 @@ class StreamAiMessage(AiMessage):
 
 
 class ToolConfirmationControls(tx.Static):
-    class Allowed(tx.Message):
+    class ClickedAllow(tx.Message):
         pass
 
     def compose(self) -> tx.ComposeResult:
         yield tx.Button('Allow', action='allow')
 
     def action_allow(self) -> None:
-        self.post_message(self.Allowed())
+        self.post_message(self.ClickedAllow())
 
 
 class ToolConfirmationMessage(Message):
@@ -170,24 +171,58 @@ class ToolConfirmationMessage(Message):
         self._inner_content = inner_content
         self._fut = fut
 
-    def compose(self) -> tx.ComposeResult:
-        with tx.Horizontal(classes='tool-confirmation-message-outer message-outer'):
-            yield tx.Static('? ', classes='tool-confirmation-message-glyph message-glyph')
-            with tx.Vertical(classes='tool-confirmation-message-inner tool-confirmation-message-inner-open message-inner'):  # noqa
-                yield tx.Static(self._outer_content, classes='tool-confirmation-message-outer-content')
-                yield tx.Static(self._inner_content, classes='tool-confirmation-message-inner-content')
-                yield ToolConfirmationControls(classes='tool-confirmation-message-controls')
+        self._has_rendered = False
+        self._has_confirmed = False
+
+    @property
+    def has_rendered(self) -> bool:
+        return self._has_rendered
+
+    @property
+    def has_confirmed(self) -> bool:
+        return self._has_confirmed
+
+    async def confirm(self) -> None:
+        check.equal(self._fut.done(), self._has_confirmed)
+
+        if self._has_confirmed:
+            return
+        self._has_confirmed = True
 
-    @tx.on(ToolConfirmationControls.Allowed)
-    async def on_allowed(self, event: ToolConfirmationControls.Allowed) -> None:
         inner = self.query_one(tx.Vertical)
+
         await inner.query_one(ToolConfirmationControls).remove()
+
         inner.remove_class('tool-confirmation-message-inner-open')
         inner.add_class('tool-confirmation-message-inner-closed')
+
         inner.query_one('.tool-confirmation-message-outer-content', tx.Static).update('Tool use confirmed.')
 
         self._fut.set_result(True)
 
+    def compose(self) -> tx.ComposeResult:
+        with tx.Horizontal(classes='tool-confirmation-message-outer message-outer'):
+            yield tx.Static('? ', classes='tool-confirmation-message-glyph message-glyph')
+            with tx.Vertical(classes=' '.join([
+                'tool-confirmation-message-inner',
+                'tool-confirmation-message-inner-open',
+                'message-inner',
+            ])):
+                yield tx.Static(self._outer_content, classes='tool-confirmation-message-outer-content')
+                yield tx.Static(self._inner_content, classes='tool-confirmation-message-inner-content')
+
+                yield ToolConfirmationControls(classes='tool-confirmation-message-controls')
+
+    def on_mount(self) -> None:
+        def inner():
+            self._has_rendered = True
+
+        self.call_after_refresh(inner)
+
+    @tx.on(ToolConfirmationControls.ClickedAllow)
+    async def on_clicked_allow(self, event: ToolConfirmationControls.ClickedAllow) -> None:
+        await self.confirm()
+
 
 #
 

{ommlds-0.0.0.dev512.dist-info → ommlds-0.0.0.dev514.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ommlds
-Version: 0.0.0.dev512
+Version: 0.0.0.dev514
 Summary: ommlds
 Author: wrmsr
 License-Expression: BSD-3-Clause
@@ -14,9 +14,9 @@ Classifier: Programming Language :: Python :: 3.13
 Requires-Python: >=3.13
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev512
+Requires-Dist: omlish==0.0.0.dev514
 Provides-Extra: all
-Requires-Dist: omdev==0.0.0.dev512; extra == "all"
+Requires-Dist: omdev==0.0.0.dev514; extra == "all"
 Requires-Dist: llama-cpp-python~=0.3; extra == "all"
 Requires-Dist: mlx~=0.30; sys_platform == "darwin" and extra == "all"
 Requires-Dist: mlx-lm~=0.29; sys_platform == "darwin" and extra == "all"
@@ -39,7 +39,7 @@ Requires-Dist: mwparserfromhell~=0.7; extra == "all"
 Requires-Dist: wikitextparser~=0.56; extra == "all"
 Requires-Dist: lxml>=5.3; python_version < "3.13" and extra == "all"
 Provides-Extra: omdev
-Requires-Dist: omdev==0.0.0.dev512; extra == "omdev"
+Requires-Dist: omdev==0.0.0.dev514; extra == "omdev"
 Provides-Extra: backends
 Requires-Dist: llama-cpp-python~=0.3; extra == "backends"
 Requires-Dist: mlx~=0.30; sys_platform == "darwin" and extra == "backends"

{ommlds-0.0.0.dev512.dist-info → ommlds-0.0.0.dev514.dist-info}/RECORD

@@ -214,7 +214,7 @@ ommlds/cli/sessions/chat/interfaces/bare/interactive.py,sha256=ZnYoePvXtUbhkDQ0j
 ommlds/cli/sessions/chat/interfaces/bare/oneshot.py,sha256=b758OIa0gf9I_0UdxYJ6re-g8-8xndgr3R0OotUOsmc,387
 ommlds/cli/sessions/chat/interfaces/bare/tools.py,sha256=_UsuoXLIvfpFP_We5DBBlhm6rwB3_cFA3lmFvpG9b-A,824
 ommlds/cli/sessions/chat/interfaces/textual/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ommlds/cli/sessions/chat/interfaces/textual/app.py,sha256=glO32FiPn4T1nLXBOe2QpTwkFv0yGKchGZQHGFQVaOw,12614
+ommlds/cli/sessions/chat/interfaces/textual/app.py,sha256=hgEQ9QEAxYVR-d7z4FJsXycbkHKcLzzAWQ6zR0jy_Zs,13301
 ommlds/cli/sessions/chat/interfaces/textual/configs.py,sha256=-pvG2_Uai70ohDfK4Tt8yaHnvdCs10_gaoQkr-CsOqA,213
 ommlds/cli/sessions/chat/interfaces/textual/facades.py,sha256=zXVG7DKVl-Xtdc893O_yktHCMvM0do6hLesMd8hbqeo,411
 ommlds/cli/sessions/chat/interfaces/textual/inject.py,sha256=eBhFVZ2VmQdoTPSZvi2OSkZ-fX8Mw2TKo28bHZeACJY,3056
@@ -227,7 +227,7 @@ ommlds/cli/sessions/chat/interfaces/textual/styles/markdown.tcss,sha256=KCKlgt_E
 ommlds/cli/sessions/chat/interfaces/textual/styles/messages.tcss,sha256=tl0ZPnYY3jsumj_Y_AFaA1Vbz7AvgWC7xMuS-JOAPEk,1820
 ommlds/cli/sessions/chat/interfaces/textual/widgets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/chat/interfaces/textual/widgets/input.py,sha256=MMONcOi3Aq8ZzmvJn6tHNPbfV3EOol25fABxtW1h--E,1827
-ommlds/cli/sessions/chat/interfaces/textual/widgets/messages.py,sha256=_xu24596FT0MZMWOdE0-2SkPF_na_J6lG35CstKCI94,5614
+ommlds/cli/sessions/chat/interfaces/textual/widgets/messages.py,sha256=RiERDoNe7HwSbQx0ATh0cToGhwOXnNLdnkVZnWV203g,6332
 ommlds/cli/sessions/completion/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 ommlds/cli/sessions/completion/configs.py,sha256=jOtadH46Esx6CztbQazAgIx9Tt5uuu4pGPov3G3O5Ac,286
 ommlds/cli/sessions/completion/inject.py,sha256=oWRS2D4d-mdCwi7jT_Is462k1UBlCruz4nrUeT9xedY,848
@@ -526,9 +526,9 @@ ommlds/wiki/utils/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU
 ommlds/wiki/utils/io.py,sha256=UKgDJGtmpnWvIqVd2mJc2QNPOqlToEY1GEveNp6_pMo,7088
 ommlds/wiki/utils/progress.py,sha256=EhvKcMFYtsarCQhIahlO6f0SboyAKP3UwUyrnVnP-Vk,3222
 ommlds/wiki/utils/xml.py,sha256=sNJNkZ9rT8B-kJMO6bRz8J1USy4fyPx0m2PwTX7vxYY,3846
-ommlds-0.0.0.dev512.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
-ommlds-0.0.0.dev512.dist-info/METADATA,sha256=iYOryaX8qoz-w6zU-x-e47TdQae2phv2yBnh4828-KU,3602
-ommlds-0.0.0.dev512.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-ommlds-0.0.0.dev512.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
-ommlds-0.0.0.dev512.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
-ommlds-0.0.0.dev512.dist-info/RECORD,,
+ommlds-0.0.0.dev514.dist-info/licenses/LICENSE,sha256=B_hVtavaA8zCYDW99DYdcpDLKz1n3BBRjZrcbv8uG8c,1451
+ommlds-0.0.0.dev514.dist-info/METADATA,sha256=q4ShoZYDFsg8DlxflkSxvX0wF1O_W0ENF79Ne0-WEJQ,3602
+ommlds-0.0.0.dev514.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+ommlds-0.0.0.dev514.dist-info/entry_points.txt,sha256=Z5YWtX7ClfiCKdW-dd_CSVvM0h4yQpJPi-2G3q6gNFo,35
+ommlds-0.0.0.dev514.dist-info/top_level.txt,sha256=Rbnk5d5wi58vnAXx13WFZqdQ4VX8hBCS2hEL3WeXOhY,7
+ommlds-0.0.0.dev514.dist-info/RECORD,,