cli-error 0.1.0__tar.gz → 0.1.2__tar.gz

{cli_error-0.1.0 → cli_error-0.1.2}/.github/workflows/ci.yml

@@ -20,10 +20,10 @@ jobs:
         python-version: ["3.12", "3.13", "3.14"]
 
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set up uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
         with:
           enable-cache: true
           cache-dependency-glob: uv.lock

{cli_error-0.1.0 → cli_error-0.1.2}/.github/workflows/release.yml

@@ -13,10 +13,10 @@ jobs:
       id-token: write
       contents: read
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
 
       - name: Set up uv
-        uses: astral-sh/setup-uv@v5
+        uses: astral-sh/setup-uv@v6
         with:
           enable-cache: true
           cache-dependency-glob: uv.lock

{cli_error-0.1.0 → cli_error-0.1.2}/.sandbox/README.md

@@ -47,10 +47,6 @@ build when the images already exist.
 Claude credentials live in `~/.claude` / `~/.claude.json` on the host (bind-mounted
 into the container), so authentication persists across container rebuilds.
 
-The host's `~/repo-skills` is bind-mounted **read-only** at `~/repo-skills` inside
-the container as a reference source, so the sandbox can consult it without
-modifying it or leaking container-generated files back onto the host.
-
 ## Daily usage
 
 ```bash

{cli_error-0.1.0 → cli_error-0.1.2}/.sandbox/docker-compose.yml

@@ -19,7 +19,6 @@ services:
       - ./base/zshrc:/home/${USER}/.zshrc:ro
       - ~/.claude:/home/${USER}/.claude
       - ~/.claude.json:/home/${USER}/.claude.json
-      - ~/repo-skills:/home/${USER}/repo-skills:ro
     working_dir: /work
     environment:
       - TERM=xterm-256color

{cli_error-0.1.0 → cli_error-0.1.2}/.tasker/s01-extract-repo-skills-error-reporting/README.md

@@ -1,7 +1,7 @@
 ---
 id: s01
 slug: extract-repo-skills-error-reporting
-status: pending
+status: done
 ---
 
 # Extract repo-skills error reporting into cli-error library
@@ -53,9 +53,11 @@ status: pending
 - [x] [s01t12](s01t12-revisit-props-markup-first-prop.md): Revisit props: markup-first `prop` with template+args, roles as thin helpers
 - [x] [s01t13](s01t13-store-detail-as-ready-to.md): Store detail as ready-to-print [misc] markup (restore render-seam invariant)
 - [x] [s01t14](s01t14-handle-empty-message-cause-in.md): Handle empty-message cause in cause-chain rendering
-- [ ] [s01t15](s01t15-reconsider-derive-debug-stderr-console.md): Debug stderr console inherits user intent (no_color + theme), not per-stream geometry
-- [ ] [s01t16](s01t16-optionally-show-locals-in-debug.md): Add opt-in show_locals to the debug traceback
-- [ ] [s01t17](s01t17-test-debug-traceback-includes-the.md): Test: debug traceback includes the exception cause chain
+- [x] [s01t15](s01t15-reconsider-derive-debug-stderr-console.md): Debug stderr console inherits user intent (no_color + theme), not per-stream geometry
+- [x] [s01t16](s01t16-optionally-show-locals-in-debug.md): Add opt-in show_locals to the debug traceback
+- [x] [s01t17](s01t17-test-debug-traceback-includes-the.md): Test: debug traceback includes the exception cause chain
 - [x] [s01t18](s01t18-add-debug-gated-diagnostic-helpers.md): Rename ErrorReporter to CliReporter and grow it into the CLI output façade
-- [ ] [s01t19](s01t19-consolidate-shared-test-helpers-across.md): Consolidate shared test helpers into tests/_helpers.py
+- [x] [s01t19](s01t19-consolidate-shared-test-helpers-across.md): Consolidate shared test helpers into tests/_helpers.py
 - [x] [s01t20](s01t20-add-a-safe-post-construction.md): Add a safe post-construction debug toggle to CliReporter
+- [x] [s01t21](s01t21-reconsider-debug-output-layout-evaluate.md): Reconsider debug_output layout — rule/divider delimiters
+- [x] [s01t22](s01t22-unify-debug-helper-label-idiom.md): Unify debug-helper label idiom (debug_cmd vs debug_output)

{cli_error-0.1.0 → cli_error-0.1.2}/.tasker/s01-extract-repo-skills-error-reporting/s01t15-reconsider-derive-debug-stderr-console.md

@@ -1,7 +1,7 @@
 ---
 id: s01t15
 slug: reconsider-derive-debug-stderr-console
-status: pending
+status: done
 ---
 
 # Debug stderr console inherits user intent (no_color + theme), not per-stream geometry

{cli_error-0.1.0 → cli_error-0.1.2}/.tasker/s01-extract-repo-skills-error-reporting/s01t16-optionally-show-locals-in-debug.md

@@ -1,7 +1,7 @@
 ---
 id: s01t16
 slug: optionally-show-locals-in-debug
-status: pending
+status: done
 ---
 
 # Add opt-in show_locals to the debug traceback

{cli_error-0.1.0 → cli_error-0.1.2}/.tasker/s01-extract-repo-skills-error-reporting/s01t17-test-debug-traceback-includes-the.md

@@ -1,7 +1,7 @@
 ---
 id: s01t17
 slug: test-debug-traceback-includes-the
-status: pending
+status: done
 ---
 
 # Test: debug traceback includes the exception cause chain

{cli_error-0.1.0 → cli_error-0.1.2}/.tasker/s01-extract-repo-skills-error-reporting/s01t19-consolidate-shared-test-helpers-across.md

@@ -1,7 +1,7 @@
 ---
 id: s01t19
 slug: consolidate-shared-test-helpers-across
-status: pending
+status: done
 ---
 
 # Consolidate shared test helpers into tests/_helpers.py

cli_error-0.1.2/.tasker/s01-extract-repo-skills-error-reporting/s01t21-reconsider-debug-output-layout-evaluate.md

@@ -0,0 +1,33 @@
+---
+id: s01t21
+slug: reconsider-debug-output-layout-evaluate
+status: done
+---
+
+# Reconsider debug_output layout — rule/divider delimiters
+
+**Superseded by s01t22:** the `─── stdout ───` rule layout below is replaced by the uppercase `LABEL:` header idiom (`STDOUT:` / `STDERR:` header line followed by the captured block).
+
+`src/cli_error/_reporter.py` · `debug_output()`:
+> TODO: this layout is ugly, lets prepend each line 'stdout: ' prefix
+
+The current layout emits a `  stdout:` / `  stderr:` header line followed by the captured text as one escaped `misc` block. The body sits flush at column 0, so it has no visual boundary and merges with surrounding debug output.
+
+**Decision:** Adopt the **rule/divider** layout (variant B). Each non-empty stream is delimited by a labeled `misc`-styled rule above the captured block:
+
+```
+─── stdout ───
+line1
+line2
+─── stderr ───
+err1
+```
+
+This labels each stream once (no per-line prefix), so it does not reopen the objection s01t18 named when it **rejected** per-line prefixing: *"bloats multi-line logs"*.
+
+**Requirements:**
+- A stream's rule is emitted **only when that stream is non-empty** — the existing empty/whitespace-only skip (`rstrip` → `continue`) must still apply, so an empty `stderr` produces no `stderr` rule at all.
+- Keep the captured text as one escaped `misc` block (internal newlines preserved, trailing whitespace `rstrip`ped) — same escaped-arg contract as today.
+- The rule/label styling routes through the existing `misc` role like the rest of the debug helpers.
+
+Remove the TODO in `debug_output` once implemented.

cli_error-0.1.2/.tasker/s01-extract-repo-skills-error-reporting/s01t22-unify-debug-helper-label-idiom.md

@@ -0,0 +1,61 @@
+---
+id: s01t22
+slug: unify-debug-helper-label-idiom
+status: done
+---
+
+# Unify debug-helper label idiom (debug_cmd vs debug_output)
+
+## Context
+
+After s01t21 adopted a labeled rule/divider for `debug_output` (`─── stdout ───`), the two subprocess debug helpers in the reporter presented labels in two different visual idioms: `debug_output` used rule headings while `debug_cmd` used an indented `COMMAND:` / `  cwd:` header. A `--debug` dump commonly interleaves both helpers (a command followed by its captured output), so the two grammars sat side by side in one stderr stream. This task unifies them onto a single label grammar.
+
+## Decisions
+
+- **Unify on one uppercase `LABEL:` grammar (variant c)** — abandon the rule/divider entirely; every field is introduced by an all-uppercase, flush-left `LABEL:`. Scalars put the value inline (`RUN: git commit -m 'a b'`, `CWD: /tmp/x`); blocks put a bare header then the value on following lines (`STDOUT:` then the block). One grammar for the whole debug stream; each helper reads fine alone or back-to-back. *Rejected: (a) unifying toward the rule idiom `─── command ───` — a rule above a single-line command is visual noise, and a lonely `─── cwd ───` for one path is heavy; (b) keeping the two idioms distinct — the scalar-vs-block distinction is real but not worth making the reader parse two label grammars in one stream.*
+
+- **Label set: `RUN:` / `CWD:` / `STDOUT:` / `STDERR:`** — all-uppercase, column 0, no indentation (drops the old `  cwd:` two-space indent). `RUN` over `COMMAND` (shorter; reads as "the command we ran"). Every line stays wrapped in `[misc]…[/misc]`; the `LABEL:` chars live in the trusted template and values (`cmd`, `cwd`, `text`) pass as escaped args — escaped-arg contract (ADR 0001) unchanged.
+
+- **`debug_cmd`: two independent prints** — `RUN: {cmd}` always (via `shlex.join`), then `CWD: {cwd}` only when `cwd is not None`. Two separate `debug_print` calls because `CWD` is conditional. The helpers stay two fully independent methods — `debug_cmd` alone emits just `RUN:`/`CWD:`, `debug_output` alone emits just the stream blocks, and together they compose; no merging.
+
+- **`debug_output`: header + block as one `[misc]` unit** — emit each non-empty stream as a single markup string `"[misc]STDOUT:\n{text}[/misc]"` (label and block coupled as one styled unit) rather than two prints. Empty-stream skip preserved unchanged: a stream's header is emitted only when non-empty (`rstrip()` → `continue`); body keeps internal newlines, `rstrip`s trailing whitespace, one escaped `misc` block.
+
+- **s01t21 superseded on layout** — this task lands the final unified idiom across both helpers and replaces s01t21's `─── stdout ───` rule; s01t21 (in-review) gets a one-line supersede note pointing here rather than being reopened. *Note: this does NOT reopen the s01t18 objection that rejected per-line `stdout: ` prefixing for bloating multi-line logs — the format is a single header per stream, not a per-line prefix.*
+
+## Edge cases
+
+- `debug_cmd` with no `cwd` → only the `RUN:` line, no `CWD:` line.
+- `debug_output` with one empty stream → only the non-empty stream's header+block; an empty/whitespace-only stream produces no header at all (existing `rstrip` → `continue`).
+- Both streams empty/whitespace-only → nothing emitted.
+- All helpers are silent no-ops when `debug` is unset.
+- Markup in values (`[red]…[/red]`, brackets in a command arg) must render literally — escaped-arg contract holds for `cmd`, `cwd`, and `text`.
+- `misc` styling must actually apply: with color forced on, the `[misc]` (=dim) ANSI escape must wrap `RUN:` and the `STDOUT:` header.
+- Multi-line stdout with trailing blank lines → internal newlines preserved, trailing whitespace `rstrip`ped.
+
+## Key files
+
+- `src/cli_error/_reporter.py` — `debug_cmd()` (`COMMAND:`/`  cwd:` → `RUN:`/`CWD:`) and `debug_output()` (rule → `STDOUT:`/`STDERR:` header block); update `debug_output`'s docstring.
+- `tests/test_reporter.py` — update assertions: `COMMAND:`→`RUN:`, `cwd:`→`CWD:`, `─── stdout ───`→`STDOUT:` (incl. the ordering assertions and the `misc`-style ANSI-escape tests).
+- `.tasker/s01-extract-repo-skills-error-reporting/s01t21-reconsider-debug-output-layout-evaluate.md` — one-line supersede note.
+
+## Acceptance criteria
+
+- `debug_cmd(["git","commit","-m","a b"], cwd=Path("/tmp/x"))` under debug emits `RUN: git commit -m 'a b'` and `CWD: /tmp/x`; no `COMMAND:` or lowercase `cwd:`.
+- `debug_cmd(["ls"])` emits `RUN: ls` and no `CWD:` line.
+- `debug_output("out1\nout2  \n", "err1")` emits a `STDOUT:` header before `out1\nout2` and a `STDERR:` header before `err1`; no `─── … ───` rule, no lowercase `stdout:`/`stderr:`.
+- `debug_output("kept", "   ")` emits `STDOUT:` + `kept` and no `STDERR:`.
+- Markup-bearing values render literally (`[red]…[/red]` preserved) for both helpers.
+- With color forced on, the dim `misc` ANSI escape wraps both `RUN:` and the `STDOUT:` header.
+- All helpers stay silent when `debug` is unset.
+- s01t21 file carries a supersede note pointing to s01t22.
+- `uv run tox` green across all environments, including any pre-existing issues.
+
+## Open questions
+
+- None outstanding — all grill questions resolved.
+
+## Out of scope
+
+- No CONTEXT.md change — the "Debug diagnostic" glossary entry never pinned an idiom.
+- No new ADR and no ADR 0002 edit — the idiom is cosmetic and trivially reversible (fails the "hard to reverse" bar), and ADR 0002 already describes these helpers as `misc`-styled escaped-arg wrappers without pinning a label style.
+- Reworking `debug_output`'s empty-skip / escaping behavior — carried over unchanged from s01t21.

{cli_error-0.1.0 → cli_error-0.1.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cli-error
-Version: 0.1.0
+Version: 0.1.2
 Summary: Error handling and reporting utilities for CLI applications.
 Requires-Python: >=3.12
 Requires-Dist: rich

{cli_error-0.1.0 → cli_error-0.1.2}/README.md

@@ -198,10 +198,12 @@ if __name__ == "__main__":
     main()
 ```
 
-`CliReporter(console, *, debug=False, console_err=None)` — when `console_err` is
-omitted a stderr console is built for you. Wire `--debug` at construction as
-above; the flag is also a plain public attribute you can toggle later
-(`reporter.debug = True`).
+`CliReporter(console, *, debug=False, show_locals=False, console_err=None)` — when
+`console_err` is omitted a stderr console is built for you, inheriting the passed
+console's `no_color` and theme so debug output matches your main console. Wire
+`--debug` at construction as above; the flag is also a plain public attribute you
+can toggle later (`reporter.debug = True`). `show_locals` sets the default for
+`debug_traceback` (see below).
 
 ### Cause chains
 
@@ -233,7 +235,7 @@ Because they self-gate, you can sprinkle them freely without guarding each call.
 | Method                         | Emits (only when `debug`)                          |
 | ------------------------------ | -------------------------------------------------- |
 | `debug_print(template, **args)`| a trusted template with escaped args               |
-| `debug_traceback()`            | the currently-handled exception traceback          |
+| `debug_traceback(show_locals=None)` | the currently-handled exception traceback     |
 | `debug_cmd(cmd, cwd=None)`     | a subprocess command line and optional working dir |
 | `debug_output(stdout, stderr)` | captured subprocess output (empty streams skipped) |
 
@@ -250,7 +252,10 @@ reporter.debug_output(result.stdout, result.stderr)
 
 `debug_traceback()` is what `handler()` calls for you on an uncaught exception,
 so a `--debug` run automatically shows the full traceback on stderr alongside
-the rendered error.
+the rendered error. Pass `show_locals=True` (per call, or as the
+`CliReporter(show_locals=True)` default) to include each frame's local variables
+— useful when debugging, but keep it developer-only since locals can expose
+secrets like tokens or passwords.
 
 ## Customizing the theme
 
@@ -285,3 +290,19 @@ The repository is checked with `tox` (typecheck, test, lint):
 ```bash
 uv run tox
 ```
+
+## Release Notes
+
+### v0.1.2
+- Debug diagnostics now share a consistent uppercase `LABEL:` grammar — `debug_cmd` emits flush-left `RUN:`/`CWD:` lines, and `debug_output` couples a single `STDOUT:`/`STDERR:` header to its output block.
+
+### v0.1.1
+- `debug_traceback` can now render per-frame locals — opt in with `CliReporter(show_locals=True)` or a per-call `debug_traceback(show_locals=True)` override (locals may expose secrets, so keep it developer-only).
+- The auto-built stderr console now inherits the injected console's `no_color` and theme intent, so debug output matches your main console's styling.
+
+### v0.1.0
+- `CliError` — structured exceptions with Rich-markup messages and a fluent builder for hints, detail blocks, and labelled context properties.
+- `CliReporter` — output/exit façade: a context manager that maps exceptions to exit codes, renders the `caused by:` cause chain, and gates debug diagnostics behind a `debug` flag.
+- `CliExit` — a clean-exit signal that prints its message and exits with status 0.
+- Theming via `make_console`, `make_theme`, and `DEFAULT_STYLES` — Rich consoles with default style roles, per-role overrides, `no_color` degradation, and stderr routing.
+- Automatic escaping of untrusted template/property values, plus standalone `render_error`, `render_template`, and `print_error` helpers.

{cli_error-0.1.0 → cli_error-0.1.2}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "cli-error"
-version = "0.1.0"
+version = "0.1.2"
 description = "Error handling and reporting utilities for CLI applications."
 requires-python = ">=3.12"
 dependencies = ["rich"]

{cli_error-0.1.0 → cli_error-0.1.2}/src/cli_error/_console.py

@@ -38,3 +38,14 @@ def make_console(
         stderr=stderr,
         no_color=no_color,
     )
+
+
+def derive_stderr_console(console: Console) -> Console:
+    """Build a stderr console that inherits ``console``'s user intent."""
+    return make_console(
+        stderr=True,
+        no_color=console.no_color,
+        styles={
+            role: console.get_style(role, default=Style()) for role in DEFAULT_STYLES
+        },
+    )

{cli_error-0.1.0 → cli_error-0.1.2}/src/cli_error/_reporter.py

@@ -7,7 +7,7 @@ from typing import Any
 
 from rich.console import Console
 
-from ._console import make_console
+from ._console import derive_stderr_console
 from ._errors import CliExit, print_error
 from ._render import render_template
 
@@ -15,18 +15,18 @@ from ._render import render_template
 class CliReporter:
     """Single integration point for a CLI's terminal output."""
 
-    debug: bool = False
-
     def __init__(
         self,
         console: Console,
         *,
         debug: bool = False,
+        show_locals: bool = False,
         console_err: Console | None = None,
     ) -> None:
         self.debug = debug
+        self.show_locals = show_locals
         self.console = console
-        self.console_err = console_err or make_console(stderr=True)
+        self.console_err = console_err or derive_stderr_console(console)
 
     def print(self, template: str, /, *, end: str = "\n", **args: Any) -> None:
         """Render a trusted template with escaped args to the stdout console."""
@@ -41,11 +41,19 @@ class CliReporter:
         if self.debug:
             _emit(self.console_err, template, end, **args)
 
-    def debug_traceback(self) -> None:
+    def debug_traceback(self, *, show_locals: bool | None = None) -> None:
         """Emit the currently-handled traceback to the stderr console.
 
         No-op unless ``debug`` is set. Safely no-ops outside an ``except``
         block: ``print_exception`` reads ``sys.exc_info()``.
+
+        ``show_locals`` overrides the instance default per call; when left as
+        ``None`` the traceback defers to the ``show_locals`` flag the reporter
+        was constructed with.
+
+        Caution: ``show_locals`` renders every frame's local variables verbatim
+        to stderr, which may expose secrets (tokens, passwords). Keep it gated
+        behind an explicit developer-only flag.
         """
         if not self.debug:
             return
@@ -53,46 +61,37 @@ class CliReporter:
         if sys.exc_info()[0] is None:
             return
 
-        self.console_err.print_exception()
+        effective = show_locals
+        if effective is None:
+            effective = self.show_locals
+
+        self.console_err.print_exception(show_locals=effective)
 
     def debug_cmd(self, cmd: list[str], cwd: Path | None = None) -> None:
         """Emit a subprocess command (and optional cwd) as a debug diagnostic."""
         if not self.debug:
             return
 
-        self.debug_print("[misc]COMMAND: {cmd}[/misc]", cmd=shlex.join(cmd))
+        self.debug_print("[misc]RUN: {cmd}[/misc]", cmd=shlex.join(cmd))
         if cwd is not None:
-            self.debug_print("[misc]  cwd: {cwd}[/misc]", cwd=cwd)
+            self.debug_print("[misc]CWD: {cwd}[/misc]", cwd=cwd)
 
     def debug_output(self, stdout: str, stderr: str) -> None:
-        """Emit captured subprocess output as debug diagnostics.
-
-        Each non-empty stream is emitted as a header line followed by the
-        captured text as one escaped ``misc`` block; empty streams are skipped.
-        """
+        """Emit captured subprocess output as debug diagnostics."""
         if not self.debug:
             return
 
-        for label, text in (("stdout", stdout), ("stderr", stderr)):
-            trimmed = text.rstrip()
-            if not trimmed:
-                continue
+        trimmed = stdout.rstrip()
+        if trimmed:
+            self.debug_print("[misc]STDOUT:\n{text}[/misc]", text=trimmed)
 
-            # TODO: this layout is ugly, lets prepend each line 'stdout: ' prefix
-            self.debug_print("[misc]  {label}:[/misc]", label=label)
-            self.debug_print("[misc]{text}[/misc]", text=trimmed)
+        trimmed = stderr.rstrip()
+        if trimmed:
+            self.debug_print("[misc]STDERR:\n{text}[/misc]", text=trimmed)
 
     @contextmanager
     def handler(self) -> Generator[None]:
-        """Report errors and translate them into process exit codes.
-
-        * ``CliExit`` prints its message and exits 0;
-        * any other ``Exception`` is rendered via ``print_error`` and exits 1,
-          additionally emitting a full traceback to the ``stderr`` console when
-          ``debug`` is set.
-        * ``KeyboardInterrupt``, ``SystemExit`` and any other ``BaseException``
-        propagate untouched.
-        """
+        """Report errors and translate them into process exit codes."""
         try:
             yield
         except CliExit as ex:

cli_error-0.1.2/tests/helpers.py

@@ -0,0 +1,33 @@
+from collections.abc import Callable
+
+from rich.console import Console
+from rich.theme import Theme
+
+from cli_error import DEFAULT_STYLES
+
+_ROLES = tuple(DEFAULT_STYLES)
+
+
+def forced_terminal(theme: Theme, *, no_color: bool = False) -> Console:
+    return Console(
+        theme=theme,
+        force_terminal=True,
+        color_system="standard",
+        no_color=no_color,
+        highlight=False,
+        width=80,
+    )
+
+
+def theme_from(console: Console, roles: tuple[str, ...] = _ROLES) -> Theme:
+    return Theme({role: console.get_style(role) for role in roles})
+
+
+def capture_emit(console: Console, emit: Callable[[Console], None]) -> str:
+    with console.capture() as cap:
+        emit(console)
+    return cap.get()
+
+
+def capture(console: Console, markup: str) -> str:
+    return capture_emit(console, lambda c: c.print(markup))

{cli_error-0.1.0 → cli_error-0.1.2}/tests/test_console.py

@@ -1,33 +1,7 @@
-from rich.console import Console
 from rich.style import Style
-from rich.theme import Theme
 
 from cli_error import DEFAULT_STYLES, make_console, make_theme
-
-_ROLES = ("id", "data", "path", "cmd", "misc", "warn", "err")
-
-
-def _forced(theme: Theme, *, no_color: bool = False) -> Console:
-    """A forced-ANSI console carrying ``theme``; ``no_color`` strips escapes."""
-    return Console(
-        theme=theme,
-        force_terminal=True,
-        color_system="standard",
-        no_color=no_color,
-        highlight=False,
-        width=80,
-    )
-
-
-def _terminal(theme_source: Console) -> Console:
-    """A forced-ANSI console carrying ``theme_source``'s resolved roles."""
-    return _forced(Theme({role: theme_source.get_style(role) for role in _ROLES}))
-
-
-def _capture(console: Console, markup: str) -> str:
-    with console.capture() as capture:
-        console.print(markup)
-    return capture.get()
+from tests.helpers import _ROLES, capture, forced_terminal, theme_from
 
 
 def test_default_console_maps_roles_to_canonical_styles() -> None:
@@ -37,8 +11,8 @@ def test_default_console_maps_roles_to_canonical_styles() -> None:
 
 
 def test_default_roles_render_as_distinct_ansi_runs() -> None:
-    console = _terminal(make_console())
-    out = _capture(console, "[id]a[/id][path]b[/path][err]c[/err]")
+    console = forced_terminal(theme_from(make_console()))
+    out = capture(console, "[id]a[/id][path]b[/path][err]c[/err]")
 
     id_run = console.get_style("id").render("a")
     path_run = console.get_style("path").render("b")
@@ -79,18 +53,18 @@ def test_unknown_role_key_is_added_and_never_raises() -> None:
     console = make_console(styles={"custom": "magenta"})
     assert console.get_style("custom") == Style.parse("magenta")
     # An undefined role degrades to plain text on a colour terminal, no error.
-    terminal = _terminal(make_console())
-    assert _capture(terminal, "[undefined]x[/undefined]") == "x\n"
+    terminal = forced_terminal(theme_from(make_console()))
+    assert capture(terminal, "[undefined]x[/undefined]") == "x\n"
 
 
 def test_no_color_suppresses_ansi_on_a_forced_terminal() -> None:
     # Positive control: an identical forced terminal DOES emit ANSI, proving the
     # no_color flag below is load-bearing rather than vacuously satisfied.
-    coloured = _forced(make_theme(), no_color=False)
-    plain = _forced(make_theme(), no_color=True)
+    coloured = forced_terminal(make_theme(), no_color=False)
+    plain = forced_terminal(make_theme(), no_color=True)
 
-    coloured_out = _capture(coloured, "[id]x[/id]")
-    plain_out = _capture(plain, "[id]x[/id]")
+    coloured_out = capture(coloured, "[id]x[/id]")
+    plain_out = capture(plain, "[id]x[/id]")
 
     assert "\x1b" in coloured_out
     assert "\x1b" not in plain_out
@@ -99,7 +73,7 @@ def test_no_color_suppresses_ansi_on_a_forced_terminal() -> None:
 
 def test_no_color_console_exposes_flag_and_renders_plain_text() -> None:
     console = make_console(no_color=True)
-    out = _capture(console, "[id]x[/id]")
+    out = capture(console, "[id]x[/id]")
 
     assert out == "x\n"
     assert "\x1b" not in out
@@ -125,8 +99,8 @@ def test_default_styles_is_public_and_has_the_seven_roles() -> None:
 
 
 def test_make_theme_is_attachable_to_a_plain_console() -> None:
-    console = _forced(make_theme())
-    out = _capture(console, "[id]x[/id]")
+    console = forced_terminal(make_theme())
+    out = capture(console, "[id]x[/id]")
     assert console.get_style("id").render("x") in out
 
 
@@ -141,4 +115,4 @@ def test_override_value_may_be_a_prebuilt_style_object() -> None:
     console = make_console(styles={"id": override})
 
     assert console.get_style("id") == override
-    assert _capture(console, "[id]x[/id]") == "x\n"
+    assert capture(console, "[id]x[/id]") == "x\n"

{cli_error-0.1.0 → cli_error-0.1.2}/tests/test_errors.py

@@ -2,6 +2,7 @@ import pytest
 from rich.console import Console
 
 from cli_error import CliError, CliExit, escape, make_console
+from tests.helpers import capture
 
 PROP_METHODS = ["prop_id", "prop_path", "prop_data", "prop_cmd", "prop_misc", "prop"]
 PROP_HELPERS = {
@@ -90,9 +91,7 @@ def test_make_console_returns_console() -> None:
     console = make_console()
     assert isinstance(console, Console)
     assert console.stderr is False
-    with console.capture() as capture:
-        console.print("[err]x[/err]")
-    assert "x" in capture.get()
+    assert "x" in capture(console, "[err]x[/err]")
 
 
 def test_make_console_stderr_variant_sets_flag_and_is_themed() -> None:

{cli_error-0.1.0 → cli_error-0.1.2}/tests/test_render.py

@@ -1,14 +1,10 @@
-from rich.console import Console
-from rich.theme import Theme
-
 from cli_error import CliError, make_console, print_error, render_error
+from tests.helpers import capture_emit, forced_terminal, theme_from
 
 
 def _render(ex: Exception) -> str:
     console = make_console()
-    with console.capture() as capture:
-        print_error(ex, console)
-    return capture.get()
+    return capture_emit(console, lambda c: print_error(ex, c))
 
 
 def test_full_layout_renders_in_documented_order() -> None:
@@ -73,20 +69,9 @@ def test_no_props_detail_or_hint_emits_only_message() -> None:
 
 def test_role_markup_is_applied_to_values_on_a_terminal() -> None:
     palette = make_console()
-    theme = Theme(
-        {role: palette.get_style(role) for role in ("id", "path", "misc", "err")}
-    )
-    console = Console(
-        theme=theme,
-        force_terminal=True,
-        color_system="standard",
-        highlight=False,
-        width=80,
-    )
+    console = forced_terminal(theme_from(palette, roles=("id", "path", "misc", "err")))
     error = CliError("m").prop_id("who", "abc").prop_path("where", "/p").detail("dee")
-    with console.capture() as capture:
-        print_error(error, console)
-    out = capture.get()
+    out = capture_emit(console, lambda c: print_error(error, c))
 
     id_run = console.get_style("id").render("abc")
     path_run = console.get_style("path").render("/p")