Color replaced with style in stream (#493)

mentat/command/commands/search.py

@@ -92,7 +92,7 @@ async def apply(self, *args: str) -> None:
                             )
                             stream.send(f"{rel_path} added to context", style="success")
                     else:
-                        stream.send("(Y/n)")
+                        stream.send("(Y/n)", style="input")
                     user_input: str = (
                         await collect_user_input(plain=True)
                     ).data.strip()

mentat/feature_filters/llm_feature_filter.py

@@ -158,7 +158,7 @@ async def filter(
             except (PathValidationError, AssertionError):
                 stream.send(
                     f"LLM selected invalid path: {selected_ref}, skipping.",
-                    color="light_yellow",
+                    style="warning",
                 )
 
         # Truncate again to enforce max_tokens

mentat/parsers/file_edit.py

@@ -44,7 +44,7 @@ async def _ask_user_change(
     session_context = SESSION_CONTEXT.get()
     stream = session_context.stream
 
-    stream.send(text, color="light_blue")
+    stream.send(text, style="input")
     return await ask_yes_no(default_yes=True)
 
 
@@ -153,14 +153,14 @@ def is_valid(self) -> bool:
             if self.file_path.exists():
                 stream.send(
                     f"File {display_path} already exists, canceling creation.",
-                    color="light_yellow",
+                    style="warning",
                 )
                 return False
         else:
             if not self.file_path.exists():
                 stream.send(
                     f"File {display_path} does not exist, canceling all edits to file.",
-                    color="light_yellow",
+                    style="warning",
                 )
                 return False
             file_features_in_context = [
@@ -173,7 +173,7 @@ def is_valid(self) -> bool:
             ):
                 stream.send(
                     f"File {display_path} not in context, canceling all edits to file.",
-                    color="light_yellow",
+                    style="warning",
                 )
                 return False
 
@@ -184,7 +184,7 @@ def is_valid(self) -> bool:
             stream.send(
                 f"File {display_path} being renamed to existing file"
                 f" {rel_rename_path or self.rename_file_path}, canceling rename.",
-                color="light_yellow",
+                style="warning",
             )
             self.rename_file_path = None
         return True
@@ -236,7 +236,7 @@ def _print_resolution(self, first: Replacement, second: Replacement):
         stream.send(self.file_path)
         stream.send(change_delimiter)
         for line in first.new_lines + second.new_lines:
-            stream.send("+ " + line, color="green")
+            stream.send("+ " + line, style="success")
         stream.send(change_delimiter)
 
     def resolve_conflicts(self):
@@ -291,7 +291,7 @@ def undo(self):
 
             self._display_creation(prefix=prefix)
             ctx.stream.send(
-                f"Creation of file {self.file_path} undone", color="light_blue"
+                f"Creation of file {self.file_path} undone", style="success"
             )
             return
 
@@ -311,7 +311,7 @@ def undo(self):
             self._display_rename(prefix=prefix)
             ctx.stream.send(
                 f"Rename of file {self.file_path} to {self.rename_file_path} undone",
-                color="light_blue",
+                style="success",
             )
 
         if self.is_deletion:
@@ -330,7 +330,7 @@ def undo(self):
 
             self._display_deletion(self.previous_file_lines, prefix=prefix)
             ctx.stream.send(
-                f"Deletion of file {self.file_path} undone", color="light_red"
+                f"Deletion of file {self.file_path} undone", style="success"
             )
         elif self.replacements:
             if not self.file_path.exists():
@@ -345,6 +345,4 @@ def undo(self):
                 f.write("\n".join(self.previous_file_lines))
 
             self._display_replacements(self.previous_file_lines, prefix=prefix)
-            ctx.stream.send(
-                f"Edits to file {self.file_path} undone", color="light_blue"
-            )
+            ctx.stream.send(f"Edits to file {self.file_path} undone", style="success")

mentat/parsers/json_parser.py

@@ -133,11 +133,11 @@ async def stream_and_parse_llm_response(
             validate(instance=response_json, schema=output_schema)
         except JSONDecodeError:
             # Should never happen with OpenAI's response_format set to json
-            stream.send("Error processing model response: Invalid JSON", color="red")
+            stream.send("Error processing model response: Invalid JSON", style="error")
             return ParsedLLMResponse(message, "", [])
         except ValidationError:
             stream.send(
-                "Error processing model response: Invalid format given", color="red"
+                "Error processing model response: Invalid format given", style="error"
             )
             return ParsedLLMResponse(message, "", [])
 

mentat/terminal/themes.py

@@ -6,7 +6,7 @@
         "success": "green",
         "input": "light_blue",
         "error": "red",
-        "warning": "blue",
+        "warning": "yellow",
     },
     "dark": {
         "code": "blue",