rdc-cli 0.5.1__tar.gz → 0.5.2__tar.gz

{rdc_cli-0.5.1 → rdc_cli-0.5.2}/.github/workflows/ci.yml

@@ -56,7 +56,8 @@ jobs:
           enable-cache: true
       - run: uv python install 3.12
       - run: uv sync --extra dev
-      - run: uv run --with pip-audit pip-audit
+      # CVE-2026-4539: no fixed pygments release yet (last_affected=2.19.2); ignore until upstream ships a patch
+      - run: uv run --with pip-audit pip-audit --ignore-vuln CVE-2026-4539
 
   validate-aur:
     name: Validate AUR PKGBUILD

{rdc_cli-0.5.1 → rdc_cli-0.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rdc-cli
-Version: 0.5.1
+Version: 0.5.2
 Summary: CLI for RenderDoc .rdc captures
 Author: Jim
 License-Expression: MIT

{rdc_cli-0.5.1 → rdc_cli-0.5.2}/docs-astro/src/data/commands.json

@@ -168,7 +168,7 @@
           "name": "passes",
           "id": "passes",
           "help": "List render passes.",
-          "usage": "rdc passes [--json] [--deps] [--dot] [--graph] [--table] [--switches] [--no-header] [--jsonl] [-q]"
+          "usage": "rdc passes [--json] [--deps] [--dot] [--graph] [--table] [--no-header] [--jsonl] [-q]"
         },
         {
           "name": "pass",

{rdc_cli-0.5.1 → rdc_cli-0.5.2}/pixi.toml

@@ -60,6 +60,7 @@ RENDERDOC_PYTHON_PATH = ".local/renderdoc"
 PYTHONPATH = "src"
 
 [tasks]
+rdc = "uv run rdc"
 sync = "uv sync --extra dev && git config core.hooksPath .githooks && python scripts/ensure-renderdoc.py && python scripts/ensure-skill-link.py"
 install = "uv run python scripts/dev_install.py"
 setup-renderdoc = "python scripts/build_renderdoc.py .local/renderdoc --build-dir .local/renderdoc-build"

{rdc_cli-0.5.1 → rdc_cli-0.5.2}/src/rdc/_skills/SKILL.md

@@ -68,7 +68,6 @@ rdc events --json | jq '.[] | select(.type == "DrawIndexed")'
 ```bash
 rdc passes                          # TSV table
 rdc passes --json                   # includes load_ops/store_ops per pass
-rdc passes --switches               # adds RT_SWITCHES column (TBR optimization)
 rdc passes --deps --table           # per-pass READS/WRITES/LOAD/STORE
 ```
 

{rdc_cli-0.5.1 → rdc_cli-0.5.2}/src/rdc/_skills/references/commands-quick-ref.md

@@ -652,7 +652,6 @@ List render passes.
 | `--dot` | Graphviz DOT output (requires --deps). | flag |  |
 | `--graph` | Human-readable graph (requires --deps). | flag |  |
 | `--table` | Per-pass I/O table (requires --deps). | flag |  |
-| `--switches` | Show RT switch count per pass (TBR flush risk). | flag |  |
 | `--no-header` | Omit TSV header | flag |  |
 | `--jsonl` | JSONL output | flag |  |
 | `-q, --quiet` | Print primary key column only | flag |  |

{rdc_cli-0.5.1 → rdc_cli-0.5.2}/src/rdc/commands/resources.py

@@ -173,12 +173,6 @@ def resource_cmd(resid: int, use_json: bool) -> None:
     default=False,
     help="Per-pass I/O table (requires --deps).",
 )
-@click.option(
-    "--switches",
-    is_flag=True,
-    default=False,
-    help="Show RT switch count per pass (TBR flush risk).",
-)
 @list_output_options
 def passes_cmd(  # noqa: PLR0913
     use_json: bool,
@@ -186,7 +180,6 @@ def passes_cmd(  # noqa: PLR0913
     dot: bool,
     graph: bool,
     table: bool,
-    switches: bool,
     no_header: bool,
     use_jsonl: bool,
     quiet: bool,
@@ -204,10 +197,7 @@ def passes_cmd(  # noqa: PLR0913
         _passes_deps(use_json, dot, graph, table)
         return
 
-    params: dict[str, Any] = {}
-    if switches:
-        params["switches"] = True
-    result = call("passes", params)
+    result = call("passes", {})
     tree: dict[str, Any] = result.get("tree", {})
     if use_json:
         write_json(tree)
@@ -221,8 +211,6 @@ def passes_cmd(  # noqa: PLR0913
             sys.stdout.write(str(p.get("name", "")) + "\n")
     else:
         header = ["NAME", "DRAWS", "DISPATCHES", "TRIANGLES", "BEGIN_EID", "END_EID"]
-        if switches:
-            header.append("RT_SWITCHES")
         tsv_rows = [
             [
                 p.get("name", "-"),
@@ -232,7 +220,6 @@ def passes_cmd(  # noqa: PLR0913
                 p.get("begin_eid", "-"),
                 p.get("end_eid", "-"),
             ]
-            + ([p.get("rt_switches", {}).get("count", 0)] if switches else [])
             for p in passes
         ]
         write_tsv(tsv_rows, header=header, no_header=no_header)

{rdc_cli-0.5.1 → rdc_cli-0.5.2}/src/rdc/daemon_server.py

@@ -198,7 +198,7 @@ def _load_replay(state: DaemonState) -> str | None:
     state.rd = rd
     version = _detect_version(rd)
     state.adapter = RenderDocAdapter(controller=controller, version=version)
-    state.structured_file = cap.GetStructuredData()
+    state.structured_file = state.adapter.get_structured_file()
 
     _init_adapter_state(state)
     return None
@@ -339,9 +339,9 @@ def _load_remote_replay(state: DaemonState, remote_url: str) -> str | None:
 
         state.cap = cap
         state.rd = rd
-        state.structured_file = cap.GetStructuredData()
         version = _detect_version(rd)
         state.adapter = RenderDocAdapter(controller=controller, version=version)
+        state.structured_file = state.adapter.get_structured_file()
 
         _init_adapter_state(state)
         _start_ping_thread(state)

{rdc_cli-0.5.1 → rdc_cli-0.5.2}/src/rdc/handlers/query.py

@@ -200,12 +200,6 @@ def _handle_passes(
     actions = state.adapter.get_root_actions()
     tree = get_pass_hierarchy(actions, state.structured_file)
 
-    if params.get("switches"):
-        from rdc.services.query_service import _count_rt_switches
-
-        for p in tree.get("passes", []):
-            p["rt_switches"] = _count_rt_switches(actions, p["begin_eid"], p["end_eid"])
-
     return _result_response(request_id, {"tree": tree}), True
 
 

{rdc_cli-0.5.1 → rdc_cli-0.5.2}/src/rdc/handlers/texture.py

@@ -82,6 +82,10 @@ def _handle_tex_export(
         return _error_response(
             request_id, -32001, f"mip {mip} out of range (max: {tex.mips - 1})"
         ), True
+    eid = int(params.get("eid", state.current_eid))
+    err = _set_frame_event(state, eid)
+    if err:
+        return _error_response(request_id, -32002, err), True
     temp_path = state.temp_dir / f"tex_{res_id}_mip{mip}.png"
     controller = state.adapter.controller
     texsave = _make_texsave(state.rd, tex.resourceId, mip)
@@ -107,6 +111,10 @@ def _handle_tex_raw(
     tex = state.tex_map.get(res_id)
     if tex is None:
         return _error_response(request_id, -32001, f"texture {res_id} not found"), True
+    eid = int(params.get("eid", state.current_eid))
+    err = _set_frame_event(state, eid)
+    if err:
+        return _error_response(request_id, -32002, err), True
     controller = state.adapter.controller
     sub = _make_subresource(state.rd)
     raw_data = controller.GetTextureData(tex.resourceId, sub)

{rdc_cli-0.5.1 → rdc_cli-0.5.2}/src/rdc/services/query_service.py

@@ -774,59 +774,27 @@ def _build_synthetic_pass_list(actions: list[Any], sf: Any = None) -> list[dict[
     return passes
 
 
-def _count_rt_switches(
-    actions: list[Any],
-    begin_eid: int,
-    end_eid: int,
-) -> dict[str, Any]:
-    """Count render-target switches within a pass EID range.
-
-    Args:
-        actions: Root action list from ReplayController.
-        begin_eid: First EID of the pass (inclusive).
-        end_eid: Last EID of the pass (inclusive).
-
-    Returns:
-        Dict with ``count`` (int) and ``switches`` list of dicts
-        containing ``eid``, ``from_targets``, and ``to_targets``.
-    """
-    leaf_actions: list[Any] = []
-
-    def _collect(nodes: list[Any]) -> None:
-        for a in nodes:
-            flags = int(a.flags)
-            if flags & _DRAW_OR_DISPATCH_OR_CLEAR:
-                if begin_eid <= a.eventId <= end_eid:
-                    leaf_actions.append(a)
-            if a.children:
-                _collect(a.children)
-
-    _collect(actions)
-    leaf_actions.sort(key=lambda a: a.eventId)
-
-    switches: list[dict[str, Any]] = []
-    prev_key: tuple[int, ...] | None = None
-    for a in leaf_actions:
-        key = _rt_key(a)
-        if prev_key is not None and key != prev_key:
-            switches.append(
-                {
-                    "eid": a.eventId,
-                    "from_targets": prev_key,
-                    "to_targets": key,
-                }
-            )
-        prev_key = key
-
-    return {"count": len(switches), "switches": switches}
-
-
 def _pass_list_with_fallback(actions: list[Any], sf: Any = None) -> list[dict[str, Any]]:
-    """Build pass list, falling back to synthetic RT inference if no API passes found."""
-    passes = _build_pass_list(actions, sf)
-    if not passes:
-        passes = _build_synthetic_pass_list(actions, sf)
-    return passes
+    """Build pass list, merging explicit passes with gap-filling synthetic passes."""
+    explicit = _build_pass_list(actions, sf)
+    if not explicit:
+        return _build_synthetic_pass_list(actions, sf)
+    synthetic = _build_synthetic_pass_list(actions, sf)
+    if not synthetic:
+        return explicit
+    # Keep synthetic passes whose EID range doesn't overlap any explicit pass
+    gap_fills = [
+        s
+        for s in synthetic
+        if not any(
+            s["begin_eid"] <= e["end_eid"] and s["end_eid"] >= e["begin_eid"] for e in explicit
+        )
+    ]
+    if not gap_fills:
+        return explicit
+    merged = explicit + gap_fills
+    merged.sort(key=lambda p: p["begin_eid"])
+    return merged
 
 
 def get_pass_detail(

{rdc_cli-0.5.1 → rdc_cli-0.5.2}/src/rdc_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: rdc-cli
-Version: 0.5.1
+Version: 0.5.2
 Summary: CLI for RenderDoc .rdc captures
 Author: Jim
 License-Expression: MIT

{rdc_cli-0.5.1 → rdc_cli-0.5.2}/src/rdc_cli.egg-info/SOURCES.txt

@@ -605,7 +605,6 @@ tests/unit/test_require_pipe.py
 tests/unit/test_resource_semantic_completion.py
 tests/unit/test_resources_commands.py
 tests/unit/test_resources_filter.py
-tests/unit/test_rt_switches.py
 tests/unit/test_script_command.py
 tests/unit/test_script_handler.py
 tests/unit/test_search.py

{rdc_cli-0.5.1 → rdc_cli-0.5.2}/tests/unit/test_binary_daemon.py

@@ -244,6 +244,13 @@ class TestTexExport:
         assert resp["error"]["code"] == -32001
         assert "mip" in resp["error"]["message"]
 
+    def test_eid_out_of_range(self, tmp_path):
+        state = _make_handler_state(tmp_path)
+        resp, _ = _handle_request(
+            rpc_request("tex_export", {"id": 42, "eid": 99999}, token="abcdef1234567890"), state
+        )
+        assert resp["error"]["code"] == -32002
+
     def test_no_temp_dir(self):
         state = DaemonState(capture="test.rdc", current_eid=0, token="abcdef1234567890")
         state.adapter = RenderDocAdapter(
@@ -275,6 +282,13 @@ class TestTexRaw:
         )
         assert resp["error"]["code"] == -32001
 
+    def test_eid_out_of_range(self, tmp_path):
+        state = _make_handler_state(tmp_path)
+        resp, _ = _handle_request(
+            rpc_request("tex_raw", {"id": 42, "eid": 99999}, token="abcdef1234567890"), state
+        )
+        assert resp["error"]["code"] == -32002
+
     def test_no_temp_dir(self):
         state = DaemonState(capture="test.rdc", current_eid=0, token="abcdef1234567890")
         state.adapter = RenderDocAdapter(

{rdc_cli-0.5.1 → rdc_cli-0.5.2}/tests/unit/test_query_service.py

@@ -14,6 +14,7 @@ from rdc.services.query_service import (
     _build_synthetic_pass_list,
     _friendly_pass_name,
     _parse_load_store_ops,
+    _pass_list_with_fallback,
     aggregate_stats,
     filter_by_pass,
     filter_by_pattern,
@@ -1048,3 +1049,128 @@ class TestSyntheticPassIntegrationGL:
         detail = get_pass_detail(actions, None, 0)
         assert detail is not None
         assert detail["draws"] == 1
+
+
+class TestPassListHybridFallback:
+    """_pass_list_with_fallback merges explicit + gap-filling synthetic passes."""
+
+    def test_mixed_explicit_and_synthetic(self) -> None:
+        """Explicit passes cover EID 10-12, synthetic fills gap at EID 60-61."""
+        begin = ActionDescription(
+            eventId=10,
+            flags=ActionFlags.BeginPass | ActionFlags.PassBoundary,
+            _name="vkCmdBeginRenderPass(C=Clear)",
+        )
+        draw1 = ActionDescription(
+            eventId=11,
+            flags=ActionFlags.Drawcall,
+            numIndices=6,
+            outputs=_make_outputs(100),
+            depthOut=ResourceId(50),
+            _name="d1",
+        )
+        end = ActionDescription(
+            eventId=12,
+            flags=ActionFlags.EndPass | ActionFlags.PassBoundary,
+            _name="vkCmdEndRenderPass(C=Store)",
+        )
+        # Gap actions: different RT, no BeginPass
+        rt2 = _make_outputs(200)
+        gap_draw1 = ActionDescription(
+            eventId=60,
+            flags=ActionFlags.Drawcall,
+            numIndices=9,
+            outputs=rt2,
+            depthOut=ResourceId(0),
+            _name="ssao",
+        )
+        gap_draw2 = ActionDescription(
+            eventId=61,
+            flags=ActionFlags.Drawcall,
+            numIndices=12,
+            outputs=rt2,
+            depthOut=ResourceId(0),
+            _name="bloom",
+        )
+        actions = [begin, draw1, end, gap_draw1, gap_draw2]
+        passes = _pass_list_with_fallback(actions)
+        assert len(passes) == 2
+        assert passes[0]["begin_eid"] <= 12
+        assert passes[1]["begin_eid"] == 60
+        assert passes[1]["draws"] == 2
+
+    def test_pure_explicit_no_gaps(self) -> None:
+        """All actions inside BeginPass -> only explicit passes returned."""
+        begin = ActionDescription(
+            eventId=10,
+            flags=ActionFlags.BeginPass | ActionFlags.PassBoundary,
+            _name="vkCmdBeginRenderPass(C=Clear)",
+        )
+        draw = ActionDescription(
+            eventId=11,
+            flags=ActionFlags.Drawcall,
+            numIndices=6,
+            outputs=_make_outputs(100),
+            depthOut=ResourceId(50),
+            _name="d",
+        )
+        end = ActionDescription(
+            eventId=12,
+            flags=ActionFlags.EndPass | ActionFlags.PassBoundary,
+            _name="vkCmdEndRenderPass(C=Store)",
+        )
+        passes = _pass_list_with_fallback([begin, draw, end])
+        assert len(passes) == 1
+        assert passes[0]["draws"] == 1
+
+    def test_pure_synthetic_fallback(self) -> None:
+        """No BeginPass at all -> full synthetic fallback."""
+        rt = _make_outputs(100)
+        actions = [
+            ActionDescription(
+                eventId=1,
+                flags=ActionFlags.Drawcall,
+                numIndices=6,
+                outputs=rt,
+                depthOut=ResourceId(50),
+                _name="glDrawArrays",
+            ),
+        ]
+        passes = _pass_list_with_fallback(actions)
+        assert len(passes) == 1
+        assert passes[0]["draws"] == 1
+
+    def test_overlapping_synthetic_discarded(self) -> None:
+        """Synthetic pass overlapping explicit pass EID range is discarded."""
+        begin = ActionDescription(
+            eventId=10,
+            flags=ActionFlags.BeginPass | ActionFlags.PassBoundary,
+            _name="vkCmdBeginRenderPass(C=Clear)",
+        )
+        draw1 = ActionDescription(
+            eventId=15,
+            flags=ActionFlags.Drawcall,
+            numIndices=6,
+            outputs=_make_outputs(100),
+            depthOut=ResourceId(50),
+            _name="d1",
+        )
+        # Overlapping draw inside BeginPass EID range but different RT
+        draw_overlap = ActionDescription(
+            eventId=18,
+            flags=ActionFlags.Drawcall,
+            numIndices=3,
+            outputs=_make_outputs(200),
+            depthOut=ResourceId(0),
+            _name="overlap",
+        )
+        end = ActionDescription(
+            eventId=20,
+            flags=ActionFlags.EndPass | ActionFlags.PassBoundary,
+            _name="vkCmdEndRenderPass(C=Store)",
+        )
+        actions = [begin, draw1, draw_overlap, end]
+        passes = _pass_list_with_fallback(actions)
+        # Synthetic pass for draw_overlap (EID 18) overlaps explicit (10-20) -> discarded
+        assert len(passes) == 1
+        assert passes[0]["begin_eid"] <= 15

rdc_cli-0.5.1/tests/unit/test_rt_switches.py

@@ -1,243 +0,0 @@
-"""Tests for RT switch detection (T8: rdc passes --switches)."""
-
-from __future__ import annotations
-
-import json
-
-from click.testing import CliRunner
-from conftest import patch_cli_session
-from mock_renderdoc import ActionDescription, ActionFlags, ResourceId
-
-from rdc.commands.resources import passes_cmd
-from rdc.services.query_service import _count_rt_switches
-
-
-def _action(
-    eid: int,
-    flags: int = ActionFlags.Drawcall,
-    outputs: list[int] | None = None,
-    depth: int = 0,
-) -> ActionDescription:
-    out = [ResourceId(v) for v in (outputs or [0] * 8)]
-    while len(out) < 8:
-        out.append(ResourceId(0))
-    return ActionDescription(
-        eventId=eid,
-        flags=flags,
-        _name=f"draw@{eid}",
-        outputs=out,
-        depthOut=ResourceId(depth),
-        numIndices=3,
-        numInstances=1,
-    )
-
-
-# ── Service tests ──────────────────────────────────────────────────
-
-
-def test_no_rt_switches() -> None:
-    """All actions share same RT -> 0 switches."""
-    actions = [
-        _action(10, outputs=[100]),
-        _action(20, outputs=[100]),
-        _action(30, outputs=[100]),
-    ]
-    result = _count_rt_switches(actions, 10, 30)
-    assert result["count"] == 0
-    assert result["switches"] == []
-
-
-def test_two_rt_switches() -> None:
-    """RT changes twice within the pass EID range."""
-    actions = [
-        _action(10, outputs=[100], depth=50),
-        _action(20, outputs=[200], depth=50),  # switch 1
-        _action(30, outputs=[200], depth=50),
-        _action(40, outputs=[300], depth=60),  # switch 2
-    ]
-    result = _count_rt_switches(actions, 10, 40)
-    assert result["count"] == 2
-    assert len(result["switches"]) == 2
-
-    sw0 = result["switches"][0]
-    assert sw0["eid"] == 20
-    assert 100 in sw0["from_targets"]
-    assert 200 in sw0["to_targets"]
-
-    sw1 = result["switches"][1]
-    assert sw1["eid"] == 40
-
-
-def test_actions_outside_eid_range_ignored() -> None:
-    """Actions outside the specified EID range are not counted."""
-    actions = [
-        _action(5, outputs=[100]),  # before range
-        _action(10, outputs=[100]),
-        _action(20, outputs=[200]),  # switch within range
-        _action(50, outputs=[300]),  # after range
-    ]
-    result = _count_rt_switches(actions, 10, 20)
-    assert result["count"] == 1
-    assert result["switches"][0]["eid"] == 20
-
-
-def test_nested_actions() -> None:
-    """Actions nested in children are found."""
-    child1 = _action(10, outputs=[100])
-    child2 = _action(20, outputs=[200])
-    parent = ActionDescription(
-        eventId=5,
-        flags=ActionFlags.PushMarker,
-        _name="Marker",
-        children=[child1, child2],
-    )
-    result = _count_rt_switches([parent], 5, 25)
-    assert result["count"] == 1
-
-
-def test_dispatch_and_clear_counted() -> None:
-    """Dispatch and clear actions participate in RT switch detection."""
-    actions = [
-        _action(10, flags=ActionFlags.Drawcall, outputs=[100]),
-        _action(20, flags=ActionFlags.Dispatch, outputs=[200]),
-        _action(30, flags=ActionFlags.Clear, outputs=[200]),
-    ]
-    result = _count_rt_switches(actions, 10, 30)
-    assert result["count"] == 1
-
-
-def test_empty_actions() -> None:
-    """No actions -> 0 switches."""
-    result = _count_rt_switches([], 0, 100)
-    assert result["count"] == 0
-    assert result["switches"] == []
-
-
-# ── Handler test ───────────────────────────────────────────────────
-
-
-def test_handle_passes_switches() -> None:
-    """Handler adds rt_switches when switches param is set."""
-    from conftest import make_daemon_state
-
-    a1 = _action(10, outputs=[100])
-    a2 = _action(20, outputs=[200])
-    begin = ActionDescription(
-        eventId=5,
-        flags=ActionFlags.BeginPass | ActionFlags.PassBoundary,
-        _name="TestPass",
-        children=[a1, a2],
-    )
-    end = ActionDescription(
-        eventId=25,
-        flags=ActionFlags.EndPass | ActionFlags.PassBoundary,
-        _name="EndPass",
-    )
-    state = make_daemon_state(actions=[begin, end])
-
-    from rdc.handlers.query import _handle_passes
-
-    resp, _ = _handle_passes(1, {"switches": True}, state)
-    passes = resp["result"]["tree"]["passes"]
-    assert len(passes) >= 1
-    p = passes[0]
-    assert "rt_switches" in p
-    assert p["rt_switches"]["count"] == 1
-
-
-def test_handle_passes_no_switches_param() -> None:
-    """Without switches param, no rt_switches key is added."""
-    from conftest import make_daemon_state
-
-    a1 = _action(10, outputs=[100])
-    begin = ActionDescription(
-        eventId=5,
-        flags=ActionFlags.BeginPass | ActionFlags.PassBoundary,
-        _name="TestPass",
-        children=[a1],
-    )
-    end = ActionDescription(
-        eventId=15,
-        flags=ActionFlags.EndPass | ActionFlags.PassBoundary,
-        _name="EndPass",
-    )
-    state = make_daemon_state(actions=[begin, end])
-
-    from rdc.handlers.query import _handle_passes
-
-    resp, _ = _handle_passes(1, {}, state)
-    passes = resp["result"]["tree"]["passes"]
-    for p in passes:
-        assert "rt_switches" not in p
-
-
-# ── CLI tests ──────────────────────────────────────────────────────
-
-_PASSES_WITH_SWITCHES = {
-    "tree": {
-        "passes": [
-            {
-                "name": "Shadow",
-                "draws": 3,
-                "dispatches": 0,
-                "triangles": 600,
-                "begin_eid": 10,
-                "end_eid": 50,
-                "load_ops": [],
-                "store_ops": [],
-                "rt_switches": {
-                    "count": 2,
-                    "switches": [
-                        {"eid": 20, "from_targets": [100, 0], "to_targets": [200, 0]},
-                        {"eid": 40, "from_targets": [200, 0], "to_targets": [300, 0]},
-                    ],
-                },
-            },
-        ]
-    }
-}
-
-
-def test_cli_switches_tsv(monkeypatch: object) -> None:
-    """--switches adds RT_SWITCHES column in TSV."""
-    patch_cli_session(monkeypatch, _PASSES_WITH_SWITCHES)  # type: ignore[arg-type]
-    result = CliRunner().invoke(passes_cmd, ["--switches"])
-    assert result.exit_code == 0
-    assert "RT_SWITCHES" in result.output
-    assert "2" in result.output
-
-
-def test_cli_switches_json(monkeypatch: object) -> None:
-    """--switches --json includes rt_switches in output."""
-    patch_cli_session(monkeypatch, _PASSES_WITH_SWITCHES)  # type: ignore[arg-type]
-    result = CliRunner().invoke(passes_cmd, ["--switches", "--json"])
-    assert result.exit_code == 0
-    data = json.loads(result.output)
-    assert "rt_switches" in data["passes"][0]
-    assert data["passes"][0]["rt_switches"]["count"] == 2
-
-
-def test_cli_no_switches_no_column(monkeypatch: object) -> None:
-    """Without --switches, no RT_SWITCHES column."""
-    patch_cli_session(
-        monkeypatch,  # type: ignore[arg-type]
-        {
-            "tree": {
-                "passes": [
-                    {
-                        "name": "Shadow",
-                        "draws": 3,
-                        "dispatches": 0,
-                        "triangles": 600,
-                        "begin_eid": 10,
-                        "end_eid": 50,
-                        "load_ops": [],
-                        "store_ops": [],
-                    }
-                ]
-            }
-        },
-    )
-    result = CliRunner().invoke(passes_cmd, [])
-    assert result.exit_code == 0
-    assert "RT_SWITCHES" not in result.output