refactor: Make agent mode interruptions more robust

Co-authored-by: cecli (openai/gemini_cli_local/gemini-2.5-pro)

Author: Your Name

cecli/coders/agent_coder.py

@@ -745,7 +745,13 @@ async def gather_and_await():
 
         if self.auto_lint and used_write_tool:
             edited = list(self.files_edited_by_tools)
-            lint_errors = self.lint_edited(edited, show_output=False)
+            lint_coro = self.lint_edited(edited, show_output=False)
+            lint_errors, interrupted = await self.coroutines.interruptible(
+                lint_coro, self.interrupt_event
+            )
+            if interrupted:
+                raise KeyboardInterrupt("Interrupted during linting")
+
             self.lint_outcome = not lint_errors
 
             if lint_errors:
@@ -847,7 +853,12 @@ async def reply_completed(self):
                 " its outputs are no longer necessary"
             )
             self.io.tool_output(waiting_msg)
-            await asyncio.sleep(command_timeout / 2)
+            sleep_coro = asyncio.sleep(command_timeout / 2)
+            _res, interrupted = await self.coroutines.interruptible(
+                sleep_coro, self.interrupt_event
+            )
+            if interrupted:
+                raise KeyboardInterrupt("Interrupted while waiting for background commands")
             return True
 
         # Check for recently finished commands that need reflection

cecli/coders/base_coder.py

@@ -2200,7 +2200,15 @@ async def send_message(self, inp):
         import asyncio
 
         loop = asyncio.get_running_loop()
-        result = await loop.run_in_executor(None, self.format_messages)
+
+        async def format_in_executor():
+            return await loop.run_in_executor(None, self.format_messages)
+
+        result, interrupted = await self.coroutines.interruptible(
+            format_in_executor(), self.interrupt_event
+        )
+        if interrupted:
+            raise KeyboardInterrupt("Interrupted during message formatting")
         messages = result
 
         if not await self.check_tokens(messages):

cecli/models.py

@@ -1278,7 +1278,13 @@ async def send_completion(
 
                 if override_kwargs:
                     kwargs = deep_merge(kwargs, override_kwargs)
-                res = await litellm.acompletion(**kwargs)
+                completion_coro = litellm.acompletion(**kwargs)
+                res, interrupted = await coroutines.interruptible(
+                    completion_coro, interrupt_event
+                )
+                if interrupted:
+                    raise KeyboardInterrupt("Interrupted during acompletion")
+
                 return hash_object, res
             except litellm.ContextWindowExceededError as err:
                 raise err