From 42ef4352f4b0bd2d05629e0c12bd6409ea8f7b74 Mon Sep 17 00:00:00 2001
From: Paul Gauthier <paul@aider.chat>
Date: Wed, 22 Jan 2025 09:02:45 -0800
Subject: [PATCH] refactor: Handle KeyboardInterrupt with user-assistant
 message pair and add env check for sanity_check_messages

---
 aider/coders/base_coder.py | 6 ++++--
 aider/sendchat.py          | 4 +++-
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/aider/coders/base_coder.py b/aider/coders/base_coder.py
index 2153fe527..7f5f613c9 100755
--- a/aider/coders/base_coder.py
+++ b/aider/coders/base_coder.py
@@ -1359,8 +1359,10 @@ class Coder:
                 interrupted = True
 
         if interrupted:
-            content += "\n^C KeyboardInterrupt"
-            self.cur_messages += [dict(role="assistant", content=content)]
+            self.cur_messages += [
+                dict(role="user", content="^C KeyboardInterrupt"),
+                dict(role="assistant", content="I see that you interrupted my previous reply."),
+            ]
             return
 
         edited = self.apply_updates()
diff --git a/aider/sendchat.py b/aider/sendchat.py
index e04008252..2cf7086aa 100644
--- a/aider/sendchat.py
+++ b/aider/sendchat.py
@@ -1,5 +1,6 @@
 import hashlib
 import json
+import os
 import time
 
 from aider.dump import dump  # noqa: F401
@@ -51,7 +52,8 @@ def send_completion(
 ):
     #
     #
-    # sanity_check_messages(messages)
+    if os.environ.get("AIDER_SANITY_CHECK_TURNS"):
+        sanity_check_messages(messages)
     #
     #