shrinkray 26.1.1.0__py3-none-any.whl → 26.2.4.1__py3-none-any.whl

shrinkray/subprocess/client.py

@@ -27,6 +27,7 @@ class SubprocessClient:
         self._progress_queue: asyncio.Queue[ProgressUpdate] = asyncio.Queue()
         self._reader_task: asyncio.Task | None = None
         self._completed = False
+        self._closed = False
         self._error_message: str | None = None
         self._debug_mode = debug_mode
         self._stderr_log_file: IO[str] | None = None
@@ -261,6 +262,17 @@ class SubprocessClient:
 
     async def close(self) -> None:
         """Close the subprocess."""
+        if self._closed:
+            return
+        self._closed = True
+
+        # Cancel all pending futures first so any code awaiting send_command
+        # responses (e.g. cancel() in action_quit) is unblocked immediately.
+        for future in self._pending_responses.values():
+            if not future.done():
+                future.cancel()
+        self._pending_responses.clear()
+
         if self._reader_task is not None:
             self._reader_task.cancel()
             try:
@@ -278,13 +290,21 @@ class SubprocessClient:
             if self._process.returncode is None:
                 try:
                     self._process.terminate()
-                    await asyncio.wait_for(self._process.wait(), timeout=5.0)
+                    await asyncio.wait_for(self._process.wait(), timeout=2.0)
                 except TimeoutError:
                     self._process.kill()
                     await self._process.wait()
                 except ProcessLookupError:
                     pass  # Process already exited
 
+            # Always await wait() to ensure the asyncio transport is fully
+            # finalized before the event loop closes. This prevents the
+            # "Event loop is closed" RuntimeError from BaseSubprocessTransport.__del__.
+            if self._process.returncode is not None:
+                await self._process.wait()
+                # Flush pending event loop callbacks (transport cleanup)
+                await asyncio.sleep(0)
+
         # Close and remove the stderr log file
         if self._stderr_log_file is not None:
             try:

shrinkray/tui.py

@@ -13,7 +13,6 @@ from difflib import unified_diff
 from typing import Literal, Protocol, cast
 
 import humanize
-from rich.markup import escape as escape_markup
 from rich.text import Text
 from textual import work
 from textual.app import App, ComposeResult
@@ -46,6 +45,7 @@ from shrinkray.subprocess.protocol import (
 
 ThemeMode = Literal["auto", "dark", "light"]
 
+
 # Custom themes with true white/black backgrounds
 SHRINKRAY_LIGHT_THEME = Theme(
     name="shrinkray-light",
@@ -505,20 +505,20 @@ class ContentPreview(Static):
         # Fallback based on common terminal height
         return 30
 
-    def render(self) -> str:
+    def render(self) -> Text:
         if not self.preview_content:
-            return "Loading..."
+            return Text("Loading...")
 
         available_lines = self._get_available_lines()
 
         if self.hex_mode:
-            return f"[Hex mode]\n{self.preview_content}"
+            return Text(f"[Hex mode]\n{self.preview_content}")
 
         lines = self.preview_content.split("\n")
 
         # For small files that fit, show full content
         if len(lines) <= available_lines:
-            return self.preview_content
+            return Text(self.preview_content)
 
         # For larger files, show diff if we have previous displayed content
         if (
@@ -530,10 +530,10 @@ class ContentPreview(Static):
             diff = list(unified_diff(prev_lines, curr_lines, lineterm=""))
             if diff:
                 # Show as much diff as fits
-                return "\n".join(diff[:available_lines])
+                return Text("\n".join(diff[:available_lines]))
 
         # No diff available, show truncated content
-        return (
+        return Text(
             "\n".join(lines[:available_lines])
             + f"\n\n... ({len(lines) - available_lines} more lines)"
         )
@@ -591,39 +591,46 @@ class OutputPreview(Static):
             pass
         return 30
 
-    def render(self) -> str:
+    def render(self) -> Text:
         # Header line - use return_code to determine if test is running
         # (return_code is None means still running, has value means completed)
         if self.active_test_id is not None and self.last_return_code is None:
-            header = f"[green]Test #{self.active_test_id} running...[/green]"
+            header_text = f"Test #{self.active_test_id} running..."
+            header_style = "green"
         elif self.active_test_id is not None:
-            header = f"[dim]Test #{self.active_test_id} exited with code {self.last_return_code}[/dim]"
+            header_text = (
+                f"Test #{self.active_test_id} exited with code {self.last_return_code}"
+            )
+            header_style = "dim"
         elif self._has_seen_output or self.output_content:
             # Have seen output before - show without header
-            header = ""
+            header_text = ""
+            header_style = ""
         else:
-            header = "[dim]No test output yet...[/dim]"
+            header_text = "No test output yet..."
+            header_style = "dim"
 
         if not self.output_content:
-            return header
+            return Text(header_text, style=header_style)
 
         available_lines = self._get_available_lines()
-        # Escape the output content to prevent Rich markup interpretation
-        # (test output may contain characters like ^ that have special meaning)
-        escaped_content = escape_markup(self.output_content)
-        lines = escaped_content.split("\n")
-
-        # Build prefix (header + newline, or empty if no header)
-        prefix = f"{header}\n" if header else ""
+        lines = self.output_content.split("\n")
 
         # Show tail of output (most recent lines)
-        if len(lines) <= available_lines:
-            return f"{prefix}{escaped_content}"
+        if len(lines) > available_lines:
+            truncated_lines = lines[-(available_lines):]
+            skipped = len(lines) - available_lines
+            content = f"... ({skipped} earlier lines)\n" + "\n".join(truncated_lines)
+        else:
+            content = self.output_content
 
-        # Truncate from the beginning
-        truncated_lines = lines[-(available_lines):]
-        skipped = len(lines) - available_lines
-        return f"{prefix}... ({skipped} earlier lines)\n" + "\n".join(truncated_lines)
+        # Build result with styled header and unstyled content
+        result = Text()
+        if header_text:
+            result.append(header_text, style=header_style)
+            result.append("\n")
+        result.append(content)
+        return result
 
 
 class HelpScreen(ModalScreen[None]):
@@ -734,21 +741,20 @@ class ExpandedBoxModal(ModalScreen[None]):
         self._content_widget_id = content_widget_id
         self._file_path = file_path
 
-    def _read_file(self, file_path: str) -> str:
+    def _read_file(self, file_path: str) -> Text:
         """Read file content, decoding as text if possible."""
         if not os.path.isfile(file_path):
-            return "[dim]File not found[/dim]"
+            return Text("File not found", style="dim")
         try:
             with open(file_path, "rb") as f:
                 raw_content = f.read()
             # Try to decode as text, fall back to hex display if binary
             encoding, text = try_decode(raw_content)
             if encoding is not None:
-                # Escape Rich markup to prevent interpretation of [ ] etc
-                return escape_markup(text)
-            return "[Binary content - hex display]\n\n" + raw_content.hex()
+                return Text(text)
+            return Text("Binary content - hex display\n\n" + raw_content.hex())
         except OSError:
-            return "[red]Error reading file[/red]"
+            return Text("Error reading file", style="red")
 
     def compose(self) -> ComposeResult:
         with Vertical():
@@ -781,16 +787,16 @@ class ExpandedBoxModal(ModalScreen[None]):
             return "Statistics not available"
         return stats_displays[0].render()
 
-    def _get_file_content(self, app: "ShrinkRayApp") -> str:
+    def _get_file_content(self, app: "ShrinkRayApp") -> str | Text:
         """Get content from file or preview widget."""
         if self._file_path:
             return self._read_file(self._file_path)
         content_previews = list(app.query("#content-preview").results(ContentPreview))
         if not content_previews:
             return "Content preview not available"
-        return content_previews[0].preview_content
+        return Text(content_previews[0].preview_content)
 
-    def _get_output_content(self, app: "ShrinkRayApp") -> str:
+    def _get_output_content(self, app: "ShrinkRayApp") -> str | Text:
         """Get output content from the output preview widget."""
         output_previews = list(app.query("#output-preview").results(OutputPreview))
         if not output_previews:
@@ -811,21 +817,29 @@ class ExpandedBoxModal(ModalScreen[None]):
         )
         has_seen_output = output_preview._has_seen_output
 
-        # Build header - return_code is None means test is still running
+        # Build header with styling
         if test_id is not None and return_code is None:
-            header = f"[green]Test #{test_id} running...[/green]\n\n"
+            header_text = f"Test #{test_id} running..."
+            header_style = "green"
         elif test_id is not None:
-            header = f"[dim]Test #{test_id} exited with code {return_code}[/dim]\n\n"
+            header_text = f"Test #{test_id} exited with code {return_code}"
+            header_style = "dim"
         else:
-            header = ""
+            header_text = ""
+            header_style = ""
 
         if raw_content:
-            return header + raw_content
+            result = Text()
+            if header_text:
+                result.append(header_text, style=header_style)
+                result.append("\n\n")
+            result.append(raw_content)
+            return result
         elif has_seen_output or test_id is not None:
             # We've seen output before - show header only (no "No test output" message)
-            return header.rstrip("\n") if header else ""
+            return Text(header_text, style=header_style)
         else:
-            return "[dim]No test output yet...[/dim]"
+            return Text("No test output yet...", style="dim")
 
     def on_mount(self) -> None:
         """Populate content from the source widget."""
@@ -1447,13 +1461,13 @@ class HistoryExplorerModal(ModalScreen[None]):
         if os.path.isfile(output_path):
             output_content = self._read_file(output_path)
         else:
-            output_content = "[dim]No output captured[/dim]"
+            output_content = Text("No output captured", style="dim")
         self.query_one(f"#{output_preview_id}", Static).update(output_content)
 
-    def _read_file(self, file_path: str) -> str:
+    def _read_file(self, file_path: str) -> Text:
         """Read file content, decoding as text if possible."""
         if not os.path.isfile(file_path):
-            return "[dim]File not found[/dim]"
+            return Text("File not found", style="dim")
         try:
             with open(file_path, "rb") as f:
                 raw_content = f.read()
@@ -1465,18 +1479,17 @@ class HistoryExplorerModal(ModalScreen[None]):
             # Try to decode as text
             encoding, text = try_decode(raw_content)
             if encoding is not None:
-                # Escape Rich markup to prevent interpretation of [ ] etc
-                text = escape_markup(text)
+                result = Text(text)
                 if truncated:
-                    text += "\n\n[dim]... (truncated)[/dim]"
-                return text
+                    result.append("\n\n... (truncated)", style="dim")
+                return result
             # Binary content - hex display
-            hex_display = "[Binary content - hex display]\n\n" + raw_content.hex()
+            result = Text("Binary content - hex display\n\n" + raw_content.hex())
             if truncated:
-                hex_display += "\n\n[dim]... (truncated)[/dim]"
-            return hex_display
+                result.append("\n\n... (truncated)", style="dim")
+            return result
         except OSError:
-            return "[red]Error reading file[/red]"
+            return Text("Error reading file", style="red")
 
     def action_restart_from_here(self) -> None:
         """Restart reduction from the currently selected history point."""
@@ -1925,11 +1938,14 @@ class ShrinkRayApp(App[None]):
 
     async def action_quit(self) -> None:
         """Quit the application with graceful cancellation."""
+        self.update_status("Shutting down...")
         if self._client and not self._completed:
             try:
-                await self._client.cancel()
+                await self._client.close()
             except Exception:
                 pass  # Process may have already exited
+            # Prevent double-close in run_reduction's finally block
+            self._client = None
         self.exit()
 
     def action_show_pass_stats(self) -> None:

{shrinkray-26.1.1.0.dist-info → shrinkray-26.2.4.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shrinkray
-Version: 26.1.1.0
+Version: 26.2.4.1
 Summary: Shrink Ray
 Author-email: "David R. MacIver" <david@drmaciver.com>
 License: MIT

{shrinkray-26.1.1.0.dist-info → shrinkray-26.2.4.1.dist-info}/RECORD

@@ -8,7 +8,7 @@ shrinkray/process.py,sha256=-eP8h5X0ESbkcTic8FFEzkd4-vwaZ0YI5tLxUR25L8U,1599
 shrinkray/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 shrinkray/reducer.py,sha256=8CF_SxkfVMBxiikQKwv-rlrQawTLhQxy6QnVwIWWiws,18601
 shrinkray/state.py,sha256=gDKz1jov84lEih-7jtYcYoWfIS2k2YtBtWuJmcAx6Is,38478
-shrinkray/tui.py,sha256=FKg5ETDC0gxurCYJpW0BLJGm9rPGRCiQC7PD0WYXfOg,73572
+shrinkray/tui.py,sha256=40od9sbfOER-Pg_ZRL1MZ8XhOnH8r5axbtJcb827qPo,73924
 shrinkray/ui.py,sha256=xuDUwU-MM3AetvwUB7bfzav0P_drUsBrKFPhON_Nr-k,2251
 shrinkray/validation.py,sha256=piBCO-k9he_id6TWC4EHMK3GfuyPqRcNfkNJPVjxEaU,13366
 shrinkray/work.py,sha256=GEZ14Kk3bvwUxAnACvY-wom2lVWaGrELMNxrDjv03dk,8110
@@ -23,12 +23,12 @@ shrinkray/passes/python.py,sha256=3WN1lZTf5oVL8FCTGomhrCuE04wIX9ocKcmFV86NMZA,68
 shrinkray/passes/sat.py,sha256=OboY6jsKf6lph3pAFh535plvhNOVzEF8HJ66WEqsNm4,19483
 shrinkray/passes/sequences.py,sha256=-5ajmMeHnS7onjjppbxLiP0F6mRSqiFI5DspBTj2x_M,2206
 shrinkray/subprocess/__init__.py,sha256=qxZ19Nzizbm7H0MkKL38OqfP7U-VuOAvaqBVkmHFivY,375
-shrinkray/subprocess/client.py,sha256=c430-qYlLlVDHoaCt2Ho2ZjbIKaGYroyt6qXfp3tvkQ,11336
+shrinkray/subprocess/client.py,sha256=4nMFiHfqGSLQHTZ1jgt4dq2GUCBXwgTqvzPw6Z1N1q4,12199
 shrinkray/subprocess/protocol.py,sha256=86sSxexQpPpr4W2C1y0V5Ddqoqb-1LfHa2wKjJSzmJA,7340
 shrinkray/subprocess/worker.py,sha256=Spy2DjzJGHgFmr9PTxkd68q1REoymWcA4Ls4iDD36tE,31373
-shrinkray-26.1.1.0.dist-info/licenses/LICENSE,sha256=iMKX79AuokJfIZUnGUARdUp30vVAoIPOJ7ek8TY63kk,1072
-shrinkray-26.1.1.0.dist-info/METADATA,sha256=2KKaq4d5_2a4VuHR_paZ_4zOz8YrtkxvOzo-K7fnOTc,7836
-shrinkray-26.1.1.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-shrinkray-26.1.1.0.dist-info/entry_points.txt,sha256=wIZvnGyOdVeaLTiv2klnSyTe-EKkkwn4SwHh9bmJ7qk,104
-shrinkray-26.1.1.0.dist-info/top_level.txt,sha256=fLif8-rFoFOnf5h8-vs3ECkKNWQopTQh3xvl1s7pchQ,10
-shrinkray-26.1.1.0.dist-info/RECORD,,
+shrinkray-26.2.4.1.dist-info/licenses/LICENSE,sha256=iMKX79AuokJfIZUnGUARdUp30vVAoIPOJ7ek8TY63kk,1072
+shrinkray-26.2.4.1.dist-info/METADATA,sha256=t4FlQASaioxkzPRRxdjaMxgd3JU_pFeQuHanZ3sOPFE,7836
+shrinkray-26.2.4.1.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
+shrinkray-26.2.4.1.dist-info/entry_points.txt,sha256=wIZvnGyOdVeaLTiv2klnSyTe-EKkkwn4SwHh9bmJ7qk,104
+shrinkray-26.2.4.1.dist-info/top_level.txt,sha256=fLif8-rFoFOnf5h8-vs3ECkKNWQopTQh3xvl1s7pchQ,10
+shrinkray-26.2.4.1.dist-info/RECORD,,

{shrinkray-26.1.1.0.dist-info → shrinkray-26.2.4.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.9.0)
+Generator: setuptools (80.10.2)
 Root-Is-Purelib: true
 Tag: py3-none-any