cecli-dev 0.100.2__tar.gz → 0.100.4rc1__tar.gz

{cecli_dev-0.100.2 → cecli_dev-0.100.4rc1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cecli-dev
-Version: 0.100.2
+Version: 0.100.4rc1
 Summary: we also can't pronounce cecli
 Project-URL: Homepage, https://github.com/dwash96/cecli
 Project-URL: Documentation, https://github.com/dwash96/cecli

{cecli_dev-0.100.2 → cecli_dev-0.100.4rc1}/cecli/__init__.py

@@ -1,6 +1,6 @@
 from packaging import version
 
-__version__ = "0.100.2.dev"
+__version__ = "0.100.4.dev"
 safe_version = __version__
 
 try:

{cecli_dev-0.100.2 → cecli_dev-0.100.4rc1}/cecli/_version.py

@@ -18,7 +18,7 @@ version_tuple: tuple[int | str, ...]
 commit_id: str | None
 __commit_id__: str | None
 
-__version__ = version = '0.100.2'
-__version_tuple__ = version_tuple = (0, 100, 2)
+__version__ = version = '0.100.4rc1'
+__version_tuple__ = version_tuple = (0, 100, 4, 'rc1')
 
-__commit_id__ = commit_id = 'gb0fcce1f4'
+__commit_id__ = commit_id = 'g65e09d1a2'

{cecli_dev-0.100.2 → cecli_dev-0.100.4rc1}/cecli/helpers/conversation/integration.py

@@ -201,9 +201,19 @@ class ConversationChunks:
             ]
         )
 
+        user_fidelity = random.choice(
+            [
+                "Be mindful of any instructions given, prioritizing the latest.",
+                "Respect all established constraints.",
+                "Please stay on task and stick closely to my guidance.",
+                "Keep my explicit intent in mind.",
+                "Stay focused on our goals and the scope of our concerns.",
+            ]
+        )
+
         msg = dict(
             role="user",
-            content="System Message:\n\n" + message,
+            content=f"System Message:\n\n{message}\n{user_fidelity}",
         )
 
         ConversationService.get_manager(coder).add_message(

{cecli_dev-0.100.2 → cecli_dev-0.100.4rc1}/cecli/helpers/io_proxy.py

@@ -170,6 +170,8 @@ class IOProxy(Generic[T]):
     async def confirm_ask(self, *args, **kwargs):
         """Forward confirm_ask — per-coder queue iteration is handled by
         TextualInputOutput which now iterates all per-coder queues."""
+        if "coder_uuid" not in kwargs:
+            kwargs["coder_uuid"] = self._coder_uuid
         return await self._target.confirm_ask(*args, **kwargs)
 
     async def recreate_input(self, future=None):

{cecli_dev-0.100.2 → cecli_dev-0.100.4rc1}/cecli/prompts/agent.yml

@@ -46,7 +46,7 @@ main_system: |
   2. **Explore**: Use discovery tools (`ExploreCode`, `Grep`, `Ls`) to research and gather understanding for you task. Modify search terms when errors are encountered.
   3. **Execute**: Mark files as editable with `ContextManager` before attempting edits.  Proactively use skills if they are available. Review diff outputs after edit to ensure the proper changes were made.
   4. **Verify & Recover**: If an edit fails or introduces linting errors, use `UndoChange` immediately.
-  5. **Yield**: Use the `Yield` tool only after verifying the solution. Briefly summarize the changes for the user.
+  5. **Yield**: Use the `Yield` tool after accomplishing the goal and verifying any changes made. Provide helpful summaries of any changes.
 
   ## Todo List Management
   - Break complex goals into meaningful sub-tasks so the problem remains tractable
@@ -57,12 +57,12 @@ main_system: |
   </context>
 
   Use the `.cecli/temp` directory for all temporary, test, or scratch files.
-  Always reply to the user in {language}.
+  Always reply in {language}.
 
 system_reminder: |
   <context name="critical_reminders">
   ## Operational Rules
-  - **Scope**: No unrequested refactors. Avoid full-file rewrites.
+  - **Scope**: No unrequested refactors. Avoid full-file rewrites. Only modify what you are asked to.
   - **Hygiene**: Use `ContextManager`/`RemoveSkill` to evict unneeded files/skills immediately after use.
   - **Outputs**: Tool calls trigger turns. Never include tool syntax in final user summaries.
   - **Sandbox**: Perform all verification and temp logic in `.cecli/temp`.

{cecli_dev-0.100.2 → cecli_dev-0.100.4rc1}/cecli/prompts/subagent.yml

@@ -31,7 +31,7 @@ main_system: |
   2. **Explore**: Use discovery tools (`ExploreCode`, `Grep`, `Ls`) to research and gather understanding for you task. Modify search terms when errors are encountered.
   3. **Execute**: Mark files as editable with `ContextManager` before attempting edits.  Proactively use skills if they are available. Review diff outputs after edit to ensure the proper changes were made.
   4. **Verify & Recover**: If an edit fails or introduces linting errors, use `UndoChange` immediately.
-  5. **Yield**: Use the `Yield` tool only after verifying the solution. Briefly summarize the changes for the user.
+  5. **Yield**: Use the `Yield` tool after accomplishing the goal and verifying any changes made. Provide helpful summaries of any changes.
 
   ## Todo List Management
   - Break complex goals into meaningful sub-tasks so the problem remains tractable
@@ -42,12 +42,12 @@ main_system: |
   </context>
 
   Use the `.cecli/temp` directory for all temporary, test, or scratch files.
-  Always reply to the user in {language}.
+  Always reply in {language}.
 
 system_reminder: |
   <context name="critical_reminders">
   ## Operational Rules
-  - **Scope**: No unrequested refactors. Avoid full-file rewrites.
+  - **Scope**: No unrequested refactors. Avoid full-file rewrites. Only modify what you are asked to.
   - **Hygiene**: Use `ContextManager`/`RemoveSkill` to evict unneeded files/skills immediately after use.
   - **Outputs**: Tool calls trigger turns. Never include tool syntax in final user summaries.
   - **Sandbox**: Perform all verification and temp logic in `.cecli/temp`.

{cecli_dev-0.100.2 → cecli_dev-0.100.4rc1}/cecli/tui/app.py

@@ -56,6 +56,7 @@ class TUI(App):
         self.output_queue = output_queue
         self.input_queue = input_queue
         self.args = args  # Store args for _get_config
+
         # Cache for code symbols (functions, classes, variables)
         self._symbols_cache = None
         self._symbols_files_hash = None
@@ -66,6 +67,11 @@ class TUI(App):
         self._sub_agent_containers = {}  # uuid -> OutputContainer
         self._primary_coder_uuid = self.worker.coder.uuid
 
+        # Confirmation lock and pending queue — ensures one confirmation at a time
+        self._confirmation_lock = False
+        self._confirmation_coder_uuid = None
+        self._confirmations_pending: list[tuple[dict, str | None]] = []
+
         self.tui_config = self._get_config()
 
         # Register and set cecli theme using config colors
@@ -651,10 +657,29 @@ class TUI(App):
 
     def show_confirmation(self, msg, agent_name: str | None = None):
         """Show inline confirmation bar."""
+
+        # Safety: clear stale lock if no confirmation bar is active
+        if self._confirmation_lock:
+            status_bar = self.query_one("#status-bar", StatusBar)
+            if status_bar.mode != "confirm":
+                self._confirmation_lock = False
+
+        # Check confirmation lock: only one confirmation at a time
+        if self._confirmation_lock:
+            self._confirmations_pending.append((msg, agent_name))
+            return
+        self._confirmation_lock = True
+
         # Disable input while confirm bar is active
         input_area = self.query_one("#input", InputArea)
         input_area.disabled = True
 
+        # Switch to the agent that requested this confirmation
+        coder_uuid = msg.get("coder_uuid")
+        self._confirmation_coder_uuid = coder_uuid
+        if coder_uuid:
+            self._switch_to_container(coder_uuid, suppress_input_enable=True)
+
         # Show confirmation in status bar with all options
         status_bar = self.query_one("#status-bar", StatusBar)
         options = msg.get("options", {})
@@ -722,9 +747,9 @@ class TUI(App):
 
     def show_error(self, message, agent_name: str | None = None):
         """Show an error message in the status bar."""
-        self.status_bar.show_notification(
-            message, severity="error", timeout=5, agent_name=agent_name
-        )
+        status_bar = self.query_one("#status-bar", StatusBar)
+
+        status_bar.show_notification(message, severity="error", timeout=5, agent_name=agent_name)
 
     def on_resize(self) -> None:
         file_list = self.query_one("#file-list", FileList)
@@ -1093,8 +1118,14 @@ class TUI(App):
             next_uuid = uuids[0]
         self._switch_to_container(next_uuid)
 
-    def _switch_to_container(self, uuid: str) -> None:
-        """Internal helper to switch active container."""
+    def _switch_to_container(self, uuid: str, suppress_input_enable: bool = False) -> None:
+        """Internal helper to switch active container.
+
+        Args:
+            uuid: The container UUID to switch to.
+            suppress_input_enable: If True, skip re-enabling the input area.
+                Used during confirmations to avoid undoing input disabling.
+        """
         # Update foreground agent in AgentService
         agent_service = AgentService.get_instance(self.worker.coder)
         primary_uuid = str(self.worker.coder.uuid)
@@ -1124,8 +1155,9 @@ class TUI(App):
         self._sync_sub_agent_display()
 
         # Update input autocomplete data for the active agent
-        coder = agent_service.foreground_coder
-        self.enable_input({}, coder=coder)
+        if not suppress_input_enable:
+            coder = agent_service.foreground_coder
+            self.enable_input({}, coder=coder)
 
     def create_sub_agent_container(self, uuid: str, name: str) -> None:
         """Create an OutputContainer for a sub-agent."""
@@ -1282,12 +1314,7 @@ class TUI(App):
         input_area.disabled = False
         input_area.focus()
 
-        foreground_coder = AgentService.get_instance(self.worker.coder).foreground_coder
-        coder_uuid = (
-            str(foreground_coder.uuid)
-            if foreground_coder and hasattr(foreground_coder, "uuid")
-            else None
-        )
+        coder_uuid = self._confirmation_coder_uuid
         # Route to per-coder queue when available
         if coder_uuid and coder_uuid in TextualInputOutput._per_coder_queues:
             TextualInputOutput._per_coder_queues[coder_uuid].put(
@@ -1295,6 +1322,15 @@ class TUI(App):
             )
         else:
             self.input_queue.put({"confirmed": message.result, "coder_uuid": coder_uuid})
+        # Release the confirmation lock and process any pending confirmations
+        self._confirmation_lock = False
+        self._process_pending_confirmation()
+
+    def _process_pending_confirmation(self) -> None:
+        """Process the next pending confirmation from the queue, if any."""
+        if self._confirmations_pending:
+            next_msg, next_agent_name = self._confirmations_pending.pop(0)
+            self.show_confirmation(next_msg, agent_name=next_agent_name)
 
     # Commands that use path-based completion
     PATH_COMPLETION_COMMANDS = {"/add", "/read-only", "/read-only-stub", "/rules", "/load", "/save"}

{cecli_dev-0.100.2 → cecli_dev-0.100.4rc1}/cecli_dev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cecli-dev
-Version: 0.100.2
+Version: 0.100.4rc1
 Summary: we also can't pronounce cecli
 Project-URL: Homepage, https://github.com/dwash96/cecli
 Project-URL: Documentation, https://github.com/dwash96/cecli

{cecli_dev-0.100.2 → cecli_dev-0.100.4rc1}/tests/tui/test_app.py

@@ -197,9 +197,12 @@ def test_handle_output_message_error_with_agent_name(tui_instance, monkeypatch):
         if isinstance(selector, type):
             name = selector.__name__
         else:
-            if "," in selector or "#" in selector:
+            if selector == "#input" or selector == "#input, InputArea":
                 return mock_input_area
-            return mock_footer
+            elif selector == "#status-bar" or selector == "#status-bar, StatusBar":
+                return mock_status_bar
+            name = "MainFooter"  # Default fallback
+
         mapping = {
             "MainFooter": mock_footer,
             "StatusBar": mock_status_bar,
@@ -217,9 +220,6 @@ def test_handle_output_message_error_with_agent_name(tui_instance, monkeypatch):
     tui_instance.worker = MagicMock()
     tui_instance.worker.coder = mock_coder
 
-    # Stub status_bar reference
-    tui_instance.status_bar = mock_status_bar
-
     # Mock AgentService - unknown UUID should return None (no prefix)
     monkeypatch.setattr(
         "cecli.helpers.agents.service.AgentService.get_instance",
@@ -239,3 +239,40 @@ def test_handle_output_message_error_with_agent_name(tui_instance, monkeypatch):
         timeout=5,
         agent_name=None,
     )
+
+
+def test_show_error_uses_query_one(tui_instance):
+    """
+    Test that show_error uses query_one to get the status bar and show a notification.
+    """
+    mock_status_bar = MagicMock()
+    tui_instance.query_one = MagicMock(return_value=mock_status_bar)
+
+    # Import StatusBar for the assertion
+    from cecli.tui.widgets import StatusBar
+
+    tui_instance.show_error("A test error", agent_name="test_agent")
+
+    # Assert query_one was called correctly
+    tui_instance.query_one.assert_called_once_with("#status-bar", StatusBar)
+
+    # Assert show_notification was called on the result of query_one
+    mock_status_bar.show_notification.assert_called_once_with(
+        "A test error",
+        severity="error",
+        timeout=5,
+        agent_name="test_agent",
+    )
+    # Test: error message for unknown agent should have agent_name=None
+    msg = {
+        "type": "error",
+        "message": "Something went wrong!",
+        "coder_uuid": "unknown_uuid",
+    }
+    tui_instance.handle_output_message(msg)
+    mock_status_bar.show_notification.assert_called_once_with(
+        "Something went wrong!",
+        severity="error",
+        timeout=5,
+        agent_name=None,
+    )