More hashline efficiency changes, closer to diff performance for most models

Author: Your Name

cecli/coders/agent_coder.py

@@ -993,8 +993,10 @@ def _generate_tool_context(self, repetitive_tools):
                     self.model_kwargs["frequency_penalty"] = min(freq_penalty + 0.1, 1)
 
                 if random.random() < 0.25:
-                    self.model_kwargs["temperature"] = max(temperature - 0.2, 1)
-                    self.model_kwargs["frequency_penalty"] = max(freq_penalty - 0.2, 0)
+                    self.model_kwargs["temperature"] = min(
+                        (self.main_model.use_temperature or 1), max(temperature - 0.15, 1)
+                    )
+                    self.model_kwargs["frequency_penalty"] = min(0, max(freq_penalty - 0.15, 0))
 
             # One tenth of the time, just straight reset the randomness
             if random.random() < 0.1:

cecli/coders/hashline_coder.py

@@ -65,7 +65,7 @@ def apply_edits(self, edits, dry_run=False):
                     start_hash, end_hash, operation = original
 
                     # Validate operation
-                    if operation in ["replace", "insert", "delete"]:
+                    if operation in ["replace", "insert", "delete", "cancel"]:
                         # Validate hashline format
                         if isinstance(start_hash, str) and (
                             operation == "insert" or isinstance(end_hash, str)
@@ -225,7 +225,7 @@ def apply_edits(self, edits, dry_run=False):
         res += (
             "The LOCATE section must be a valid JSON array in the format:\n"
             '["{start hashline}", "{end hashline}", "{operation}"]\n'
-            "Hashline prefixes must have the structure `{line_num}{hash_fragment}` (e.g., `20Bv`)"
+            "Hashline prefixes must have the structure `{4 char hash}` (e.g., `20Bv`)"
             " and match one found directly in the file"
         )
         if passed:
@@ -650,14 +650,15 @@ def find_original_update_blocks(content, fence=DEFAULT_FENCE, valid_fnames=None)
                 # Check if original_text is a hashline JSON block
                 try:
                     # Try to parse as JSON
-                    parsed = json.loads(original_text_str.strip())
+                    # parsed = json.loads(original_text_str.strip())
+                    parsed = extract_base64url_parts(original_text_str.strip())
                     # Check if it's a list with 3 elements (start_hash, end_hash, operation)
                     if isinstance(parsed, list) and len(parsed) == 3:
                         # Validate the format: all strings
                         if all(isinstance(item, str) for item in parsed):
                             # Check if first two items look like hashline format (e.g., "1ab")
 
-                            if parsed[2] in ["replace", "insert", "delete"]:
+                            if parsed[2] in ["replace", "insert", "delete", "cancel"]:
                                 # This is a hashline JSON block
                                 yield filename, parsed, updated_text_str
                                 continue
@@ -675,6 +676,17 @@ def find_original_update_blocks(content, fence=DEFAULT_FENCE, valid_fnames=None)
         i += 1
 
 
+def extract_base64url_parts(input_string):
+    # Remove any character that is NOT a-z, A-Z, 0-9, -, or _
+    clean_str = re.sub(r"[^a-zA-Z0-9\-_]", "", input_string)
+
+    return [
+        clean_str[:4],  # First 4 chars
+        clean_str[4:8],  # Second 4 chars
+        clean_str[8:],  # The rest
+    ]
+
+
 def find_filename(lines, fence, valid_fnames):
     """
     Deepseek Coder v2 has been doing this:

cecli/helpers/conversation/files.py

@@ -242,7 +242,9 @@ def update_file_diff(cls, fname: str) -> Optional[str]:
             # Add diff message to conversation
             diff_message = {
                 "role": "user",
-                "content": f"File Diff For:\n{rel_fname}\n\n{diff}",
+                "content": (
+                    f"{rel_fname} has been updated. Here is a diff of the changes:\n\n{diff}"
+                ),
             }
 
             ConversationManager.add_message(

cecli/helpers/conversation/integration.py

@@ -646,12 +646,14 @@ def add_file_context_messages(cls, coder) -> None:
                 message_dict=user_msg,
                 tag=MessageTag.FILE_CONTEXTS,
                 hash_key=("file_context_user", file_path),
+                force=True,
             )
 
             ConversationManager.add_message(
                 message_dict=assistant_msg,
                 tag=MessageTag.FILE_CONTEXTS,
                 hash_key=("file_context_assistant", file_path),
+                force=True,
             )
 
     @classmethod