Separate stdout and stderr in plain dev

Author: davegaeddert

plain-dev/plain/dev/poncho/color.py

@@ -1,6 +1,6 @@
 from collections.abc import Iterator
 
-ANSI_COLOURS = ["grey", "red", "green", "yellow", "blue", "magenta", "cyan", "white"]
+ANSI_COLOURS = ["black", "red", "green", "yellow", "blue", "magenta", "cyan", "white"]
 
 for i, name in enumerate(ANSI_COLOURS):
     globals()[name] = str(30 + i)
@@ -13,13 +13,11 @@ def get_colors() -> Iterator[str]:
         "yellow",
         "green",
         "magenta",
-        "red",
         "blue",
         "intense_cyan",
         "intense_yellow",
         "intense_green",
         "intense_magenta",
-        "intense_red",
         "intense_blue",
     ]
     cs = [globals()[c] for c in cs]

plain-dev/plain/dev/poncho/manager.py

@@ -217,6 +217,7 @@ def _system_print(self, data: str) -> None:
                 data=data,
                 time=self._clock.now(),
                 name=SYSTEM_PRINTER_NAME,
-                color=None,
+                color="2",  # Dim prefix
+                stream="stdout",
             )
         )

plain-dev/plain/dev/poncho/printer.py

@@ -1,9 +1,15 @@
 import re
-from collections import namedtuple
 from pathlib import Path
-from typing import Any
+from typing import Any, NamedTuple
 
-Message = namedtuple("Message", "type data time name color")
+
+class Message(NamedTuple):
+    type: str
+    data: bytes | dict[str, Any] | str
+    time: Any
+    name: str | None
+    color: str | None
+    stream: str = "stdout"
 
 
 class Printer:
@@ -55,9 +61,25 @@ def write(self, message: Message) -> None:
             prefix = ""
             if self.prefix:
                 time_formatted = message.time.strftime(self.time_format)
-                prefix = f"{time_formatted} {name}| "
+                prefix_base = f"{time_formatted} {name}"
+
+                # Color the timestamp and name with process color
                 if self.color and message.color:
-                    prefix = _color_string(message.color, prefix)
+                    prefix_base = _color_string(message.color, prefix_base)
+
+                # Use fat red pipe for stderr, dim pipe for stdout
+                if message.stream == "stderr" and self.color:
+                    pipe = _color_string("31", "┃")
+                elif self.color:
+                    pipe = _color_string("2", "|")
+                else:
+                    pipe = "|"
+
+                prefix = prefix_base + pipe + " "
+
+            # Dim the line content for system messages (color="2")
+            if self.color and message.color == "2":
+                line = _color_string("2", line)
 
             formatted = prefix + line
 

plain-dev/plain/dev/poncho/process.py

@@ -2,6 +2,7 @@
 import os
 import signal
 import subprocess
+import threading
 from queue import Queue
 from typing import Any
 
@@ -50,15 +51,35 @@ def run(
             signal.signal(signal.SIGINT, signal.SIG_IGN)
             signal.signal(signal.SIGTERM, signal.SIG_IGN)
 
-        for line in iter(self._child.stdout.readline, b""):
-            if not self.quiet:
-                self._send_message(line)
-        self._child.stdout.close()
+        # Read stdout and stderr concurrently using threads
+        stdout_thread = threading.Thread(
+            target=self._read_stream, args=(self._child.stdout, "stdout")
+        )
+        stderr_thread = threading.Thread(
+            target=self._read_stream, args=(self._child.stderr, "stderr")
+        )
+
+        stdout_thread.start()
+        stderr_thread.start()
+
+        # Wait for both threads to complete
+        stdout_thread.join()
+        stderr_thread.join()
+
         self._child.wait()
 
         self._send_message({"returncode": self._child.returncode}, type="stop")
 
-    def _send_message(self, data: bytes | dict[str, Any], type: str = "line") -> None:
+    def _read_stream(self, stream: Any, stream_name: str) -> None:
+        """Read lines from a stream and send them as messages."""
+        for line in iter(stream.readline, b""):
+            if not self.quiet:
+                self._send_message(line, stream=stream_name)
+        stream.close()
+
+    def _send_message(
+        self, data: bytes | dict[str, Any], type: str = "line", stream: str = "stdout"
+    ) -> None:
         if self._events is not None:
             self._events.put(
                 Message(
@@ -67,6 +88,7 @@ def _send_message(self, data: bytes | dict[str, Any], type: str = "line") -> Non
                     time=self._clock.now(),
                     name=self.name,
                     color=self.color,
+                    stream=stream,
                 )
             )
 
@@ -76,7 +98,7 @@ def __init__(self, cmd: str, **kwargs: Any) -> None:
         start_new_session = kwargs.pop("start_new_session", True)
         options = {
             "stdout": subprocess.PIPE,
-            "stderr": subprocess.STDOUT,
+            "stderr": subprocess.PIPE,
             "shell": True,
             "close_fds": not ON_WINDOWS,
         }