build(deps): bump pyqtgraph from 0.13.7 to 0.14.0

Bumps [pyqtgraph](https://github.com/pyqtgraph/pyqtgraph) from 0.13.7 to 0.14.0.
- [Release notes](https://github.com/pyqtgraph/pyqtgraph/releases)
- [Changelog](https://github.com/pyqtgraph/pyqtgraph/blob/master/CHANGELOG)
- [Commits](https://github.com/pyqtgraph/pyqtgraph/compare/pyqtgraph-0.13.7...pyqtgraph-0.14.0)

---
updated-dependencies:
- dependency-name: pyqtgraph
  dependency-version: 0.14.0
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

.github/actions/bw_install/action.yml

@@ -62,4 +62,4 @@ runs:
         uv pip install --system -e ./ophyd_devices
         uv pip install --system -e ./bec/bec_lib[dev]
         uv pip install --system -e ./bec/bec_ipython_client
-        uv pip install --system -e ./bec_widgets[dev,qtermwidget]
+        uv pip install --system -e ./bec_widgets[dev,pyside6]

.github/scripts/aggregate_benchmarks.py

@@ -1,169 +0,0 @@
-##########################
-### AI-generated file. ###
-##########################
-
-"""Aggregate and merge benchmark JSON files.
-
-The workflow runs the same benchmark suite on multiple independent runners.
-This script reads every JSON file produced by those attempts, normalizes the
-contained benchmark values, and writes a compact mapping JSON where each value is
-the median across attempts. It can also merge independent hyperfine JSON files
-from one runner into a single hyperfine-style JSON file.
-"""
-
-from __future__ import annotations
-
-import argparse
-import json
-import statistics
-from pathlib import Path
-from typing import Any
-
-from compare_benchmarks import Benchmark, extract_benchmarks
-
-
-def collect_benchmarks(paths: list[Path]) -> dict[str, list[Benchmark]]:
-    """Collect benchmarks from multiple JSON files.
-
-    Args:
-        paths (list[Path]): Paths to hyperfine, pytest-benchmark, or compact
-            mapping JSON files.
-
-    Returns:
-        dict[str, list[Benchmark]]: Benchmarks grouped by benchmark name.
-    """
-
-    collected: dict[str, list[Benchmark]] = {}
-    for path in paths:
-        for name, benchmark in extract_benchmarks(path).items():
-            collected.setdefault(name, []).append(benchmark)
-    return collected
-
-
-def aggregate(collected: dict[str, list[Benchmark]]) -> dict[str, dict[str, object]]:
-    """Aggregate grouped benchmarks using the median value.
-
-    Args:
-        collected (dict[str, list[Benchmark]]): Benchmarks grouped by benchmark
-            name.
-
-    Returns:
-        dict[str, dict[str, object]]: Compact mapping JSON data. Each benchmark
-        contains ``value``, ``unit``, ``metric``, ``attempts``, and
-        ``attempt_values``.
-    """
-
-    aggregated: dict[str, dict[str, object]] = {}
-    for name, benchmarks in sorted(collected.items()):
-        values = [benchmark.value for benchmark in benchmarks]
-        unit = next((benchmark.unit for benchmark in benchmarks if benchmark.unit), "")
-        metric = next((benchmark.metric for benchmark in benchmarks if benchmark.metric), "value")
-        aggregated[name] = {
-            "value": statistics.median(values),
-            "unit": unit,
-            "metric": f"median-of-attempt-{metric}",
-            "attempts": len(values),
-            "attempt_values": values,
-        }
-    return aggregated
-
-
-def merge_hyperfine_results(paths: list[Path]) -> dict[str, Any]:
-    """Merge hyperfine result files.
-
-    Args:
-        paths (list[Path]): Hyperfine JSON files to merge.
-
-    Returns:
-        dict[str, Any]: Hyperfine-style JSON object containing all result rows.
-
-    Raises:
-        ValueError: If any file has no hyperfine ``results`` list.
-    """
-
-    merged: dict[str, Any] = {"results": []}
-    for path in paths:
-        data = json.loads(path.read_text(encoding="utf-8"))
-        results = data.get("results", []) if isinstance(data, dict) else None
-        if not isinstance(results, list):
-            raise ValueError(f"{path} has no hyperfine results list")
-        merged["results"].extend(results)
-    return merged
-
-
-def main_from_paths(input_dir: Path, output: Path) -> int:
-    """Aggregate all JSON files in a directory and write the result.
-
-    Args:
-        input_dir (Path): Directory containing benchmark JSON files.
-        output (Path): Path where the aggregate JSON should be written.
-
-    Returns:
-        int: Always ``0`` on success.
-
-    Raises:
-        ValueError: If no JSON files are found in ``input_dir``.
-    """
-
-    paths = sorted(input_dir.rglob("*.json"))
-    if not paths:
-        raise ValueError(f"No benchmark JSON files found in {input_dir}")
-
-    output.parent.mkdir(parents=True, exist_ok=True)
-    output.write_text(
-        json.dumps(aggregate(collect_benchmarks(paths)), indent=2, sort_keys=True) + "\n",
-        encoding="utf-8",
-    )
-    return 0
-
-
-def merge_from_paths(input_dir: Path, output: Path) -> int:
-    """Merge all hyperfine JSON files in a directory and write the result.
-
-    Args:
-        input_dir (Path): Directory containing hyperfine JSON files.
-        output (Path): Path where the merged JSON should be written.
-
-    Returns:
-        int: Always ``0`` on success.
-
-    Raises:
-        ValueError: If no JSON files are found in ``input_dir``.
-    """
-
-    paths = sorted(input_dir.glob("*.json"))
-    if not paths:
-        raise ValueError(f"No hyperfine JSON files found in {input_dir}")
-
-    output.parent.mkdir(parents=True, exist_ok=True)
-    output.write_text(
-        json.dumps(merge_hyperfine_results(paths), indent=2, sort_keys=True) + "\n",
-        encoding="utf-8",
-    )
-    return 0
-
-
-def main() -> int:
-    """Run the benchmark aggregation command line interface.
-
-    Returns:
-        int: Always ``0`` on success.
-    """
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument(
-        "--mode",
-        choices=("aggregate", "merge-hyperfine"),
-        default="aggregate",
-        help="Operation to perform.",
-    )
-    parser.add_argument("--input-dir", required=True, type=Path)
-    parser.add_argument("--output", required=True, type=Path)
-    args = parser.parse_args()
-    if args.mode == "merge-hyperfine":
-        return merge_from_paths(input_dir=args.input_dir, output=args.output)
-    return main_from_paths(input_dir=args.input_dir, output=args.output)
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())

.github/scripts/compare_benchmarks.py

@@ -1,454 +0,0 @@
-##########################
-### AI-generated file. ###
-##########################
-
-"""Compare benchmark JSON files and write a GitHub Actions summary.
-
-The script supports JSON emitted by hyperfine, JSON emitted by pytest-benchmark,
-and a compact mapping format generated by ``aggregate_benchmarks.py``. Timing
-formats prefer median values and fall back to mean values when median values are
-not present.
-"""
-
-from __future__ import annotations
-
-import argparse
-import json
-import math
-from dataclasses import dataclass
-from pathlib import Path
-from typing import Any
-
-
-@dataclass(frozen=True)
-class Benchmark:
-    """Normalized benchmark result.
-
-    Attributes:
-        name (str): Stable benchmark name used to match baseline and current results.
-        value (float): Numeric benchmark value used for comparison.
-        unit (str): Display unit for the value, for example ``"s"``.
-        metric (str): Source metric name, for example ``"median"`` or ``"mean"``.
-    """
-
-    name: str
-    value: float
-    unit: str
-    metric: str = "value"
-
-
-@dataclass(frozen=True)
-class Comparison:
-    """Comparison between one baseline benchmark and one current benchmark.
-
-    Attributes:
-        name (str): Benchmark name.
-        baseline (float): Baseline benchmark value.
-        current (float): Current benchmark value.
-        delta_percent (float): Percent change from baseline to current.
-        unit (str): Display unit for both values.
-        metric (str): Current result metric used for comparison.
-        regressed (bool): Whether the change exceeds the configured threshold in
-            the worse direction.
-        improved (bool): Whether the change exceeds the configured threshold in
-            the better direction.
-    """
-
-    name: str
-    baseline: float
-    current: float
-    delta_percent: float
-    unit: str
-    metric: str
-    regressed: bool
-    improved: bool
-
-
-def _read_json(path: Path) -> Any:
-    """Read JSON data from a file.
-
-    Args:
-        path (Path): Path to the JSON file.
-
-    Returns:
-        Any: Parsed JSON value.
-    """
-
-    with path.open("r", encoding="utf-8") as stream:
-        return json.load(stream)
-
-
-def _as_float(value: Any) -> float | None:
-    """Convert a value to a finite float.
-
-    Args:
-        value (Any): Value to convert.
-
-    Returns:
-        float | None: Converted finite float, or ``None`` if conversion fails.
-    """
-
-    try:
-        result = float(value)
-    except (TypeError, ValueError):
-        return None
-    if math.isfinite(result):
-        return result
-    return None
-
-
-def _extract_hyperfine(data: dict[str, Any]) -> dict[str, Benchmark]:
-    """Extract normalized benchmarks from hyperfine JSON.
-
-    Args:
-        data (dict[str, Any]): Parsed hyperfine JSON object.
-
-    Returns:
-        dict[str, Benchmark]: Benchmarks keyed by command name.
-    """
-
-    benchmarks: dict[str, Benchmark] = {}
-    for result in data.get("results", []):
-        if not isinstance(result, dict):
-            continue
-        name = str(result.get("command") or result.get("name") or "").strip()
-        metric = "median"
-        value = _as_float(result.get(metric))
-        if value is None:
-            metric = "mean"
-            value = _as_float(result.get(metric))
-        if name and value is not None:
-            benchmarks[name] = Benchmark(name=name, value=value, unit="s", metric=metric)
-    return benchmarks
-
-
-def _extract_pytest_benchmark(data: dict[str, Any]) -> dict[str, Benchmark]:
-    """Extract normalized benchmarks from pytest-benchmark JSON.
-
-    Args:
-        data (dict[str, Any]): Parsed pytest-benchmark JSON object.
-
-    Returns:
-        dict[str, Benchmark]: Benchmarks keyed by full benchmark name.
-    """
-
-    benchmarks: dict[str, Benchmark] = {}
-    for benchmark in data.get("benchmarks", []):
-        if not isinstance(benchmark, dict):
-            continue
-
-        name = str(benchmark.get("fullname") or benchmark.get("name") or "").strip()
-        stats = benchmark.get("stats", {})
-        value = None
-        metric = "median"
-        if isinstance(stats, dict):
-            value = _as_float(stats.get(metric))
-            if value is None:
-                metric = "mean"
-                value = _as_float(stats.get(metric))
-        if name and value is not None:
-            benchmarks[name] = Benchmark(name=name, value=value, unit="s", metric=metric)
-    return benchmarks
-
-
-def _extract_simple_mapping(data: dict[str, Any]) -> dict[str, Benchmark]:
-    """Extract normalized benchmarks from a compact mapping JSON object.
-
-    Args:
-        data (dict[str, Any]): Parsed mapping where each benchmark is either a
-            raw number or an object containing ``value``, ``unit``, and ``metric``.
-
-    Returns:
-        dict[str, Benchmark]: Benchmarks keyed by mapping key.
-    """
-
-    benchmarks: dict[str, Benchmark] = {}
-
-    for name, raw_value in data.items():
-        if name in {"version", "context", "commit", "timestamp"}:
-            continue
-
-        value = _as_float(raw_value)
-        unit = ""
-        metric = "value"
-        if value is None and isinstance(raw_value, dict):
-            value = _as_float(raw_value.get("value"))
-            unit = str(raw_value.get("unit") or "")
-            metric = str(raw_value.get("metric") or "value")
-
-        if value is not None:
-            benchmarks[str(name)] = Benchmark(name=str(name), value=value, unit=unit, metric=metric)
-
-    return benchmarks
-
-
-def extract_benchmarks(path: Path) -> dict[str, Benchmark]:
-    """Extract normalized benchmarks from a supported JSON file.
-
-    Args:
-        path (Path): Path to a hyperfine, pytest-benchmark, or compact mapping
-            JSON file.
-
-    Returns:
-        dict[str, Benchmark]: Normalized benchmarks keyed by name.
-
-    Raises:
-        ValueError: If the JSON root is not an object or no supported benchmark
-            entries can be extracted.
-    """
-
-    data = _read_json(path)
-    if not isinstance(data, dict):
-        raise ValueError(f"{path} must contain a JSON object")
-
-    extractors = (_extract_hyperfine, _extract_pytest_benchmark, _extract_simple_mapping)
-    for extractor in extractors:
-        benchmarks = extractor(data)
-        if benchmarks:
-            return benchmarks
-
-    raise ValueError(f"No supported benchmark entries found in {path}")
-
-
-def compare_benchmarks(
-    baseline: dict[str, Benchmark],
-    current: dict[str, Benchmark],
-    threshold_percent: float,
-    higher_is_better: bool,
-) -> tuple[list[Comparison], list[str], list[str]]:
-    """Compare baseline benchmarks with current benchmarks.
-
-    Args:
-        baseline (dict[str, Benchmark]): Baseline benchmarks keyed by name.
-        current (dict[str, Benchmark]): Current benchmarks keyed by name.
-        threshold_percent (float): Regression threshold in percent.
-        higher_is_better (bool): If ``True``, lower current values are treated as
-            regressions. If ``False``, higher current values are treated as
-            regressions.
-
-    Returns:
-        tuple[list[Comparison], list[str], list[str]]: Comparisons for common
-        benchmark names, names missing from current results, and names newly
-        present in current results.
-    """
-
-    comparisons: list[Comparison] = []
-    missing_in_current: list[str] = []
-    new_in_current: list[str] = []
-
-    for name, baseline_benchmark in sorted(baseline.items()):
-        current_benchmark = current.get(name)
-        if current_benchmark is None:
-            missing_in_current.append(name)
-            continue
-
-        if baseline_benchmark.value == 0:
-            delta_percent = 0.0
-        else:
-            delta_percent = (
-                (current_benchmark.value - baseline_benchmark.value)
-                / abs(baseline_benchmark.value)
-                * 100
-            )
-
-        if higher_is_better:
-            regressed = delta_percent <= -threshold_percent
-            improved = delta_percent >= threshold_percent
-        else:
-            regressed = delta_percent >= threshold_percent
-            improved = delta_percent <= -threshold_percent
-
-        comparisons.append(
-            Comparison(
-                name=name,
-                baseline=baseline_benchmark.value,
-                current=current_benchmark.value,
-                delta_percent=delta_percent,
-                unit=current_benchmark.unit or baseline_benchmark.unit,
-                metric=current_benchmark.metric,
-                regressed=regressed,
-                improved=improved,
-            )
-        )
-
-    for name in sorted(set(current) - set(baseline)):
-        new_in_current.append(name)
-
-    return comparisons, missing_in_current, new_in_current
-
-
-def _format_value(value: float, unit: str) -> str:
-    """Format a benchmark value for Markdown output.
-
-    Args:
-        value (float): Numeric benchmark value.
-        unit (str): Display unit.
-
-    Returns:
-        str: Formatted value with optional unit suffix.
-    """
-
-    suffix = f" {unit}" if unit else ""
-    return f"{value:.6g}{suffix}"
-
-
-def _format_status(comparison: Comparison) -> str:
-    """Format a comparison status for Markdown output."""
-
-    if comparison.regressed:
-        return ":red_circle: regressed"
-    if comparison.improved:
-        return ":green_circle: improved"
-    return "ok"
-
-
-def write_summary(
-    path: Path,
-    comparisons: list[Comparison],
-    missing_in_current: list[str],
-    new_in_current: list[str],
-    threshold_percent: float,
-    higher_is_better: bool,
-) -> None:
-    """Write a Markdown benchmark comparison summary.
-
-    Args:
-        path (Path): Path where the summary should be written.
-        comparisons (list[Comparison]): Comparison rows for matching benchmarks.
-        missing_in_current (list[str]): Baseline benchmark names missing from the
-            current result.
-        new_in_current (list[str]): Current benchmark names not present in the
-            baseline result.
-        threshold_percent (float): Regression threshold in percent.
-        higher_is_better (bool): Whether higher benchmark values are considered
-            better.
-    """
-
-    regressions = [comparison for comparison in comparisons if comparison.regressed]
-    improvements = [comparison for comparison in comparisons if comparison.improved]
-    direction = "higher is better" if higher_is_better else "lower is better"
-    sorted_comparisons = sorted(comparisons, key=lambda comparison: comparison.name)
-
-    lines = [
-        "<!-- bw-benchmark-comment -->",
-        "## Benchmark comparison",
-        "",
-        f"Threshold: {threshold_percent:g}% ({direction}).",
-        f"Result: {len(regressions)} regression(s), {len(improvements)} improvement(s) beyond threshold.",
-    ]
-    lines.append("")
-
-    if regressions:
-        lines.extend(
-            [
-                f"{len(regressions)} benchmark(s) regressed beyond the configured threshold.",
-                "",
-                "| Benchmark | Baseline | Current | Change |",
-                "| --- | ---: | ---: | ---: |",
-            ]
-        )
-        for comparison in regressions:
-            lines.append(
-                "| "
-                f"{comparison.name} | "
-                f"{_format_value(comparison.baseline, comparison.unit)} | "
-                f"{_format_value(comparison.current, comparison.unit)} | "
-                f"{comparison.delta_percent:+.2f}% |"
-            )
-    else:
-        lines.append("No benchmark regression exceeded the configured threshold.")
-
-    lines.append("")
-
-    if improvements:
-        lines.extend(
-            [
-                f"{len(improvements)} benchmark(s) improved beyond the configured threshold.",
-                "",
-                "| Benchmark | Baseline | Current | Change |",
-                "| --- | ---: | ---: | ---: |",
-            ]
-        )
-        for comparison in improvements:
-            lines.append(
-                "| "
-                f"{comparison.name} | "
-                f"{_format_value(comparison.baseline, comparison.unit)} | "
-                f"{_format_value(comparison.current, comparison.unit)} | "
-                f"{comparison.delta_percent:+.2f}% |"
-            )
-    else:
-        lines.append("No benchmark improvement exceeded the configured threshold.")
-
-    if sorted_comparisons:
-        lines.extend(
-            [
-                "",
-                "<details>",
-                "<summary>All benchmark results</summary>",
-                "",
-                "| Benchmark | Baseline | Current | Change | Status |",
-                "| --- | ---: | ---: | ---: | --- |",
-            ]
-        )
-        for comparison in sorted_comparisons:
-            lines.append(
-                "| "
-                f"{comparison.name} | "
-                f"{_format_value(comparison.baseline, comparison.unit)} | "
-                f"{_format_value(comparison.current, comparison.unit)} | "
-                f"{comparison.delta_percent:+.2f}% | "
-                f"{_format_status(comparison)} |"
-            )
-        lines.extend(["", "</details>"])
-
-    if missing_in_current:
-        lines.extend(["", "Missing benchmarks in the current run:"])
-        lines.extend(f"- `{name}`" for name in missing_in_current)
-
-    if new_in_current:
-        lines.extend(["", "New benchmarks in the current run:"])
-        lines.extend(f"- `{name}`" for name in new_in_current)
-
-    path.parent.mkdir(parents=True, exist_ok=True)
-    path.write_text("\n".join(lines) + "\n", encoding="utf-8")
-
-
-def main() -> int:
-    """Run the benchmark comparison command line interface.
-
-    Returns:
-        int: ``1`` when a regression exceeds the threshold, otherwise ``0``.
-    """
-
-    parser = argparse.ArgumentParser()
-    parser.add_argument("--baseline", required=True, type=Path)
-    parser.add_argument("--current", required=True, type=Path)
-    parser.add_argument("--summary", required=True, type=Path)
-    parser.add_argument("--threshold-percent", required=True, type=float)
-    parser.add_argument("--higher-is-better", action="store_true")
-    args = parser.parse_args()
-
-    baseline = extract_benchmarks(args.baseline)
-    current = extract_benchmarks(args.current)
-    comparisons, missing_in_current, new_in_current = compare_benchmarks(
-        baseline=baseline,
-        current=current,
-        threshold_percent=args.threshold_percent,
-        higher_is_better=args.higher_is_better,
-    )
-
-    write_summary(
-        path=args.summary,
-        comparisons=comparisons,
-        missing_in_current=missing_in_current,
-        new_in_current=new_in_current,
-        threshold_percent=args.threshold_percent,
-        higher_is_better=args.higher_is_better,
-    )
-
-    return 1 if any(comparison.regressed for comparison in comparisons) else 0
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())

.github/scripts/run_benchmarks.sh

@@ -1,74 +0,0 @@
-#!/usr/bin/env bash
-
-##########################
-### AI-generated file. ###
-##########################
-
-set -euo pipefail
-
-mkdir -p benchmark-results
-benchmark_json="${BENCHMARK_JSON:-benchmark-results/current.json}"
-benchmark_root="$(dirname "$benchmark_json")"
-hyperfine_benchmark_dir="${BENCHMARK_HYPERFINE_DIR:-tests/benchmarks/hyperfine}"
-pytest_benchmark_dirs="${BENCHMARK_PYTEST_DIRS:-${BENCHMARK_PYTEST_DIR:-}}"
-benchmark_work_dir="$benchmark_root/raw-results"
-hyperfine_json_dir="$benchmark_work_dir/hyperfine"
-pytest_json="$benchmark_work_dir/pytest.json"
-
-shopt -s nullglob
-benchmark_scripts=()
-benchmark_scripts=("$hyperfine_benchmark_dir"/benchmark_*.sh)
-shopt -u nullglob
-
-pytest_dirs=()
-for pytest_benchmark_dir in $pytest_benchmark_dirs; do
-  if [ -d "$pytest_benchmark_dir" ]; then
-    pytest_dirs+=("$pytest_benchmark_dir")
-  else
-    echo "Pytest benchmark directory not found: $pytest_benchmark_dir" >&2
-    exit 1
-  fi
-done
-
-if [ "${#benchmark_scripts[@]}" -eq 0 ] && [ "${#pytest_dirs[@]}" -eq 0 ]; then
-  echo "No benchmark scripts or pytest benchmarks found" >&2
-  exit 1
-fi
-
-echo "Benchmark Python: $(command -v python)"
-python -c 'import sys; print(sys.version)'
-
-rm -rf "$benchmark_work_dir"
-mkdir -p "$hyperfine_json_dir"
-
-if [ "${#benchmark_scripts[@]}" -gt 0 ]; then
-  for benchmark_script in "${benchmark_scripts[@]}"; do
-    title="$(sed -n 's/^# BENCHMARK_TITLE:[[:space:]]*//p' "$benchmark_script" | head -n 1)"
-    if [ -z "$title" ]; then
-      title="$(basename "$benchmark_script" .sh)"
-    fi
-    benchmark_name="$(basename "$benchmark_script" .sh)"
-    benchmark_result_json="$hyperfine_json_dir/$benchmark_name.json"
-    echo "Preflight benchmark script: $benchmark_script"
-    bash "$benchmark_script"
-
-    hyperfine \
-      --show-output \
-      --warmup 1 \
-      --runs 5 \
-      --command-name "$title" \
-      --export-json "$benchmark_result_json" \
-      "bash $(printf "%q" "$benchmark_script")"
-  done
-fi
-
-if [ "${#pytest_dirs[@]}" -gt 0 ]; then
-  pytest \
-    -q "${pytest_dirs[@]}" \
-    --benchmark-only \
-    --benchmark-json "$pytest_json"
-fi
-
-python .github/scripts/aggregate_benchmarks.py \
-  --input-dir "$benchmark_work_dir" \
-  --output "$benchmark_json"

.github/scripts/run_with_bec_servers.py

@@ -1,125 +0,0 @@
-##########################
-### AI-generated file. ###
-##########################
-
-"""Run a command with BEC e2e services available."""
-
-from __future__ import annotations
-
-import argparse
-import os
-import shutil
-import subprocess
-import tempfile
-import time
-from pathlib import Path
-
-import bec_lib
-from bec_ipython_client import BECIPythonClient
-from bec_lib.redis_connector import RedisConnector
-from bec_lib.service_config import ServiceConfig, ServiceConfigModel
-from redis import Redis
-
-
-def _wait_for_redis(host: str, port: int) -> None:
-    client = Redis(host=host, port=port)
-    deadline = time.monotonic() + 10
-    while time.monotonic() < deadline:
-        try:
-            if client.ping():
-                return
-        except Exception:
-            time.sleep(0.1)
-    raise RuntimeError(f"Redis did not start on {host}:{port}")
-
-
-def _start_redis(files_path: Path, host: str, port: int) -> subprocess.Popen:
-    redis_server = shutil.which("redis-server")
-    if redis_server is None:
-        raise RuntimeError("redis-server executable not found")
-
-    return subprocess.Popen(
-        [
-            redis_server,
-            "--bind",
-            host,
-            "--port",
-            str(port),
-            "--save",
-            "",
-            "--appendonly",
-            "no",
-            "--dir",
-            str(files_path),
-        ]
-    )
-
-
-def _write_configs(files_path: Path, host: str, port: int) -> Path:
-    test_config = files_path / "test_config.yaml"
-    services_config = files_path / "services_config.yaml"
-
-    bec_lib_path = Path(bec_lib.__file__).resolve().parent
-    shutil.copyfile(bec_lib_path / "tests" / "test_config.yaml", test_config)
-
-    service_config = ServiceConfigModel(
-        redis={"host": host, "port": port}, file_writer={"base_path": str(files_path)}
-    )
-    services_config.write_text(service_config.model_dump_json(indent=4), encoding="utf-8")
-    return services_config
-
-
-def _load_demo_config(services_config: Path) -> None:
-    bec = BECIPythonClient(ServiceConfig(services_config), RedisConnector, forced=True)
-    bec.start()
-    try:
-        bec.config.load_demo_config()
-    finally:
-        bec.shutdown()
-        bec._client._reset_singleton()
-
-
-def main() -> int:
-    parser = argparse.ArgumentParser()
-    parser.add_argument("command", nargs=argparse.REMAINDER)
-    args = parser.parse_args()
-
-    if args.command[:1] == ["--"]:
-        args.command = args.command[1:]
-    if not args.command:
-        raise ValueError("No command provided")
-
-    host = "127.0.0.1"
-    port = 6379
-
-    with tempfile.TemporaryDirectory(prefix="bec-benchmark-") as tmp:
-        files_path = Path(tmp)
-        services_config = _write_configs(files_path, host, port)
-        redis_process = _start_redis(files_path, host, port)
-        processes = None
-        service_handler = None
-        try:
-            _wait_for_redis(host, port)
-
-            from bec_server.bec_server_utils.service_handler import ServiceHandler
-
-            service_handler = ServiceHandler(
-                bec_path=files_path, config_path=services_config, interface="subprocess"
-            )
-            processes = service_handler.start()
-            _load_demo_config(services_config)
-
-            env = os.environ.copy()
-            return subprocess.run(args.command, env=env, check=False).returncode
-        finally:
-            if service_handler is not None and processes is not None:
-                service_handler.stop(processes)
-            redis_process.terminate()
-            try:
-                redis_process.wait(timeout=10)
-            except subprocess.TimeoutExpired:
-                redis_process.kill()
-
-
-if __name__ == "__main__":
-    raise SystemExit(main())

.github/workflows/benchmark.yml

@@ -1,242 +0,0 @@
-name: BW Benchmarks
-
-on: [ workflow_call ]
-
-permissions:
-  contents: read
-
-env:
-  BENCHMARK_JSON: benchmark-results/current.json
-  BENCHMARK_BASELINE_JSON: gh-pages-benchmark-data/benchmarks/latest.json
-  BENCHMARK_SUMMARY: benchmark-results/summary.md
-  BENCHMARK_COMMAND: "bash .github/scripts/run_benchmarks.sh"
-  BENCHMARK_THRESHOLD_PERCENT: 20
-  BENCHMARK_HIGHER_IS_BETTER: false
-
-jobs:
-  benchmark_attempt:
-    runs-on: ubuntu-latest
-    continue-on-error: true
-    permissions:
-      contents: read
-    defaults:
-      run:
-        shell: bash -el {0}
-    strategy:
-      fail-fast: false
-      matrix:
-        attempt: [ 1, 2, 3 ]
-
-    env:
-      BENCHMARK_JSON: benchmark-results/current-${{ matrix.attempt }}.json
-      BEC_CORE_BRANCH: main
-      OPHYD_DEVICES_BRANCH: main
-      PLUGIN_REPO_BRANCH: main
-      BENCHMARK_PYTEST_DIRS: tests/unit_tests/benchmarks
-      QTWEBENGINE_DISABLE_SANDBOX: 1
-      QT_QPA_PLATFORM: "offscreen"
-
-    steps:
-      - name: Checkout BEC Widgets
-        uses: actions/checkout@v4
-        with:
-          repository: bec-project/bec_widgets
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-
-      - name: Set up Conda
-        uses: conda-incubator/setup-miniconda@v3
-        with:
-          auto-update-conda: true
-          auto-activate-base: true
-          python-version: "3.11"
-
-      - name: Install system dependencies
-        run: |
-          sudo apt-get update
-          sudo apt-get install -y libgl1 libegl1 x11-utils libxkbcommon-x11-0 libdbus-1-3 xvfb
-          sudo apt-get -y install libnss3 libxdamage1 libasound2t64 libatomic1 libxcursor1
-          sudo apt-get -y install ttyd hyperfine redis-server
-
-      - name: Install full e2e environment
-        run: |
-          echo -e "\033[35;1m Using branch $BEC_CORE_BRANCH of BEC CORE \033[0;m";
-          git clone --branch "$BEC_CORE_BRANCH" https://github.com/bec-project/bec.git
-          echo -e "\033[35;1m Using branch $OPHYD_DEVICES_BRANCH of OPHYD_DEVICES \033[0;m";
-          git clone --branch "$OPHYD_DEVICES_BRANCH" https://github.com/bec-project/ophyd_devices.git
-          export OHPYD_DEVICES_PATH=$PWD/ophyd_devices
-          echo -e "\033[35;1m Using branch $PLUGIN_REPO_BRANCH of bec_testing_plugin \033[0;m";
-          git clone --branch "$PLUGIN_REPO_BRANCH" https://github.com/bec-project/bec_testing_plugin.git
-          cd ./bec
-          conda create -q -n test-environment python=3.11
-          conda activate test-environment
-          source ./bin/install_bec_dev.sh -t
-          cd ../
-          python -m pip install -e ./ophyd_devices -e .[dev,pyside6] -e ./bec_testing_plugin pytest-benchmark
-
-          mkdir -p "$(dirname "$BENCHMARK_JSON")"
-          python .github/scripts/run_with_bec_servers.py -- bash -lc "$BENCHMARK_COMMAND"
-          test -s "$BENCHMARK_JSON"
-
-      - name: Upload benchmark artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: bw-benchmark-json-${{ matrix.attempt }}
-          path: ${{ env.BENCHMARK_JSON }}
-
-  benchmark:
-    needs: [ benchmark_attempt ]
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      issues: write
-      pull-requests: write
-
-    steps:
-      - name: Checkout BEC Widgets
-        uses: actions/checkout@v4
-        with:
-          repository: bec-project/bec_widgets
-          ref: ${{ github.event.pull_request.head.sha || github.sha }}
-
-      - name: Download benchmark attempts
-        uses: actions/download-artifact@v4
-        with:
-          pattern: bw-benchmark-json-*
-          path: benchmark-results/attempts
-          merge-multiple: true
-
-      - name: Aggregate benchmark attempts
-        run: |
-          python .github/scripts/aggregate_benchmarks.py \
-            --input-dir benchmark-results/attempts \
-            --output "$BENCHMARK_JSON"
-
-      - name: Upload aggregate benchmark artifact
-        uses: actions/upload-artifact@v4
-        with:
-          name: bw-benchmark-json
-          path: ${{ env.BENCHMARK_JSON }}
-
-      - name: Fetch gh-pages benchmark data
-        run: |
-          if git ls-remote --exit-code --heads origin gh-pages; then
-            git clone --depth=1 --branch gh-pages "$GITHUB_SERVER_URL/$GITHUB_REPOSITORY.git" gh-pages-benchmark-data
-          else
-            mkdir -p gh-pages-benchmark-data
-          fi
-
-      - name: Compare with latest gh-pages benchmark
-        id: compare
-        continue-on-error: true
-        run: |
-          if [ ! -s "$BENCHMARK_BASELINE_JSON" ]; then
-            mkdir -p "$(dirname "$BENCHMARK_SUMMARY")"
-            {
-              echo "<!-- bw-benchmark-comment -->"
-              echo "## Benchmark comparison"
-              echo
-              echo "No benchmark baseline was found on gh-pages."
-            } > "$BENCHMARK_SUMMARY"
-            exit 0
-          fi
-
-          args=(
-            --baseline "$BENCHMARK_BASELINE_JSON"
-            --current "$BENCHMARK_JSON"
-            --summary "$BENCHMARK_SUMMARY"
-            --threshold-percent "$BENCHMARK_THRESHOLD_PERCENT"
-          )
-
-          if [ "$BENCHMARK_HIGHER_IS_BETTER" = "true" ]; then
-            args+=(--higher-is-better)
-          fi
-
-          set +e
-          python .github/scripts/compare_benchmarks.py "${args[@]}"
-          status=$?
-          set -e
-
-          if [ ! -s "$BENCHMARK_SUMMARY" ]; then
-            mkdir -p "$(dirname "$BENCHMARK_SUMMARY")"
-            {
-              echo "<!-- bw-benchmark-comment -->"
-              echo "## Benchmark comparison"
-              echo
-              echo "Benchmark comparison failed before writing a summary."
-            } > "$BENCHMARK_SUMMARY"
-          fi
-
-          exit "$status"
-
-      - name: Find existing benchmark PR comment
-        if: github.event_name == 'pull_request'
-        id: fc
-        uses: peter-evans/find-comment@v3
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          comment-author: github-actions[bot]
-          body-includes: "<!-- bw-benchmark-comment -->"
-
-      - name: Create or update benchmark PR comment
-        if: github.event_name == 'pull_request'
-        uses: peter-evans/create-or-update-comment@v5
-        with:
-          issue-number: ${{ github.event.pull_request.number }}
-          comment-id: ${{ steps.fc.outputs.comment-id }}
-          body-path: ${{ env.BENCHMARK_SUMMARY }}
-          edit-mode: replace
-
-      - name: Fail on benchmark regression
-        if: github.event_name == 'pull_request' && steps.compare.outcome == 'failure'
-        run: exit 1
-
-  publish:
-    needs: [ benchmark ]
-    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
-    runs-on: ubuntu-latest
-    permissions:
-      contents: write
-
-    steps:
-      - name: Checkout BEC Widgets
-        uses: actions/checkout@v4
-        with:
-          repository: bec-project/bec_widgets
-          ref: ${{ github.sha }}
-
-      - name: Download aggregate benchmark artifact
-        uses: actions/download-artifact@v4
-        with:
-          name: bw-benchmark-json
-          path: benchmark-results
-
-      - name: Verify aggregate benchmark artifact
-        run: test -s "$BENCHMARK_JSON"
-
-      - name: Prepare gh-pages for publishing
-        run: |
-          # Clean up any existing worktree/directory
-          if [ -d gh-pages-benchmark-data ]; then
-            git worktree remove gh-pages-benchmark-data --force || rm -rf gh-pages-benchmark-data
-          fi
-
-          if git ls-remote --exit-code --heads origin gh-pages; then
-            git fetch --depth=1 origin gh-pages
-            git worktree add gh-pages-benchmark-data FETCH_HEAD
-          else
-            git worktree add --detach gh-pages-benchmark-data
-            git -C gh-pages-benchmark-data checkout --orphan gh-pages
-            git -C gh-pages-benchmark-data rm -rf .
-          fi
-
-      - name: Publish benchmark data to gh-pages
-        working-directory: gh-pages-benchmark-data
-        run: |
-          mkdir -p benchmarks/history
-          cp "../$BENCHMARK_JSON" benchmarks/latest.json
-          cp "../$BENCHMARK_JSON" "benchmarks/history/${GITHUB_SHA}.json"
-          git config user.name "github-actions[bot]"
-          git config user.email "41898282+github-actions[bot]@users.noreply.github.com"
-          git add benchmarks/latest.json "benchmarks/history/${GITHUB_SHA}.json"
-          git commit -m "Update BW benchmark data for ${GITHUB_SHA}" || exit 0
-          git push origin HEAD:gh-pages

.github/workflows/ci.yml

@@ -1,19 +1,19 @@
 name: Full CI
-on:
+on: 
   push:
   pull_request:
   workflow_dispatch:
     inputs:
       BEC_WIDGETS_BRANCH:
-        description: "Branch of BEC Widgets to install"
+        description: 'Branch of BEC Widgets to install'
         required: false
         type: string
       BEC_CORE_BRANCH:
-        description: "Branch of BEC Core to install"
+        description: 'Branch of BEC Core to install'
         required: false
         type: string
       OPHYD_DEVICES_BRANCH:
-        description: "Branch of Ophyd Devices to install"
+        description: 'Branch of Ophyd Devices to install'
         required: false
         type: string
 
@@ -23,7 +23,6 @@ concurrency:
 
 permissions:
   pull-requests: write
-  contents: read
 
 jobs:
   check_pr_status:
@@ -34,15 +33,6 @@ jobs:
     if: needs.check_pr_status.outputs.branch-pr == ''
     uses: ./.github/workflows/formatter.yml
 
-  benchmark:
-    needs: [check_pr_status]
-    if: needs.check_pr_status.outputs.branch-pr == ''
-    permissions:
-      contents: write
-      issues: write
-      pull-requests: write
-    uses: ./.github/workflows/benchmark.yml
-
   unit-test:
     needs: [check_pr_status, formatter]
     if: needs.check_pr_status.outputs.branch-pr == ''
@@ -79,9 +69,9 @@ jobs:
     uses: ./.github/workflows/child_repos.yml
     with:
       BEC_CORE_BRANCH: ${{ inputs.BEC_CORE_BRANCH || 'main' }}
-      OPHYD_DEVICES_BRANCH: ${{ inputs.OPHYD_DEVICES_BRANCH || 'main'}}
+      OPHYD_DEVICES_BRANCH: ${{ inputs.OPHYD_DEVICES_BRANCH || 'main'}} 
       BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH || github.head_ref || github.sha }}
-
+  
   plugin_repos:
     needs: [check_pr_status, formatter]
     if: needs.check_pr_status.outputs.branch-pr == ''
@@ -91,4 +81,4 @@ jobs:
       BEC_WIDGETS_BRANCH: ${{ inputs.BEC_WIDGETS_BRANCH || github.head_ref || github.sha }}
 
     secrets:
-      GH_READ_TOKEN: ${{ secrets.GH_READ_TOKEN }}
+      GH_READ_TOKEN: ${{ secrets.GH_READ_TOKEN }}

.github/workflows/end2end-conda.yml

@@ -55,5 +55,5 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: pytest-logs
-          path: ./bec/logs/*.log
+          path: ./logs/*.log
           retention-days: 7

.github/workflows/pytest-matrix.yml

@@ -1,25 +1,25 @@
 name: Run Pytest with different Python versions
-on:
+on: 
   workflow_call:
     inputs:
       pr_number:
-        description: "Pull request number"
+        description: 'Pull request number'
         required: false
         type: number
       BEC_CORE_BRANCH:
-        description: "Branch of BEC Core to install"
+        description: 'Branch of BEC Core to install'
         required: false
-        default: "main"
+        default: 'main'
         type: string
       OPHYD_DEVICES_BRANCH:
-        description: "Branch of Ophyd Devices to install"
+        description: 'Branch of Ophyd Devices to install'
         required: false
-        default: "main"
+        default: 'main'
         type: string
       BEC_WIDGETS_BRANCH:
-        description: "Branch of BEC Widgets to install"
+        description: 'Branch of BEC Widgets to install'
         required: false
-        default: "main"
+        default: 'main'
         type: string
 
 jobs:
@@ -30,14 +30,15 @@ jobs:
         python-version: ["3.11", "3.12", "3.13"]
 
     env:
-      BEC_WIDGETS_BRANCH: main # Set the branch you want for bec_widgets
-      BEC_CORE_BRANCH: main # Set the branch you want for bec
-      OPHYD_DEVICES_BRANCH: main # Set the branch you want for ophyd_devices
+      BEC_WIDGETS_BRANCH: main  # Set the branch you want for bec_widgets
+      BEC_CORE_BRANCH: main        # Set the branch you want for bec
+      OPHYD_DEVICES_BRANCH: main   # Set the branch you want for ophyd_devices
       PROJECT_PATH: ${{ github.repository }}
       QTWEBENGINE_DISABLE_SANDBOX: 1
       QT_QPA_PLATFORM: "offscreen"
 
     steps:
+
       - name: Checkout BEC Widgets
         uses: actions/checkout@v4
         with:
@@ -55,4 +56,4 @@ jobs:
       - name: Run Pytest
         run: |
           pip install pytest pytest-random-order
-          pytest -v --junitxml=report.xml --random-order --ignore=tests/unit_tests/benchmarks ./tests/unit_tests
+          pytest -v --junitxml=report.xml --random-order ./tests/unit_tests

.github/workflows/pytest.yml

@@ -1,30 +1,32 @@
 name: Run Pytest with Coverage
-on:
+on: 
   workflow_call:
     inputs:
       pr_number:
-        description: "Pull request number"
+        description: 'Pull request number'
         required: false
         type: number
       BEC_CORE_BRANCH:
-        description: "Branch of BEC Core to install"
+        description: 'Branch of BEC Core to install'
         required: false
-        default: "main"
+        default: 'main'
         type: string
       OPHYD_DEVICES_BRANCH:
-        description: "Branch of Ophyd Devices to install"
+        description: 'Branch of Ophyd Devices to install'
         required: false
-        default: "main"
+        default: 'main'
         type: string
       BEC_WIDGETS_BRANCH:
-        description: "Branch of BEC Widgets to install"
+        description: 'Branch of BEC Widgets to install'
         required: false
-        default: "main"
+        default: 'main'
         type: string
     secrets:
       CODECOV_TOKEN:
         required: true
 
+
+
 permissions:
   pull-requests: write
 
@@ -53,7 +55,7 @@ jobs:
 
       - name: Run Pytest with Coverage
         id: coverage
-        run: pytest --random-order --cov=bec_widgets --cov-config=pyproject.toml --cov-branch --cov-report=xml --no-cov-on-fail --ignore=tests/unit_tests/benchmarks tests/unit_tests/
+        run: pytest --random-order --cov=bec_widgets --cov-config=pyproject.toml --cov-branch --cov-report=xml --no-cov-on-fail tests/unit_tests/
 
       - name: Upload test artifacts
         uses: actions/upload-artifact@v4
@@ -67,4 +69,4 @@ jobs:
         uses: codecov/codecov-action@v5
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
-          slug: bec-project/bec_widgets
+          slug: bec-project/bec_widgets

.gitignore

@@ -177,6 +177,4 @@ cython_debug/
 #  be found at https://github.com/github/gitignore/blob/main/Global/JetBrains.gitignore
 #  and can be added to the global gitignore or merged into this file.  For a more nuclear
 #  option (not recommended) you can uncomment the following to ignore the entire idea folder.
-#.idea/
-#
-tombi.toml
+#.idea/

CHANGELOG.md

@@ -1,444 +1,6 @@
 # CHANGELOG
 
 
-## v3.7.3 (2026-05-01)
-
-### Bug Fixes
-
-- **dock_area**: Profile names changed, default->baseline, user->runtime
-  ([`dd32caf`](https://github.com/bec-project/bec_widgets/commit/dd32caf6e815fd1922b6aae84d00decad9dbf869))
-
-### Testing
-
-- **dock_area**: Remove low-value tests
-  ([`717d74b`](https://github.com/bec-project/bec_widgets/commit/717d74b19e8c6960209190c47ba32732ffaa0094))
-
-
-## v3.7.2 (2026-04-29)
-
-### Bug Fixes
-
-- **dock-area**: Avoid switching profile when saving new profile
-  ([`73b44cf`](https://github.com/bec-project/bec_widgets/commit/73b44cffb219347cacb609f3b93068eda6701b42))
-
-- **workspace-actions**: Use try/finally and restore previous blocked state in refresh_profiles
-  ([`30ef255`](https://github.com/bec-project/bec_widgets/commit/30ef25533af9df5a9bd9e69808dc49fdf22f4318))
-
-Agent-Logs-Url:
-  https://github.com/bec-project/bec_widgets/sessions/004cb4bc-5015-485e-a803-1e63876b7024
-
-Co-authored-by: wyzula-jan <133381102+wyzula-jan@users.noreply.github.com>
-
-### Build System
-
-- Add pytest-benchmark dependency
-  ([`551d38d`](https://github.com/bec-project/bec_widgets/commit/551d38d90111361e64bfcf10a1409be71dd298bc))
-
-### Chores
-
-- Update header comments in script files to indicate AI generation
-  ([`3f1aa80`](https://github.com/bec-project/bec_widgets/commit/3f1aa80756368454c3631cb6cf9d29db28af177a))
-
-### Continuous Integration
-
-- Add benchmark workflow
-  ([`999b7a2`](https://github.com/bec-project/bec_widgets/commit/999b7a2321f2f222c04b056a2db4280f66de9c48))
-
-- Fix benchmark upload
-  ([`19b5c8f`](https://github.com/bec-project/bec_widgets/commit/19b5c8f724dbdb7421957c290f9213bf072392df))
-
-- Increase threshold to 20 percent
-  ([`409c9e5`](https://github.com/bec-project/bec_widgets/commit/409c9e5bfacdfc003f1bc8c9944f01798bd3818e))
-
-### Testing
-
-- Fix assertions after updating ophyd devices templates
-  ([`a614d66`](https://github.com/bec-project/bec_widgets/commit/a614d662d6da716a49afb4ed3a3903f108210386))
-
-Co-authored-by: Copilot <copilot@github.com>
-
-- Remove references to "scan_motors" in tests
-  ([`5056ef8`](https://github.com/bec-project/bec_widgets/commit/5056ef8946d03a20e802709d3fe81c84c195fe41))
-
-
-## v3.7.1 (2026-04-21)
-
-### Bug Fixes
-
-- **heatmap**: Fix access to status from metadata
-  ([`55694ff`](https://github.com/bec-project/bec_widgets/commit/55694ff2b96581e03c63c8b8e068e2db79bcf780))
-
-### Testing
-
-- Fix exit status and status access in tests
-  ([`91afc77`](https://github.com/bec-project/bec_widgets/commit/91afc775d59b4ba31bed3585847a67c301acf9b0))
-
-
-## v3.7.0 (2026-04-21)
-
-### Features
-
-- Move companion app to applications
-  ([`0cf84cd`](https://github.com/bec-project/bec_widgets/commit/0cf84cd1d839ac4a39ffb5fb9ba57d432e04348a))
-
-### Refactoring
-
-- Cleanup of imports
-  ([`3e77f54`](https://github.com/bec-project/bec_widgets/commit/3e77f540345f56b9f184a332fcdd50d4d4c8c621))
-
-
-## v3.6.0 (2026-04-21)
-
-### Bug Fixes
-
-- Change resize mode to interactive
-  ([`a5db2dc`](https://github.com/bec-project/bec_widgets/commit/a5db2dc340f3386e68b300fd4528a44f87cbbf97))
-
-- Small usability changes
-  ([`5a497c3`](https://github.com/bec-project/bec_widgets/commit/5a497c3598c2d8f27916d91d53c646d5d6d3a4a7))
-
-### Features
-
-- Add button/slot to pause/unpause logs
-  ([`23e3644`](https://github.com/bec-project/bec_widgets/commit/23e3644619de958bcfdb8a0b2ee1f7c2ce05b235))
-
-- Add logpanel to menu
-  ([`2e8f43f`](https://github.com/bec-project/bec_widgets/commit/2e8f43fcac581cd1c227308198565d142a1bf276))
-
-- Migrate logpanel to table model/view
-  ([`09bb112`](https://github.com/bec-project/bec_widgets/commit/09bb1121d83bac1f6e4827daa476fbe7cd5b3a80))
-
-
-## v3.5.1 (2026-04-20)
-
-### Bug Fixes
-
-- Don't assume attr exists if we timed out waiting for it
-  ([`f7a1ee4`](https://github.com/bec-project/bec_widgets/commit/f7a1ee49a42c58ba315c8957b45a80d862ffe745))
-
-### Refactoring
-
-- Don't import real widgets in client
-  ([`8e51c1a`](https://github.com/bec-project/bec_widgets/commit/8e51c1adb6a7658c54846794cf97b774cbac2193))
-
-
-## v3.5.0 (2026-04-14)
-
-### Bug Fixes
-
-- Connect signals the correct way around
-  ([`f562c61`](https://github.com/bec-project/bec_widgets/commit/f562c61e3cec3387f6821bad74403beeb3436355))
-
-- Create new bec shell if deleted
-  ([`1754e75`](https://github.com/bec-project/bec_widgets/commit/1754e759f0c59f2f4063f661bacd334127326947))
-
-- Formatting in plugin template
-  ([`fa2ef83`](https://github.com/bec-project/bec_widgets/commit/fa2ef83bb9dfeeb4c5fc7cd77168c16101c32693))
-
-- **bec_console**: Persistent bec session
-  ([`9b0ec9d`](https://github.com/bec-project/bec_widgets/commit/9b0ec9dd79ad1adc5d211dd703db7441da965f34))
-
-### Features
-
-- Add qtermwidget plugin and replace web term
-  ([`02cb393`](https://github.com/bec-project/bec_widgets/commit/02cb393bb086165dc64917b633d5570d02e1a2a9))
-
-### Refactoring
-
-- Code cleanup
-  ([`bda5d38`](https://github.com/bec-project/bec_widgets/commit/bda5d389651bb2b13734cd31159679e85b1bd583))
-
-
-## v3.4.4 (2026-04-14)
-
-### Bug Fixes
-
-- Check duplicate stream sub
-  ([`c7de320`](https://github.com/bec-project/bec_widgets/commit/c7de320ca564264a31b84931f553170f25659685))
-
-- Check for duplicate subscriptions in GUIClient
-  ([`37747ba`](https://github.com/bec-project/bec_widgets/commit/37747babda407040333c6bd04646be9a49e0ee81))
-
-- Make gui client registry callback non static
-  ([`32f5d48`](https://github.com/bec-project/bec_widgets/commit/32f5d486d3fc8d41df2668c58932ae982819b285))
-
-- Remove staticmethod subscription
-  ([`0ff1fdc`](https://github.com/bec-project/bec_widgets/commit/0ff1fdc81578eec3ffc5d4030fca7b357a0b4c2f))
-
-
-## v3.4.3 (2026-04-13)
-
-### Bug Fixes
-
-- Set OPHYD_CONTROL_LAYER to dummy for tests
-  ([`5e84d3b`](https://github.com/bec-project/bec_widgets/commit/5e84d3bec608ae9f2ee6dae67db2e3e1387b1f59))
-
-
-## v3.4.2 (2026-04-01)
-
-### Bug Fixes
-
-- Allow admin user to pass deployment group check
-  ([`e6c8cd0`](https://github.com/bec-project/bec_widgets/commit/e6c8cd0b1a1162302071c93a2ac51880b3cf1b7d))
-
-- **bec-atlas-admin-view**: Fix atlas_url to bec-atlas-prod.psi.ch
-  ([`242f893`](https://github.com/bec-project/bec_widgets/commit/242f8933b246802f5f3a5b9df7de07901f151c82))
-
-### Testing
-
-- Add tests for admin access
-  ([`2dab16b`](https://github.com/bec-project/bec_widgets/commit/2dab16b68415806f3f291657f394bb2d8654229d))
-
-
-## v3.4.1 (2026-04-01)
-
-### Bug Fixes
-
-- **hover_widget**: Make it fancy + mouse tracking
-  ([`e25b660`](https://github.com/bec-project/bec_widgets/commit/e25b6604d195804bbd6ea6aac395d44dc00d6155))
-
-- **ring**: Changed inheritance to BECWidget and added cleanup
-  ([`2f75aae`](https://github.com/bec-project/bec_widgets/commit/2f75aaea16a178e180e68d702cd1bdf85a768bcf))
-
-- **ring**: Hook update hover to update method
-  ([`90ecd8e`](https://github.com/bec-project/bec_widgets/commit/90ecd8ea87faf06c3f545e3f9241f403b733d7eb))
-
-- **ring**: Minor general fixes
-  ([`6775509`](https://github.com/bec-project/bec_widgets/commit/677550931b28fbf35fd55880bf6e001f7351b99b))
-
-- **ring_progress_bar**: Added hover mouse effect
-  ([`96b5179`](https://github.com/bec-project/bec_widgets/commit/96b5179658c41fb39df7a40f4d96e82092605791))
-
-### Testing
-
-- **ring_progress_bar**: Add unit tests for hover behavior
-  ([`6e5f6e7`](https://github.com/bec-project/bec_widgets/commit/6e5f6e7fbb6f9680f6d026e105e6840d24c6591c))
-
-
-## v3.4.0 (2026-03-26)
-
-### Bug Fixes
-
-- **lmfit_dialog**: Compact layout size policy for better alignment panel UX
-  ([`31389a3`](https://github.com/bec-project/bec_widgets/commit/31389a3dd0c7b1c671acdf49ae50b08455f466a7))
-
-- **waveform**: Alignment panel indicators request autoscale if updated
-  ([`a292375`](https://github.com/bec-project/bec_widgets/commit/a2923752c27ad7b9749db3d309fe288747b85acb))
-
-### Features
-
-- **waveform**: 1d alignment mode panel
-  ([`a486c52`](https://github.com/bec-project/bec_widgets/commit/a486c52058b4edbea00ad7bb018f1fa2822fb9c6))
-
-
-## v3.3.4 (2026-03-24)
-
-### Bug Fixes
-
-- **lmfit_dialog**: Dialog compact adjustment and cleanup of stale methods
-  ([`f67b60a`](https://github.com/bec-project/bec_widgets/commit/f67b60ac98cd87ed8391fee8545eb8064a068e67))
-
-- **lmfit_dialog**: Fix cpp object deleted
-  ([`5ec59d5`](https://github.com/bec-project/bec_widgets/commit/5ec59d5dbb75e3a9deb488b0affaf8cb704242b9))
-
-- **lmfit_dialog**: Fix fit_curve_id type annotation and remove_dap_data selection behavior
-  ([`05c38d9`](https://github.com/bec-project/bec_widgets/commit/05c38d9b82cc6dfaec8f5abf8e0ececa5d001524))
-
-Co-authored-by: wyzula-jan <133381102+wyzula-jan@users.noreply.github.com>
-
-Agent-Logs-Url:
-  https://github.com/bec-project/bec_widgets/sessions/97395c0e-0271-4cdf-b39f-f3117d21bfa3
-
-
-## v3.3.3 (2026-03-23)
-
-### Bug Fixes
-
-- **positioner_box**: Remove CompactPopupWidget inheritance
-  ([`da400d2`](https://github.com/bec-project/bec_widgets/commit/da400d20b672236241ce3a4480481ac6a5df1b2e))
-
-
-## v3.3.2 (2026-03-22)
-
-### Bug Fixes
-
-- Typos
-  ([`3d29a67`](https://github.com/bec-project/bec_widgets/commit/3d29a67c0b2175f2f29b8e5a7befce55f3d28fd3))
-
-
-## v3.3.1 (2026-03-20)
-
-### Bug Fixes
-
-- **dap_combobox**: Added safeguard for no DAP models
-  ([`79af15a`](https://github.com/bec-project/bec_widgets/commit/79af15a88b993cd5b6bf730796f995f20cf6f188))
-
-- **dap_combobox**: Rewritten as proper combobox
-  ([`90222f3`](https://github.com/bec-project/bec_widgets/commit/90222f30821f822eb24b0179401d4e43050e0156))
-
-
-## v3.3.0 (2026-03-20)
-
-### Bug Fixes
-
-- Fix black 2026 formatting
-  ([`d4ecefd`](https://github.com/bec-project/bec_widgets/commit/d4ecefd80a6ab944b4da51c1ee35e5dea67770f2))
-
-- **actions**: Allow minimum icon size for actions in toolbar
-  ([`de941d1`](https://github.com/bec-project/bec_widgets/commit/de941d1bc565e444f84696b1de046d50b62f3c1b))
-
-- **admin-view**: Generate RPC interface for AdminView
-  ([`137e572`](https://github.com/bec-project/bec_widgets/commit/137e572a942281a9c7478a6be83f815848917e26))
-
-- **admin-widget**: Cleanup and minor improvements
-  ([`0c6f3f8`](https://github.com/bec-project/bec_widgets/commit/0c6f3f8352e7318a4f0579c83066b5b433fd1144))
-
-- **admin_view**: Minor changes
-  ([`48c9c83`](https://github.com/bec-project/bec_widgets/commit/48c9c83bb0c9432905d347b2d2cf46c05e58c098))
-
-- **bec-atlas-admin-view**: Fix connect_slot for dispatcher
-  ([`23c146b`](https://github.com/bec-project/bec_widgets/commit/23c146b3e6bbbabfb35f1892bc8653a65652ae6a))
-
-- **login-dialog**: Remove login_dialog
-  ([`d1a1d85`](https://github.com/bec-project/bec_widgets/commit/d1a1d85abd3331ebab696580c692c69b71482f37))
-
-- **main-app**: Fix id for main-app init of AdminView
-  ([`b14b046`](https://github.com/bec-project/bec_widgets/commit/b14b04688284eb875ea4469765786834e74fceb3))
-
-- **main-app**: Skip on_enter/exit hooks if darkmodebutton clicked
-  ([`f565deb`](https://github.com/bec-project/bec_widgets/commit/f565deb71db8fa5206fa2b4eea436e5055030bbc))
-
-- **pyproject**: Add PyJWT as dependency
-  ([`889e9c0`](https://github.com/bec-project/bec_widgets/commit/889e9c0994a960b93c93143b6dc5845dc96f9f96))
-
-- **RPC**: Fix rpc access
-  ([`8e53ae2`](https://github.com/bec-project/bec_widgets/commit/8e53ae2d3938e9c0a4c11082300156994447faaf))
-
-### Features
-
-- **admin-view**: Add admin view to views
-  ([`63059a4`](https://github.com/bec-project/bec_widgets/commit/63059a4ef897a919f296c68ada066e0b228f8248))
-
-- **bec-atlas-admin-view**: Add http service through QNetworkAccessManager
-  ([`1770873`](https://github.com/bec-project/bec_widgets/commit/17708730fcff41713638c17d0cc1f5d9d0b75122))
-
-- **bec-atlas-admin-view**: Add initial admin view
-  ([`ec58fbd`](https://github.com/bec-project/bec_widgets/commit/ec58fbd6d859058f518b88ba15670a3a715c3cc3))
-
-- **bec-atlas-admin-view**: Add login dilaog
-  ([`1384a32`](https://github.com/bec-project/bec_widgets/commit/1384a329abf873b5496e540a542088c7f13b7270))
-
-- **experiment-selection**: Add experiment selection widget
-  ([`598c453`](https://github.com/bec-project/bec_widgets/commit/598c453a1876cebc2482d55bf6c2728ec247def0))
-
-### Refactoring
-
-- Address review comments
-  ([`a7a9458`](https://github.com/bec-project/bec_widgets/commit/a7a9458180c18bf2bba652c2ff8a68875af36a22))
-
-- Cleanup widgets
-  ([`895b318`](https://github.com/bec-project/bec_widgets/commit/895b3189904778c269200365b264a32ff15dda21))
-
-- Fix formatting, running black 2026.1
-  ([`ab223d5`](https://github.com/bec-project/bec_widgets/commit/ab223d5fdc00b1a7bc9fd61abce5fabe4409654b))
-
-- **admin-view**: Refactor experiment selection, http service, admin view, and add main view
-  ([`3a17a24`](https://github.com/bec-project/bec_widgets/commit/3a17a249ed179fb8a11591f948c7b6338e10a60d))
-
-- **atlas-http-service**: Rename AtlasEndpoints
-  ([`2b0f575`](https://github.com/bec-project/bec_widgets/commit/2b0f575733412a96e54dff2dca15082d64caf7ee))
-
-- **fuzzy-search**: Unify is_match for fuzzy search
-  ([`d4afcb6`](https://github.com/bec-project/bec_widgets/commit/d4afcb68324f63ac8aea7cc3b2c82e79d2e643ca))
-
-### Testing
-
-- **bec-atlas-admin-view**: Complement tests for BECAtlasAdminView, ExperimentSelection,
-  BECAtlasHTTPService
-  ([`df44d9b`](https://github.com/bec-project/bec_widgets/commit/df44d9b50eb289a7851579c64a2a8c0e2363b06a))
-
-- **bec-atlas-http-service**: Add tests for http service
-  ([`34e80ee`](https://github.com/bec-project/bec_widgets/commit/34e80ee8f9a2b2373c97ae7cde90690ab6fb37ce))
-
-
-## v3.2.4 (2026-03-19)
-
-### Bug Fixes
-
-- **main_app**: Setapplicationname("bec")
-  ([`28be696`](https://github.com/bec-project/bec_widgets/commit/28be696f7c7d9762c742c6d5fb5b03867d5e92ea))
-
-
-## v3.2.3 (2026-03-16)
-
-### Bug Fixes
-
-- Check adding parent for filesystemmodel
-  ([`b9145d7`](https://github.com/bec-project/bec_widgets/commit/b9145d762cdf946f184834928a6404f21b4802a9))
-
-- Refactor client mock with global fakeredis
-  ([`37a5dc2`](https://github.com/bec-project/bec_widgets/commit/37a5dc2e9eeb447d174f4d7087051672f308c84c))
-
-### Continuous Integration
-
-- Fix path for uploading logs on failure
-  ([`1351fcd`](https://github.com/bec-project/bec_widgets/commit/1351fcd47b909c1a33cb389c096041eb1449e3d3))
-
-
-## v3.2.2 (2026-03-16)
-
-### Bug Fixes
-
-- **image**: Disconnecting of 2d monitor
-  ([`4c9d7fd`](https://github.com/bec-project/bec_widgets/commit/4c9d7fddce7aa5b7f13a00ac332bd54b301e3c28))
-
-
-## v3.2.1 (2026-03-16)
-
-### Bug Fixes
-
-- **e2e**: Bec dock rpc fixed synchronization
-  ([`e061fa3`](https://github.com/bec-project/bec_widgets/commit/e061fa31a9a5e5c00e44337d7cc52c51d8e259b5))
-
-- **e2e**: Bec shell excluded from e2e testing
-  ([`974f259`](https://github.com/bec-project/bec_widgets/commit/974f25997d68d13ff1063026f9e5c4c8dd4d49f3))
-
-- **e2e**: Timeout for maybe_remove_dock_area
-  ([`718f995`](https://github.com/bec-project/bec_widgets/commit/718f99527c3bebb96845d3305aba69434eb83f77))
-
-
-## v3.2.0 (2026-03-11)
-
-### Features
-
-- **curve, waveform**: Add dap_parameters for lmfit customization in DAP requests
-  ([`14d51b8`](https://github.com/bec-project/bec_widgets/commit/14d51b80169f5a060dd24287f3a6db9a4b41275a))
-
-- **waveform**: Composite DAP with multiple models
-  ([`b4f6f5a`](https://github.com/bec-project/bec_widgets/commit/b4f6f5aa8bcd0f6091610e8f839ea265c87575e0))
-
-
-## v3.1.4 (2026-03-11)
-
-### Bug Fixes
-
-- **profile_utils**: Renamed to fetch widgets settings
-  ([`53e5ec4`](https://github.com/bec-project/bec_widgets/commit/53e5ec42b8b33397af777f418fbd8601628226a6))
-
-### Build System
-
-- Increased minimal version of bec and bec qthemes
-  ([`7e0e391`](https://github.com/bec-project/bec_widgets/commit/7e0e391888f2ee4e8528ccb3938e36da4c32f146))
-
-
-## v3.1.3 (2026-03-09)
-
-### Bug Fixes
-
-- **monaco_dock**: Optimization, removal of QTimer, eventFilter replaced by signal/slot
-  ([`278d8de`](https://github.com/bec-project/bec_widgets/commit/278d8de058c2f5c6c9aa7317e1026651d7a4acd3))
-
-
 ## v3.1.2 (2026-03-06)
 
 ### Bug Fixes

bec_widgets/__init__.py

@@ -1,13 +1,19 @@
+import os
+import sys
+
+import bec_widgets.widgets.containers.qt_ads as QtAds
+from bec_widgets.utils.bec_widget import BECWidget
+from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
+
+if sys.platform.startswith("linux"):
+    qt_platform = os.environ.get("QT_QPA_PLATFORM", "")
+    if qt_platform != "offscreen":
+        os.environ["QT_QPA_PLATFORM"] = "xcb"
+
+# Default QtAds configuration
+QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.eConfigFlag.FocusHighlighting, True)
+QtAds.CDockManager.setConfigFlag(
+    QtAds.CDockManager.eConfigFlag.RetainTabSizeWhenCloseButtonHidden, True
+)
+
 __all__ = ["BECWidget", "SafeSlot", "SafeProperty"]
-
-
-def __getattr__(name):
-    if name == "BECWidget":
-        from bec_widgets.utils.bec_widget import BECWidget
-
-        return BECWidget
-    if name in {"SafeSlot", "SafeProperty"}:
-        from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
-
-        return {"SafeSlot": SafeSlot, "SafeProperty": SafeProperty}[name]
-    raise AttributeError(f"module {__name__!r} has no attribute {name!r}")

bec_widgets/applications/__init__.py

@@ -1,15 +0,0 @@
-import os
-import sys
-
-import bec_widgets.widgets.containers.qt_ads as QtAds
-
-if sys.platform.startswith("linux"):
-    qt_platform = os.environ.get("QT_QPA_PLATFORM", "")
-    if qt_platform != "offscreen":
-        os.environ["QT_QPA_PLATFORM"] = "xcb"
-
-# Default QtAds configuration
-QtAds.CDockManager.setConfigFlag(QtAds.CDockManager.eConfigFlag.FocusHighlighting, True)
-QtAds.CDockManager.setConfigFlag(
-    QtAds.CDockManager.eConfigFlag.RetainTabSizeWhenCloseButtonHidden, True
-)

bec_widgets/applications/launch_window.py

@@ -20,13 +20,13 @@ from qtpy.QtWidgets import (
 )
 
 import bec_widgets
+from bec_widgets.cli.rpc.rpc_register import RPCRegister
 from bec_widgets.utils.bec_plugin_helper import get_all_plugin_widgets
 from bec_widgets.utils.container_utils import WidgetContainerUtils
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.name_utils import pascal_to_snake
 from bec_widgets.utils.plugin_utils import get_plugin_auto_updates
 from bec_widgets.utils.round_frame import RoundedFrame
-from bec_widgets.utils.rpc_register import RPCRegister
 from bec_widgets.utils.screen_utils import apply_window_geometry, centered_geometry_for_app
 from bec_widgets.utils.toolbars.toolbar import ModularToolBar
 from bec_widgets.utils.ui_loader import UILoader

bec_widgets/applications/main_app.py

@@ -5,7 +5,6 @@ from qtpy.QtWidgets import QApplication, QHBoxLayout, QStackedWidget, QWidget
 from bec_widgets.applications.navigation_centre.reveal_animator import ANIMATION_DURATION
 from bec_widgets.applications.navigation_centre.side_bar import SideBar
 from bec_widgets.applications.navigation_centre.side_bar_components import NavigationItem
-from bec_widgets.applications.views.admin_view.admin_view import AdminView
 from bec_widgets.applications.views.developer_view.developer_view import DeveloperView
 from bec_widgets.applications.views.device_manager_view.device_manager_view import DeviceManagerView
 from bec_widgets.applications.views.dock_area_view.dock_area_view import DockAreaView
@@ -64,8 +63,6 @@ class BECMainApp(BECMainWindow):
         self.dock_area = DockAreaView(self)
         self.device_manager = DeviceManagerView(self)
         # self.developer_view = DeveloperView(self) #TODO temporary disable until the bugs with BECShell are resolved
-        self.admin_view = AdminView(self)
-
         self.add_view(icon="widgets", title="Dock Area", widget=self.dock_area, mini_text="Docks")
         self.add_view(
             icon="display_settings",
@@ -81,13 +78,6 @@ class BECMainApp(BECMainWindow):
         #     mini_text="IDE",
         #     exclusive=True,
         # )
-        self.add_view(
-            icon="admin_panel_settings",
-            title="Admin View",
-            widget=self.admin_view,
-            mini_text="Admin",
-            from_top=False,
-        )
 
         if self._show_examples:
             self.add_section("Examples", "examples")
@@ -191,12 +181,6 @@ class BECMainApp(BECMainWindow):
 
     # Internal: route sidebar selection to the stack
     def _on_view_selected(self, vid: str) -> None:
-        # Special handling for views that can not be switched to (e.g. dark mode toggle)
-        # Not registered as proper view with a stack index, so we ignore any logic below
-        # as it will anyways not result in a stack switch.
-        idx = self._view_index.get(vid)
-        if idx is None or not (0 <= idx < self.stack.count()):
-            return
         # Determine current view
         current_index = self.stack.currentIndex()
         current_view = (
@@ -263,7 +247,7 @@ class BECMainApp(BECMainWindow):
             developer_view_step = self.guided_tour.register_widget(
                 widget=sidebar_developer_view,
                 title="Developer View",
-                text="Click here to access the Developer view to write scripts and macros.",
+                text="Click here to access the Developer view to write scripts and makros.",
             )
             tour_steps.append(developer_view_step)
 
@@ -394,7 +378,6 @@ def main():  # pragma: no cover
     args, qt_args = parser.parse_known_args(sys.argv[1:])
 
     app = QApplication([sys.argv[0], *qt_args])
-    app.setApplicationName("BEC")
     apply_theme("dark")
     w = BECMainApp(show_examples=args.examples)
 

bec_widgets/applications/views/admin_view/admin_view.py

@@ -1,35 +0,0 @@
-"""Module for Admin View."""
-
-from qtpy.QtWidgets import QWidget
-
-from bec_widgets.applications.views.view import ViewBase
-from bec_widgets.utils.error_popups import SafeSlot
-from bec_widgets.widgets.services.bec_atlas_admin_view.bec_atlas_admin_view import BECAtlasAdminView
-
-
-class AdminView(ViewBase):
-    """
-    A view for administrators to change the current active experiment, manage messaging
-    services, and more tasks reserved for users with admin privileges.
-    """
-
-    def __init__(
-        self,
-        parent: QWidget | None = None,
-        content: QWidget | None = None,
-        *,
-        view_id: str | None = None,
-        title: str | None = None,
-        **kwargs,
-    ):
-        super().__init__(parent=parent, content=content, view_id=view_id, title=title)
-        self.admin_widget = BECAtlasAdminView(parent=self)
-        self.set_content(self.admin_widget)
-
-    @SafeSlot()
-    def on_exit(self) -> None:
-        """Called before the view is hidden.
-
-        Default implementation does nothing. Override in subclasses.
-        """
-        self.admin_widget.logout()

bec_widgets/applications/views/developer_view/developer_widget.py

@@ -16,9 +16,9 @@ from bec_widgets.utils.toolbars.toolbar import ModularToolBar
 from bec_widgets.widgets.containers.dock_area.basic_dock_area import DockAreaWidget
 from bec_widgets.widgets.containers.dock_area.dock_area import BECDockArea
 from bec_widgets.widgets.containers.qt_ads import CDockWidget
-from bec_widgets.widgets.editors.bec_console.bec_console import BecConsole, BECShell
 from bec_widgets.widgets.editors.monaco.monaco_dock import MonacoDock
 from bec_widgets.widgets.editors.monaco.monaco_widget import MonacoWidget
+from bec_widgets.widgets.editors.web_console.web_console import BECShell, WebConsole
 from bec_widgets.widgets.utility.ide_explorer.ide_explorer import IDEExplorer
 
 
@@ -96,7 +96,7 @@ class DeveloperWidget(DockAreaWidget):
 
         self.console = BECShell(self, rpc_exposed=False)
         self.console.setObjectName("BEC Shell")
-        self.terminal = BecConsole(self, rpc_exposed=False)
+        self.terminal = WebConsole(self, rpc_exposed=False)
         self.terminal.setObjectName("Terminal")
         self.monaco = MonacoDock(self, rpc_exposed=False, rpc_passthrough_children=False)
         self.monaco.setObjectName("MonacoEditor")
@@ -410,3 +410,23 @@ class DeveloperWidget(DockAreaWidget):
         """Clean up resources used by the developer widget."""
         self.delete_all()
         return super().cleanup()
+
+
+if __name__ == "__main__":
+    import sys
+
+    from bec_qthemes import apply_theme
+    from qtpy.QtWidgets import QApplication
+
+    from bec_widgets.applications.main_app import BECMainApp
+
+    app = QApplication(sys.argv)
+    apply_theme("dark")
+
+    _app = BECMainApp()
+    _app.show()
+    # developer_view.show()
+    # developer_view.setWindowTitle("Developer View")
+    # developer_view.resize(1920, 1080)
+    # developer_view.set_stretch(horizontal=[1, 3, 2], vertical=[5, 5]) #can be set during runtime
+    sys.exit(app.exec_())

bec_widgets/applications/views/device_manager_view/device_manager_display_widget.py

@@ -169,7 +169,7 @@ class DeviceManagerDisplayWidget(DockAreaWidget):
         self._upload_redis_dialog: UploadRedisDialog | None = None
         self._dialog_validation_connection: QMetaObject.Connection | None = None
 
-        # NOTE: We need here a separate config helper instance to avoid conflicts with
+        # NOTE: We need here a seperate config helper instance to avoid conflicts with
         # other communications to REDIS as uploading a config through a CommunicationConfigAction
         # will block if we use the config_helper from self.client.config._config_helper
         self._config_helper = config_helper.ConfigHelper(self.client.connector)
@@ -607,8 +607,8 @@ class DeviceManagerDisplayWidget(DockAreaWidget):
                 self.device_table_view._is_config_in_sync_with_redis()
             )
             validation_results = self.device_table_view.get_validation_results()
-            for config, config_status, connection_status in validation_results.values():
-                if connection_status == ConnectionStatus.CONNECTED.value:
+            for config, config_status, connnection_status in validation_results.values():
+                if connnection_status == ConnectionStatus.CONNECTED.value:
                     self.device_table_view.update_device_validation(
                         config, config_status, ConnectionStatus.CAN_CONNECT, ""
                     )

bec_widgets/cli/__init__.py

@@ -1 +0,0 @@
-from bec_widgets.cli.rpc import rpc_base

bec_widgets/cli/client.py

@@ -13,7 +13,7 @@ from typing import Literal, Optional
 from bec_lib.logger import bec_logger
 
 from bec_widgets.cli.rpc.rpc_base import RPCBase, rpc_call, rpc_timeout
-from bec_widgets.utils.bec_plugin_helper import get_plugin_client_module
+from bec_widgets.utils.bec_plugin_helper import get_all_plugin_widgets, get_plugin_client_module
 
 logger = bec_logger.logger
 
@@ -21,7 +21,7 @@ logger = bec_logger.logger
 
 
 class _WidgetsEnumType(str, enum.Enum):
-    """Enum for the available widgets, to be generated programmatically"""
+    """Enum for the available widgets, to be generated programatically"""
 
     ...
 
@@ -32,7 +32,6 @@ _Widgets = {
     "BECQueue": "BECQueue",
     "BECShell": "BECShell",
     "BECStatusBox": "BECStatusBox",
-    "BecConsole": "BecConsole",
     "DapComboBox": "DapComboBox",
     "DeviceBrowser": "DeviceBrowser",
     "Heatmap": "Heatmap",
@@ -57,43 +56,40 @@ _Widgets = {
     "SignalLabel": "SignalLabel",
     "TextBox": "TextBox",
     "Waveform": "Waveform",
+    "WebConsole": "WebConsole",
     "WebsiteWidget": "WebsiteWidget",
 }
 
 
 try:
+    _plugin_widgets = get_all_plugin_widgets().as_dict()
     plugin_client = get_plugin_client_module()
+    Widgets = _WidgetsEnumType("Widgets", {name: name for name in _plugin_widgets} | _Widgets)
+
+    if (_overlap := _Widgets.keys() & _plugin_widgets.keys()) != set():
+        for _widget in _overlap:
+            logger.warning(
+                f"Detected duplicate widget {_widget} in plugin repo file: {inspect.getfile(_plugin_widgets[_widget])} !"
+            )
     for plugin_name, plugin_class in inspect.getmembers(plugin_client, inspect.isclass):
         if issubclass(plugin_class, RPCBase) and plugin_class is not RPCBase:
-            if plugin_name not in _Widgets:
-                _Widgets[plugin_name] = plugin_name
             if plugin_name in globals():
+                conflicting_file = (
+                    inspect.getfile(_plugin_widgets[plugin_name])
+                    if plugin_name in _plugin_widgets
+                    else f"{plugin_client}"
+                )
                 logger.warning(
-                    f"Plugin widget {plugin_name} in {plugin_class._IMPORT_MODULE} conflicts with a built-in class!"
+                    f"Plugin widget {plugin_name} from {conflicting_file} conflicts with a built-in class!"
                 )
                 continue
-            else:
+            if plugin_name not in _overlap:
                 globals()[plugin_name] = plugin_class
-        Widgets = _WidgetsEnumType("Widgets", _Widgets)
 except ImportError as e:
     logger.error(f"Failed loading plugins: \n{reduce(add, traceback.format_exception(e))}")
 
 
-class AdminView(RPCBase):
-    """A view for administrators to change the current active experiment, manage messaging"""
-
-    _IMPORT_MODULE = "bec_widgets.applications.views.admin_view.admin_view"
-
-    @rpc_call
-    def activate(self) -> "None":
-        """
-        Switch the parent application to this view.
-        """
-
-
 class AutoUpdates(RPCBase):
-    _IMPORT_MODULE = "bec_widgets.widgets.containers.auto_update.auto_updates"
-
     @property
     @rpc_call
     def enabled(self) -> "bool":
@@ -130,8 +126,6 @@ class AutoUpdates(RPCBase):
 
 
 class AvailableDeviceResources(RPCBase):
-    _IMPORT_MODULE = "bec_widgets.widgets.control.device_manager.components.available_device_resources.available_device_resources"
-
     @rpc_call
     def remove(self):
         """
@@ -152,8 +146,6 @@ class AvailableDeviceResources(RPCBase):
 
 
 class BECDockArea(RPCBase):
-    _IMPORT_MODULE = "bec_widgets.widgets.containers.dock_area.dock_area"
-
     @rpc_call
     def new(
         self,
@@ -340,10 +332,10 @@ class BECDockArea(RPCBase):
         Save the current workspace profile.
 
         On first save of a given name:
-          - writes a baseline copy to profiles/baseline/<name>.ini with created_at
-          - writes a runtime copy to profiles/runtime/<name>.ini with created_at
-        On subsequent saves:
-          - updates both the baseline and runtime copies so restore uses the latest snapshot.
+          - writes a default copy to states/default/<name>.ini with tag=default and created_at
+          - writes a user copy   to states/user/<name>.ini    with tag=user    and created_at
+        On subsequent saves of user-owned profiles:
+          - updates both the default and user copies so restore uses the latest snapshot.
         Read-only bundled profiles cannot be overwritten.
 
         Args:
@@ -362,8 +354,8 @@ class BECDockArea(RPCBase):
         """
         Load a workspace profile.
 
-        Before switching, persist the current profile to the runtime copy.
-        Prefer loading the runtime copy; fall back to the baseline copy.
+        Before switching, persist the current profile to the user copy.
+        Prefer loading the user copy; fall back to the default copy.
 
         Args:
             name (str | None): The name of the profile to load. If None, prompts the user.
@@ -389,8 +381,6 @@ class BECDockArea(RPCBase):
 
 
 class BECMainWindow(RPCBase):
-    _IMPORT_MODULE = "bec_widgets.widgets.containers.main_window.main_window"
-
     @rpc_call
     def remove(self):
         """
@@ -413,8 +403,6 @@ class BECMainWindow(RPCBase):
 class BECProgressBar(RPCBase):
     """A custom progress bar with smooth transitions. The displayed text can be customized using a template."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.progress.bec_progressbar.bec_progressbar"
-
     @rpc_call
     def set_value(self, value):
         """
@@ -488,8 +476,6 @@ class BECProgressBar(RPCBase):
 class BECQueue(RPCBase):
     """Widget to display the BEC queue."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.services.bec_queue.bec_queue"
-
     @rpc_call
     def remove(self):
         """
@@ -510,9 +496,7 @@ class BECQueue(RPCBase):
 
 
 class BECShell(RPCBase):
-    """A BecConsole pre-configured to run the BEC shell."""
-
-    _IMPORT_MODULE = "bec_widgets.widgets.editors.bec_console.bec_console"
+    """A WebConsole pre-configured to run the BEC shell."""
 
     @rpc_call
     def remove(self):
@@ -536,8 +520,6 @@ class BECShell(RPCBase):
 class BECStatusBox(RPCBase):
     """An autonomous widget to display the status of BEC services."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.services.bec_status_box.bec_status_box"
-
     @rpc_call
     def get_server_state(self) -> "str":
         """
@@ -573,8 +555,6 @@ class BECStatusBox(RPCBase):
 class BaseROI(RPCBase):
     """Base class for all Region of Interest (ROI) implementations."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.plots.roi.image_roi"
-
     @property
     @rpc_call
     def label(self) -> "str":
@@ -701,35 +681,9 @@ class BaseROI(RPCBase):
         """
 
 
-class BecConsole(RPCBase):
-    """A console widget with access to a shared registry of terminals, such that instances can be moved around."""
-
-    _IMPORT_MODULE = "bec_widgets.widgets.editors.bec_console.bec_console"
-
-    @rpc_call
-    def remove(self):
-        """
-        Cleanup the BECConnector
-        """
-
-    @rpc_call
-    def attach(self):
-        """
-        None
-        """
-
-    @rpc_call
-    def detach(self):
-        """
-        Detach the widget from its parent dock widget (if widget is in the dock), making it a floating widget.
-        """
-
-
 class CircularROI(RPCBase):
     """Circular Region of Interest with center/diameter tracking and auto-labeling."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.plots.roi.image_roi"
-
     @property
     @rpc_call
     def label(self) -> "str":
@@ -857,8 +811,6 @@ class CircularROI(RPCBase):
 
 
 class Curve(RPCBase):
-    _IMPORT_MODULE = "bec_widgets.widgets.plots.waveform.curve"
-
     @rpc_call
     def remove(self):
         """
@@ -1023,9 +975,7 @@ class Curve(RPCBase):
 
 
 class DapComboBox(RPCBase):
-    """Editable combobox listing the available DAP models."""
-
-    _IMPORT_MODULE = "bec_widgets.widgets.dap.dap_combo_box.dap_combo_box"
+    """The DAPComboBox widget is an extension to the QComboBox with all avaialble DAP model from BEC."""
 
     @rpc_call
     def select_y_axis(self, y_axis: str):
@@ -1051,15 +1001,13 @@ class DapComboBox(RPCBase):
         Slot to update the fit model.
 
         Args:
-            fit_name(str): Fit model name.
+            default_device(str): Default device name.
         """
 
 
 class DeveloperView(RPCBase):
     """A view for users to write scripts and macros and execute them within the application."""
 
-    _IMPORT_MODULE = "bec_widgets.applications.views.developer_view.developer_view"
-
     @rpc_call
     def activate(self) -> "None":
         """
@@ -1070,8 +1018,6 @@ class DeveloperView(RPCBase):
 class DeviceBrowser(RPCBase):
     """DeviceBrowser is a widget that displays all available devices in the current BEC session."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.services.device_browser.device_browser"
-
     @rpc_call
     def remove(self):
         """
@@ -1094,8 +1040,6 @@ class DeviceBrowser(RPCBase):
 class DeviceInitializationProgressBar(RPCBase):
     """A progress bar that displays the progress of device initialization."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.progress.device_initialization_progress_bar.device_initialization_progress_bar"
-
     @rpc_call
     def remove(self):
         """
@@ -1118,8 +1062,6 @@ class DeviceInitializationProgressBar(RPCBase):
 class DeviceInputBase(RPCBase):
     """Mixin base class for device input widgets."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.control.device_input.base_classes.device_input_base"
-
     @rpc_call
     def remove(self):
         """
@@ -1142,8 +1084,6 @@ class DeviceInputBase(RPCBase):
 class DeviceManagerView(RPCBase):
     """A view for users to manage devices within the application."""
 
-    _IMPORT_MODULE = "bec_widgets.applications.views.device_manager_view.device_manager_view"
-
     @rpc_call
     def activate(self) -> "None":
         """
@@ -1154,8 +1094,6 @@ class DeviceManagerView(RPCBase):
 class DockAreaView(RPCBase):
     """Modular dock area view for arranging and managing multiple dockable widgets."""
 
-    _IMPORT_MODULE = "bec_widgets.applications.views.dock_area_view.dock_area_view"
-
     @rpc_call
     def activate(self) -> "None":
         """
@@ -1348,10 +1286,10 @@ class DockAreaView(RPCBase):
         Save the current workspace profile.
 
         On first save of a given name:
-          - writes a baseline copy to profiles/baseline/<name>.ini with created_at
-          - writes a runtime copy to profiles/runtime/<name>.ini with created_at
-        On subsequent saves:
-          - updates both the baseline and runtime copies so restore uses the latest snapshot.
+          - writes a default copy to states/default/<name>.ini with tag=default and created_at
+          - writes a user copy   to states/user/<name>.ini    with tag=user    and created_at
+        On subsequent saves of user-owned profiles:
+          - updates both the default and user copies so restore uses the latest snapshot.
         Read-only bundled profiles cannot be overwritten.
 
         Args:
@@ -1370,8 +1308,8 @@ class DockAreaView(RPCBase):
         """
         Load a workspace profile.
 
-        Before switching, persist the current profile to the runtime copy.
-        Prefer loading the runtime copy; fall back to the baseline copy.
+        Before switching, persist the current profile to the user copy.
+        Prefer loading the user copy; fall back to the default copy.
 
         Args:
             name (str | None): The name of the profile to load. If None, prompts the user.
@@ -1399,8 +1337,6 @@ class DockAreaView(RPCBase):
 class DockAreaWidget(RPCBase):
     """Lightweight dock area that exposes the core Qt ADS docking helpers without any"""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.containers.dock_area.basic_dock_area"
-
     @rpc_call
     def new(
         self,
@@ -1585,8 +1521,6 @@ class DockAreaWidget(RPCBase):
 class EllipticalROI(RPCBase):
     """Elliptical Region of Interest with centre/width/height tracking and auto-labelling."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.plots.roi.image_roi"
-
     @property
     @rpc_call
     def label(self) -> "str":
@@ -1709,8 +1643,6 @@ class EllipticalROI(RPCBase):
 class Heatmap(RPCBase):
     """Heatmap widget for visualizing 2d grid data with color mapping for the z-axis."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.plots.heatmap.heatmap"
-
     @rpc_call
     def remove(self):
         """
@@ -2409,8 +2341,6 @@ class Heatmap(RPCBase):
 class Image(RPCBase):
     """Image widget for displaying 2D data."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.plots.image.image"
-
     @rpc_call
     def remove(self):
         """
@@ -3022,8 +2952,6 @@ class Image(RPCBase):
 
 
 class ImageItem(RPCBase):
-    _IMPORT_MODULE = "bec_widgets.widgets.plots.image.image_item"
-
     @property
     @rpc_call
     def color_map(self) -> "str":
@@ -3174,8 +3102,6 @@ class ImageItem(RPCBase):
 
 
 class LaunchWindow(RPCBase):
-    _IMPORT_MODULE = "bec_widgets.applications.launch_window"
-
     @rpc_call
     def show_launcher(self):
         """
@@ -3190,38 +3116,33 @@ class LaunchWindow(RPCBase):
 
 
 class LogPanel(RPCBase):
-    """Live display of the BEC logs in a table view."""
-
-    _IMPORT_MODULE = "bec_widgets.widgets.utility.logpanel.logpanel"
+    """Displays a log panel"""
 
     @rpc_call
-    def remove(self):
+    def set_plain_text(self, text: str) -> None:
         """
-        Cleanup the BECConnector
+        Set the plain text of the widget.
+
+        Args:
+            text (str): The text to set.
         """
 
     @rpc_call
-    def attach(self):
-        """
-        None
+    def set_html_text(self, text: str) -> None:
         """
+        Set the HTML text of the widget.
 
-    @rpc_call
-    def detach(self):
-        """
-        Detach the widget from its parent dock widget (if widget is in the dock), making it a floating widget.
+        Args:
+            text (str): The text to set.
         """
 
 
-class Minesweeper(RPCBase):
-    _IMPORT_MODULE = "bec_widgets.widgets.games.minesweeper"
+class Minesweeper(RPCBase): ...
 
 
 class MonacoDock(RPCBase):
     """MonacoDock is a dock widget that contains Monaco editor instances."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.editors.monaco.monaco_dock"
-
     @rpc_call
     def new(
         self,
@@ -3406,8 +3327,6 @@ class MonacoDock(RPCBase):
 class MonacoWidget(RPCBase):
     """A simple Monaco editor widget"""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.editors.monaco.monaco_widget"
-
     @rpc_call
     def set_text(
         self, text: "str", file_name: "str | None" = None, reset: "bool" = False
@@ -3582,8 +3501,6 @@ class MonacoWidget(RPCBase):
 class MotorMap(RPCBase):
     """Motor map widget for plotting motor positions in 2D including a trace of the last points."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.plots.motor_map.motor_map"
-
     @rpc_call
     def remove(self):
         """
@@ -4054,8 +3971,6 @@ class MotorMap(RPCBase):
 class MultiWaveform(RPCBase):
     """MultiWaveform widget for displaying multiple waveforms emitted by a single signal."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.plots.multi_waveform.multi_waveform"
-
     @rpc_call
     def remove(self):
         """
@@ -4515,8 +4430,6 @@ class MultiWaveform(RPCBase):
 class PdfViewerWidget(RPCBase):
     """A widget to display PDF documents with toolbar controls."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.utility.pdf_viewer.pdf_viewer"
-
     @rpc_call
     def load_pdf(self, file_path: str):
         """
@@ -4648,10 +4561,6 @@ class PdfViewerWidget(RPCBase):
 class PositionIndicator(RPCBase):
     """Display a position within a defined range, e.g. motor limits."""
 
-    _IMPORT_MODULE = (
-        "bec_widgets.widgets.control.device_control.position_indicator.position_indicator"
-    )
-
     @rpc_call
     def set_value(self, position: float):
         """
@@ -4717,10 +4626,6 @@ class PositionIndicator(RPCBase):
 class PositionerBox(RPCBase):
     """Simple Widget to control a positioner in box form"""
 
-    _IMPORT_MODULE = (
-        "bec_widgets.widgets.control.device_control.positioner_box.positioner_box.positioner_box"
-    )
-
     @rpc_call
     def set_positioner(self, positioner: "str | Positioner"):
         """
@@ -4753,8 +4658,6 @@ class PositionerBox(RPCBase):
 class PositionerBox2D(RPCBase):
     """Simple Widget to control two positioners in box form"""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.control.device_control.positioner_box.positioner_box_2d.positioner_box_2d"
-
     @rpc_call
     def set_positioner_hor(self, positioner: "str | Positioner"):
         """
@@ -4824,8 +4727,6 @@ class PositionerBox2D(RPCBase):
 class PositionerControlLine(RPCBase):
     """A widget that controls a single device."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.control.device_control.positioner_box.positioner_control_line.positioner_control_line"
-
     @rpc_call
     def set_positioner(self, positioner: "str | Positioner"):
         """
@@ -4858,8 +4759,6 @@ class PositionerControlLine(RPCBase):
 class PositionerGroup(RPCBase):
     """Simple Widget to control a positioner in box form"""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.control.device_control.positioner_group.positioner_group"
-
     @rpc_call
     def set_positioners(self, device_names: "str"):
         """
@@ -4891,8 +4790,6 @@ class PositionerGroup(RPCBase):
 class RectangularROI(RPCBase):
     """Defines a rectangular Region of Interest (ROI) with additional functionality."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.plots.roi.image_roi"
-
     @property
     @rpc_call
     def label(self) -> "str":
@@ -5022,8 +4919,6 @@ class RectangularROI(RPCBase):
 class ResumeButton(RPCBase):
     """A button that continue scan queue."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.control.buttons.button_resume.button_resume"
-
     @rpc_call
     def remove(self):
         """
@@ -5044,8 +4939,6 @@ class ResumeButton(RPCBase):
 
 
 class Ring(RPCBase):
-    _IMPORT_MODULE = "bec_widgets.widgets.progress.ring_progress_bar.ring"
-
     @rpc_call
     def set_value(self, value: "int | float"):
         """
@@ -5139,8 +5032,6 @@ class Ring(RPCBase):
 
 
 class RingProgressBar(RPCBase):
-    _IMPORT_MODULE = "bec_widgets.widgets.progress.ring_progress_bar.ring_progress_bar"
-
     @rpc_call
     def remove(self):
         """
@@ -5220,14 +5111,12 @@ class RingProgressBar(RPCBase):
 class SBBMonitor(RPCBase):
     """A widget to display the SBB monitor website."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.editors.sbb_monitor.sbb_monitor"
+    ...
 
 
 class ScanControl(RPCBase):
     """Widget to submit new scans to the queue."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.control.scan_control.scan_control"
-
     @rpc_call
     def attach(self):
         """
@@ -5251,8 +5140,6 @@ class ScanControl(RPCBase):
 class ScanProgressBar(RPCBase):
     """Widget to display a progress bar that is hooked up to the scan progress of a scan."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.progress.scan_progressbar.scan_progressbar"
-
     @rpc_call
     def remove(self):
         """
@@ -5275,8 +5162,6 @@ class ScanProgressBar(RPCBase):
 class ScatterCurve(RPCBase):
     """Scatter curve item for the scatter waveform widget."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.plots.scatter_waveform.scatter_curve"
-
     @property
     @rpc_call
     def color_map(self) -> "str":
@@ -5286,8 +5171,6 @@ class ScatterCurve(RPCBase):
 
 
 class ScatterWaveform(RPCBase):
-    _IMPORT_MODULE = "bec_widgets.widgets.plots.scatter_waveform.scatter_waveform"
-
     @rpc_call
     def remove(self):
         """
@@ -5755,8 +5638,6 @@ class ScatterWaveform(RPCBase):
 
 
 class SignalLabel(RPCBase):
-    _IMPORT_MODULE = "bec_widgets.widgets.utility.signal_label.signal_label"
-
     @property
     @rpc_call
     def custom_label(self) -> "str":
@@ -5901,8 +5782,6 @@ class SignalLabel(RPCBase):
 class TextBox(RPCBase):
     """A widget that displays text in plain and HTML format"""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.editors.text_box.text_box"
-
     @rpc_call
     def set_plain_text(self, text: str) -> None:
         """
@@ -5925,8 +5804,6 @@ class TextBox(RPCBase):
 class ViewBase(RPCBase):
     """Wrapper for a content widget used inside the main app's stacked view."""
 
-    _IMPORT_MODULE = "bec_widgets.applications.views.view"
-
     @rpc_call
     def activate(self) -> "None":
         """
@@ -5937,8 +5814,6 @@ class ViewBase(RPCBase):
 class Waveform(RPCBase):
     """Widget for plotting waveforms."""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.plots.waveform.waveform"
-
     @rpc_call
     def remove(self):
         """
@@ -6374,8 +6249,7 @@ class Waveform(RPCBase):
         signal_y: "str | None" = None,
         color: "str | None" = None,
         label: "str | None" = None,
-        dap: "str | list[str] | None" = None,
-        dap_parameters: "dict | list | lmfit.Parameters | None | object" = None,
+        dap: "str | None" = None,
         scan_id: "str | None" = None,
         scan_number: "int | None" = None,
         **kwargs,
@@ -6397,14 +6271,9 @@ class Waveform(RPCBase):
             signal_y(str): The name of the entry for the y-axis.
             color(str): The color of the curve.
             label(str): The label of the curve.
-            dap(str | list[str]): The dap model to use for the curve. When provided, a DAP curve is
+            dap(str): The dap model to use for the curve. When provided, a DAP curve is
                 attached automatically for device, history, or custom data sources. Use
-                the same string as the LMFit model name, or a list of model names to build a composite.
-            dap_parameters(dict | list | lmfit.Parameters | None): Optional lmfit parameter overrides sent to
-                the DAP server. For a single model: values can be numeric (interpreted as fixed parameters)
-                or dicts like `{"value": 1.0, "vary": False}`. For composite models (dap is list), use either
-                a list aligned to the model list (each item is a param dict), or a dict of
-                `{ "ModelName": { "param": {...} } }` when model names are unique.
+                the same string as the LMFit model name.
             scan_id(str):  Optional scan ID. When provided, the curve is treated as a **history** curve and
                 the y‑data (and optional x‑data) are fetched from that historical scan. Such curves are
                 never cleared by live‑scan resets.
@@ -6418,10 +6287,9 @@ class Waveform(RPCBase):
     def add_dap_curve(
         self,
         device_label: "str",
-        dap_name: "str | list[str]",
+        dap_name: "str",
         color: "str | None" = None,
         dap_oversample: "int" = 1,
-        dap_parameters: "dict | list | lmfit.Parameters | None" = None,
         **kwargs,
     ) -> "Curve":
         """
@@ -6431,11 +6299,9 @@ class Waveform(RPCBase):
 
         Args:
             device_label(str): The label of the source curve to add DAP to.
-            dap_name(str | list[str]): The name of the DAP model to use, or a list of model
-                names to build a composite model.
+            dap_name(str): The name of the DAP model to use.
             color(str): The color of the curve.
             dap_oversample(int): The oversampling factor for the DAP curve.
-            dap_parameters(dict | list | lmfit.Parameters | None): Optional lmfit parameter overrides sent to the DAP server.
             **kwargs
 
         Returns:
@@ -6517,8 +6383,6 @@ class Waveform(RPCBase):
 
 
 class WaveformViewInline(RPCBase):
-    _IMPORT_MODULE = "bec_widgets.applications.views.view"
-
     @rpc_call
     def activate(self) -> "None":
         """
@@ -6527,8 +6391,6 @@ class WaveformViewInline(RPCBase):
 
 
 class WaveformViewPopup(RPCBase):
-    _IMPORT_MODULE = "bec_widgets.applications.views.view"
-
     @rpc_call
     def activate(self) -> "None":
         """
@@ -6536,10 +6398,30 @@ class WaveformViewPopup(RPCBase):
         """
 
 
-class WebsiteWidget(RPCBase):
+class WebConsole(RPCBase):
     """A simple widget to display a website"""
 
-    _IMPORT_MODULE = "bec_widgets.widgets.editors.website.website"
+    @rpc_call
+    def remove(self):
+        """
+        Cleanup the BECConnector
+        """
+
+    @rpc_call
+    def attach(self):
+        """
+        None
+        """
+
+    @rpc_call
+    def detach(self):
+        """
+        Detach the widget from its parent dock widget (if widget is in the dock), making it a floating widget.
+        """
+
+
+class WebsiteWidget(RPCBase):
+    """A simple widget to display a website"""
 
     @rpc_call
     def set_url(self, url: str) -> None:

bec_widgets/cli/client_utils.py

@@ -10,9 +10,9 @@ import threading
 import time
 from contextlib import contextmanager
 from threading import Lock
-from typing import TYPE_CHECKING, Callable, Literal, TypeAlias, cast
+from typing import TYPE_CHECKING, Literal, TypeAlias, cast
 
-from bec_lib.endpoints import EndpointInfo, MessageEndpoints
+from bec_lib.endpoints import MessageEndpoints
 from bec_lib.logger import bec_logger
 from bec_lib.utils.import_utils import lazy_import, lazy_import_from
 from rich.console import Console
@@ -232,11 +232,6 @@ class BECGuiClient(RPCBase):
         """The launcher object."""
         return RPCBase(gui_id=f"{self._gui_id}:launcher", parent=self, object_name="launcher")
 
-    def _safe_register_stream(self, endpoint: EndpointInfo, cb: Callable, **kwargs):
-        """Check if already registered for registration in idempotent functions."""
-        if not self._client.connector.any_stream_is_registered(endpoint, cb=cb):
-            self._client.connector.register(endpoint, cb=cb, **kwargs)
-
     def connect_to_gui_server(self, gui_id: str) -> None:
         """Connect to a GUI server"""
         # Unregister the old callback
@@ -252,9 +247,10 @@ class BECGuiClient(RPCBase):
         self._ipython_registry = {}
 
         # Register the new callback
-        self._safe_register_stream(
+        self._client.connector.register(
             MessageEndpoints.gui_registry_state(self._gui_id),
             cb=self._handle_registry_update,
+            parent=self,
             from_start=True,
         )
 
@@ -535,14 +531,20 @@ class BECGuiClient(RPCBase):
 
     def _start(self, wait: bool = False) -> None:
         self._killed = False
-        self._safe_register_stream(
-            MessageEndpoints.gui_registry_state(self._gui_id), cb=self._handle_registry_update
+        self._client.connector.register(
+            MessageEndpoints.gui_registry_state(self._gui_id),
+            cb=self._handle_registry_update,
+            parent=self,
         )
         return self._start_server(wait=wait)
 
-    def _handle_registry_update(self, msg: dict[str, GUIRegistryStateMessage]) -> None:
+    @staticmethod
+    def _handle_registry_update(
+        msg: dict[str, GUIRegistryStateMessage], parent: BECGuiClient
+    ) -> None:
         # This was causing a deadlock during shutdown, not sure why.
         # with self._lock:
+        self = parent
         self._server_registry = cast(dict[str, RegistryState], msg["data"].state)
         self._update_dynamic_namespace(self._server_registry)
 

bec_widgets/cli/generate_cli.py

@@ -7,7 +7,6 @@ import inspect
 import os
 import sys
 from pathlib import Path
-from typing import get_overloads
 
 import black
 import isort
@@ -19,6 +18,20 @@ from bec_widgets.utils.plugin_utils import BECClassContainer, get_custom_classes
 
 logger = bec_logger.logger
 
+if sys.version_info >= (3, 11):
+    from typing import get_overloads
+else:
+    print(
+        "Python version is less than 3.11, using dummy function for get_overloads. "
+        "If you want to use the real function 'typing.get_overloads()', please use Python 3.11 or later."
+    )
+
+    def get_overloads(_obj):
+        """
+        Dummy function for Python versions before 3.11.
+        """
+        return []
+
 
 class ClientGenerator:
     def __init__(self, base=False):
@@ -41,7 +54,7 @@ from __future__ import annotations
 from bec_lib.logger import bec_logger
 
 from bec_widgets.cli.rpc.rpc_base import RPCBase, rpc_call, rpc_timeout
-{"from bec_widgets.utils.bec_plugin_helper import get_plugin_client_module" if self._base else ""}
+{"from bec_widgets.utils.bec_plugin_helper import get_all_plugin_widgets, get_plugin_client_module" if self._base else ""}
 
 logger = bec_logger.logger
 
@@ -81,7 +94,7 @@ logger = bec_logger.logger
         if self._base:
             self.content += """
 class _WidgetsEnumType(str, enum.Enum):
-    \"\"\" Enum for the available widgets, to be generated programmatically  \"\"\"
+    \"\"\" Enum for the available widgets, to be generated programatically  \"\"\"
     ...
     """
 
@@ -98,19 +111,27 @@ _Widgets = {
             self.content += """
 
 try:
+    _plugin_widgets = get_all_plugin_widgets().as_dict()
     plugin_client = get_plugin_client_module()
+    Widgets = _WidgetsEnumType("Widgets", {name: name for name in _plugin_widgets} | _Widgets)
+
+    if (_overlap := _Widgets.keys() & _plugin_widgets.keys()) != set():
+        for _widget in _overlap:
+            logger.warning(f"Detected duplicate widget {_widget} in plugin repo file: {inspect.getfile(_plugin_widgets[_widget])} !")
     for plugin_name, plugin_class in inspect.getmembers(plugin_client, inspect.isclass):
         if issubclass(plugin_class, RPCBase) and plugin_class is not RPCBase:
-            if plugin_name not in _Widgets:
-                _Widgets[plugin_name] = plugin_name
             if plugin_name in globals():
+                conflicting_file = (
+                    inspect.getfile(_plugin_widgets[plugin_name])
+                    if plugin_name in _plugin_widgets
+                    else f"{plugin_client}"
+                )
                 logger.warning(
-                    f"Plugin widget {plugin_name} in {plugin_class._IMPORT_MODULE} conflicts with a built-in class!"
+                    f"Plugin widget {plugin_name} from {conflicting_file} conflicts with a built-in class!"
                 )
                 continue
-            else:
+            if plugin_name not in _overlap:
                 globals()[plugin_name] = plugin_class
-        Widgets = _WidgetsEnumType("Widgets", _Widgets)
 except ImportError as e:
     logger.error(f"Failed loading plugins: \\n{reduce(add, traceback.format_exception(e))}")
 """
@@ -125,8 +146,12 @@ except ImportError as e:
 
         class_name = cls.__name__
 
-        self.content += f"""
-class {class_name}(RPCBase):\n"""
+        if class_name == "BECDockArea":
+            self.content += f"""
+class {class_name}(RPCBase):"""
+        else:
+            self.content += f"""
+class {class_name}(RPCBase):"""
 
         if cls.__doc__:
             # We only want the first line of the docstring
@@ -137,9 +162,13 @@ class {class_name}(RPCBase):\n"""
             else:
                 class_docs = cls.__doc__.split("\n")[1]
             self.content += f"""
-    \"\"\"{class_docs}\"\"\"\n"""
+    \"\"\"{class_docs}\"\"\"
+    """
         user_access_entries = self._get_user_access_entries(cls)
-        self.content += f'    _IMPORT_MODULE="{cls.__module__}"\n'
+        if not user_access_entries:
+            self.content += """...
+    """
+
         for method_entry in user_access_entries:
             method, obj, is_property_setter = self._resolve_method_object(cls, method_entry)
             if obj is None:

bec_widgets/cli/rpc/rpc_base.py

@@ -248,7 +248,9 @@ class RPCBase:
             self._rpc_response = None
             self._msg_wait_event.clear()
             self._client.connector.register(
-                MessageEndpoints.gui_instruction_response(request_id), cb=self._on_rpc_response
+                MessageEndpoints.gui_instruction_response(request_id),
+                cb=self._on_rpc_response,
+                parent=self,
             )
 
         self._client.connector.set_and_publish(MessageEndpoints.gui_instructions(receiver), rpc_msg)
@@ -274,10 +276,11 @@ class RPCBase:
             self._rpc_response = None
             return self._create_widget_from_msg_result(msg_result)
 
-    def _on_rpc_response(self, msg_obj: MessageObject) -> None:
+    @staticmethod
+    def _on_rpc_response(msg_obj: MessageObject, parent: RPCBase) -> None:
         msg = cast(messages.RequestResponseMessage, msg_obj.value)
-        self._rpc_response = msg
-        self._msg_wait_event.set()
+        parent._rpc_response = msg
+        parent._msg_wait_event.set()
 
     def _create_widget_from_msg_result(self, msg_result):
         if msg_result is None:

bec_widgets/cli/server.py

@@ -19,8 +19,8 @@ from qtpy.QtWidgets import QApplication
 
 import bec_widgets
 from bec_widgets.applications.launch_window import LaunchWindow
+from bec_widgets.cli.rpc.rpc_register import RPCRegister
 from bec_widgets.utils.bec_dispatcher import BECDispatcher
-from bec_widgets.utils.rpc_register import RPCRegister
 
 logger = bec_logger.logger
 

bec_widgets/examples/jupyter_console/jupyter_console_window.py

@@ -25,8 +25,8 @@ from qtpy.QtWidgets import (
     QWidget,
 )
 
+from bec_widgets.cli.rpc.rpc_widget_handler import widget_handler
 from bec_widgets.utils.colors import apply_theme
-from bec_widgets.utils.rpc_widget_handler import widget_handler
 from bec_widgets.utils.widget_io import WidgetHierarchy as wh
 from bec_widgets.widgets.editors.jupyter_console.jupyter_console import BECJupyterConsole
 

bec_widgets/tests/utils.py

@@ -1,7 +1,6 @@
 # pylint: skip-file
 from unittest.mock import MagicMock
 
-from bec_lib.config_helper import ConfigHelper
 from bec_lib.device import Device as BECDevice
 from bec_lib.device import Positioner as BECPositioner
 from bec_lib.device import ReadoutPriority
@@ -220,9 +219,7 @@ class Device(FakeDevice):
 
 
 class DMMock:
-    def __init__(self, *args, **kwargs):
-        self._service = args[0]
-        self.config_helper = ConfigHelper(self._service.connector, self._service._service_name)
+    def __init__(self):
         self.devices = DeviceContainer()
         self.enabled_devices = [device for device in self.devices if device.enabled]
 
@@ -276,10 +273,6 @@ class DMMock:
             configs.append(device._config)
         return configs
 
-    def initialize(*_): ...
-
-    def shutdown(self): ...
-
 
 DEVICES = [
     FakePositioner("samx", limits=[-10, 10], read_value=2.0),

bec_widgets/utils/__init__.py

@@ -1 +1,13 @@
+from qtpy.QtWebEngineWidgets import QWebEngineView
 
+from .bec_connector import BECConnector, ConnectionConfig
+from .bec_dispatcher import BECDispatcher
+from .bec_table import BECTable
+from .colors import Colors
+from .container_utils import WidgetContainerUtils
+from .crosshair import Crosshair
+from .entry_validator import EntryValidator
+from .layout_manager import GridLayoutManager
+from .rpc_decorator import register_rpc_methods, rpc_public
+from .ui_loader import UILoader
+from .validator_delegate import DoubleValidationDelegate

bec_widgets/utils/bec_connector.py

@@ -15,9 +15,9 @@ from pydantic import BaseModel, Field, field_validator
 from qtpy.QtCore import Property, QObject, QRunnable, QThreadPool, Signal
 from qtpy.QtWidgets import QApplication
 
+from bec_widgets.cli.rpc.rpc_register import RPCRegister
 from bec_widgets.utils.error_popups import ErrorPopupUtility, SafeSlot
 from bec_widgets.utils.name_utils import sanitize_namespace
-from bec_widgets.utils.rpc_register import RPCRegister
 from bec_widgets.utils.widget_io import WidgetHierarchy
 from bec_widgets.utils.yaml_dialog import load_yaml, load_yaml_gui, save_yaml, save_yaml_gui
 
@@ -167,7 +167,7 @@ class BECConnector:
             )
             self.config = ConnectionConfig(widget_class=self.__class__.__name__)
 
-        # If the gui_id is passed, it should be respected. However, this should be revisited since
+        # If the gui_id is passed, it should be respected. However, this should be revisted since
         # the gui_id has to be unique, and may no longer be.
         if gui_id:
             self.config.gui_id = gui_id
@@ -399,7 +399,7 @@ class BECConnector:
         """
         self.config = config
 
-    # FIXME some thoughts are required to decide how this should work with rpc registry
+    # FIXME some thoughts are required to decide how thhis should work with rpc registry
     def apply_config(self, config: dict, generate_new_id: bool = True) -> None:
         """
         Apply the configuration to the widget.
@@ -417,7 +417,7 @@ class BECConnector:
         else:
             self.gui_id = self.config.gui_id
 
-    # FIXME some thoughts are required to decide how this should work with rpc registry
+    # FIXME some thoughts are required to decide how thhis should work with rpc registry
     def load_config(self, path: str | None = None, gui: bool = False):
         """
         Load the configuration of the widget from YAML.

bec_widgets/utils/bec_dispatcher.py

@@ -123,16 +123,17 @@ class BECDispatcher:
         self._registered_slots: DefaultDict[Hashable, QtThreadSafeCallback] = (
             collections.defaultdict()
         )
+        self.client = client
 
-        if client is None:
-            if config is not None and not isinstance(config, ServiceConfig):
-                # config is supposed to be a path
-                config = ServiceConfig(config)
+        if self.client is None:
+            if config is not None:
+                if not isinstance(config, ServiceConfig):
+                    # config is supposed to be a path
+                    config = ServiceConfig(config)
             self.client = BECClient(
                 config=config, connector_cls=QtRedisConnector, name="BECWidgets"
             )
         else:
-            self.client = client
             if self.client.started:
                 # have to reinitialize client to use proper connector
                 logger.info("Shutting down BECClient to switch to QtRedisConnector")
@@ -175,15 +176,12 @@ class BECDispatcher:
             cb_info (dict | None): A dictionary containing information about the callback. Defaults to None.
         """
         qt_slot = QtThreadSafeCallback(cb=slot, cb_info=cb_info)
-        if not self.client.connector.any_stream_is_registered(topics, qt_slot):
-            if qt_slot not in self._registered_slots:
-                self._registered_slots[qt_slot] = qt_slot
-            qt_slot = self._registered_slots[qt_slot]
-            self.client.connector.register(topics, cb=qt_slot, **kwargs)
-            topics_str, _ = self.client.connector._convert_endpointinfo(topics)
-            qt_slot.topics.update(set(topics_str))
-        else:
-            logger.warning(f"Attempted to create duplicate stream subscription for {topics=}")
+        if qt_slot not in self._registered_slots:
+            self._registered_slots[qt_slot] = qt_slot
+        qt_slot = self._registered_slots[qt_slot]
+        self.client.connector.register(topics, cb=qt_slot, **kwargs)
+        topics_str, _ = self.client.connector._convert_endpointinfo(topics)
+        qt_slot.topics.update(set(topics_str))
 
     def disconnect_slot(
         self, slot: Callable, topics: EndpointInfo | str | list[EndpointInfo] | list[str]

bec_widgets/utils/bec_widget.py

@@ -10,11 +10,11 @@ from qtpy.QtGui import QFont, QPixmap
 from qtpy.QtWidgets import QApplication, QFileDialog, QLabel, QVBoxLayout, QWidget
 
 import bec_widgets.widgets.containers.qt_ads as QtAds
+from bec_widgets.cli.rpc.rpc_register import RPCRegister
 from bec_widgets.utils.bec_connector import BECConnector, ConnectionConfig
 from bec_widgets.utils.busy_loader import install_busy_loader
 from bec_widgets.utils.error_popups import SafeConnect, SafeSlot
 from bec_widgets.utils.rpc_decorator import rpc_timeout
-from bec_widgets.utils.rpc_register import RPCRegister
 from bec_widgets.utils.widget_io import WidgetHierarchy
 from bec_widgets.widgets.utility.spinner.spinner import SpinnerWidget
 

bec_widgets/utils/container_utils.py

@@ -43,7 +43,7 @@ class WidgetContainerUtils:
         if list_of_names is None:
             list_of_names = []
         ii = 0
-        while ii < 1000:  # 1000 is arbitrary!
+        while ii < 1000:  # 1000 is arbritrary!
             name_candidate = f"{name}_{ii}"
             if name_candidate not in list_of_names:
                 return name_candidate

bec_widgets/utils/forms_from_types/items.py

@@ -71,7 +71,7 @@ class FormItemSpec(BaseModel):
     """
     The specification for an item in a dynamically generated form. Uses a pydantic FieldInfo
     to store most annotation info, since one of the main purposes is to store data for
-    forms generated from pydantic models, but can also be composed from other sources or by hand.
+    forms genrated from pydantic models, but can also be composed from other sources or by hand.
     """
 
     model_config = ConfigDict(arbitrary_types_allowed=True)
@@ -192,7 +192,7 @@ class DynamicFormItem(QWidget):
     @abstractmethod
     def _add_main_widget(self) -> None:
         self._main_widget: QWidget
-        """Add the main data entry widget to self._main_widget and apply any
+        """Add the main data entry widget to self._main_widget and appply any
         constraints from the field info"""
 
     @SafeSlot()

bec_widgets/utils/fuzzy_search.py

@@ -1,35 +0,0 @@
-"""Module providing fuzzy search utilities for the BEC widgets."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from thefuzz import fuzz
-
-FUZZY_SEARCH_THRESHOLD = 80
-
-
-def is_match(
-    text: str, row_data: dict[str, Any], relevant_keys: list[str], enable_fuzzy: bool
-) -> bool:
-    """
-    Check if the text matches any of the relevant keys in the row data.
-
-    Args:
-        text (str): The text to search for.
-        row_data (dict[str, Any]): The row data to search in.
-        relevant_keys (list[str]): The keys to consider for searching.
-        enable_fuzzy (bool): Whether to use fuzzy matching.
-    Returns:
-        bool: True if a match is found, False otherwise.
-    """
-    for key in relevant_keys:
-        data = str(row_data.get(key, "") or "")
-        if enable_fuzzy:
-            match_ratio = fuzz.partial_ratio(text.lower(), data.lower())
-            if match_ratio >= FUZZY_SEARCH_THRESHOLD:
-                return True
-        else:
-            if text.lower() in data.lower():
-                return True
-    return False

bec_widgets/utils/ophyd_kind_util.py

@@ -15,7 +15,7 @@ class Kind(IFBase):
     """
     This is used in the .kind attribute of all OphydObj (Signals, Devices).
 
-    A Device examines its components' .kind attribute to decide whether to
+    A Device examines its components' .kind atttribute to decide whether to
     traverse it in read(), read_configuration(), or neither. Additionally, if
     decides whether to include its name in `hints['fields']`.
     """

bec_widgets/utils/plugin_templates/plugin.template

@@ -22,7 +22,7 @@ class {plugin_name_pascal}Plugin(QDesignerCustomWidgetInterface):  # pragma: no
 
     def createWidget(self, parent):
         if parent is None:
-            return QWidget()
+           return QWidget()
         t = {plugin_name_pascal}(parent)
         return t
 

bec_widgets/utils/plugin_utils.py

@@ -9,7 +9,7 @@ from typing import TYPE_CHECKING, Iterable
 from bec_lib.plugin_helper import _get_available_plugins
 from qtpy.QtWidgets import QWidget
 
-from bec_widgets.utils.bec_connector import BECConnector
+from bec_widgets.utils import BECConnector
 from bec_widgets.utils.bec_widget import BECWidget
 
 if TYPE_CHECKING:  # pragma: no cover

bec_widgets/utils/rpc_server.py

@@ -14,11 +14,11 @@ from qtpy.QtCore import Qt, QTimer
 from qtpy.QtWidgets import QWidget
 from redis.exceptions import RedisError
 
+from bec_widgets.cli.rpc.rpc_register import RPCRegister
+from bec_widgets.utils import BECDispatcher
 from bec_widgets.utils.bec_connector import BECConnector
-from bec_widgets.utils.bec_dispatcher import BECDispatcher
 from bec_widgets.utils.container_utils import WidgetContainerUtils
 from bec_widgets.utils.error_popups import ErrorPopupUtility
-from bec_widgets.utils.rpc_register import RPCRegister
 from bec_widgets.utils.screen_utils import apply_window_geometry
 from bec_widgets.widgets.containers.dock_area.dock_area import BECDockArea
 from bec_widgets.widgets.containers.main_window.main_window import BECMainWindow, BECMainWindowNoRPC
@@ -156,7 +156,7 @@ class RPCServer:
             if method == "raise" and hasattr(
                 obj, "setWindowState"
             ):  # special case for raising windows, should work even if minimized
-                # this is a special case for raising windows for gnome on Red Hat (RHEL) 9 systems where changing focus is suppressed by default
+                # this is a special case for raising windows for gnome on rethat 9 systems where changing focus is supressed by default
                 # The procedure is as follows:
                 # 1. Get the current window state to check if the window is minimized and remove minimized flag
                 # 2. Then in order to force gnome to raise the window, we set the window to stay on top temporarily
@@ -442,5 +442,5 @@ class RPCServer:
         self.status = messages.BECStatus.IDLE
         self._heartbeat_timer.stop()
         self.emit_heartbeat()
-        logger.info("Succeeded in shutting down CLI server")
+        logger.info("Succeded in shutting down CLI server")
         self.client.shutdown()

bec_widgets/utils/toolbars/actions.py

@@ -35,19 +35,16 @@ logger = bec_logger.logger
 MODULE_PATH = os.path.dirname(bec_widgets.__file__)
 
 
-def create_action_with_text(toolbar_action, toolbar: QToolBar, min_size: QSize | None = None):
+def create_action_with_text(toolbar_action, toolbar: QToolBar):
     """
     Helper function to create a toolbar button with text beside or under the icon.
 
     Args:
         toolbar_action(ToolBarAction): The toolbar action to create the button for.
         toolbar(ModularToolBar): The toolbar to add the button to.
-        min_size(QSize, optional): The minimum size for the button. Defaults to None.
     """
 
     btn = QToolButton(parent=toolbar)
-    if min_size is not None:
-        btn.setMinimumSize(min_size)
     if getattr(toolbar_action, "label_text", None):
         toolbar_action.action.setText(toolbar_action.label_text)
     if getattr(toolbar_action, "tooltip", None):

bec_widgets/utils/widget_io.py

@@ -26,7 +26,7 @@ from qtpy.QtWidgets import (
 from bec_widgets.widgets.utility.toggle.toggle import ToggleSwitch
 
 if TYPE_CHECKING:  # pragma: no cover
-    from bec_widgets.utils.bec_connector import BECConnector
+    from bec_widgets.utils import BECConnector
 
 logger = bec_logger.logger
 
@@ -418,7 +418,7 @@ class WidgetHierarchy:
             only_bec_widgets(bool, optional): Whether to print only widgets that are instances of BECWidget.
             show_parent(bool, optional): Whether to display which BECWidget is the parent of each discovered BECWidget.
         """
-        from bec_widgets.utils.bec_connector import BECConnector
+        from bec_widgets.utils import BECConnector
         from bec_widgets.widgets.plots.waveform.waveform import Waveform
 
         for node in WidgetHierarchy.iter_widget_tree(
@@ -468,7 +468,7 @@ class WidgetHierarchy:
 
         from qtpy.QtWidgets import QApplication
 
-        from bec_widgets.utils.bec_connector import BECConnector
+        from bec_widgets.utils import BECConnector
         from bec_widgets.widgets.plots.plot_base import PlotBase
 
         # 1) Gather ALL QWidget-based BECConnector objects
@@ -534,7 +534,7 @@ class WidgetHierarchy:
         Returns:
             The nearest ancestor that is a BECConnector, or None if not found.
         """
-        from bec_widgets.utils.bec_connector import BECConnector
+        from bec_widgets.utils import BECConnector
 
         # Guard against deleted/invalid Qt wrappers
         if not shb.isValid(widget):
@@ -636,7 +636,7 @@ class WidgetHierarchy:
         Return all BECConnector instances whose closest BECConnector ancestor is the given widget,
         including the widget itself if it is a BECConnector.
         """
-        from bec_widgets.utils.bec_connector import BECConnector
+        from bec_widgets.utils import BECConnector
 
         connectors: list[BECConnector] = []
         if isinstance(widget, BECConnector):
@@ -664,7 +664,7 @@ class WidgetHierarchy:
             return None
 
         try:
-            from bec_widgets.utils.bec_connector import BECConnector  # local import to avoid cycles
+            from bec_widgets.utils import BECConnector  # local import to avoid cycles
 
             is_bec_target = False
             if isinstance(ancestor_class, str):

bec_widgets/widgets/containers/dock_area/basic_dock_area.py

@@ -13,9 +13,9 @@ from shiboken6 import isValid
 
 import bec_widgets.widgets.containers.qt_ads as QtAds
 from bec_widgets import BECWidget, SafeSlot
+from bec_widgets.cli.rpc.rpc_widget_handler import widget_handler
 from bec_widgets.utils.bec_connector import BECConnector
 from bec_widgets.utils.property_editor import PropertyEditor
-from bec_widgets.utils.rpc_widget_handler import widget_handler
 from bec_widgets.utils.toolbars.actions import MaterialIconAction
 from bec_widgets.widgets.containers.qt_ads import (
     CDockAreaWidget,

bec_widgets/widgets/containers/dock_area/dock_area.py

@@ -20,10 +20,10 @@ from qtpy.QtWidgets import (
 import bec_widgets.widgets.containers.qt_ads as QtAds
 from bec_widgets import BECWidget, SafeProperty, SafeSlot
 from bec_widgets.applications.views.view import ViewTourSteps
-from bec_widgets.utils.bec_dispatcher import BECDispatcher
+from bec_widgets.cli.rpc.rpc_widget_handler import widget_handler
+from bec_widgets.utils import BECDispatcher
 from bec_widgets.utils.colors import apply_theme
 from bec_widgets.utils.rpc_decorator import rpc_timeout
-from bec_widgets.utils.rpc_widget_handler import widget_handler
 from bec_widgets.utils.toolbars.actions import (
     ExpandableMenuAction,
     MaterialIconAction,
@@ -35,25 +35,25 @@ from bec_widgets.utils.widget_state_manager import WidgetStateManager
 from bec_widgets.widgets.containers.dock_area.basic_dock_area import DockAreaWidget
 from bec_widgets.widgets.containers.dock_area.profile_utils import (
     SETTINGS_KEYS,
-    baseline_profile_candidates,
+    default_profile_candidates,
     delete_profile_files,
     get_last_profile,
     is_profile_read_only,
     is_quick_select,
     list_profiles,
     list_quick_profiles,
-    load_baseline_profile_screenshot,
-    load_runtime_profile_screenshot,
+    load_default_profile_screenshot,
+    load_user_profile_screenshot,
     now_iso_utc,
-    open_baseline_settings,
-    open_runtime_settings,
+    open_default_settings,
+    open_user_settings,
     profile_origin,
     profile_origin_display,
     read_manifest,
-    restore_runtime_from_baseline,
-    runtime_profile_candidates,
+    restore_user_from_default,
     set_last_profile,
     set_quick_select,
+    user_profile_candidates,
     write_manifest,
 )
 from bec_widgets.widgets.containers.dock_area.settings.dialogs import (
@@ -69,7 +69,7 @@ from bec_widgets.widgets.containers.main_window.main_window import BECMainWindow
 from bec_widgets.widgets.containers.qt_ads import CDockWidget
 from bec_widgets.widgets.control.device_control.positioner_box import PositionerBox, PositionerBox2D
 from bec_widgets.widgets.control.scan_control import ScanControl
-from bec_widgets.widgets.editors.bec_console.bec_console import BecConsole, BECShell
+from bec_widgets.widgets.editors.web_console.web_console import BECShell, WebConsole
 from bec_widgets.widgets.plots.heatmap.heatmap import Heatmap
 from bec_widgets.widgets.plots.image.image import Image
 from bec_widgets.widgets.plots.motor_map.motor_map import MotorMap
@@ -79,7 +79,7 @@ from bec_widgets.widgets.plots.waveform.waveform import Waveform
 from bec_widgets.widgets.progress.ring_progress_bar.ring_progress_bar import RingProgressBar
 from bec_widgets.widgets.services.bec_queue.bec_queue import BECQueue
 from bec_widgets.widgets.services.bec_status_box.bec_status_box import BECStatusBox
-from bec_widgets.widgets.utility.logpanel.logpanel import LogPanel
+from bec_widgets.widgets.utility.logpanel import LogPanel
 from bec_widgets.widgets.utility.visual.dark_mode_button.dark_mode_button import DarkModeButton
 
 logger = bec_logger.logger
@@ -235,8 +235,11 @@ class BECDockArea(DockAreaWidget):
     def _load_initial_profile(self, name: str) -> None:
         """Load the initial profile."""
         self.load_profile(name)
+        combo = self.toolbar.components.get_action("workspace_combo").widget
+        combo.blockSignals(True)
         if not self._empty_profile_active:
-            self._set_workspace_combo_text_silent(name)
+            combo.setCurrentText(name)
+        combo.blockSignals(False)
 
     def _start_empty_workspace(self) -> None:
         """
@@ -369,11 +372,10 @@ class BECDockArea(DockAreaWidget):
                 "Add Circular ProgressBar",
                 "RingProgressBar",
             ),
-            "terminal": (BecConsole.ICON_NAME, "Add Terminal", "BecConsole"),
+            "terminal": (WebConsole.ICON_NAME, "Add Terminal", "WebConsole"),
             "bec_shell": (BECShell.ICON_NAME, "Add BEC Shell", "BECShell"),
             "log_panel": (LogPanel.ICON_NAME, "Add LogPanel - Disabled", "LogPanel"),
             "sbb_monitor": ("train", "Add SBB Monitor", "SBBMonitor"),
-            "log_panel": (LogPanel.ICON_NAME, "Add LogPanel", "LogPanel"),
         }
 
         # Create expandable menu actions (original behavior)
@@ -485,7 +487,9 @@ class BECDockArea(DockAreaWidget):
             # first two items not needed for this part
             for key, (_, _, widget_type) in mapping.items():
                 act = menu.actions[key].action
-                if key == "terminal":
+                if widget_type == "LogPanel":
+                    act.setEnabled(False)  # keep disabled per issue #644
+                elif key == "terminal":
                     act.triggered.connect(
                         lambda _, t=widget_type: self.new(widget=t, closable=True, startup_cmd=None)
                     )
@@ -506,7 +510,10 @@ class BECDockArea(DockAreaWidget):
             for action_id, (_, _, widget_type) in mapping.items():
                 flat_action_id = f"flat_{action_id}"
                 flat_action = self.toolbar.components.get_action(flat_action_id).action
-                flat_action.triggered.connect(lambda _, t=widget_type: self.new(t))
+                if widget_type == "LogPanel":
+                    flat_action.setEnabled(False)  # keep disabled per issue #644
+                else:
+                    flat_action.triggered.connect(lambda _, t=widget_type: self.new(t))
 
         _connect_flat_actions(self._ACTION_MAPPINGS["menu_plots"])
         _connect_flat_actions(self._ACTION_MAPPINGS["menu_devices"])
@@ -588,13 +595,13 @@ class BECDockArea(DockAreaWidget):
 
     @property
     def profile_namespace(self) -> str | None:
-        """Namespace used to scope runtime/baseline profile files for this dock area."""
+        """Namespace used to scope user/default profile files for this dock area."""
         return self._resolve_profile_namespace()
 
     def _profile_exists(self, name: str, namespace: str | None) -> bool:
         return any(
-            os.path.exists(path) for path in runtime_profile_candidates(name, namespace)
-        ) or any(os.path.exists(path) for path in baseline_profile_candidates(name, namespace))
+            os.path.exists(path) for path in user_profile_candidates(name, namespace)
+        ) or any(os.path.exists(path) for path in default_profile_candidates(name, namespace))
 
     def _write_snapshot_to_settings(self, settings, save_preview: bool = True) -> None:
         """
@@ -620,34 +627,35 @@ class BECDockArea(DockAreaWidget):
         name: str,
         namespace: str | None,
         *,
-        write_baseline: bool = True,
-        write_runtime: bool = True,
+        write_default: bool = True,
+        write_user: bool = True,
         save_preview: bool = True,
     ) -> None:
         """
-        Write profile settings to baseline and/or runtime settings files.
+        Write profile settings to default and/or user settings files.
 
         Args:
             name: The profile name.
             namespace: The profile namespace.
-            write_baseline: Whether to write to the baseline settings file.
-            write_runtime: Whether to write to the runtime settings file.
+            write_default: Whether to write to the default settings file.
+            write_user: Whether to write to the user settings file.
             save_preview: Whether to save a screenshot preview.
         """
+        if write_default:
+            ds = open_default_settings(name, namespace=namespace)
+            self._write_snapshot_to_settings(ds, save_preview=save_preview)
+            if not ds.value(SETTINGS_KEYS["created_at"], ""):
+                ds.setValue(SETTINGS_KEYS["created_at"], now_iso_utc())
+            if not ds.value(SETTINGS_KEYS["is_quick_select"], None):
+                ds.setValue(SETTINGS_KEYS["is_quick_select"], True)
 
-        def _write_settings(open_settings) -> None:
-            settings = open_settings(name, namespace=namespace)
-            self._write_snapshot_to_settings(settings, save_preview=save_preview)
-            if not settings.value(SETTINGS_KEYS["created_at"], ""):
-                settings.setValue(SETTINGS_KEYS["created_at"], now_iso_utc())
-            if not settings.value(SETTINGS_KEYS["is_quick_select"], None):
-                settings.setValue(SETTINGS_KEYS["is_quick_select"], True)
-
-        if write_baseline:
-            _write_settings(open_baseline_settings)
-
-        if write_runtime:
-            _write_settings(open_runtime_settings)
+        if write_user:
+            us = open_user_settings(name, namespace=namespace)
+            self._write_snapshot_to_settings(us, save_preview=save_preview)
+            if not us.value(SETTINGS_KEYS["created_at"], ""):
+                us.setValue(SETTINGS_KEYS["created_at"], now_iso_utc())
+            if not us.value(SETTINGS_KEYS["is_quick_select"], None):
+                us.setValue(SETTINGS_KEYS["is_quick_select"], True)
 
     def _finalize_profile_change(self, name: str, namespace: str | None) -> None:
         """
@@ -665,14 +673,6 @@ class BECDockArea(DockAreaWidget):
         combo = self.toolbar.components.get_action("workspace_combo").widget
         combo.refresh_profiles(active_profile=name)
 
-    def _set_workspace_combo_text_silent(self, text: str) -> None:
-        combo = self.toolbar.components.get_action("workspace_combo").widget
-        was_blocked = combo.blockSignals(True)
-        try:
-            combo.setCurrentText(text)
-        finally:
-            combo.blockSignals(was_blocked)
-
     def _enter_empty_profile_state(self) -> None:
         """
         Switch to the transient empty workspace state.
@@ -709,10 +709,10 @@ class BECDockArea(DockAreaWidget):
         Save the current workspace profile.
 
         On first save of a given name:
-          - writes a baseline copy to profiles/baseline/<name>.ini with created_at
-          - writes a runtime copy to profiles/runtime/<name>.ini with created_at
-        On subsequent saves:
-          - updates both the baseline and runtime copies so restore uses the latest snapshot.
+          - writes a default copy to states/default/<name>.ini with tag=default and created_at
+          - writes a user copy   to states/user/<name>.ini    with tag=user    and created_at
+        On subsequent saves of user-owned profiles:
+          - updates both the default and user copies so restore uses the latest snapshot.
         Read-only bundled profiles cannot be overwritten.
 
         Args:
@@ -776,7 +776,7 @@ class BECDockArea(DockAreaWidget):
             overwrite_existing = origin == "settings"
 
         origin_before_save = profile_origin(name, namespace=namespace)
-        overwrite_baseline = overwrite_existing and origin_before_save == "settings"
+        overwrite_default = overwrite_existing and origin_before_save == "settings"
 
         # Display saving placeholder in toolbar
         workspace_combo = self.toolbar.components.get_action("workspace_combo").widget
@@ -785,12 +785,12 @@ class BECDockArea(DockAreaWidget):
         workspace_combo.setCurrentIndex(0)
         workspace_combo.blockSignals(False)
 
-        # Write to baseline and/or runtime settings
-        should_write_baseline = overwrite_baseline or not any(
-            os.path.exists(path) for path in baseline_profile_candidates(name, namespace)
+        # Write to default and/or user settings
+        should_write_default = overwrite_default or not any(
+            os.path.exists(path) for path in default_profile_candidates(name, namespace)
         )
         self._write_profile_settings(
-            name, namespace, write_baseline=should_write_baseline, write_runtime=True
+            name, namespace, write_default=should_write_default, write_user=True
         )
 
         set_quick_select(name, quickselect, namespace=namespace)
@@ -800,6 +800,7 @@ class BECDockArea(DockAreaWidget):
             self._pending_autosave_skip = (current_profile, name)
         else:
             self._pending_autosave_skip = None
+        workspace_combo.setCurrentText(name)
         self._finalize_profile_change(name, namespace)
 
     @SafeSlot()
@@ -824,8 +825,8 @@ class BECDockArea(DockAreaWidget):
         """
         Load a workspace profile.
 
-        Before switching, persist the current profile to the runtime copy.
-        Prefer loading the runtime copy; fall back to the baseline copy.
+        Before switching, persist the current profile to the user copy.
+        Prefer loading the user copy; fall back to the default copy.
 
         Args:
             name (str | None): The name of the profile to load. If None, prompts the user.
@@ -847,14 +848,14 @@ class BECDockArea(DockAreaWidget):
             if skip_pair and skip_pair == (prev_name, name):
                 self._pending_autosave_skip = None
             else:
-                us_prev = open_runtime_settings(prev_name, namespace=namespace)
+                us_prev = open_user_settings(prev_name, namespace=namespace)
                 self._write_snapshot_to_settings(us_prev, save_preview=True)
 
         settings = None
-        if any(os.path.exists(path) for path in runtime_profile_candidates(name, namespace)):
-            settings = open_runtime_settings(name, namespace=namespace)
-        elif any(os.path.exists(path) for path in baseline_profile_candidates(name, namespace)):
-            settings = open_baseline_settings(name, namespace=namespace)
+        if any(os.path.exists(path) for path in user_profile_candidates(name, namespace)):
+            settings = open_user_settings(name, namespace=namespace)
+        elif any(os.path.exists(path) for path in default_profile_candidates(name, namespace)):
+            settings = open_default_settings(name, namespace=namespace)
         if settings is None:
             logger.warning(f"Profile '{name}' not found in namespace '{namespace}'. Creating new.")
             self.delete_all()
@@ -896,9 +897,9 @@ class BECDockArea(DockAreaWidget):
 
     @SafeSlot()
     @SafeSlot(str)
-    def restore_runtime_profile_from_baseline(self, name: str | None = None):
+    def restore_user_profile_from_default(self, name: str | None = None):
         """
-        Overwrite the runtime copy of *name* with the baseline.
+        Overwrite the user copy of *name* with the default baseline.
         If *name* is None, target the currently active profile.
 
         Args:
@@ -915,13 +916,13 @@ class BECDockArea(DockAreaWidget):
             ba = bytes(self.screenshot_bytes())
             current_pixmap.loadFromData(ba)
         if current_pixmap is None or current_pixmap.isNull():
-            current_pixmap = load_runtime_profile_screenshot(target, namespace=namespace)
-        baseline_pixmap = load_baseline_profile_screenshot(target, namespace=namespace)
+            current_pixmap = load_user_profile_screenshot(target, namespace=namespace)
+        default_pixmap = load_default_profile_screenshot(target, namespace=namespace)
 
-        if not RestoreProfileDialog.confirm(self, current_pixmap, baseline_pixmap):
+        if not RestoreProfileDialog.confirm(self, current_pixmap, default_pixmap):
             return
 
-        restore_runtime_from_baseline(target, namespace=namespace)
+        restore_user_from_default(target, namespace=namespace)
         self.delete_all()
         self.load_profile(target)
 
@@ -1056,7 +1057,7 @@ class BECDockArea(DockAreaWidget):
         manage_action = self.toolbar.components.get_action("manage_workspaces").action
         if self.manage_dialog is None or not self.manage_dialog.isVisible():
             self.manage_widget = WorkSpaceManager(
-                self, target_widget=self, active_profile=self._current_profile_name
+                self, target_widget=self, default_profile=self._current_profile_name
             )
             self.manage_dialog = QDialog(modal=False)
 
@@ -1155,7 +1156,7 @@ class BECDockArea(DockAreaWidget):
             return
 
         namespace = self.profile_namespace
-        settings = open_runtime_settings(name, namespace=namespace)
+        settings = open_user_settings(name, namespace=namespace)
         self._write_snapshot_to_settings(settings)
         set_last_profile(name, namespace=namespace, instance=self._last_profile_instance_id())
         self._exit_snapshot_written = True

bec_widgets/widgets/containers/dock_area/profile_utils.py

@@ -2,13 +2,9 @@
 Utilities for managing BECDockArea profiles stored in INI files.
 
 Policy:
-- All created/modified profiles are stored under the BEC settings root:
-  <base_path>/profiles/{baseline,runtime}
-- Bundled read-only baselines are discovered in BW core profiles and plugin
-  bec_widgets/profiles but never written to.
-- Lookup order when reading: runtime → settings baseline → app or plugin bundled baseline.
-- Legacy settings paths profiles/{default,user} are read through a thin segment
-  alias layer and copied to the canonical location on first access.
+- All created/modified profiles are stored under the BEC settings root: <base_path>/profiles/{default,user}
+- Bundled read-only defaults are discovered in BW core states/default and plugin bec_widgets/profiles but never written to.
+- Lookup order when reading: user → settings default → app or plugin bundled default.
 """
 
 from __future__ import annotations
@@ -36,12 +32,6 @@ logger = bec_logger.logger
 MODULE_PATH = os.path.dirname(os.path.dirname(os.path.dirname(__file__)))
 
 ProfileOrigin = Literal["module", "plugin", "settings", "unknown"]
-ProfileSegment = Literal["baseline", "runtime"]
-
-_PROFILE_SEGMENT_ALIASES: dict[ProfileSegment, tuple[str, str]] = {
-    "baseline": ("baseline", "default"),
-    "runtime": ("runtime", "user"),
-}
 
 
 def module_profiles_dir() -> str:
@@ -125,12 +115,12 @@ def _settings_profiles_root() -> str:
         str: Absolute path to the profiles root. The directory is created if missing.
     """
     client = BECClient()
-    bec_widgets_settings = client._service_config.config.get("widgets_settings")
+    bec_widgets_settings = client._service_config.config.get("bec_widgets_settings")
     bec_widgets_setting_path = (
         bec_widgets_settings.get("base_path") if bec_widgets_settings else None
     )
     default_path = os.path.join(bec_widgets_setting_path, "profiles")
-    root = os.path.expanduser(os.environ.get("BECWIDGETS_PROFILE_DIR", default_path))
+    root = os.environ.get("BECWIDGETS_PROFILE_DIR", default_path)
     os.makedirs(root, exist_ok=True)
     return root
 
@@ -140,7 +130,7 @@ def _profiles_dir(segment: str, namespace: str | None) -> str:
     Build (and ensure) the directory that holds profiles for a namespace segment.
 
     Args:
-        segment (str): Profile segment directory name.
+        segment (str): Either ``"user"`` or ``"default"``.
         namespace (str | None): Optional namespace label to scope profiles.
 
     Returns:
@@ -148,180 +138,162 @@ def _profiles_dir(segment: str, namespace: str | None) -> str:
     """
     base = os.path.join(_settings_profiles_root(), segment)
     ns = slugify.slugify(namespace, separator="_") if namespace else None
-    path = os.path.expanduser(os.path.join(base, ns) if ns else base)
+    path = os.path.join(base, ns) if ns else base
     os.makedirs(path, exist_ok=True)
     return path
 
 
-def _candidate_namespaces(namespace: str | None) -> list[str | None]:
+def _user_path_candidates(name: str, namespace: str | None) -> list[str]:
+    """
+    Generate candidate user-profile paths honoring namespace fallbacks.
+
+    Args:
+        name (str): Profile name without extension.
+        namespace (str | None): Optional namespace label.
+
+    Returns:
+        list[str]: Ordered list of candidate user profile paths (.ini files).
+    """
     ns = slugify.slugify(namespace, separator="_") if namespace else None
+    primary = os.path.join(_profiles_dir("user", ns), f"{name}.ini")
     if not ns:
-        return [None]
-    return [ns, None]
+        return [primary]
+    legacy = os.path.join(_profiles_dir("user", None), f"{name}.ini")
+    return [primary, legacy] if legacy != primary else [primary]
 
 
-def _segment_profile_path(segment_name: str, name: str, namespace: str | None) -> str:
-    return os.path.join(_profiles_dir(segment_name, namespace), f"{name}.ini")
-
-
-def _canonical_profile_path(segment: ProfileSegment, name: str, namespace: str | None) -> str:
-    return _segment_profile_path(_PROFILE_SEGMENT_ALIASES[segment][0], name, namespace)
-
-
-def _segment_path_candidates(
-    segment: ProfileSegment,
-    name: str,
-    namespace: str | None,
-    *,
-    include_legacy: bool = True,
-    migrate_legacy: bool = True,
-) -> list[str]:
+def _default_path_candidates(name: str, namespace: str | None) -> list[str]:
     """
-    Generate profile candidates for a canonical segment.
+    Generate candidate default-profile paths honoring namespace fallbacks.
 
-    Canonical baseline/runtime files are always preferred. Namespace fallback
-    files and legacy default/user files are copied to the primary canonical path
-    when the primary file does not exist.
+    Args:
+        name (str): Profile name without extension.
+        namespace (str | None): Optional namespace label.
+
+    Returns:
+        list[str]: Ordered list of candidate default profile paths (.ini files).
     """
-    canonical = [
-        _segment_profile_path(_PROFILE_SEGMENT_ALIASES[segment][0], name, ns)
-        for ns in _candidate_namespaces(namespace)
-    ]
-    legacy = []
-    if include_legacy:
-        legacy = [
-            _segment_profile_path(_PROFILE_SEGMENT_ALIASES[segment][1], name, ns)
-            for ns in _candidate_namespaces(namespace)
-        ]
-
-    primary_canonical = canonical[0]
-    if migrate_legacy and not os.path.exists(primary_canonical):
-        canonical_src = next((path for path in canonical[1:] if os.path.exists(path)), None)
-        if canonical_src:
-            os.makedirs(os.path.dirname(primary_canonical), exist_ok=True)
-            shutil.copy2(canonical_src, primary_canonical)
-        elif include_legacy:
-            legacy_src = next((path for path in legacy if os.path.exists(path)), None)
-            if legacy_src:
-                os.makedirs(os.path.dirname(primary_canonical), exist_ok=True)
-                shutil.copy2(legacy_src, primary_canonical)
-
-    return list(dict.fromkeys(canonical + legacy))
+    ns = slugify.slugify(namespace, separator="_") if namespace else None
+    primary = os.path.join(_profiles_dir("default", ns), f"{name}.ini")
+    if not ns:
+        return [primary]
+    legacy = os.path.join(_profiles_dir("default", None), f"{name}.ini")
+    return [primary, legacy] if legacy != primary else [primary]
 
 
-def baseline_profiles_dir(namespace: str | None = None) -> str:
+def default_profiles_dir(namespace: str | None = None) -> str:
     """
-    Return the directory that stores baseline profiles for the namespace.
+    Return the directory that stores default profiles for the namespace.
 
     Args:
         namespace (str | None, optional): Namespace label. Defaults to ``None``.
 
     Returns:
-        str: Absolute path to the baseline profile directory.
+        str: Absolute path to the default profile directory.
     """
-    return _profiles_dir("baseline", namespace)
+    return _profiles_dir("default", namespace)
 
 
-def runtime_profiles_dir(namespace: str | None = None) -> str:
+def user_profiles_dir(namespace: str | None = None) -> str:
     """
-    Return the directory that stores runtime profiles for the namespace.
+    Return the directory that stores user profiles for the namespace.
 
     Args:
         namespace (str | None, optional): Namespace label. Defaults to ``None``.
 
     Returns:
-        str: Absolute path to the runtime profile directory.
+        str: Absolute path to the user profile directory.
     """
-    return _profiles_dir("runtime", namespace)
+    return _profiles_dir("user", namespace)
 
 
-def baseline_profile_path(name: str, namespace: str | None = None) -> str:
+def default_profile_path(name: str, namespace: str | None = None) -> str:
     """
-    Compute the canonical baseline profile path for a profile name.
+    Compute the canonical default profile path for a profile name.
 
     Args:
         name (str): Profile name without extension.
         namespace (str | None, optional): Namespace label. Defaults to ``None``.
 
     Returns:
-        str: Absolute path to the baseline profile file (.ini).
+        str: Absolute path to the default profile file (.ini).
     """
-    return _canonical_profile_path("baseline", name, namespace)
+    return _default_path_candidates(name, namespace)[0]
 
 
-def runtime_profile_path(name: str, namespace: str | None = None) -> str:
+def user_profile_path(name: str, namespace: str | None = None) -> str:
     """
-    Compute the canonical runtime profile path for a profile name.
+    Compute the canonical user profile path for a profile name.
 
     Args:
         name (str): Profile name without extension.
         namespace (str | None, optional): Namespace label. Defaults to ``None``.
 
     Returns:
-        str: Absolute path to the runtime profile file (.ini).
+        str: Absolute path to the user profile file (.ini).
     """
-    return _canonical_profile_path("runtime", name, namespace)
+    return _user_path_candidates(name, namespace)[0]
 
 
-def runtime_profile_candidates(name: str, namespace: str | None = None) -> list[str]:
+def user_profile_candidates(name: str, namespace: str | None = None) -> list[str]:
     """
-    List all runtime profile path candidates for a profile name.
+    List all user profile path candidates for a profile name.
 
     Args:
         name (str): Profile name without extension.
         namespace (str | None, optional): Namespace label. Defaults to ``None``.
 
     Returns:
-        list[str]: De-duplicated list of candidate runtime profile paths.
+        list[str]: De-duplicated list of candidate user profile paths.
     """
-    return _segment_path_candidates("runtime", name, namespace)
+    return list(dict.fromkeys(_user_path_candidates(name, namespace)))
 
 
-def baseline_profile_candidates(name: str, namespace: str | None = None) -> list[str]:
+def default_profile_candidates(name: str, namespace: str | None = None) -> list[str]:
     """
-    List all baseline profile path candidates for a profile name.
+    List all default profile path candidates for a profile name.
 
     Args:
         name (str): Profile name without extension.
         namespace (str | None, optional): Namespace label. Defaults to ``None``.
 
     Returns:
-        list[str]: De-duplicated list of candidate baseline profile paths.
+        list[str]: De-duplicated list of candidate default profile paths.
     """
-    return _segment_path_candidates("baseline", name, namespace)
+    return list(dict.fromkeys(_default_path_candidates(name, namespace)))
 
 
-def _existing_runtime_settings(name: str, namespace: str | None = None) -> QSettings | None:
+def _existing_user_settings(name: str, namespace: str | None = None) -> QSettings | None:
     """
-    Resolve the first existing runtime profile settings object.
+    Resolve the first existing user profile settings object.
 
     Args:
         name (str): Profile name without extension.
         namespace (str | None, optional): Namespace label to search. Defaults to ``None``.
 
     Returns:
-        QSettings | None: Config for the first existing runtime profile candidate, or ``None``
+        QSettings | None: Config for the first existing user profile candidate, or ``None``
             when no files are present.
     """
-    for path in runtime_profile_candidates(name, namespace):
+    for path in user_profile_candidates(name, namespace):
         if os.path.exists(path):
             return QSettings(path, QSettings.IniFormat)
     return None
 
 
-def _existing_baseline_settings(name: str, namespace: str | None = None) -> QSettings | None:
+def _existing_default_settings(name: str, namespace: str | None = None) -> QSettings | None:
     """
-    Resolve the first existing baseline profile settings object.
+    Resolve the first existing default profile settings object.
 
     Args:
         name (str): Profile name without extension.
         namespace (str | None, optional): Namespace label to search. Defaults to ``None``.
 
     Returns:
-        QSettings | None: Config for the first existing baseline profile candidate, or ``None``
+        QSettings | None: Config for the first existing default profile candidate, or ``None``
             when no files are present.
     """
-    for path in baseline_profile_candidates(name, namespace):
+    for path in default_profile_candidates(name, namespace):
         if os.path.exists(path):
             return QSettings(path, QSettings.IniFormat)
     return None
@@ -375,7 +347,7 @@ def profile_origin(name: str, namespace: str | None = None) -> ProfileOrigin:
     plugin_path = plugin_profile_path(name)
     if plugin_path and os.path.exists(plugin_path):
         return "plugin"
-    for path in runtime_profile_candidates(name, namespace) + baseline_profile_candidates(
+    for path in user_profile_candidates(name, namespace) + default_profile_candidates(
         name, namespace
     ):
         if os.path.exists(path):
@@ -434,8 +406,8 @@ def delete_profile_files(name: str, namespace: str | None = None) -> bool:
     read_only = is_profile_read_only(name, namespace)
 
     removed = False
-    # Always allow removing runtime copies; keep baseline copies for read-only origins.
-    for path in set(runtime_profile_candidates(name, namespace)):
+    # Always allow removing user copies; keep default copies for read-only origins.
+    for path in set(user_profile_candidates(name, namespace)):
         try:
             os.remove(path)
             removed = True
@@ -443,7 +415,7 @@ def delete_profile_files(name: str, namespace: str | None = None) -> bool:
             continue
 
     if not read_only:
-        for path in set(baseline_profile_candidates(name, namespace)):
+        for path in set(default_profile_candidates(name, namespace)):
             try:
                 os.remove(path)
                 removed = True
@@ -471,7 +443,7 @@ SETTINGS_KEYS = {
 
 def list_profiles(namespace: str | None = None) -> list[str]:
     """
-    Enumerate all known profile names, syncing bundled baselines when missing locally.
+    Enumerate all known profile names, syncing bundled defaults when missing locally.
 
     Args:
         namespace (str | None, optional): Namespace label scoped to the profile set.
@@ -487,27 +459,16 @@ def list_profiles(namespace: str | None = None) -> list[str]:
             return set()
         return {os.path.splitext(f)[0] for f in os.listdir(directory) if f.endswith(".ini")}
 
-    settings_dirs = {baseline_profiles_dir(namespace), runtime_profiles_dir(namespace)}
+    settings_dirs = {default_profiles_dir(namespace), user_profiles_dir(namespace)}
     if ns:
-        settings_dirs.add(baseline_profiles_dir(None))
-        settings_dirs.add(runtime_profiles_dir(None))
-
-    for segment in ("baseline", "runtime"):
-        for legacy_dir in [
-            _profiles_dir(_PROFILE_SEGMENT_ALIASES[segment][1], item)
-            for item in _candidate_namespaces(namespace)
-        ]:
-            settings_dirs.add(legacy_dir)
+        settings_dirs.add(default_profiles_dir(None))
+        settings_dirs.add(user_profiles_dir(None))
 
     settings_names: set[str] = set()
     for directory in settings_dirs:
         settings_names |= _collect_from(directory)
 
-    for name in sorted(settings_names):
-        runtime_profile_candidates(name, namespace)
-        baseline_profile_candidates(name, namespace)
-
-    # Also consider read-only baselines from core module and beamline plugin repositories
+    # Also consider read-only defaults from core module and beamline plugin repositories
     read_only_sources: dict[str, tuple[str, str]] = {}
     sources: list[tuple[str, str | None]] = [
         ("module", module_profiles_dir()),
@@ -523,17 +484,17 @@ def list_profiles(namespace: str | None = None) -> list[str]:
             read_only_sources.setdefault(name, (origin, os.path.join(directory, filename)))
 
     for name, (_origin, src) in sorted(read_only_sources.items()):
-        # Ensure a copy in the namespace-specific settings baseline directory.
-        dst_baseline = baseline_profile_path(name, namespace)
-        if not os.path.exists(dst_baseline):
-            os.makedirs(os.path.dirname(dst_baseline), exist_ok=True)
-            shutil.copy2(src, dst_baseline)
-        # Ensure a runtime copy exists to allow edits in the writable settings area.
-        dst_runtime = runtime_profile_path(name, namespace)
-        if not os.path.exists(dst_runtime):
-            os.makedirs(os.path.dirname(dst_runtime), exist_ok=True)
-            shutil.copy2(src, dst_runtime)
-            s = open_runtime_settings(name, namespace)
+        # Ensure a copy in the namespace-specific settings default directory
+        dst_default = default_profile_path(name, namespace)
+        if not os.path.exists(dst_default):
+            os.makedirs(os.path.dirname(dst_default), exist_ok=True)
+            shutil.copyfile(src, dst_default)
+        # Ensure a user copy exists to allow edits in the writable settings area
+        dst_user = user_profile_path(name, namespace)
+        if not os.path.exists(dst_user):
+            os.makedirs(os.path.dirname(dst_user), exist_ok=True)
+            shutil.copyfile(src, dst_user)
+            s = open_user_settings(name, namespace)
             if s.value(SETTINGS_KEYS["created_at"], "") == "":
                 s.setValue(SETTINGS_KEYS["created_at"], now_iso_utc())
 
@@ -543,34 +504,32 @@ def list_profiles(namespace: str | None = None) -> list[str]:
     return sorted(settings_names)
 
 
-def open_baseline_settings(name: str, namespace: str | None = None) -> QSettings:
+def open_default_settings(name: str, namespace: str | None = None) -> QSettings:
     """
-    Open (and create if necessary) the baseline profile settings file.
+    Open (and create if necessary) the default profile settings file.
 
     Args:
         name (str): Profile name without extension.
         namespace (str | None, optional): Namespace label. Defaults to ``None``.
 
     Returns:
-        QSettings: Settings instance targeting the baseline profile file.
+        QSettings: Settings instance targeting the default profile file.
     """
-    baseline_profile_candidates(name, namespace)
-    return QSettings(baseline_profile_path(name, namespace), QSettings.IniFormat)
+    return QSettings(default_profile_path(name, namespace), QSettings.IniFormat)
 
 
-def open_runtime_settings(name: str, namespace: str | None = None) -> QSettings:
+def open_user_settings(name: str, namespace: str | None = None) -> QSettings:
     """
-    Open (and create if necessary) the runtime profile settings file.
+    Open (and create if necessary) the user profile settings file.
 
     Args:
         name (str): Profile name without extension.
         namespace (str | None, optional): Namespace label. Defaults to ``None``.
 
     Returns:
-        QSettings: Settings instance targeting the runtime profile file.
+        QSettings: Settings instance targeting the user profile file.
     """
-    runtime_profile_candidates(name, namespace)
-    return QSettings(runtime_profile_path(name, namespace), QSettings.IniFormat)
+    return QSettings(user_profile_path(name, namespace), QSettings.IniFormat)
 
 
 def _app_settings() -> QSettings:
@@ -800,26 +759,26 @@ def read_manifest(settings: QSettings) -> list[dict]:
     return items
 
 
-def restore_runtime_from_baseline(name: str, namespace: str | None = None) -> None:
+def restore_user_from_default(name: str, namespace: str | None = None) -> None:
     """
-    Copy the baseline profile to the runtime profile, preserving quick-select flag.
+    Copy the default profile to the user profile, preserving quick-select flag.
 
     Args:
         name(str): Profile name without extension.
         namespace(str | None, optional): Namespace label. Defaults to ``None``.
     """
     src = None
-    for candidate in baseline_profile_candidates(name, namespace):
+    for candidate in default_profile_candidates(name, namespace):
         if os.path.exists(candidate):
             src = candidate
             break
     if not src:
         return
-    dst = runtime_profile_path(name, namespace)
+    dst = user_profile_path(name, namespace)
     preserve_quick_select = is_quick_select(name, namespace)
     os.makedirs(os.path.dirname(dst), exist_ok=True)
     shutil.copyfile(src, dst)
-    s = open_runtime_settings(name, namespace)
+    s = open_user_settings(name, namespace)
     if not s.value(SETTINGS_KEYS["created_at"], ""):
         s.setValue(SETTINGS_KEYS["created_at"], now_iso_utc())
     if preserve_quick_select:
@@ -837,9 +796,9 @@ def is_quick_select(name: str, namespace: str | None = None) -> bool:
     Returns:
         bool: True if quick-select is enabled for the profile.
     """
-    s = _existing_runtime_settings(name, namespace)
+    s = _existing_user_settings(name, namespace)
     if s is None:
-        s = _existing_baseline_settings(name, namespace)
+        s = _existing_default_settings(name, namespace)
     if s is None:
         return False
     return s.value(SETTINGS_KEYS["is_quick_select"], False, type=bool)
@@ -854,13 +813,13 @@ def set_quick_select(name: str, enabled: bool, namespace: str | None = None) ->
         enabled(bool): True to enable quick-select, False to disable.
         namespace(str | None, optional): Namespace label. Defaults to ``None``.
     """
-    s = open_runtime_settings(name, namespace)
+    s = open_user_settings(name, namespace)
     s.setValue(SETTINGS_KEYS["is_quick_select"], bool(enabled))
 
 
 def list_quick_profiles(namespace: str | None = None) -> list[str]:
     """
-    List only profiles that have quick-select enabled (runtime wins over baseline).
+    List only profiles that have quick-select enabled (user wins over default).
 
     Args:
         namespace(str | None, optional): Namespace label. Defaults to ``None``.
@@ -950,8 +909,8 @@ class ProfileInfo(BaseModel):
     is_quick_select: bool = False
     widget_count: int = 0
     size_kb: int = 0
-    runtime_path: str = ""
-    baseline_path: str = ""
+    user_path: str = ""
+    default_path: str = ""
     origin: ProfileOrigin = "unknown"
     is_read_only: bool = False
 
@@ -965,19 +924,19 @@ def get_profile_info(name: str, namespace: str | None = None) -> ProfileInfo:
         namespace (str | None, optional): Namespace label. Defaults to ``None``.
 
     Returns:
-        ProfileInfo: Structured profile metadata, preferring the runtime copy when present.
+        ProfileInfo: Structured profile metadata, preferring the user copy when present.
     """
-    runtime_paths = runtime_profile_candidates(name, namespace)
-    baseline_paths = baseline_profile_candidates(name, namespace)
-    r_path = next((p for p in runtime_paths if os.path.exists(p)), runtime_paths[0])
-    b_path = next((p for p in baseline_paths if os.path.exists(p)), baseline_paths[0])
+    user_paths = user_profile_candidates(name, namespace)
+    default_paths = default_profile_candidates(name, namespace)
+    u_path = next((p for p in user_paths if os.path.exists(p)), user_paths[0])
+    d_path = next((p for p in default_paths if os.path.exists(p)), default_paths[0])
     origin = profile_origin(name, namespace)
     read_only = origin in {"module", "plugin"}
-    prefer_runtime = os.path.exists(r_path)
-    if prefer_runtime:
-        s = QSettings(r_path, QSettings.IniFormat)
-    elif os.path.exists(b_path):
-        s = QSettings(b_path, QSettings.IniFormat)
+    prefer_user = os.path.exists(u_path)
+    if prefer_user:
+        s = QSettings(u_path, QSettings.IniFormat)
+    elif os.path.exists(d_path):
+        s = QSettings(d_path, QSettings.IniFormat)
     else:
         s = None
     if s is None:
@@ -998,14 +957,14 @@ def get_profile_info(name: str, namespace: str | None = None) -> ProfileInfo:
             is_quick_select=False,
             widget_count=0,
             size_kb=0,
-            runtime_path=r_path,
-            baseline_path=b_path,
+            user_path=u_path,
+            default_path=d_path,
             origin=origin,
             is_read_only=read_only,
         )
 
     created = s.value(SETTINGS_KEYS["created_at"], "", type=str) or now_iso_utc()
-    src_path = r_path if prefer_runtime else b_path
+    src_path = u_path if prefer_user else d_path
     modified = _file_modified_iso(src_path)
     count = _manifest_count(s)
     try:
@@ -1031,8 +990,8 @@ def get_profile_info(name: str, namespace: str | None = None) -> ProfileInfo:
         is_quick_select=is_quick_select(name, namespace),
         widget_count=count,
         size_kb=size_kb,
-        runtime_path=r_path,
-        baseline_path=b_path,
+        user_path=u_path,
+        default_path=d_path,
         origin=origin,
         is_read_only=read_only,
     )
@@ -1040,7 +999,7 @@ def get_profile_info(name: str, namespace: str | None = None) -> ProfileInfo:
 
 def load_profile_screenshot(name: str, namespace: str | None = None) -> QPixmap | None:
     """
-    Load the stored screenshot pixmap for a profile from settings (runtime preferred).
+    Load the stored screenshot pixmap for a profile from settings (user preferred).
 
     Args:
         name (str): Profile name without extension.
@@ -1049,17 +1008,17 @@ def load_profile_screenshot(name: str, namespace: str | None = None) -> QPixmap
     Returns:
         QPixmap | None: Screenshot pixmap or ``None`` if unavailable.
     """
-    s = _existing_runtime_settings(name, namespace)
+    s = _existing_user_settings(name, namespace)
     if s is None:
-        s = _existing_baseline_settings(name, namespace)
+        s = _existing_default_settings(name, namespace)
     if s is None:
         return None
     return _load_screenshot_from_settings(s)
 
 
-def load_baseline_profile_screenshot(name: str, namespace: str | None = None) -> QPixmap | None:
+def load_default_profile_screenshot(name: str, namespace: str | None = None) -> QPixmap | None:
     """
-    Load the screenshot from the baseline profile copy, if available.
+    Load the screenshot from the default profile copy, if available.
 
     Args:
         name (str): Profile name without extension.
@@ -1068,15 +1027,15 @@ def load_baseline_profile_screenshot(name: str, namespace: str | None = None) ->
     Returns:
         QPixmap | None: Screenshot pixmap or ``None`` if unavailable.
     """
-    s = _existing_baseline_settings(name, namespace)
+    s = _existing_default_settings(name, namespace)
     if s is None:
         return None
     return _load_screenshot_from_settings(s)
 
 
-def load_runtime_profile_screenshot(name: str, namespace: str | None = None) -> QPixmap | None:
+def load_user_profile_screenshot(name: str, namespace: str | None = None) -> QPixmap | None:
     """
-    Load the screenshot from the runtime profile copy, if available.
+    Load the screenshot from the user profile copy, if available.
 
     Args:
         name (str): Profile name without extension.
@@ -1085,7 +1044,7 @@ def load_runtime_profile_screenshot(name: str, namespace: str | None = None) ->
     Returns:
         QPixmap | None: Screenshot pixmap or ``None`` if unavailable.
     """
-    s = _existing_runtime_settings(name, namespace)
+    s = _existing_user_settings(name, namespace)
     if s is None:
         return None
     return _load_screenshot_from_settings(s)

bec_widgets/widgets/containers/dock_area/settings/dialogs.py

@@ -160,7 +160,7 @@ class SaveProfileDialog(QDialog):
                 self,
                 "Read-only profile",
                 (
-                    f"'{name}' is a baseline profile provided by {provider} and cannot be overwritten.\n"
+                    f"'{name}' is a default profile provided by {provider} and cannot be overwritten.\n"
                     "Please choose a different name."
                 ),
             )
@@ -179,7 +179,7 @@ class SaveProfileDialog(QDialog):
                 "Overwrite profile",
                 (
                     f"A profile named '{name}' already exists.\n\n"
-                    "Overwriting will update both the runtime profile and its restore baseline.\n"
+                    "Overwriting will update both the saved profile and its restore default.\n"
                     "Do you want to continue?"
                 ),
                 QMessageBox.StandardButton.Yes | QMessageBox.StandardButton.No,
@@ -257,24 +257,21 @@ class PreviewPanel(QGroupBox):
 
 class RestoreProfileDialog(QDialog):
     """
-    Confirmation dialog that previews the current runtime screenshot against the baseline.
+    Confirmation dialog that previews the current profile screenshot against the default baseline.
     """
 
     def __init__(
-        self,
-        parent: QWidget | None,
-        current_pixmap: QPixmap | None,
-        baseline_pixmap: QPixmap | None,
+        self, parent: QWidget | None, current_pixmap: QPixmap | None, default_pixmap: QPixmap | None
     ):
         super().__init__(parent)
-        self.setWindowTitle("Restore Profile to Baseline")
+        self.setWindowTitle("Restore Profile to Default")
         self.setModal(True)
         self.resize(880, 480)
 
         layout = QVBoxLayout(self)
 
         info_label = QLabel(
-            "Restoring will discard your runtime layout and replace it with the baseline profile."
+            "Restoring will discard your custom layout and replace it with the default profile."
         )
         info_label.setWordWrap(True)
         layout.addWidget(info_label)
@@ -283,7 +280,7 @@ class RestoreProfileDialog(QDialog):
         layout.addLayout(preview_row)
 
         current_preview = PreviewPanel("Current", current_pixmap, self)
-        baseline_preview = PreviewPanel("Baseline", baseline_pixmap, self)
+        default_preview = PreviewPanel("Default", default_pixmap, self)
 
         # Equal expansion left/right
         preview_row.addWidget(current_preview, 1)
@@ -295,7 +292,7 @@ class RestoreProfileDialog(QDialog):
         arrow_label.setSizePolicy(QSizePolicy.Fixed, QSizePolicy.Expanding)
         preview_row.addWidget(arrow_label)
 
-        preview_row.addWidget(baseline_preview, 1)
+        preview_row.addWidget(default_preview, 1)
 
         # Enforce equal stretch for both previews
         preview_row.setStretch(0, 1)
@@ -303,7 +300,7 @@ class RestoreProfileDialog(QDialog):
         preview_row.setStretch(2, 1)
 
         warn_label = QLabel(
-            "This action cannot be undone. Do you want to restore the baseline layout now?"
+            "This action cannot be undone. Do you want to restore the default layout now?"
         )
         warn_label.setWordWrap(True)
         layout.addWidget(warn_label)
@@ -327,7 +324,7 @@ class RestoreProfileDialog(QDialog):
 
     @staticmethod
     def confirm(
-        parent: QWidget | None, current_pixmap: QPixmap | None, baseline_pixmap: QPixmap | None
+        parent: QWidget | None, current_pixmap: QPixmap | None, default_pixmap: QPixmap | None
     ) -> bool:
-        dialog = RestoreProfileDialog(parent, current_pixmap, baseline_pixmap)
+        dialog = RestoreProfileDialog(parent, current_pixmap, default_pixmap)
         return dialog.exec() == QDialog.Accepted

bec_widgets/widgets/containers/dock_area/settings/workspace_manager.py

@@ -48,7 +48,7 @@ class WorkSpaceManager(BECWidget, QWidget):
     HEADERS = ["Actions", "Profile", "Author"]
 
     def __init__(
-        self, parent=None, target_widget=None, active_profile: str | None = None, **kwargs
+        self, parent=None, target_widget=None, default_profile: str | None = None, **kwargs
     ):
         super().__init__(parent=parent, **kwargs)
         self.target_widget = target_widget
@@ -59,13 +59,13 @@ class WorkSpaceManager(BECWidget, QWidget):
         self._init_ui()
         if self.target_widget is not None and hasattr(self.target_widget, "profile_changed"):
             self.target_widget.profile_changed.connect(self.on_profile_changed)
-        if active_profile is not None:
-            self._select_by_name(active_profile)
-            self._show_profile_details(active_profile)
+        if default_profile is not None:
+            self._select_by_name(default_profile)
+            self._show_profile_details(default_profile)
 
     def _init_ui(self):
         self.root_layout = QHBoxLayout(self)
-        self.splitter = QSplitter(Qt.Orientation.Horizontal, self)
+        self.splitter = QSplitter(Qt.Horizontal, self)
         self.root_layout.addWidget(self.splitter)
 
         # Init components
@@ -89,9 +89,7 @@ class WorkSpaceManager(BECWidget, QWidget):
         left_panel.setMinimumWidth(220)
 
         # Make the screenshot preview expand to fill remaining space
-        self.screenshot_label.setSizePolicy(
-            QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Expanding
-        )
+        self.screenshot_label.setSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding)
 
         self.right_box = QGroupBox("Profile Screenshot Preview", self)
         right_col = QVBoxLayout(self.right_box)
@@ -252,8 +250,8 @@ class WorkSpaceManager(BECWidget, QWidget):
             ("Quick select", "Yes" if info.is_quick_select else "No"),
             ("Widgets", str(info.widget_count)),
             ("Size (KB)", str(info.size_kb)),
-            ("Runtime path", info.runtime_path or ""),
-            ("Baseline path", info.baseline_path or ""),
+            ("User path", info.user_path or ""),
+            ("Default path", info.default_path or ""),
         ]
         for k, v in entries:
             self.profile_details_tree.addTopLevelItem(QTreeWidgetItem([k, v]))

bec_widgets/widgets/containers/dock_area/toolbar_components/workspace_actions.py

@@ -24,9 +24,19 @@ class ProfileComboBox(QComboBox):
     def set_quick_profile_provider(self, provider: Callable[[], list[str]]) -> None:
         self._quick_provider = provider
 
-    def _refresh_profiles(
-        self, current_text: str, active_profile: str | None = None, show_empty_profile: bool = False
+    def refresh_profiles(
+        self, active_profile: str | None = None, show_empty_profile: bool = False
     ) -> None:
+        """
+        Refresh the profile list and ensure the active profile is visible.
+
+        Args:
+            active_profile(str | None): The currently active profile name.
+            show_empty_profile(bool): If True, show an explicit empty unsaved workspace entry.
+        """
+
+        current_text = active_profile or self.currentText()
+        self.blockSignals(True)
         self.clear()
 
         quick_profiles = self._quick_provider()
@@ -93,6 +103,7 @@ class ProfileComboBox(QComboBox):
             if index >= 0:
                 self.setCurrentIndex(index)
 
+        self.blockSignals(False)
         if active_profile and self.currentText() != active_profile:
             idx = self.findText(active_profile)
             if idx >= 0:
@@ -104,24 +115,6 @@ class ProfileComboBox(QComboBox):
         else:
             self.setToolTip("")
 
-    def refresh_profiles(
-        self, active_profile: str | None = None, show_empty_profile: bool = False
-    ) -> None:
-        """
-        Refresh the profile list and ensure the active profile is visible.
-
-        Args:
-            active_profile(str | None): The currently active profile name.
-            show_empty_profile(bool): If True, show an explicit empty unsaved workspace entry.
-        """
-
-        current_text = active_profile or self.currentText()
-        was_blocked = self.blockSignals(True)
-        try:
-            self._refresh_profiles(current_text, active_profile, show_empty_profile)
-        finally:
-            self.blockSignals(was_blocked)
-
 
 def workspace_bundle(components: ToolbarComponents, enable_tools: bool = True) -> ToolbarBundle:
     """
@@ -129,7 +122,6 @@ def workspace_bundle(components: ToolbarComponents, enable_tools: bool = True) -
 
     Args:
         components (ToolbarComponents): The components to be added to the bundle.
-        enable_tools(bool): If True, show the workspace management tools; otherwise, only show the profile combo.
 
     Returns:
         ToolbarBundle: The workspace toolbar bundle.
@@ -151,15 +143,15 @@ def workspace_bundle(components: ToolbarComponents, enable_tools: bool = True) -
     components.get_action("save_workspace").action.setVisible(enable_tools)
 
     components.add_safe(
-        "reset_baseline_workspace",
+        "reset_default_workspace",
         MaterialIconAction(
             icon_name="undo",
-            tooltip="Restore Baseline Profile",
+            tooltip="Refresh Current Workspace",
             checkable=False,
             parent=components.toolbar,
         ),
     )
-    components.get_action("reset_baseline_workspace").action.setVisible(enable_tools)
+    components.get_action("reset_default_workspace").action.setVisible(enable_tools)
 
     components.add_safe(
         "manage_workspaces",
@@ -172,7 +164,7 @@ def workspace_bundle(components: ToolbarComponents, enable_tools: bool = True) -
     bundle = ToolbarBundle("workspace", components)
     bundle.add_action("workspace_combo")
     bundle.add_action("save_workspace")
-    bundle.add_action("reset_baseline_workspace")
+    bundle.add_action("reset_default_workspace")
     bundle.add_action("manage_workspaces")
     return bundle
 
@@ -202,9 +194,9 @@ class WorkspaceConnection(BundleConnection):
             self.target_widget.load_profile
         )
 
-        reset_action = self.components.get_action("reset_baseline_workspace").action
+        reset_action = self.components.get_action("reset_default_workspace").action
         if reset_action.isVisible():
-            reset_action.triggered.connect(self._reset_workspace_to_baseline)
+            reset_action.triggered.connect(self._reset_workspace_to_default)
 
         manage_action = self.components.get_action("manage_workspaces").action
         if manage_action.isVisible():
@@ -221,9 +213,9 @@ class WorkspaceConnection(BundleConnection):
             self.target_widget.load_profile
         )
 
-        reset_action = self.components.get_action("reset_baseline_workspace").action
+        reset_action = self.components.get_action("reset_default_workspace").action
         if reset_action.isVisible():
-            reset_action.triggered.disconnect(self._reset_workspace_to_baseline)
+            reset_action.triggered.disconnect(self._reset_workspace_to_default)
 
         manage_action = self.components.get_action("manage_workspaces").action
         if manage_action.isVisible():
@@ -231,8 +223,8 @@ class WorkspaceConnection(BundleConnection):
         self._connected = False
 
     @SafeSlot()
-    def _reset_workspace_to_baseline(self):
+    def _reset_workspace_to_default(self):
         """
         Refreshes the current workspace.
         """
-        self.target_widget.restore_runtime_profile_from_baseline()
+        self.target_widget.restore_user_profile_from_default()

bec_widgets/widgets/containers/explorer/script_tree_widget.py

@@ -63,7 +63,7 @@ class ScriptTreeWidget(QWidget):
         layout.setSpacing(0)
 
         # Create tree view
-        self.tree = QTreeView(parent=self)
+        self.tree = QTreeView()
         self.tree.setHeaderHidden(True)
         self.tree.setRootIsDecorated(True)
 
@@ -71,12 +71,12 @@ class ScriptTreeWidget(QWidget):
         self.tree.setMouseTracking(True)
 
         # Create file system model
-        self.model = QFileSystemModel(parent=self)
+        self.model = QFileSystemModel()
         self.model.setNameFilters(["*.py"])
         self.model.setNameFilterDisables(False)
 
         # Create proxy model to filter out underscore directories
-        self.proxy_model = QSortFilterProxyModel(parent=self)
+        self.proxy_model = QSortFilterProxyModel()
         self.proxy_model.setFilterRegularExpression(QRegularExpression("^[^_].*"))
         self.proxy_model.setSourceModel(self.model)
         self.tree.setModel(self.proxy_model)

bec_widgets/widgets/containers/layout_manager/layout_manager.py

@@ -22,7 +22,7 @@ from qtpy.QtWidgets import (
 )
 from typeguard import typechecked
 
-from bec_widgets.utils.rpc_widget_handler import widget_handler
+from bec_widgets.cli.rpc.rpc_widget_handler import widget_handler
 
 
 class LayoutManagerWidget(QWidget):

bec_widgets/widgets/containers/main_window/addons/hover_widget.py

@@ -1,83 +1,27 @@
 import sys
 
-from qtpy import QtGui, QtWidgets
 from qtpy.QtCore import QPoint, Qt
-from qtpy.QtWidgets import (
-    QApplication,
-    QFrame,
-    QHBoxLayout,
-    QLabel,
-    QProgressBar,
-    QVBoxLayout,
-    QWidget,
-)
+from qtpy.QtWidgets import QApplication, QHBoxLayout, QLabel, QProgressBar, QVBoxLayout, QWidget
 
 
 class WidgetTooltip(QWidget):
     """Frameless, always-on-top window that behaves like a tooltip."""
 
     def __init__(self, content: QWidget) -> None:
-        super().__init__(
-            None,
-            Qt.WindowType.ToolTip
-            | Qt.WindowType.FramelessWindowHint
-            | Qt.WindowType.WindowStaysOnTopHint,
-        )
-        self.setAttribute(Qt.WidgetAttribute.WA_ShowWithoutActivating)
-        self.setAttribute(Qt.WidgetAttribute.WA_TranslucentBackground)
+        super().__init__(None, Qt.ToolTip | Qt.FramelessWindowHint | Qt.WindowStaysOnTopHint)
+        self.setAttribute(Qt.WA_ShowWithoutActivating)
         self.setMouseTracking(True)
         self.content = content
 
         layout = QVBoxLayout(self)
-        layout.setContentsMargins(14, 14, 14, 14)
-
-        self._card = QFrame(self)
-        self._card.setObjectName("WidgetTooltipCard")
-        card_layout = QVBoxLayout(self._card)
-        card_layout.setContentsMargins(12, 10, 12, 10)
-        card_layout.addWidget(self.content)
-
-        shadow = QtWidgets.QGraphicsDropShadowEffect(self._card)
-        shadow.setBlurRadius(18)
-        shadow.setOffset(0, 2)
-        shadow.setColor(QtGui.QColor(0, 0, 0, 140))
-        self._card.setGraphicsEffect(shadow)
-
-        layout.addWidget(self._card)
-        self.apply_theme()
+        layout.setContentsMargins(6, 6, 6, 6)
+        layout.addWidget(self.content)
         self.adjustSize()
 
     def leaveEvent(self, _event) -> None:
         self.hide()
 
-    def apply_theme(self) -> None:
-        palette = QApplication.palette()
-        base = palette.color(QtGui.QPalette.ColorRole.Base)
-        text = palette.color(QtGui.QPalette.ColorRole.Text)
-        border = palette.color(QtGui.QPalette.ColorRole.Mid)
-        background = QtGui.QColor(base)
-        background.setAlpha(242)
-        self._card.setStyleSheet(f"""
-            QFrame#WidgetTooltipCard {{
-                background: {background.name(QtGui.QColor.NameFormat.HexArgb)};
-                border: 1px solid {border.name()};
-                border-radius: 12px;
-            }}
-            QFrame#WidgetTooltipCard QLabel {{
-                color: {text.name()};
-                background: transparent;
-            }}
-            """)
-
     def show_above(self, global_pos: QPoint, offset: int = 8) -> None:
-        """
-        Show the tooltip above a global position, adjusting to stay within screen bounds.
-
-        Args:
-            global_pos(QPoint): The global position to show above.
-            offset(int, optional): The vertical offset from the global position. Defaults to 8 pixels.
-        """
-        self.apply_theme()
         self.adjustSize()
         screen = QApplication.screenAt(global_pos) or QApplication.primaryScreen()
         screen_geo = screen.availableGeometry()
@@ -86,43 +30,11 @@ class WidgetTooltip(QWidget):
         x = global_pos.x() - geom.width() // 2
         y = global_pos.y() - geom.height() - offset
 
-        self._navigate_screen_coordinates(screen_geo, geom, x, y)
-
-    def show_near(self, global_pos: QPoint, offset: QPoint | None = None) -> None:
-        """
-        Show the tooltip near a global position, adjusting to stay within screen bounds.
-        By default, it will try to show below and to the right of the position,
-        but if that would cause it to go off-screen, it will flip to the other side.
-
-        Args:
-            global_pos(QPoint): The global position to show near.
-            offset(QPoint, optional): The offset from the global position. Defaults to QPoint(12, 16).
-        """
-
-        self.apply_theme()
-        self.adjustSize()
-        offset = offset or QPoint(12, 16)
-        screen = QApplication.screenAt(global_pos) or QApplication.primaryScreen()
-        screen_geo = screen.availableGeometry()
-        geom = self.geometry()
-
-        x = global_pos.x() + offset.x()
-        y = global_pos.y() + offset.y()
-
-        if x + geom.width() > screen_geo.right():
-            x = global_pos.x() - geom.width() - abs(offset.x())
-        if y + geom.height() > screen_geo.bottom():
-            y = global_pos.y() - geom.height() - abs(offset.y())
-
-        self._navigate_screen_coordinates(screen_geo, geom, x, y)
-
-    def _navigate_screen_coordinates(self, screen_geo, geom, x, y):
         x = max(screen_geo.left(), min(x, screen_geo.right() - geom.width()))
         y = max(screen_geo.top(), min(y, screen_geo.bottom() - geom.height()))
 
         self.move(x, y)
         self.show()
-        self.raise_()
 
 
 class HoverWidget(QWidget):

bec_widgets/widgets/containers/main_window/addons/notification_center/notification_banner.py

@@ -28,7 +28,7 @@ from qtpy.QtCore import QObject, QTimer
 from qtpy.QtWidgets import QApplication, QFrame, QMainWindow, QScrollArea, QWidget
 
 from bec_widgets import SafeProperty, SafeSlot
-from bec_widgets.utils.bec_connector import BECConnector
+from bec_widgets.utils import BECConnector
 from bec_widgets.utils.colors import apply_theme
 from bec_widgets.utils.widget_io import WidgetIO
 

bec_widgets/widgets/containers/main_window/main_window.py

@@ -18,10 +18,10 @@ from qtpy.QtWidgets import (
 )
 
 import bec_widgets
+from bec_widgets.utils import UILoader
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import apply_theme
 from bec_widgets.utils.error_popups import SafeSlot
-from bec_widgets.utils.ui_loader import UILoader
 from bec_widgets.widgets.containers.main_window.addons.hover_widget import HoverWidget
 from bec_widgets.widgets.containers.main_window.addons.notification_center.notification_banner import (
     BECNotificationBroker,

bec_widgets/widgets/control/device_control/positioner_box/_base/__init__.py

@@ -0,0 +1,3 @@
+from .positioner_box_base import PositionerBoxBase
+
+__ALL__ = ["PositionerBoxBase"]

bec_widgets/widgets/control/device_control/positioner_box/_base/positioner_box_base.py

@@ -14,10 +14,10 @@ from qtpy.QtWidgets import (
     QLineEdit,
     QPushButton,
     QVBoxLayout,
-    QWidget,
 )
 
 from bec_widgets.utils.bec_widget import BECWidget
+from bec_widgets.utils.compact_popup import CompactPopupWidget
 from bec_widgets.widgets.control.device_control.position_indicator.position_indicator import (
     PositionIndicator,
 )
@@ -43,7 +43,7 @@ class DeviceUpdateUIComponents(TypedDict):
     units: QLabel
 
 
-class PositionerBoxBase(BECWidget, QWidget):
+class PositionerBoxBase(BECWidget, CompactPopupWidget):
     """Contains some core logic for positioner box widgets"""
 
     current_path = ""
@@ -57,10 +57,7 @@ class PositionerBoxBase(BECWidget, QWidget):
             parent: The parent widget.
             device (Positioner): The device to control.
         """
-        super().__init__(parent=parent, **kwargs)
-        self.main_layout = QVBoxLayout(self)
-        self.main_layout.setContentsMargins(0, 0, 0, 0)
-        self.main_layout.setSpacing(0)
+        super().__init__(parent=parent, layout=QVBoxLayout, **kwargs)
         self._dialog = None
         self.get_bec_shortcuts()
 
@@ -176,9 +173,11 @@ class PositionerBoxBase(BECWidget, QWidget):
             if is_moving:
                 spinner.start()
                 spinner.setToolTip("Device is moving")
+                self.set_global_state("warning")
             else:
                 spinner.stop()
                 spinner.setToolTip("Device is idle")
+                self.set_global_state("success")
         else:
             spinner.setVisible(False)
 
@@ -197,8 +196,9 @@ class PositionerBoxBase(BECWidget, QWidget):
             pos = (readback_val - limits[0]) / (limits[1] - limits[0])
             position_indicator.set_value(pos)
 
-    @staticmethod
-    def _update_limits_ui(limits: tuple[float, float], position_indicator, setpoint_validator):
+    def _update_limits_ui(
+        self, limits: tuple[float, float], position_indicator, setpoint_validator
+    ):
         if limits is not None and limits[0] != limits[1]:
             position_indicator.setToolTip(f"Min: {limits[0]}, Max: {limits[1]}")
             setpoint_validator.setRange(limits[0], limits[1])
@@ -223,9 +223,8 @@ class PositionerBoxBase(BECWidget, QWidget):
         self.bec_dispatcher.disconnect_slot(slot, MessageEndpoints.device_readback(old_device))
         self.bec_dispatcher.connect_slot(slot, MessageEndpoints.device_readback(new_device))
 
-    @staticmethod
-    def _toggle_enable_buttons(ui: DeviceUpdateUIComponents, enable: bool) -> None:
-        """Toggle enable/disable on available buttons
+    def _toggle_enable_buttons(self, ui: DeviceUpdateUIComponents, enable: bool) -> None:
+        """Toogle enable/disable on available buttons
 
         Args:
             enable (bool): Enable buttons

bec_widgets/widgets/control/device_control/positioner_box/positioner_box/positioner_box.py

@@ -11,12 +11,12 @@ from qtpy.QtCore import Qt, Signal
 from qtpy.QtGui import QDoubleValidator
 from qtpy.QtWidgets import QDoubleSpinBox
 
+from bec_widgets.utils import UILoader
 from bec_widgets.utils.colors import apply_theme, get_accent_colors
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
-from bec_widgets.utils.ui_loader import UILoader
-from bec_widgets.widgets.control.device_control.positioner_box.positioner_box_base import (
+from bec_widgets.widgets.control.device_control.positioner_box._base import PositionerBoxBase
+from bec_widgets.widgets.control.device_control.positioner_box._base.positioner_box_base import (
     DeviceUpdateUIComponents,
-    PositionerBoxBase,
 )
 
 logger = bec_logger.logger
@@ -63,10 +63,10 @@ class PositionerBox(PositionerBoxBase):
 
         self.ui = UILoader(self).loader(os.path.join(self.current_path, self.ui_file))
 
-        self.main_layout.addWidget(self.ui)
-        self.main_layout.setSpacing(0)
-        self.main_layout.setContentsMargins(0, 0, 0, 0)
-        self.main_layout.setAlignment(Qt.AlignmentFlag.AlignVCenter | Qt.AlignmentFlag.AlignHCenter)
+        self.addWidget(self.ui)
+        self.layout.setSpacing(0)
+        self.layout.setContentsMargins(0, 0, 0, 0)
+        self.layout.setAlignment(Qt.AlignmentFlag.AlignVCenter | Qt.AlignmentFlag.AlignHCenter)
         ui_min_size = self.ui.minimumSize()
         ui_min_hint = self.ui.minimumSizeHint()
         self.setMinimumSize(
@@ -115,6 +115,8 @@ class PositionerBox(PositionerBoxBase):
             return
         old_device = self._device
         self._device = value
+        if not self.label:
+            self.label = value
         self.device_changed.emit(old_device, value)
 
     @SafeProperty(bool)

bec_widgets/widgets/control/device_control/positioner_box/positioner_box_2d/positioner_box_2d.py

@@ -12,12 +12,12 @@ from qtpy.QtCore import Signal
 from qtpy.QtGui import QDoubleValidator
 from qtpy.QtWidgets import QDoubleSpinBox
 
+from bec_widgets.utils import UILoader
 from bec_widgets.utils.colors import apply_theme
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
-from bec_widgets.utils.ui_loader import UILoader
-from bec_widgets.widgets.control.device_control.positioner_box.positioner_box_base import (
+from bec_widgets.widgets.control.device_control.positioner_box._base import PositionerBoxBase
+from bec_widgets.widgets.control.device_control.positioner_box._base.positioner_box_base import (
     DeviceUpdateUIComponents,
-    PositionerBoxBase,
 )
 
 logger = bec_logger.logger
@@ -96,9 +96,9 @@ class PositionerBox2D(PositionerBoxBase):
 
     def connect_ui(self):
         """Connect the UI components to signals, data, or routines"""
-        self.main_layout.addWidget(self.ui)
-        self.main_layout.setSpacing(0)
-        self.main_layout.setContentsMargins(0, 0, 0, 0)
+        self.addWidget(self.ui)
+        self.layout.setSpacing(0)
+        self.layout.setContentsMargins(0, 0, 0, 0)
 
         def _init_ui(val: QDoubleValidator, device_id: DeviceId):
             ui = self._device_ui_components_hv(device_id)
@@ -200,6 +200,7 @@ class PositionerBox2D(PositionerBoxBase):
             return
         old_device = self._device_hor
         self._device_hor = value
+        self.label = f"{self._device_hor}, {self._device_ver}"
         self.device_changed_hor.emit(old_device, value)
         self._init_device(self.device_hor, self.position_update_hor.emit, self.update_limits_hor)
 
@@ -219,6 +220,7 @@ class PositionerBox2D(PositionerBoxBase):
             return
         old_device = self._device_ver
         self._device_ver = value
+        self.label = f"{self._device_hor}, {self._device_ver}"
         self.device_changed_ver.emit(old_device, value)
         self._init_device(self.device_ver, self.position_update_ver.emit, self.update_limits_ver)
 

bec_widgets/widgets/control/device_control/positioner_box/positioner_control_line/positioner_control_line.py

@@ -1,8 +1,6 @@
 import os
 
 from bec_lib.device import Positioner
-from qtpy.QtCore import Qt
-from qtpy.QtWidgets import QSizePolicy
 
 from bec_widgets.widgets.control.device_control.positioner_box import PositionerBox
 
@@ -24,82 +22,7 @@ class PositionerControlLine(PositionerBox):
             device (Positioner): The device to control.
         """
         self.current_path = os.path.dirname(__file__)
-        self._indicator_switch_width = 0
-        self._horizontal_indicator_width = 0
-        self._vertical_indicator_width = 15
-        self._indicator_thickness = 10
-        self._indicator_is_horizontal = False
-        self._line_height = self.dimensions[0]
         super().__init__(parent=parent, device=device, *args, **kwargs)
-        self._configure_line_layout()
-        self._update_indicator_orientation()
-
-    def _configure_line_layout(self):
-        device_box = self.ui.device_box
-        indicator = self.ui.position_indicator
-
-        self.main_layout.setAlignment(Qt.AlignmentFlag(0))
-        self.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
-        self.ui.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
-        device_box.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Fixed)
-
-        self._line_height = max(
-            self.dimensions[0],
-            self.ui.minimumSizeHint().height(),
-            self.ui.sizeHint().height(),
-            device_box.minimumSizeHint().height(),
-            device_box.sizeHint().height(),
-        )
-        device_box.setFixedHeight(self._line_height)
-        device_box.setMinimumWidth(self.dimensions[1])
-        device_box.setMaximumWidth(16777215)
-        self.setFixedHeight(self._line_height)
-        self.setMinimumWidth(self.dimensions[1])
-
-        self.ui.verticalLayout.setContentsMargins(0, 0, 0, 0)
-        self.ui.verticalLayout.setSpacing(0)
-        self.ui.readback.setMaximumWidth(16777215)
-        self.ui.setpoint.setMaximumWidth(16777215)
-        self.ui.step_size.setMaximumWidth(16777215)
-
-        indicator_hint = indicator.minimumSizeHint()
-        step_hint = self.ui.step_size.sizeHint()
-        self._indicator_thickness = max(indicator_hint.height(), 10)
-        self._vertical_indicator_width = max(indicator.minimumWidth(), 15)
-        self._horizontal_indicator_width = max(90, step_hint.width())
-        base_width = max(device_box.minimumSizeHint().width(), self.dimensions[1])
-        self._indicator_switch_width = (
-            base_width - self._vertical_indicator_width + self._horizontal_indicator_width
-        )
-
-    def resizeEvent(self, event):
-        super().resizeEvent(event)
-        self._update_indicator_orientation()
-
-    def _update_indicator_orientation(self):
-        if not hasattr(self, "ui"):
-            return
-
-        indicator = self.ui.position_indicator
-        available_width = self.ui.device_box.width() or self.width() or self.dimensions[1]
-        should_use_horizontal = available_width >= self._indicator_switch_width
-        if should_use_horizontal == self._indicator_is_horizontal:
-            return
-
-        self._indicator_is_horizontal = should_use_horizontal
-        indicator.vertical = not should_use_horizontal
-
-        if should_use_horizontal:
-            indicator.setMinimumSize(self._horizontal_indicator_width, self._indicator_thickness)
-            indicator.setMaximumHeight(self._indicator_thickness)
-            indicator.setMaximumWidth(16777215)
-            indicator.setSizePolicy(QSizePolicy.Policy.MinimumExpanding, QSizePolicy.Policy.Fixed)
-        else:
-            indicator.setMinimumSize(self._vertical_indicator_width, self._indicator_thickness)
-            indicator.setMaximumSize(self._vertical_indicator_width, 16777215)
-            indicator.setSizePolicy(QSizePolicy.Policy.Fixed, QSizePolicy.Policy.Preferred)
-
-        indicator.updateGeometry()
 
 
 if __name__ == "__main__":  # pragma: no cover

bec_widgets/widgets/control/device_control/positioner_box/positioner_control_line/positioner_control_line.ui

@@ -2,18 +2,12 @@
 <ui version="4.0">
  <class>Form</class>
  <widget class="QWidget" name="Form">
-  <property name="sizePolicy">
-   <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-    <horstretch>0</horstretch>
-    <verstretch>0</verstretch>
-   </sizepolicy>
-  </property>
   <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>592</width>
-    <height>76</height>
+    <width>612</width>
+    <height>91</height>
    </rect>
   </property>
   <property name="minimumSize">
@@ -32,29 +26,8 @@
    <string>Form</string>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout">
-   <property name="spacing">
-    <number>0</number>
-   </property>
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
    <item>
     <widget class="QGroupBox" name="device_box">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
      <property name="title">
       <string>Device Name</string>
      </property>
@@ -254,12 +227,12 @@
  <customwidgets>
   <customwidget>
    <class>PositionIndicator</class>
-   <extends></extends>
+   <extends>QWidget</extends>
    <header>position_indicator</header>
   </customwidget>
   <customwidget>
    <class>SpinnerWidget</class>
-   <extends></extends>
+   <extends>QWidget</extends>
    <header>spinner_widget</header>
   </customwidget>
  </customwidgets>

bec_widgets/widgets/control/device_control/positioner_group/positioner_group.py

@@ -27,13 +27,30 @@ class PositionerGroupBox(QGroupBox):
         self.layout().setContentsMargins(0, 0, 0, 0)
         self.layout().setSpacing(0)
         self.widget = PositionerBox(self, dev_name)
+        self.widget.compact_view = True
+        self.widget.expand_popup = False
         self.layout().addWidget(self.widget)
         self.widget.position_update.connect(self._on_position_update)
+        self.widget.expand.connect(self._on_expand)
         self.setTitle(self.device_name)
         self.widget.force_update_readback()
 
+    def _on_expand(self, expand):
+        if expand:
+            self.setTitle("")
+            self.setFlat(True)
+        else:
+            self.setTitle(self.device_name)
+            self.setFlat(False)
+
     def _on_position_update(self, pos: float):
         self.position_update.emit(pos)
+        precision = getattr(self.widget.dev[self.widget.device], "precision", 8)
+        try:
+            precision = int(precision)
+        except (TypeError, ValueError):
+            precision = int(8)
+        self.widget.label = f"{pos:.{precision}f}"
 
     def close(self):
         self.widget.close()

bec_widgets/widgets/control/device_input/base_classes/device_input_base.py

@@ -7,7 +7,7 @@ from bec_lib.device import Signal as BECSignal
 from bec_lib.logger import bec_logger
 from pydantic import field_validator
 
-from bec_widgets.utils.bec_connector import ConnectionConfig
+from bec_widgets.utils import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.utils.filter_io import FilterIO

bec_widgets/widgets/control/device_input/base_classes/device_signal_input_base.py

@@ -3,7 +3,7 @@ from bec_lib.device import Signal
 from bec_lib.logger import bec_logger
 from qtpy.QtCore import Property
 
-from bec_widgets.utils.bec_connector import ConnectionConfig
+from bec_widgets.utils import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.filter_io import FilterIO

bec_widgets/widgets/control/device_manager/components/available_device_resources/available_device_group_ui.py

@@ -13,7 +13,7 @@ if TYPE_CHECKING:
     from .available_device_group import AvailableDeviceGroup
 
 
-class _DeviceListWidget(QListWidget):
+class _DeviceListWiget(QListWidget):
 
     def _item_iter(self):
         return (self.item(i) for i in range(self.count()))
@@ -44,7 +44,7 @@ class Ui_AvailableDeviceGroup(object):
         self.n_included.setObjectName("n_included")
         title_layout.addWidget(self.n_included)
 
-        self.device_list = _DeviceListWidget(AvailableDeviceGroup)
+        self.device_list = _DeviceListWiget(AvailableDeviceGroup)
         self.device_list.setSelectionMode(QListWidget.SelectionMode.ExtendedSelection)
         self.device_list.setObjectName("device_list")
         self.device_list.setFrameStyle(0)

bec_widgets/widgets/control/device_manager/components/available_device_resources/device_resource_backend.py

@@ -34,13 +34,13 @@ class HashModel(str, Enum):
 class DeviceResourceBackend(Protocol):
     @property
     def tag_groups(self) -> dict[str, set[HashableDevice]]:
-        """A dictionary of all available devices separated by tag groups. The same device may
+        """A dictionary of all availble devices separated by tag groups. The same device may
         appear more than once (in different groups)."""
         ...
 
     @property
     def all_devices(self) -> set[HashableDevice]:
-        """A set of all available devices. The same device may not appear more than once."""
+        """A set of all availble devices. The same device may not appear more than once."""
         ...
 
     @property

bec_widgets/widgets/control/device_manager/components/device_table/device_table.py

@@ -5,8 +5,9 @@ in DeviceTableRow entries.
 
 from __future__ import annotations
 
+import traceback
 from copy import deepcopy
-from typing import TYPE_CHECKING, Any, Callable, Iterable, Tuple
+from typing import TYPE_CHECKING, Any, Callable, Iterable, Literal, Tuple
 
 from bec_lib.atlas_models import Device as DeviceModel
 from bec_lib.callback_handler import EventType
@@ -18,7 +19,6 @@ from thefuzz import fuzz
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import get_accent_colors
 from bec_widgets.utils.error_popups import SafeSlot
-from bec_widgets.utils.fuzzy_search import is_match
 from bec_widgets.widgets.control.device_manager.components.device_table.device_table_row import (
     DeviceTableRow,
 )
@@ -37,6 +37,34 @@ _DeviceCfgIter = Iterable[dict[str, Any]]
 # DeviceValidationResult: device_config, config_status, connection_status, error_message
 _ValidationResultIter = Iterable[Tuple[dict[str, Any], ConfigStatus, ConnectionStatus, str]]
 
+FUZZY_SEARCH_THRESHOLD = 80
+
+
+def is_match(
+    text: str, row_data: dict[str, Any], relevant_keys: list[str], enable_fuzzy: bool
+) -> bool:
+    """
+    Check if the text matches any of the relevant keys in the row data.
+
+    Args:
+        text (str): The text to search for.
+        row_data (dict[str, Any]): The row data to search in.
+        relevant_keys (list[str]): The keys to consider for searching.
+        enable_fuzzy (bool): Whether to use fuzzy matching.
+    Returns:
+        bool: True if a match is found, False otherwise.
+    """
+    for key in relevant_keys:
+        data = str(row_data.get(key, "") or "")
+        if enable_fuzzy:
+            match_ratio = fuzz.partial_ratio(text.lower(), data.lower())
+            if match_ratio >= FUZZY_SEARCH_THRESHOLD:
+                return True
+        else:
+            if text.lower() in data.lower():
+                return True
+    return False
+
 
 class TableSortOnHold:
     """Context manager for putting table sorting on hold. Works with nested calls."""

bec_widgets/widgets/control/scan_control/scan_control.py

@@ -19,7 +19,7 @@ from qtpy.QtWidgets import (
     QWidget,
 )
 
-from bec_widgets.utils.bec_connector import ConnectionConfig
+from bec_widgets.utils import ConnectionConfig
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import apply_theme, get_accent_colors
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot

bec_widgets/widgets/control/scan_control/scan_group_box.py

@@ -347,14 +347,14 @@ class ScanGroupBox(QGroupBox):
 
     def get_parameters(self, device_object: bool = True):
         """
-        Returns the parameters from the widgets in the scan control layout formatted to run scan from BEC.
+        Returns the parameters from the widgets in the scan control layout formated to run scan from BEC.
         """
         if self.box_type == "args":
-            return self._get_arg_parameters(device_object=device_object)
+            return self._get_arg_parameterts(device_object=device_object)
         elif self.box_type == "kwargs":
             return self._get_kwarg_parameters(device_object=device_object)
 
-    def _get_arg_parameters(self, device_object: bool = True):
+    def _get_arg_parameterts(self, device_object: bool = True):
         args = []
         for i in range(1, self.layout.rowCount()):
             for j in range(self.layout.columnCount()):

bec_widgets/widgets/dap/dap_combo_box/dap_combo_box.py

@@ -2,19 +2,22 @@
 
 from bec_lib.logger import bec_logger
 from qtpy.QtCore import Property, Signal, Slot
-from qtpy.QtWidgets import QComboBox
+from qtpy.QtWidgets import QComboBox, QVBoxLayout, QWidget
 
 from bec_widgets.utils.bec_widget import BECWidget
 
 logger = bec_logger.logger
 
 
-class DapComboBox(BECWidget, QComboBox):
+class DapComboBox(BECWidget, QWidget):
     """
-    Editable combobox listing the available DAP models.
+    The DAPComboBox widget is an extension to the QComboBox with all avaialble DAP model from BEC.
 
-    The widget behaves as a plain QComboBox and keeps ``fit_model_combobox`` as an alias to itself
-    for backwards compatibility with older call sites.
+    Args:
+        parent: Parent widget.
+        client: BEC client object.
+        gui_id: GUI ID.
+        default: Default device name.
     """
 
     ICON_NAME = "data_exploration"
@@ -42,20 +45,19 @@ class DapComboBox(BECWidget, QComboBox):
         **kwargs,
     ):
         super().__init__(parent=parent, client=client, gui_id=gui_id, **kwargs)
-        self.fit_model_combobox = self  # Just for backwards compatibility with older call sites, the widget itself is the combobox
-        self._available_models: list[str] = []
+        self.layout = QVBoxLayout(self)
+        self.fit_model_combobox = QComboBox(self)
+        self.layout.addWidget(self.fit_model_combobox)
+        self.layout.setContentsMargins(0, 0, 0, 0)
+        self._available_models = None
         self._x_axis = None
         self._y_axis = None
-        self._is_valid_input = False
-
-        self.setEditable(True)
-
         self.populate_fit_model_combobox()
-        self.currentTextChanged.connect(self._on_text_changed)
+        self.fit_model_combobox.currentTextChanged.connect(self._update_current_fit)
+        # Set default fit model
         self.select_default_fit(default_fit)
-        self.check_validity(self.currentText())
 
-    def select_default_fit(self, default_fit: str | None = "GaussianModel"):
+    def select_default_fit(self, default_fit: str | None):
         """Set the default fit model.
 
         Args:
@@ -63,8 +65,8 @@ class DapComboBox(BECWidget, QComboBox):
         """
         if self._validate_dap_model(default_fit):
             self.select_fit_model(default_fit)
-        elif self.available_models:
-            self.select_fit_model(self.available_models[0])
+        else:
+            self.select_fit_model("GaussianModel")
 
     @property
     def available_models(self):
@@ -112,40 +114,12 @@ class DapComboBox(BECWidget, QComboBox):
         self._y_axis = y_axis
         self.y_axis_updated.emit(y_axis)
 
-    @Slot(str)
-    def _on_text_changed(self, fit_name: str):
-        """
-        Validate and emit updates for the current text.
-
-        Args:
-            fit_name(str): The current text in the combobox, representing the selected fit model.
-        """
-        self.check_validity(fit_name)
-        if not self._is_valid_input:
-            return
-
+    def _update_current_fit(self, fit_name: str):
+        """Update the current fit."""
         self.fit_model_updated.emit(fit_name)
         if self.x_axis is not None and self.y_axis is not None:
             self.new_dap_config.emit(self._x_axis, self._y_axis, fit_name)
 
-    @Slot(str)
-    def check_validity(self, fit_name: str):
-        """
-        Highlight invalid manual entries similarly to DeviceComboBox.
-
-        Args:
-            fit_name(str): The current text in the combobox, representing the selected fit model.
-        """
-        if self._validate_dap_model(fit_name):
-            self._is_valid_input = True
-            self.setStyleSheet("border: 1px solid transparent;")
-        else:
-            self._is_valid_input = False
-            if self.isEnabled():
-                self.setStyleSheet("border: 1px solid red;")
-            else:
-                self.setStyleSheet("border: 1px solid transparent;")
-
     @Slot(str)
     def select_x_axis(self, x_axis: str):
         """Slot to update the x axis.
@@ -154,7 +128,7 @@ class DapComboBox(BECWidget, QComboBox):
             x_axis(str): X axis.
         """
         self.x_axis = x_axis
-        self._on_text_changed(self.currentText())
+        self._update_current_fit(self.fit_model_combobox.currentText())
 
     @Slot(str)
     def select_y_axis(self, y_axis: str):
@@ -164,26 +138,25 @@ class DapComboBox(BECWidget, QComboBox):
             y_axis(str): Y axis.
         """
         self.y_axis = y_axis
-        self._on_text_changed(self.currentText())
+        self._update_current_fit(self.fit_model_combobox.currentText())
 
     @Slot(str)
     def select_fit_model(self, fit_name: str | None):
         """Slot to update the fit model.
 
         Args:
-            fit_name(str): Fit model name.
+            default_device(str): Default device name.
         """
         if not self._validate_dap_model(fit_name):
             raise ValueError(f"Fit {fit_name} is not valid.")
-        self.setCurrentText(fit_name)
+        self.fit_model_combobox.setCurrentText(fit_name)
 
     def populate_fit_model_combobox(self):
         """Populate the fit_model_combobox with the devices."""
         # pylint: disable=protected-access
-        available_plugins = getattr(getattr(self.client, "dap", None), "_available_dap_plugins", {})
-        self.available_models = [model for model in available_plugins.keys()]
-        self.clear()
-        self.addItems(self.available_models)
+        self.available_models = [model for model in self.client.dap._available_dap_plugins.keys()]
+        self.fit_model_combobox.clear()
+        self.fit_model_combobox.addItems(self.available_models)
 
     def _validate_dap_model(self, model: str | None) -> bool:
         """Validate the DAP model.
@@ -193,23 +166,23 @@ class DapComboBox(BECWidget, QComboBox):
         """
         if model is None:
             return False
-        return model in self.available_models
-
-    @property
-    def is_valid_input(self) -> bool:
-        """Whether the current text matches an available DAP model."""
-        return self._is_valid_input
+        if model not in self.available_models:
+            return False
+        return True
 
 
 if __name__ == "__main__":  # pragma: no cover
-    import sys
-
+    # pylint: disable=import-outside-toplevel
     from qtpy.QtWidgets import QApplication
 
     from bec_widgets.utils.colors import apply_theme
 
-    app = QApplication(sys.argv)
+    app = QApplication([])
     apply_theme("dark")
-    dialog = DapComboBox()
-    dialog.show()
-    sys.exit(app.exec_())
+    widget = QWidget()
+    widget.setFixedSize(200, 200)
+    layout = QVBoxLayout()
+    widget.setLayout(layout)
+    layout.addWidget(DapComboBox())
+    widget.show()
+    app.exec_()

bec_widgets/widgets/dap/lmfit_dialog/lmfit_dialog.py

@@ -1,14 +1,13 @@
 import os
 
-import shiboken6
 from bec_lib.logger import bec_logger
 from qtpy.QtCore import Signal
-from qtpy.QtWidgets import QPushButton, QSizePolicy, QTreeWidgetItem, QVBoxLayout, QWidget
+from qtpy.QtWidgets import QPushButton, QTreeWidgetItem, QVBoxLayout, QWidget
 
+from bec_widgets.utils import UILoader
 from bec_widgets.utils.bec_widget import BECWidget
 from bec_widgets.utils.colors import get_accent_colors
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
-from bec_widgets.utils.ui_loader import UILoader
 
 logger = bec_logger.logger
 
@@ -35,7 +34,7 @@ class LMFitDialog(BECWidget, QWidget):
         **kwargs,
     ):
         """
-        Initializes the LMFitDialog widget.
+        Initialises the LMFitDialog widget.
 
         Args:
             parent (QWidget): The parent widget.
@@ -69,27 +68,6 @@ class LMFitDialog(BECWidget, QWidget):
         self._hide_curve_selection = False
         self._hide_summary = False
         self._hide_parameters = False
-        self._configure_embedded_size_policy()
-
-    def _configure_embedded_size_policy(self):
-        """Allow the compact dialog to shrink more gracefully in embedded layouts."""
-        if self._ui_file != "lmfit_dialog_compact.ui":
-            return
-
-        self.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Preferred)
-        self.ui.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Preferred)
-
-        for group in (
-            self.ui.group_curve_selection,
-            self.ui.group_summary,
-            self.ui.group_parameters,
-        ):
-            group.setMinimumHeight(0)
-            group.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Preferred)
-
-        for view in (self.ui.curve_list, self.ui.summary_tree, self.ui.param_tree):
-            view.setMinimumHeight(0)
-            view.setSizePolicy(QSizePolicy.Policy.Expanding, QSizePolicy.Policy.Ignored)
 
     @property
     def enable_actions(self) -> bool:
@@ -99,14 +77,8 @@ class LMFitDialog(BECWidget, QWidget):
     @enable_actions.setter
     def enable_actions(self, enable: bool):
         self._enable_actions = enable
-        valid_buttons = {}
-        for name, button in self.action_buttons.items():
-            # just to be sure we have a valid c++ object
-            if button is None or not shiboken6.isValid(button):
-                continue
+        for button in self.action_buttons.values():
             button.setEnabled(enable)
-            valid_buttons[name] = button
-        self.action_buttons = valid_buttons
 
     @SafeProperty(list)
     def active_action_list(self) -> list[str]:
@@ -117,6 +89,16 @@ class LMFitDialog(BECWidget, QWidget):
     def active_action_list(self, actions: list[str]):
         self._active_actions = actions
 
+    # This SafeSlot needed?
+    @SafeSlot(bool)
+    def set_actions_enabled(self, enable: bool) -> bool:
+        """SafeSlot to enable the move to buttons.
+
+        Args:
+            enable (bool): Whether to enable the action buttons.
+        """
+        self.enable_actions = enable
+
     @SafeProperty(bool)
     def always_show_latest(self):
         """SafeProperty to indicate if always the latest DAP update is displayed."""
@@ -172,21 +154,19 @@ class LMFitDialog(BECWidget, QWidget):
         self.ui.group_parameters.setVisible(not show)
 
     @property
-    def fit_curve_id(self) -> str | None:
+    def fit_curve_id(self) -> str:
         """SafeProperty for the currently displayed fit curve_id."""
         return self._fit_curve_id
 
     @fit_curve_id.setter
-    def fit_curve_id(self, curve_id: str | None):
+    def fit_curve_id(self, curve_id: str):
         """Setter for the currently displayed fit curve_id.
 
         Args:
-            curve_id (str | None): The curve_id of the fit curve to be displayed,
-                or None to clear the selection.
+            fit_curve_id (str): The curve_id of the fit curve to be displayed.
         """
         self._fit_curve_id = curve_id
-        if curve_id is not None:
-            self.selected_fit.emit(curve_id)
+        self.selected_fit.emit(curve_id)
 
     @SafeSlot(str)
     def remove_dap_data(self, curve_id: str):
@@ -196,15 +176,6 @@ class LMFitDialog(BECWidget, QWidget):
             curve_id (str): The curve_id of the DAP data to be removed.
         """
         self.summary_data.pop(curve_id, None)
-        if self.fit_curve_id == curve_id:
-            self.action_buttons = {}
-            self.ui.summary_tree.clear()
-            self.ui.param_tree.clear()
-            remaining = list(self.summary_data.keys())
-            if remaining:
-                self.fit_curve_id = remaining[0]
-            else:
-                self._fit_curve_id = None
         self.refresh_curve_list()
 
     @SafeSlot(str)
@@ -280,7 +251,6 @@ class LMFitDialog(BECWidget, QWidget):
             params (list): List of LMFit parameters for the fit curve.
         """
         self._move_buttons = []
-        self.action_buttons = {}
         self.ui.param_tree.clear()
         for param in params:
             param_name = param[0]
@@ -299,9 +269,9 @@ class LMFitDialog(BECWidget, QWidget):
             if param_name in self.active_action_list:  # pylint: disable=unsupported-membership-test
                 # Create a push button to move the motor to a specific position
                 widget = QWidget()
-                button = QPushButton("Move")
+                button = QPushButton(f"Move to {param_name}")
                 button.clicked.connect(self._create_move_action(param_name, param[1]))
-                if self.enable_actions:
+                if self.enable_actions is True:
                     button.setEnabled(True)
                 else:
                     button.setEnabled(False)

bec_widgets/widgets/dap/lmfit_dialog/lmfit_dialog_compact.ui

@@ -14,18 +14,6 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <property name="leftMargin">
-    <number>0</number>
-   </property>
-   <property name="topMargin">
-    <number>0</number>
-   </property>
-   <property name="rightMargin">
-    <number>0</number>
-   </property>
-   <property name="bottomMargin">
-    <number>0</number>
-   </property>
    <item row="0" column="0">
     <widget class="QSplitter" name="splitter_2">
      <property name="sizePolicy">
@@ -34,6 +22,15 @@
        <verstretch>0</verstretch>
       </sizepolicy>
      </property>
+     <property name="frameShape">
+      <enum>QFrame::Shape::VLine</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Shadow::Plain</enum>
+     </property>
+     <property name="lineWidth">
+      <number>1</number>
+     </property>
      <property name="orientation">
       <enum>Qt::Orientation::Horizontal</enum>
      </property>
@@ -44,12 +41,6 @@
       <bool>true</bool>
      </property>
      <widget class="QGroupBox" name="group_curve_selection">
-      <property name="minimumSize">
-       <size>
-        <width>120</width>
-        <height>0</height>
-       </size>
-      </property>
       <property name="title">
        <string>Select Curve</string>
       </property>
@@ -67,36 +58,18 @@
        </sizepolicy>
       </property>
       <property name="orientation">
-       <enum>Qt::Orientation::Horizontal</enum>
+       <enum>Qt::Orientation::Vertical</enum>
       </property>
       <widget class="QGroupBox" name="group_summary">
-       <property name="minimumSize">
-        <size>
-         <width>180</width>
-         <height>0</height>
-        </size>
-       </property>
        <property name="title">
         <string>Fit Summary</string>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_2">
         <item>
          <widget class="QTreeWidget" name="summary_tree">
-          <property name="alternatingRowColors">
-           <bool>true</bool>
-          </property>
-             <property name="indentation">
-                 <number>0</number>
-             </property>
-             <property name="rootIsDecorated">
-                 <bool>false</bool>
-             </property>
           <property name="uniformRowHeights">
            <bool>false</bool>
           </property>
-          <attribute name="headerDefaultSectionSize">
-           <number>90</number>
-          </attribute>
           <column>
            <property name="text">
             <string>Property</string>
@@ -112,33 +85,12 @@
        </layout>
       </widget>
       <widget class="QGroupBox" name="group_parameters">
-       <property name="minimumSize">
-        <size>
-         <width>240</width>
-         <height>0</height>
-        </size>
-       </property>
        <property name="title">
         <string>Parameter Details</string>
        </property>
        <layout class="QVBoxLayout" name="verticalLayout_3">
         <item>
          <widget class="QTreeWidget" name="param_tree">
-          <property name="alternatingRowColors">
-           <bool>true</bool>
-          </property>
-             <property name="indentation">
-                 <number>0</number>
-             </property>
-             <property name="rootIsDecorated">
-                 <bool>false</bool>
-          </property>
-          <property name="columnCount">
-           <number>4</number>
-          </property>
-          <attribute name="headerDefaultSectionSize">
-           <number>80</number>
-          </attribute>
           <column>
            <property name="text">
             <string>Parameter</string>
@@ -154,11 +106,6 @@
             <string>Std</string>
            </property>
           </column>
-          <column>
-           <property name="text">
-            <string>Action</string>
-           </property>
-          </column>
          </widget>
         </item>
        </layout>

bec_widgets/widgets/dap/lmfit_dialog/lmfit_dialog_vertical.ui

@@ -95,12 +95,6 @@
           <height>0</height>
          </size>
         </property>
-           <property name="indentation">
-               <number>0</number>
-           </property>
-           <property name="rootIsDecorated">
-               <bool>false</bool>
-           </property>
         <property name="uniformRowHeights">
          <bool>false</bool>
         </property>
@@ -153,12 +147,6 @@
           <width>0</width>
           <height>0</height>
          </size>
-        </property>
-           <property name="indentation">
-               <number>0</number>
-           </property>
-           <property name="rootIsDecorated">
-               <bool>false</bool>
         </property>
         <property name="columnCount">
          <number>4</number>

bec_widgets/widgets/editors/bec_console/bec_console.py

@@ -1,605 +0,0 @@
-from __future__ import annotations
-
-import enum
-from dataclasses import dataclass, field
-from uuid import uuid4
-from weakref import WeakValueDictionary
-
-import shiboken6
-from bec_lib.logger import bec_logger
-from qtpy.QtCore import Qt, Signal
-from qtpy.QtGui import QMouseEvent
-from qtpy.QtWidgets import (
-    QApplication,
-    QHBoxLayout,
-    QLabel,
-    QStackedLayout,
-    QTabWidget,
-    QVBoxLayout,
-    QWidget,
-)
-
-from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.widgets.utility.bec_term.protocol import BecTerminal
-from bec_widgets.widgets.utility.bec_term.util import get_current_bec_term_class
-
-logger = bec_logger.logger
-
-_BecTermClass = get_current_bec_term_class()
-
-# Note on definitions:
-# Terminal: an instance of a terminal widget with a system shell
-# Console: one of possibly several widgets which may share ownership of one single terminal
-# Shell: a Console set to start the BEC IPython client in its terminal
-
-
-class ConsoleMode(str, enum.Enum):
-    ACTIVE = "active"
-    INACTIVE = "inactive"
-    HIDDEN = "hidden"
-
-
-@dataclass
-class _TerminalOwnerInfo:
-    """Should be managed only by the BecConsoleRegistry. Consoles should ask the registry for
-    necessary ownership info."""
-
-    owner_console_id: str | None = None
-    registered_console_ids: set[str] = field(default_factory=set)
-    instance: BecTerminal | None = None
-    terminal_id: str = ""
-    initialized: bool = False
-    persist_session: bool = False
-    fallback_holder: QWidget | None = None
-
-
-class BecConsoleRegistry:
-    """
-    A registry for the BecConsole class to manage its instances.
-    """
-
-    def __init__(self):
-        """
-        Initialize the registry.
-        """
-        self._consoles: WeakValueDictionary[str, BecConsole] = WeakValueDictionary()
-        self._terminal_registry: dict[str, _TerminalOwnerInfo] = {}
-
-    @staticmethod
-    def _is_valid_qobject(obj: object | None) -> bool:
-        return obj is not None and shiboken6.isValid(obj)
-
-    def _connect_app_cleanup(self) -> None:
-        app = QApplication.instance()
-        if app is None:
-            return
-        app.aboutToQuit.connect(self.clear, Qt.ConnectionType.UniqueConnection)
-
-    @staticmethod
-    def _new_terminal_info(console: BecConsole) -> _TerminalOwnerInfo:
-        term = _BecTermClass()
-        return _TerminalOwnerInfo(
-            registered_console_ids={console.console_id},
-            owner_console_id=console.console_id,
-            instance=term,
-            terminal_id=console.terminal_id,
-            persist_session=console.persist_terminal_session,
-        )
-
-    @staticmethod
-    def _replace_terminal(info: _TerminalOwnerInfo, console: BecConsole) -> None:
-        info.instance = _BecTermClass()
-        info.initialized = False
-        info.owner_console_id = console.console_id
-        info.registered_console_ids.add(console.console_id)
-        info.persist_session = info.persist_session or console.persist_terminal_session
-
-    def _delete_terminal_info(self, info: _TerminalOwnerInfo) -> None:
-        if self._is_valid_qobject(info.instance):
-            info.instance.deleteLater()  # type: ignore[union-attr]
-        info.instance = None
-        if self._is_valid_qobject(info.fallback_holder):
-            info.fallback_holder.deleteLater()
-        info.fallback_holder = None
-
-    def _parking_parent(
-        self,
-        info: _TerminalOwnerInfo,
-        console: BecConsole | None = None,
-        *,
-        avoid_console: bool = False,
-    ) -> QWidget | None:
-        for console_id in info.registered_console_ids:
-            candidate = self._consoles.get(console_id)
-            if candidate is None or candidate is console:
-                continue
-            if self._is_valid_qobject(candidate):
-                return candidate._term_holder
-
-        if console is None or not self._is_valid_qobject(console):
-            return None
-
-        window = console.window()
-        if window is not None and window is not console and self._is_valid_qobject(window):
-            return window
-
-        if not avoid_console:
-            return console._term_holder
-        return None
-
-    def _fallback_holder(
-        self,
-        info: _TerminalOwnerInfo,
-        console: BecConsole | None = None,
-        *,
-        avoid_console: bool = False,
-    ) -> QWidget:
-        if not self._is_valid_qobject(info.fallback_holder):
-            info.fallback_holder = QWidget(
-                parent=self._parking_parent(info, console, avoid_console=avoid_console)
-            )
-            info.fallback_holder.setObjectName(f"_bec_console_terminal_holder_{info.terminal_id}")
-            info.fallback_holder.hide()
-        return info.fallback_holder
-
-    def _park_terminal(
-        self,
-        info: _TerminalOwnerInfo,
-        console: BecConsole | None = None,
-        *,
-        avoid_console: bool = False,
-    ) -> None:
-        if not self._is_valid_qobject(info.instance):
-            return
-
-        parent = self._parking_parent(info, console, avoid_console=avoid_console)
-        if parent is None and info.persist_session:
-            parent = self._fallback_holder(info, console, avoid_console=avoid_console)
-
-        info.instance.hide()  # type: ignore[union-attr]
-        info.instance.setParent(parent)  # type: ignore[union-attr]
-
-    def clear(self) -> None:
-        """Delete every tracked terminal and holder."""
-        for info in list(self._terminal_registry.values()):
-            self._delete_terminal_info(info)
-        self._terminal_registry.clear()
-        self._consoles.clear()
-
-    def register(self, console: BecConsole):
-        """
-        Register an instance of BecConsole. If there is already a terminal with the associated
-        terminal_id, this does not automatically grant ownership.
-
-        Args:
-            console (BecConsole): The instance to register.
-        """
-        self._connect_app_cleanup()
-        self._consoles[console.console_id] = console
-        console_id, terminal_id = console.console_id, console.terminal_id
-        term_info = self._terminal_registry.get(terminal_id)
-        if term_info is None:
-            self._terminal_registry[terminal_id] = self._new_terminal_info(console)
-            return
-
-        term_info.persist_session = term_info.persist_session or console.persist_terminal_session
-        had_registered_consoles = bool(term_info.registered_console_ids)
-        term_info.registered_console_ids.add(console_id)
-        if not self._is_valid_qobject(term_info.instance):
-            self._replace_terminal(term_info, console)
-            return
-        if (
-            term_info.owner_console_id is not None
-            and term_info.owner_console_id not in self._consoles
-        ):
-            term_info.owner_console_id = None
-        if term_info.owner_console_id is None and not had_registered_consoles:
-            term_info.owner_console_id = console_id
-        logger.info(f"Registered new console {console_id} for terminal {terminal_id}")
-
-    def unregister(self, console: BecConsole):
-        """
-        Unregister an instance of BecConsole.
-
-        Args:
-            console (BecConsole): The instance to unregister.
-        """
-        console_id, terminal_id = console.console_id, console.terminal_id
-        if console_id in self._consoles:
-            del self._consoles[console_id]
-        if (term_info := self._terminal_registry.get(terminal_id)) is None:
-            return
-        detached = console._detach_terminal_widget(term_info.instance)
-        if console_id in term_info.registered_console_ids:
-            term_info.registered_console_ids.remove(console_id)
-        if term_info.owner_console_id == console_id:
-            term_info.owner_console_id = None
-        if not term_info.registered_console_ids:
-            if term_info.persist_session and self._is_valid_qobject(term_info.instance):
-                self._park_terminal(term_info, console, avoid_console=True)
-                logger.info(f"Unregistered console {console_id} for terminal {terminal_id}")
-                return
-
-            self._delete_terminal_info(term_info)
-            del self._terminal_registry[terminal_id]
-        elif detached:
-            self._park_terminal(term_info, console, avoid_console=True)
-
-        logger.info(f"Unregistered console {console_id} for terminal {terminal_id}")
-
-    def is_owner(self, console: BecConsole):
-        """Returns true if the given console is the owner of its terminal"""
-        if console not in self._consoles.values():
-            return False
-        if (info := self._terminal_registry.get(console.terminal_id)) is None:
-            logger.warning(f"Console {console.console_id} references an unknown terminal!")
-            return False
-        if not self._is_valid_qobject(info.instance):
-            return False
-        return info.owner_console_id == console.console_id
-
-    def take_ownership(self, console: BecConsole) -> BecTerminal | None:
-        """
-        Transfer ownership of a terminal to the given console.
-
-        Args:
-            console: the console which wishes to take ownership of its associated terminal.
-        Returns:
-            BecTerminal | None: The instance if ownership transfer was successful, None otherwise.
-        """
-        console_id, terminal_id = console.console_id, console.terminal_id
-
-        if terminal_id not in self._terminal_registry:
-            self.register(console)
-
-        instance_info = self._terminal_registry[terminal_id]
-        if not self._is_valid_qobject(instance_info.instance):
-            self._replace_terminal(instance_info, console)
-        if (old_owner_console_ide := instance_info.owner_console_id) is not None:
-            if (
-                old_owner_console_ide != console_id
-                and (old_owner := self._consoles.get(old_owner_console_ide)) is not None
-            ):
-                old_owner.yield_ownership()  # call this on the old owner to make sure it is updated
-        instance_info.owner_console_id = console_id
-        instance_info.registered_console_ids.add(console_id)
-        logger.info(f"Transferred ownership of terminal {terminal_id} to {console_id}")
-        return instance_info.instance
-
-    def try_get_term(self, console: BecConsole) -> BecTerminal | None:
-        """
-        Return the terminal instance if the requesting console is the owner
-
-        Args:
-            console: the requesting console.
-        Returns:
-            BecTerminal | None: The instance if the console is the owner, None otherwise.
-        """
-        console_id, terminal_id = console.console_id, console.terminal_id
-        logger.debug(f"checking term for {console_id}")
-        if terminal_id not in self._terminal_registry:
-            logger.warning(f"Terminal {terminal_id} not found in registry")
-            return None
-
-        instance_info = self._terminal_registry[terminal_id]
-        if not self._is_valid_qobject(instance_info.instance):
-            if instance_info.owner_console_id == console_id:
-                self._replace_terminal(instance_info, console)
-            else:
-                return None
-        if instance_info.owner_console_id == console_id:
-            return instance_info.instance
-
-    def yield_ownership(self, console: BecConsole):
-        """
-        Yield ownership of an instance without destroying it. The instance remains in the
-        registry with no owner, available for another widget to claim.
-
-        Args:
-            console (BecConsole): The console which wishes to yield ownership of its associated terminal.
-        """
-        console_id, terminal_id = console.console_id, console.terminal_id
-        logger.debug(f"Console {console_id} attempted to yield ownership")
-        if console_id not in self._consoles or terminal_id not in self._terminal_registry:
-            return
-
-        term_info = self._terminal_registry[terminal_id]
-        if term_info.owner_console_id != console_id:
-            logger.debug(f"But it was not the owner, which was {term_info.owner_console_id}!")
-            return
-        term_info.owner_console_id = None
-        console._detach_terminal_widget(term_info.instance)
-        self._park_terminal(term_info, console)
-
-    def should_initialize(self, console: BecConsole) -> bool:
-        """Return true if the console should send its startup command to the terminal."""
-        info = self._terminal_registry.get(console.terminal_id)
-        if info is None:
-            return False
-        return (
-            info.owner_console_id == console.console_id
-            and not info.initialized
-            and self._is_valid_qobject(info.instance)
-        )
-
-    def mark_initialized(self, console: BecConsole) -> None:
-        info = self._terminal_registry.get(console.terminal_id)
-        if info is not None and info.owner_console_id == console.console_id:
-            info.initialized = True
-
-    def owner_is_visible(self, term_id: str) -> bool:
-        """
-        Check if the owner of an instance is currently visible.
-
-        Args:
-            term_id (str): The terminal ID to check.
-        Returns:
-            bool: True if the owner is visible, False otherwise.
-        """
-        instance_info = self._terminal_registry.get(term_id)
-        if (
-            instance_info is None
-            or instance_info.owner_console_id is None
-            or not self._is_valid_qobject(instance_info.instance)
-        ):
-            return False
-
-        if (owner := self._consoles.get(instance_info.owner_console_id)) is None:
-            return False
-        return owner.isVisible()
-
-
-_bec_console_registry = BecConsoleRegistry()
-
-
-class _Overlay(QWidget):
-    def __init__(self, console: BecConsole):
-        super().__init__(parent=console)
-        self._console = console
-
-    def mousePressEvent(self, event: QMouseEvent) -> None:
-        if event.button() == Qt.MouseButton.LeftButton:
-            self._console.take_terminal_ownership()
-            event.accept()
-            return
-        return super().mousePressEvent(event)
-
-
-class BecConsole(BECWidget, QWidget):
-    """A console widget with access to a shared registry of terminals, such that instances can be moved around."""
-
-    _js_callback = Signal(bool)
-    initialized = Signal()
-
-    PLUGIN = True
-    ICON_NAME = "terminal"
-    persist_terminal_session = False
-
-    def __init__(
-        self,
-        parent=None,
-        config=None,
-        client=None,
-        gui_id=None,
-        startup_cmd: str | None = None,
-        terminal_id: str | None = None,
-        **kwargs,
-    ):
-        super().__init__(parent=parent, client=client, gui_id=gui_id, config=config, **kwargs)
-        self._mode = ConsoleMode.INACTIVE
-        self._startup_cmd = startup_cmd
-        self._is_initialized = False
-        self.terminal_id = terminal_id or str(uuid4())
-        self.console_id = self.gui_id
-        self.term: BecTerminal | None = None  # Will be set in _set_up_instance
-
-        self._set_up_instance()
-
-    def _set_up_instance(self):
-        """
-        Set up the web instance and UI elements.
-        """
-        self._stacked_layout = QStackedLayout()
-        # self._stacked_layout.setStackingMode(QStackedLayout.StackingMode.StackAll)
-        self._term_holder = QWidget()
-        self._term_layout = QVBoxLayout()
-        self._term_layout.setContentsMargins(0, 0, 0, 0)
-        self._term_holder.setLayout(self._term_layout)
-
-        self.setLayout(self._stacked_layout)
-
-        # prepare overlay
-        self._overlay = _Overlay(self)
-        layout = QVBoxLayout(self._overlay)
-        layout.setAlignment(Qt.AlignmentFlag.AlignCenter)
-        label = QLabel("Click to activate terminal", self._overlay)
-        layout.addWidget(label)
-
-        self._stacked_layout.addWidget(self._term_holder)
-        self._stacked_layout.addWidget(self._overlay)
-
-        # will create a new terminal instance if there isn't already one for this ID
-        _bec_console_registry.register(self)
-        self._infer_mode()
-        self._ensure_startup_started()
-
-    def _infer_mode(self):
-        self.term = _bec_console_registry.try_get_term(self)
-        if self.term:
-            self._set_mode(ConsoleMode.ACTIVE)
-        elif self.isHidden():
-            self._set_mode(ConsoleMode.HIDDEN)
-        else:
-            self._set_mode(ConsoleMode.INACTIVE)
-
-    def _set_mode(self, mode: ConsoleMode):
-        """
-        Set the mode of the web console.
-
-        Args:
-            mode (ConsoleMode): The mode to set.
-        """
-
-        match mode:
-            case ConsoleMode.ACTIVE:
-                if self.term:
-                    if self._term_layout.indexOf(self.term) == -1:  # type: ignore[arg-type]
-                        self._term_layout.addWidget(self.term)  # type: ignore # BecTerminal is QWidget
-                    self.term.show()  # type: ignore[attr-defined]
-                    self._stacked_layout.setCurrentIndex(0)
-                    self._mode = mode
-                else:
-                    self._stacked_layout.setCurrentIndex(1)
-                    self._mode = ConsoleMode.INACTIVE
-            case ConsoleMode.INACTIVE:
-                self._stacked_layout.setCurrentIndex(1)
-                self._mode = mode
-            case ConsoleMode.HIDDEN:
-                self._stacked_layout.setCurrentIndex(1)
-                self._mode = mode
-
-    @property
-    def startup_cmd(self):
-        """
-        Get the startup command for the web console.
-        """
-        return self._startup_cmd
-
-    @startup_cmd.setter
-    def startup_cmd(self, cmd: str | None):
-        """
-        Set the startup command for the console.
-        """
-        self._startup_cmd = cmd
-
-    def write(self, data: str, send_return: bool = True):
-        """
-        Send data to the console
-
-        Args:
-            data (str): The data to send.
-            send_return (bool): Whether to send a return after the data.
-        """
-        if self.term:
-            self.term.write(data, send_return)
-
-    def _ensure_startup_started(self):
-        if not self.startup_cmd or not _bec_console_registry.should_initialize(self):
-            return
-        self.write(self.startup_cmd, True)
-        _bec_console_registry.mark_initialized(self)
-
-    def _detach_terminal_widget(self, term: BecTerminal | None) -> bool:
-        if term is None or not BecConsoleRegistry._is_valid_qobject(term):
-            if self.term is term:
-                self.term = None
-            return False
-
-        is_child = self.isAncestorOf(term)  # type: ignore[arg-type]
-        if self._term_layout.indexOf(term) != -1:  # type: ignore[arg-type]
-            self._term_layout.removeWidget(term)  # type: ignore[arg-type]
-            is_child = True
-        if is_child:
-            term.hide()  # type: ignore[attr-defined]
-            term.setParent(None)  # type: ignore[attr-defined]
-        if self.term is term:
-            self.term = None
-        return is_child
-
-    def take_terminal_ownership(self):
-        """
-        Take ownership of a web instance from the registry. This will transfer the instance
-        from its current owner (if any) to this widget.
-        """
-        # Get the instance from registry
-        self.term = _bec_console_registry.take_ownership(self)
-        self._infer_mode()
-        self._ensure_startup_started()
-        if self._mode == ConsoleMode.ACTIVE:
-            logger.debug(f"Widget {self.gui_id} took ownership of instance {self.terminal_id}")
-
-    def yield_ownership(self):
-        """
-        Yield ownership of the instance. The instance remains in the registry with no owner,
-        available for another widget to claim. This is automatically called when the
-        widget becomes hidden.
-        """
-        _bec_console_registry.yield_ownership(self)
-        self._infer_mode()
-        if self._mode != ConsoleMode.ACTIVE:
-            logger.debug(f"Widget {self.gui_id} yielded ownership of instance {self.terminal_id}")
-
-    def hideEvent(self, event):
-        """Called when the widget is hidden. Automatically yields ownership."""
-        self.yield_ownership()
-        super().hideEvent(event)
-
-    def showEvent(self, event):
-        """Called when the widget is shown. Updates UI state based on ownership."""
-        super().showEvent(event)
-        if not _bec_console_registry.is_owner(self):
-            if not _bec_console_registry.owner_is_visible(self.terminal_id):
-                self.take_terminal_ownership()
-
-    def cleanup(self):
-        """Unregister this console on destruction."""
-        _bec_console_registry.unregister(self)
-        super().cleanup()
-
-
-class BECShell(BecConsole):
-    """
-    A BecConsole pre-configured to run the BEC shell.
-    We cannot simply expose the web console properties to Qt as we need to have a deterministic
-    startup behavior for sharing the same shell instance across multiple widgets.
-    """
-
-    ICON_NAME = "hub"
-    persist_terminal_session = True
-
-    def __init__(self, parent=None, config=None, client=None, gui_id=None, **kwargs):
-        super().__init__(
-            parent=parent,
-            config=config,
-            client=client,
-            gui_id=gui_id,
-            terminal_id="bec_shell",
-            **kwargs,
-        )
-
-    @property
-    def startup_cmd(self):
-        """
-        Get the startup command for the BEC shell.
-        """
-        if self.bec_dispatcher.cli_server is None:
-            return "bec --nogui"
-        return f"bec --gui-id {self.bec_dispatcher.cli_server.gui_id}"
-
-    @startup_cmd.setter
-    def startup_cmd(self, cmd: str | None): ...
-
-
-if __name__ == "__main__":  # pragma: no cover
-    import sys
-
-    app = QApplication(sys.argv)
-    widget = QTabWidget()
-
-    # Create two consoles with different unique_ids
-    bec_console_1a = BecConsole(startup_cmd="htop", gui_id="console_1_a", terminal_id="terminal_1")
-    bec_console_1b = BecConsole(startup_cmd="htop", gui_id="console_1_b", terminal_id="terminal_1")
-    bec_console_1 = QWidget()
-    bec_console_1_layout = QHBoxLayout(bec_console_1)
-    bec_console_1_layout.addWidget(bec_console_1a)
-    bec_console_1_layout.addWidget(bec_console_1b)
-    bec_console2 = BECShell()
-    bec_console3 = BecConsole(gui_id="console_3", terminal_id="terminal_1")
-    widget.addTab(bec_console_1, "Console 1")
-    widget.addTab(bec_console2, "Console 2 - BEC Shell")
-    widget.addTab(bec_console3, "Console 3 -- mirror of Console 1")
-    widget.show()
-
-    widget.resize(800, 600)
-
-    sys.exit(app.exec_())

bec_widgets/widgets/editors/bec_console/bec_console.pyproject

@@ -1 +0,0 @@
-{'files': ['bec_console.py']}

bec_widgets/widgets/editors/bec_console/bec_shell.pyproject

@@ -1 +0,0 @@
-{'files': ['bec_console.py']}

bec_widgets/widgets/editors/monaco/monaco_dock.py

@@ -6,7 +6,7 @@ from typing import Any, cast
 
 from bec_lib.logger import bec_logger
 from bec_lib.macro_update_handler import has_executable_code
-from qtpy.QtCore import Signal
+from qtpy.QtCore import QEvent, QTimer, Signal
 from qtpy.QtWidgets import QFileDialog, QMessageBox, QToolButton, QWidget
 
 from bec_widgets.widgets.containers.dock_area.basic_dock_area import DockAreaWidget
@@ -36,12 +36,12 @@ class MonacoDock(DockAreaWidget):
             **kwargs,
         )
         self.dock_manager.focusedDockWidgetChanged.connect(self._on_focus_event)
+        self.dock_manager.installEventFilter(self)
         self._last_focused_editor: CDockWidget | None = None
         self.focused_editor.connect(self._on_last_focused_editor_changed)
         initial_editor = self.add_editor()
         if isinstance(initial_editor, CDockWidget):
             self.last_focused_editor = initial_editor
-        self._install_manager_scan_and_fix_guards()
 
     def _create_editor_widget(self) -> MonacoWidget:
         """Create a configured Monaco editor widget."""
@@ -73,8 +73,7 @@ class MonacoDock(DockAreaWidget):
             logger.info(f"Editor '{widget.current_file}' has unsaved changes: {widget.get_text()}")
         self.save_enabled.emit(widget.modified)
 
-    @staticmethod
-    def _update_tab_title_for_modification(dock: CDockWidget, modified: bool):
+    def _update_tab_title_for_modification(self, dock: CDockWidget, modified: bool):
         """Update the tab title to show modification status with a dot indicator."""
         current_title = dock.windowTitle()
 
@@ -99,12 +98,14 @@ class MonacoDock(DockAreaWidget):
             return
 
         active_sig = signatures[signature.get("activeSignature", 0)]
+        active_param = signature.get("activeParameter", 0)  # TODO: Add highlight for active_param
+
         # Get signature label and documentation
         label = active_sig.get("label", "")
         doc_obj = active_sig.get("documentation", {})
         documentation = doc_obj.get("value", "") if isinstance(doc_obj, dict) else str(doc_obj)
 
-        # Format the Markdown output
+        # Format the markdown output
         markdown = f"```python\n{label}\n```\n\n{documentation}"
         self.signature_help.emit(markdown)
 
@@ -155,10 +156,9 @@ class MonacoDock(DockAreaWidget):
         if self.last_focused_editor is dock:
             self.last_focused_editor = None
         # After topology changes, make sure single-tab areas get a plus button
-        self._scan_and_fix_areas()
+        QTimer.singleShot(0, self._scan_and_fix_areas)
 
-    @staticmethod
-    def reset_widget(widget: MonacoWidget):
+    def reset_widget(self, widget: MonacoWidget):
         """
         Reset the given Monaco editor widget to its initial state.
 
@@ -193,23 +193,23 @@ class MonacoDock(DockAreaWidget):
             # pylint: disable=protected-access
             area._monaco_plus_btn = plus_btn
 
-    def _install_manager_scan_and_fix_guards(self) -> None:
-        """
-        Track ADS structural changes to trigger scan and fix of dock areas for plus button injection.
-        """
-        self.dock_manager.dockAreaCreated.connect(self._scan_and_fix_areas)
-        self.dock_manager.dockWidgetAdded.connect(self._scan_and_fix_areas)
-        self.dock_manager.stateRestored.connect(self._scan_and_fix_areas)
-        self.dock_manager.restoringState.connect(self._scan_and_fix_areas)
-        self.dock_manager.focusedDockWidgetChanged.connect(self._scan_and_fix_areas)
-        self._scan_and_fix_areas()
-
-    def _scan_and_fix_areas(self, *_arg):
+    def _scan_and_fix_areas(self):
         # Find all dock areas under this manager and ensure each single-tab area has a plus button
         areas = self.dock_manager.findChildren(CDockAreaWidget)
         for a in areas:
             self._ensure_area_plus(a)
 
+    def eventFilter(self, obj, event):
+        # Track dock manager events
+        if obj is self.dock_manager and event.type() in (
+            QEvent.Type.ChildAdded,
+            QEvent.Type.ChildRemoved,
+            QEvent.Type.LayoutRequest,
+        ):
+            QTimer.singleShot(0, self._scan_and_fix_areas)
+
+        return super().eventFilter(obj, event)
+
     def add_editor(
         self, area: Any | None = None, title: str | None = None, tooltip: str | None = None
     ) -> CDockWidget:
@@ -258,7 +258,7 @@ class MonacoDock(DockAreaWidget):
         if area_widget is not None:
             self._ensure_area_plus(area_widget)
 
-        self._scan_and_fix_areas()
+        QTimer.singleShot(0, self._scan_and_fix_areas)
         self.last_focused_editor = dock
         return dock
 

bec_widgets/widgets/editors/web_console/bec_shell.pyproject

@@ -0,0 +1 @@
+{'files': ['web_console.py']}

bec_widgets/widgets/editors/web_console/bec_shell_plugin.py

@@ -5,7 +5,7 @@ from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.editors.bec_console.bec_console import BECShell
+from bec_widgets.widgets.editors.web_console.web_console import BECShell
 
 DOM_XML = """
 <ui language='c++'>

bec_widgets/widgets/editors/web_console/register_bec_shell.py

@@ -6,7 +6,7 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.editors.bec_console.bec_shell_plugin import BECShellPlugin
+    from bec_widgets.widgets.editors.web_console.bec_shell_plugin import BECShellPlugin
 
     QPyDesignerCustomWidgetCollection.addCustomWidget(BECShellPlugin())
 

bec_widgets/widgets/editors/web_console/register_web_console.py

@@ -6,9 +6,9 @@ def main():  # pragma: no cover
         return
     from PySide6.QtDesigner import QPyDesignerCustomWidgetCollection
 
-    from bec_widgets.widgets.editors.bec_console.bec_console_plugin import BecConsolePlugin
+    from bec_widgets.widgets.editors.web_console.web_console_plugin import WebConsolePlugin
 
-    QPyDesignerCustomWidgetCollection.addCustomWidget(BecConsolePlugin())
+    QPyDesignerCustomWidgetCollection.addCustomWidget(WebConsolePlugin())
 
 
 if __name__ == "__main__":  # pragma: no cover

bec_widgets/widgets/editors/web_console/web_console.py

@@ -0,0 +1,705 @@
+from __future__ import annotations
+
+import enum
+import json
+import secrets
+import subprocess
+import time
+
+from bec_lib.logger import bec_logger
+from louie.saferef import safe_ref
+from pydantic import BaseModel
+from qtpy.QtCore import Qt, QTimer, QUrl, Signal, qInstallMessageHandler
+from qtpy.QtGui import QMouseEvent, QResizeEvent
+from qtpy.QtWebEngineWidgets import QWebEnginePage, QWebEngineView
+from qtpy.QtWidgets import QApplication, QLabel, QTabWidget, QVBoxLayout, QWidget
+
+from bec_widgets.utils.bec_widget import BECWidget
+
+logger = bec_logger.logger
+
+
+class ConsoleMode(str, enum.Enum):
+    ACTIVE = "active"
+    INACTIVE = "inactive"
+    HIDDEN = "hidden"
+
+
+class PageOwnerInfo(BaseModel):
+    owner_gui_id: str | None = None
+    widget_ids: list[str] = []
+    page: QWebEnginePage | None = None
+    initialized: bool = False
+
+    model_config = {"arbitrary_types_allowed": True}
+
+
+class WebConsoleRegistry:
+    """
+    A registry for the WebConsole class to manage its instances.
+    """
+
+    def __init__(self):
+        """
+        Initialize the registry.
+        """
+        self._instances = {}
+        self._server_process = None
+        self._server_port = None
+        self._token = secrets.token_hex(16)
+        self._page_registry: dict[str, PageOwnerInfo] = {}
+
+    def register(self, instance: WebConsole):
+        """
+        Register an instance of WebConsole.
+
+        Args:
+            instance (WebConsole): The instance to register.
+        """
+        self._instances[instance.gui_id] = safe_ref(instance)
+        self.cleanup()
+
+        if instance._unique_id:
+            self._register_page(instance)
+
+        if self._server_process is None:
+            # Start the ttyd server if not already running
+            self.start_ttyd()
+
+    def start_ttyd(self, use_zsh: bool | None = None):
+        """
+        Start the ttyd server
+        ttyd -q -W -t 'theme={"background": "black"}' zsh
+
+        Args:
+            use_zsh (bool): Whether to use zsh or bash. If None, it will try to detect if zsh is available.
+        """
+
+        # First, check if ttyd is installed
+        try:
+            subprocess.run(["ttyd", "--version"], check=True, stdout=subprocess.PIPE)
+        except FileNotFoundError:
+            # pylint: disable=raise-missing-from
+            raise RuntimeError("ttyd is not installed. Please install it first.")
+
+        if use_zsh is None:
+            # Check if we can use zsh
+            try:
+                subprocess.run(["zsh", "--version"], check=True, stdout=subprocess.PIPE)
+                use_zsh = True
+            except FileNotFoundError:
+                use_zsh = False
+
+        command = [
+            "ttyd",
+            "-p",
+            "0",
+            "-W",
+            "-t",
+            'theme={"background": "black"}',
+            "-c",
+            f"user:{self._token}",
+        ]
+        if use_zsh:
+            command.append("zsh")
+        else:
+            command.append("bash")
+
+        # Start the ttyd server
+        self._server_process = subprocess.Popen(
+            command, stdout=subprocess.PIPE, stderr=subprocess.PIPE
+        )
+
+        self._wait_for_server_port()
+
+        self._server_process.stdout.close()
+        self._server_process.stderr.close()
+
+    def _wait_for_server_port(self, timeout: float = 10):
+        """
+        Wait for the ttyd server to start and get the port number.
+
+        Args:
+            timeout (float): The timeout in seconds to wait for the server to start.
+        """
+        start_time = time.time()
+        while True:
+            output = self._server_process.stderr.readline()
+            if output == b"" and self._server_process.poll() is not None:
+                break
+            if not output:
+                continue
+
+            output = output.decode("utf-8").strip()
+            if "Listening on" in output:
+                # Extract the port number from the output
+                self._server_port = int(output.split(":")[-1])
+                logger.info(f"ttyd server started on port {self._server_port}")
+                break
+            if time.time() - start_time > timeout:
+                raise TimeoutError(
+                    "Timeout waiting for ttyd server to start. Please check if ttyd is installed and available in your PATH."
+                )
+
+    def cleanup(self):
+        """
+        Clean up the registry by removing any instances that are no longer valid.
+        """
+        for gui_id, weak_ref in list(self._instances.items()):
+            if weak_ref() is None:
+                del self._instances[gui_id]
+
+        if not self._instances and self._server_process:
+            # If no instances are left, terminate the server process
+            self._server_process.terminate()
+            self._server_process = None
+            self._server_port = None
+            logger.info("ttyd server terminated")
+
+    def unregister(self, instance: WebConsole):
+        """
+        Unregister an instance of WebConsole.
+
+        Args:
+            instance (WebConsole): The instance to unregister.
+        """
+        if instance.gui_id in self._instances:
+            del self._instances[instance.gui_id]
+
+        if instance._unique_id:
+            self._unregister_page(instance._unique_id, instance.gui_id)
+
+        self.cleanup()
+
+    def _register_page(self, instance: WebConsole):
+        """
+        Register a page in the registry. Please note that this does not transfer ownership
+        for already existing pages; it simply records which widget currently owns the page.
+        Use transfer_page_ownership to change ownership.
+
+        Args:
+            instance (WebConsole): The instance to register.
+        """
+
+        unique_id = instance._unique_id
+        gui_id = instance.gui_id
+
+        if unique_id is None:
+            return
+
+        if unique_id not in self._page_registry:
+            page = BECWebEnginePage()
+            page.authenticationRequired.connect(instance._authenticate)
+            self._page_registry[unique_id] = PageOwnerInfo(
+                owner_gui_id=gui_id, widget_ids=[gui_id], page=page
+            )
+            logger.info(f"Registered new page {unique_id} for {gui_id}")
+            return
+
+        if gui_id not in self._page_registry[unique_id].widget_ids:
+            self._page_registry[unique_id].widget_ids.append(gui_id)
+
+    def _unregister_page(self, unique_id: str, gui_id: str):
+        """
+        Unregister a page from the registry.
+
+        Args:
+            unique_id (str): The unique identifier for the page.
+            gui_id (str): The GUI ID of the widget.
+        """
+        if unique_id not in self._page_registry:
+            return
+        page_info = self._page_registry[unique_id]
+        if gui_id in page_info.widget_ids:
+            page_info.widget_ids.remove(gui_id)
+        if page_info.owner_gui_id == gui_id:
+            page_info.owner_gui_id = None
+        if not page_info.widget_ids:
+            if page_info.page:
+                page_info.page.deleteLater()
+            del self._page_registry[unique_id]
+
+        logger.info(f"Unregistered page {unique_id} for {gui_id}")
+
+    def get_page_info(self, unique_id: str) -> PageOwnerInfo | None:
+        """
+        Get a page from the registry.
+
+        Args:
+            unique_id (str): The unique identifier for the page.
+
+        Returns:
+            PageOwnerInfo | None: The page info if found, None otherwise.
+        """
+        if unique_id not in self._page_registry:
+            return None
+        return self._page_registry[unique_id]
+
+    def take_page_ownership(self, unique_id: str, new_owner_gui_id: str) -> QWebEnginePage | None:
+        """
+        Transfer ownership of a page to a new owner.
+
+        Args:
+            unique_id (str): The unique identifier for the page.
+            new_owner_gui_id (str): The GUI ID of the new owner.
+
+        Returns:
+            QWebEnginePage | None: The page if ownership transfer was successful, None otherwise.
+        """
+        if unique_id not in self._page_registry:
+            logger.warning(f"Page {unique_id} not found in registry")
+            return None
+
+        page_info = self._page_registry[unique_id]
+        old_owner_gui_id = page_info.owner_gui_id
+        if old_owner_gui_id:
+            old_owner_ref = self._instances.get(old_owner_gui_id)
+            if old_owner_ref:
+                old_owner_instance = old_owner_ref()
+                if old_owner_instance:
+                    old_owner_instance.yield_ownership()
+        page_info.owner_gui_id = new_owner_gui_id
+
+        logger.info(f"Transferred ownership of page {unique_id} to {new_owner_gui_id}")
+        return page_info.page
+
+    def yield_ownership(self, gui_id: str) -> bool:
+        """
+        Yield ownership of a page without destroying it. The page remains in the
+        registry with no owner, available for another widget to claim.
+
+        Args:
+            gui_id (str): The GUI ID of the widget yielding ownership.
+
+        Returns:
+            bool: True if ownership was yielded, False otherwise.
+        """
+        if gui_id not in self._instances:
+            return False
+
+        instance = self._instances[gui_id]()
+        if instance is None:
+            return False
+
+        unique_id = instance._unique_id
+        if unique_id is None:
+            return False
+
+        if unique_id not in self._page_registry:
+            return False
+
+        page_owner_info = self._page_registry[unique_id]
+        if page_owner_info.owner_gui_id != gui_id:
+            return False
+
+        page_owner_info.owner_gui_id = None
+        return True
+
+    def owner_is_visible(self, unique_id: str) -> bool:
+        """
+        Check if the owner of a page is currently visible.
+
+        Args:
+            unique_id (str): The unique identifier for the page.
+        Returns:
+            bool: True if the owner is visible, False otherwise.
+        """
+        page_info = self.get_page_info(unique_id)
+        if page_info is None or page_info.owner_gui_id is None:
+            return False
+
+        owner_ref = self._instances.get(page_info.owner_gui_id)
+        if owner_ref is None:
+            return False
+
+        owner_instance = owner_ref()
+        if owner_instance is None:
+            return False
+
+        return owner_instance.isVisible()
+
+
+_web_console_registry = WebConsoleRegistry()
+
+
+def suppress_qt_messages(type_, context, msg):
+    if context.category in ["js", "default"]:
+        return
+    print(msg)
+
+
+qInstallMessageHandler(suppress_qt_messages)
+
+
+class BECWebEnginePage(QWebEnginePage):
+    def javaScriptConsoleMessage(self, level, message, lineNumber, sourceID):
+        logger.info(f"[JS Console] {level.name} at line {lineNumber} in {sourceID}: {message}")
+
+
+class WebConsole(BECWidget, QWidget):
+    """
+    A simple widget to display a website
+    """
+
+    _js_callback = Signal(bool)
+    initialized = Signal()
+
+    PLUGIN = True
+    ICON_NAME = "terminal"
+
+    def __init__(
+        self,
+        parent=None,
+        config=None,
+        client=None,
+        gui_id=None,
+        startup_cmd: str | None = None,
+        is_bec_shell: bool = False,
+        unique_id: str | None = None,
+        **kwargs,
+    ):
+        super().__init__(parent=parent, client=client, gui_id=gui_id, config=config, **kwargs)
+        self._mode = ConsoleMode.INACTIVE
+        self._is_bec_shell = is_bec_shell
+        self._startup_cmd = startup_cmd
+        self._is_initialized = False
+        self._unique_id = unique_id
+        self.page = None  # Will be set in _set_up_page
+
+        self._startup_timer = QTimer()
+        self._startup_timer.setInterval(500)
+        self._startup_timer.timeout.connect(self._check_page_ready)
+        self._startup_timer.start()
+        self._js_callback.connect(self._on_js_callback)
+
+        self._set_up_page()
+
+    def _set_up_page(self):
+        """
+        Set up the web page and UI elements.
+        """
+        layout = QVBoxLayout()
+        layout.setContentsMargins(0, 0, 0, 0)
+        self.browser = QWebEngineView(self)
+
+        layout.addWidget(self.browser)
+        self.setLayout(layout)
+
+        # prepare overlay
+        self.overlay = QWidget(self)
+        layout = QVBoxLayout(self.overlay)
+        layout.setAlignment(Qt.AlignmentFlag.AlignCenter)
+        label = QLabel("Click to activate terminal", self.overlay)
+        layout.addWidget(label)
+        self.overlay.hide()
+
+        _web_console_registry.register(self)
+        self._token = _web_console_registry._token
+
+        # If no unique_id is provided, create a new page
+        if not self._unique_id:
+            self.page = BECWebEnginePage(self)
+            self.page.authenticationRequired.connect(self._authenticate)
+            self.page.setUrl(QUrl(f"http://localhost:{_web_console_registry._server_port}"))
+            self.browser.setPage(self.page)
+            self._set_mode(ConsoleMode.ACTIVE)
+            return
+
+        # Try to get the page from the registry
+        page_info = _web_console_registry.get_page_info(self._unique_id)
+        if page_info and page_info.page:
+            self.page = page_info.page
+            if not page_info.owner_gui_id or page_info.owner_gui_id == self.gui_id:
+                self.browser.setPage(self.page)
+            # Only set URL if this is a newly created page (no URL set yet)
+            if self.page.url().isEmpty():
+                self.page.setUrl(QUrl(f"http://localhost:{_web_console_registry._server_port}"))
+            else:
+                # We have an existing page, so we don't need the startup timer
+                self._startup_timer.stop()
+            if page_info.owner_gui_id != self.gui_id:
+                self._set_mode(ConsoleMode.INACTIVE)
+            else:
+                self._set_mode(ConsoleMode.ACTIVE)
+
+    def _set_mode(self, mode: ConsoleMode):
+        """
+        Set the mode of the web console.
+
+        Args:
+            mode (ConsoleMode): The mode to set.
+        """
+        if not self._unique_id:
+            # For non-unique_id consoles, always active
+            mode = ConsoleMode.ACTIVE
+
+        self._mode = mode
+        match mode:
+            case ConsoleMode.ACTIVE:
+                self.browser.setVisible(True)
+                self.overlay.hide()
+            case ConsoleMode.INACTIVE:
+                self.browser.setVisible(False)
+                self.overlay.show()
+            case ConsoleMode.HIDDEN:
+                self.browser.setVisible(False)
+                self.overlay.hide()
+
+    def _check_page_ready(self):
+        """
+        Check if the page is ready and stop the timer if it is.
+        """
+        if not self.page or self.page.isLoading():
+            return
+
+        self.page.runJavaScript("window.term !== undefined", self._js_callback.emit)
+
+    def _on_js_callback(self, ready: bool):
+        """
+        Callback for when the JavaScript is ready.
+        """
+        if not ready:
+            return
+        self._is_initialized = True
+        self._startup_timer.stop()
+        if self.startup_cmd:
+            if self._unique_id:
+                page_info = _web_console_registry.get_page_info(self._unique_id)
+                if page_info is None:
+                    return
+                if not page_info.initialized:
+                    page_info.initialized = True
+                    self.write(self.startup_cmd)
+            else:
+                self.write(self.startup_cmd)
+        self.initialized.emit()
+
+    @property
+    def startup_cmd(self):
+        """
+        Get the startup command for the web console.
+        """
+        if self._is_bec_shell:
+            if self.bec_dispatcher.cli_server is None:
+                return "bec --nogui"
+            return f"bec --gui-id {self.bec_dispatcher.cli_server.gui_id}"
+        return self._startup_cmd
+
+    @startup_cmd.setter
+    def startup_cmd(self, cmd: str):
+        """
+        Set the startup command for the web console.
+        """
+        if not isinstance(cmd, str):
+            raise ValueError("Startup command must be a string.")
+        self._startup_cmd = cmd
+
+    def write(self, data: str, send_return: bool = True):
+        """
+        Send data to the web page
+
+        Args:
+            data (str): The data to send.
+            send_return (bool): Whether to send a return after the data.
+        """
+        cmd = f"window.term.paste({json.dumps(data)});"
+        if self.page is None:
+            logger.warning("Cannot write to web console: page is not initialized.")
+            return
+        self.page.runJavaScript(cmd)
+        if send_return:
+            self.send_return()
+
+    def take_page_ownership(self, unique_id: str | None = None):
+        """
+        Take ownership of a web page from the registry. This will transfer the page
+        from its current owner (if any) to this widget.
+
+        Args:
+            unique_id (str): The unique identifier of the page to take ownership of.
+                           If None, uses this widget's unique_id.
+        """
+        if unique_id is None:
+            unique_id = self._unique_id
+
+        if not unique_id:
+            logger.warning("Cannot take page ownership without a unique_id")
+            return
+
+        # Get the page from registry
+        page = _web_console_registry.take_page_ownership(unique_id, self.gui_id)
+
+        if not page:
+            logger.warning(f"Page {unique_id} not found in registry")
+            return
+
+        self.page = page
+        self.browser.setPage(page)
+        self._set_mode(ConsoleMode.ACTIVE)
+        logger.info(f"Widget {self.gui_id} took ownership of page {unique_id}")
+
+    def _on_ownership_lost(self):
+        """
+        Called when this widget loses ownership of its page.
+        Displays the overlay and hides the browser.
+        """
+        self._set_mode(ConsoleMode.INACTIVE)
+        logger.info(f"Widget {self.gui_id} lost ownership of page {self._unique_id}")
+
+    def yield_ownership(self):
+        """
+        Yield ownership of the page. The page remains in the registry with no owner,
+        available for another widget to claim. This is automatically called when the
+        widget becomes hidden.
+        """
+        if not self._unique_id:
+            return
+        success = _web_console_registry.yield_ownership(self.gui_id)
+        if success:
+            self._on_ownership_lost()
+            logger.info(f"Widget {self.gui_id} yielded ownership of page {self._unique_id}")
+
+    def has_ownership(self) -> bool:
+        """
+        Check if this widget currently has ownership of a page.
+
+        Returns:
+            bool: True if this widget owns a page, False otherwise.
+        """
+        if not self._unique_id:
+            return False
+        page_info = _web_console_registry.get_page_info(self._unique_id)
+        if page_info is None:
+            return False
+        return page_info.owner_gui_id == self.gui_id
+
+    def hideEvent(self, event):
+        """
+        Called when the widget is hidden. Automatically yields ownership.
+        """
+        if self.has_ownership():
+            self.yield_ownership()
+        self._set_mode(ConsoleMode.HIDDEN)
+        super().hideEvent(event)
+
+    def showEvent(self, event):
+        """
+        Called when the widget is shown. Updates UI state based on ownership.
+        """
+        super().showEvent(event)
+        if self._unique_id and not self.has_ownership():
+            # Take ownership if the page does not have an owner or
+            # the owner is not visible
+            page_info = _web_console_registry.get_page_info(self._unique_id)
+            if page_info is None:
+                self._set_mode(ConsoleMode.INACTIVE)
+                return
+            if page_info.owner_gui_id is None or not _web_console_registry.owner_is_visible(
+                self._unique_id
+            ):
+                self.take_page_ownership(self._unique_id)
+                return
+            if page_info.owner_gui_id != self.gui_id:
+                self._set_mode(ConsoleMode.INACTIVE)
+                return
+
+    def resizeEvent(self, event: QResizeEvent) -> None:
+        super().resizeEvent(event)
+        self.overlay.resize(event.size())
+
+    def mousePressEvent(self, event: QMouseEvent) -> None:
+        if event.button() == Qt.MouseButton.LeftButton and not self.has_ownership():
+            self.take_page_ownership(self._unique_id)
+            event.accept()
+            return
+        return super().mousePressEvent(event)
+
+    def _authenticate(self, _, auth):
+        """
+        Authenticate the request with the provided username and password.
+        """
+        auth.setUser("user")
+        auth.setPassword(self._token)
+
+    def send_return(self):
+        """
+        Send return to the web page
+        """
+        self.page.runJavaScript(
+            "document.querySelector('textarea.xterm-helper-textarea').dispatchEvent(new KeyboardEvent('keypress', {charCode: 13}))"
+        )
+
+    def send_ctrl_c(self):
+        """
+        Send Ctrl+C to the web page
+        """
+        self.page.runJavaScript(
+            "document.querySelector('textarea.xterm-helper-textarea').dispatchEvent(new KeyboardEvent('keypress', {charCode: 3}))"
+        )
+
+    def set_readonly(self, readonly: bool):
+        """
+        Set the web console to read-only mode.
+        """
+        if not isinstance(readonly, bool):
+            raise ValueError("Readonly must be a boolean.")
+        self.setEnabled(not readonly)
+
+    def cleanup(self):
+        """
+        Clean up the registry by removing any instances that are no longer valid.
+        """
+        self._startup_timer.stop()
+        _web_console_registry.unregister(self)
+        super().cleanup()
+
+
+class BECShell(WebConsole):
+    """
+    A WebConsole pre-configured to run the BEC shell.
+    We cannot simply expose the web console properties to Qt as we need to have a deterministic
+    startup behavior for sharing the same shell instance across multiple widgets.
+    """
+
+    ICON_NAME = "hub"
+
+    def __init__(self, parent=None, config=None, client=None, gui_id=None, **kwargs):
+        super().__init__(
+            parent=parent,
+            config=config,
+            client=client,
+            gui_id=gui_id,
+            is_bec_shell=True,
+            unique_id="bec_shell",
+            **kwargs,
+        )
+
+
+if __name__ == "__main__":  # pragma: no cover
+    import sys
+
+    app = QApplication(sys.argv)
+    widget = QTabWidget()
+
+    # Create two consoles with different unique_ids
+    web_console1 = WebConsole(startup_cmd="bec --nogui", unique_id="console1")
+    web_console2 = WebConsole(startup_cmd="htop")
+    web_console3 = WebConsole(startup_cmd="bec --nogui", unique_id="console1")
+    widget.addTab(web_console1, "Console 1")
+    widget.addTab(web_console2, "Console 2")
+    widget.addTab(web_console3, "Console 3 -- mirror of Console 1")
+    widget.show()
+
+    # Demonstrate page sharing:
+    # After initialization, web_console2 can take ownership of console1's page:
+    # web_console2.take_page_ownership("console1")
+
+    widget.resize(800, 600)
+
+    def _close_cons1():
+        web_console2.close()
+        web_console2.deleteLater()
+
+    # QTimer.singleShot(3000, _close_cons1)
+
+    sys.exit(app.exec_())

bec_widgets/widgets/editors/web_console/web_console.pyproject

@@ -0,0 +1 @@
+{'files': ['web_console.py']}

bec_widgets/widgets/editors/web_console/web_console_plugin.py

@@ -5,17 +5,17 @@ from qtpy.QtDesigner import QDesignerCustomWidgetInterface
 from qtpy.QtWidgets import QWidget
 
 from bec_widgets.utils.bec_designer import designer_material_icon
-from bec_widgets.widgets.editors.bec_console.bec_console import BecConsole
+from bec_widgets.widgets.editors.web_console.web_console import WebConsole
 
 DOM_XML = """
 <ui language='c++'>
-    <widget class='BecConsole' name='bec_console'>
+    <widget class='WebConsole' name='web_console'>
     </widget>
 </ui>
 """
 
 
-class BecConsolePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
+class WebConsolePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def __init__(self):
         super().__init__()
         self._form_editor = None
@@ -23,20 +23,20 @@ class BecConsolePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
     def createWidget(self, parent):
         if parent is None:
             return QWidget()
-        t = BecConsole(parent)
+        t = WebConsole(parent)
         return t
 
     def domXml(self):
         return DOM_XML
 
     def group(self):
-        return ""
+        return "BEC Developer"
 
     def icon(self):
-        return designer_material_icon(BecConsole.ICON_NAME)
+        return designer_material_icon(WebConsole.ICON_NAME)
 
     def includeFile(self):
-        return "bec_console"
+        return "web_console"
 
     def initialize(self, form_editor):
         self._form_editor = form_editor
@@ -48,10 +48,10 @@ class BecConsolePlugin(QDesignerCustomWidgetInterface):  # pragma: no cover
         return self._form_editor is not None
 
     def name(self):
-        return "BecConsole"
+        return "WebConsole"
 
     def toolTip(self):
-        return "A console widget with access to a shared registry of terminals, such that instances can be moved around."
+        return ""
 
     def whatsThis(self):
         return self.toolTip()

bec_widgets/widgets/plots/heatmap/heatmap.py

@@ -19,8 +19,8 @@ from scipy.interpolate import (
 from scipy.spatial import cKDTree
 from toolz import partition
 
+from bec_widgets.utils import Colors
 from bec_widgets.utils.bec_connector import ConnectionConfig
-from bec_widgets.utils.colors import Colors
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.utils.settings_dialog import SettingsDialog
 from bec_widgets.utils.toolbars.actions import MaterialIconAction
@@ -611,7 +611,7 @@ class Heatmap(ImageBase):
             scan_msg = self.scan_item.status_message
         elif hasattr(self.scan_item, "metadata"):
             metadata = self.scan_item.metadata["bec"]
-            status = metadata["status"]
+            status = metadata["exit_status"]
             scan_id = metadata["scan_id"]
             scan_name = metadata["scan_name"]
             scan_type = metadata["scan_type"]

bec_widgets/widgets/plots/heatmap/settings/heatmap_setting.py

@@ -4,9 +4,9 @@ import os
 
 from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout
 
+from bec_widgets.utils import UILoader
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.settings_dialog import SettingWidget
-from bec_widgets.utils.ui_loader import UILoader
 
 
 class HeatmapSettings(SettingWidget):

bec_widgets/widgets/plots/image/image.py

@@ -10,7 +10,7 @@ from pydantic import BaseModel, Field, field_validator
 from qtpy.QtCore import QTimer
 from qtpy.QtWidgets import QWidget
 
-from bec_widgets.utils.bec_connector import ConnectionConfig
+from bec_widgets.utils import ConnectionConfig
 from bec_widgets.utils.colors import Colors, apply_theme
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.widgets.plots.image.image_base import ImageBase
@@ -270,16 +270,6 @@ class Image(ImageBase):
             return
 
         old_device = self._config.device
-        old_signal = self._config.signal
-        old_config = self.subscriptions["main"]
-        if old_device and old_signal and old_device != value:
-            self._disconnect_monitor_subscription(
-                device=old_device,
-                signal=old_signal,
-                source=old_config.source,
-                async_update=self.async_update,
-                async_signal_name=old_config.async_signal_name,
-            )
         self._config.device = value
 
         # If we have a signal, reconnect with the new device
@@ -335,16 +325,6 @@ class Image(ImageBase):
                 self._set_connection_status("disconnected")
             return
 
-        old_signal = self._config.signal
-        old_config = self.subscriptions["main"]
-        if self._config.device and old_signal and old_signal != value:
-            self._disconnect_monitor_subscription(
-                device=self._config.device,
-                signal=old_signal,
-                source=old_config.source,
-                async_update=self.async_update,
-                async_signal_name=old_config.async_signal_name,
-            )
         self._config.signal = value
 
         # If we have a device, try to connect
@@ -467,61 +447,6 @@ class Image(ImageBase):
         )
         self._autorange_on_next_update = True
 
-    def _disconnect_monitor_subscription(
-        self,
-        *,
-        device: str,
-        signal: str,
-        source: Literal["device_monitor_1d", "device_monitor_2d"] | None,
-        async_update: bool,
-        async_signal_name: str | None,
-    ) -> None:
-        if not device or not signal:
-            return
-
-        if async_update:
-            async_signal_name = async_signal_name or signal
-            ids_to_check = [self.scan_id, self.old_scan_id]
-
-            if source == "device_monitor_1d":
-                for scan_id in ids_to_check:
-                    if scan_id is None:
-                        continue
-                    self.bec_dispatcher.disconnect_slot(
-                        self.on_image_update_1d,
-                        MessageEndpoints.device_async_signal(scan_id, device, async_signal_name),
-                    )
-                    logger.info(
-                        f"Disconnecting 1d update ScanID:{scan_id}, Device Name:{device},Device Entry:{async_signal_name}"
-                    )
-            elif source == "device_monitor_2d":
-                for scan_id in ids_to_check:
-                    if scan_id is None:
-                        continue
-                    self.bec_dispatcher.disconnect_slot(
-                        self.on_image_update_2d,
-                        MessageEndpoints.device_async_signal(scan_id, device, async_signal_name),
-                    )
-                    logger.info(
-                        f"Disconnecting 2d update ScanID:{scan_id}, Device Name:{device},Device Entry:{async_signal_name}"
-                    )
-            return
-
-        if source == "device_monitor_1d":
-            self.bec_dispatcher.disconnect_slot(
-                self.on_image_update_1d, MessageEndpoints.device_preview(device, signal)
-            )
-            logger.info(
-                f"Disconnecting preview 1d update Device Name:{device}, Device Entry:{signal}"
-            )
-        elif source == "device_monitor_2d":
-            self.bec_dispatcher.disconnect_slot(
-                self.on_image_update_2d, MessageEndpoints.device_preview(device, signal)
-            )
-            logger.info(
-                f"Disconnecting preview 2d update Device Name:{device}, Device Entry:{signal}"
-            )
-
     def _disconnect_current_monitor(self):
         """
         Internal method to disconnect the current monitor subscriptions.
@@ -530,13 +455,55 @@ class Image(ImageBase):
             return
 
         config = self.subscriptions["main"]
-        self._disconnect_monitor_subscription(
-            device=self._config.device,
-            signal=self._config.signal,
-            source=config.source,
-            async_update=self.async_update,
-            async_signal_name=config.async_signal_name,
-        )
+
+        if self.async_update:
+            async_signal_name = config.async_signal_name or self._config.signal
+            ids_to_check = [self.scan_id, self.old_scan_id]
+
+            if config.source == "device_monitor_1d":
+                for scan_id in ids_to_check:
+                    if scan_id is None:
+                        continue
+                    self.bec_dispatcher.disconnect_slot(
+                        self.on_image_update_1d,
+                        MessageEndpoints.device_async_signal(
+                            scan_id, self._config.device, async_signal_name
+                        ),
+                    )
+                    logger.info(
+                        f"Disconnecting 1d update ScanID:{scan_id}, Device Name:{self._config.device},Device Entry:{async_signal_name}"
+                    )
+            elif config.source == "device_monitor_2d":
+                for scan_id in ids_to_check:
+                    if scan_id is None:
+                        continue
+                    self.bec_dispatcher.disconnect_slot(
+                        self.on_image_update_2d,
+                        MessageEndpoints.device_async_signal(
+                            scan_id, self._config.device, async_signal_name
+                        ),
+                    )
+                    logger.info(
+                        f"Disconnecting 2d update ScanID:{scan_id}, Device Name:{self._config.device},Device Entry:{async_signal_name}"
+                    )
+
+        else:
+            if config.source == "device_monitor_1d":
+                self.bec_dispatcher.disconnect_slot(
+                    self.on_image_update_1d,
+                    MessageEndpoints.device_preview(self._config.device, self._config.signal),
+                )
+                logger.info(
+                    f"Disconnecting preview 1d update Device Name:{self._config.device}, Device Entry:{self._config.signal}"
+                )
+            elif config.source == "device_monitor_2d":
+                self.bec_dispatcher.disconnect_slot(
+                    self.on_image_update_2d,
+                    MessageEndpoints.device_preview(self._config.device, self._config.signal),
+                )
+                logger.info(
+                    f"Disconnecting preview 2d update Device Name:{self._config.device}, Device Entry:{self._config.signal}"
+                )
 
         # Reset async state
         self.async_update = False
@@ -893,19 +860,45 @@ class Image(ImageBase):
             logger.warning("Cannot disconnect monitor without both device and signal")
             return
 
-        if config.source not in {"device_monitor_1d", "device_monitor_2d"}:
-            logger.warning(
-                f"Cannot disconnect monitor {target_device}.{target_entry} with source {self.subscriptions['main'].source}"
-            )
-            return
-
-        self._disconnect_monitor_subscription(
-            device=target_device,
-            signal=target_entry,
-            source=config.source,
-            async_update=self.async_update,
-            async_signal_name=config.async_signal_name,
-        )
+        if self.async_update:
+            async_signal_name = config.async_signal_name or target_entry
+            ids_to_check = [self.scan_id, self.old_scan_id]
+            if config.source == "device_monitor_1d":
+                for scan_id in ids_to_check:
+                    if scan_id is None:
+                        continue
+                    self.bec_dispatcher.disconnect_slot(
+                        self.on_image_update_1d,
+                        MessageEndpoints.device_async_signal(
+                            scan_id, target_device, async_signal_name
+                        ),
+                    )
+            elif config.source == "device_monitor_2d":
+                for scan_id in ids_to_check:
+                    if scan_id is None:
+                        continue
+                    self.bec_dispatcher.disconnect_slot(
+                        self.on_image_update_2d,
+                        MessageEndpoints.device_async_signal(
+                            scan_id, target_device, async_signal_name
+                        ),
+                    )
+        else:
+            if config.source == "device_monitor_1d":
+                self.bec_dispatcher.disconnect_slot(
+                    self.on_image_update_1d,
+                    MessageEndpoints.device_preview(target_device, target_entry),
+                )
+            elif config.source == "device_monitor_2d":
+                self.bec_dispatcher.disconnect_slot(
+                    self.on_image_update_2d,
+                    MessageEndpoints.device_preview(target_device, target_entry),
+                )
+            else:
+                logger.warning(
+                    f"Cannot disconnect monitor {target_device}.{target_entry} with source {self.subscriptions['main'].source}"
+                )
+                return
 
         self.subscriptions["main"].async_signal_name = None
         self.async_update = False

bec_widgets/widgets/plots/image/image_base.py

@@ -9,7 +9,7 @@ from pydantic import BaseModel, ConfigDict, Field, ValidationError
 from qtpy.QtCore import QPointF, Signal, SignalInstance
 from qtpy.QtWidgets import QDialog, QVBoxLayout
 
-from bec_widgets.utils.colors import Colors
+from bec_widgets.utils import Colors
 from bec_widgets.utils.container_utils import WidgetContainerUtils
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.utils.side_panel import SidePanel

bec_widgets/widgets/plots/image/image_item.py

@@ -9,8 +9,7 @@ from pydantic import Field, ValidationError, field_validator
 from qtpy.QtCore import Signal
 from qtpy.QtGui import QTransform
 
-from bec_widgets.utils.bec_connector import BECConnector, ConnectionConfig
-from bec_widgets.utils.colors import Colors
+from bec_widgets.utils import BECConnector, Colors, ConnectionConfig
 from bec_widgets.widgets.plots.image.image_processor import (
     ImageProcessor,
     ImageStats,

bec_widgets/widgets/plots/image/setting_widgets/image_roi_tree.py

@@ -20,8 +20,7 @@ from qtpy.QtWidgets import (
 )
 
 from bec_widgets import BECWidget
-from bec_widgets.utils.bec_connector import ConnectionConfig
-from bec_widgets.utils.bec_dispatcher import BECDispatcher
+from bec_widgets.utils import BECDispatcher, ConnectionConfig
 from bec_widgets.utils.toolbars.actions import WidgetAction
 from bec_widgets.utils.toolbars.bundles import ToolbarBundle
 from bec_widgets.utils.toolbars.toolbar import MaterialIconAction, ModularToolBar

bec_widgets/widgets/plots/motor_map/motor_map.py

@@ -10,8 +10,8 @@ from qtpy.QtCore import Signal
 from qtpy.QtGui import QColor
 from qtpy.QtWidgets import QHBoxLayout, QMainWindow, QWidget
 
-from bec_widgets.utils.bec_connector import ConnectionConfig
-from bec_widgets.utils.colors import Colors, apply_theme
+from bec_widgets.utils import Colors, ConnectionConfig
+from bec_widgets.utils.colors import apply_theme
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.utils.settings_dialog import SettingsDialog
 from bec_widgets.utils.toolbars.toolbar import MaterialIconAction

bec_widgets/widgets/plots/motor_map/settings/motor_map_settings.py

@@ -2,9 +2,9 @@ import os
 
 from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout, QWidget
 
+from bec_widgets.utils import UILoader
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.settings_dialog import SettingWidget
-from bec_widgets.utils.ui_loader import UILoader
 from bec_widgets.utils.widget_io import WidgetIO
 
 

bec_widgets/widgets/plots/multi_waveform/multi_waveform.py

@@ -10,8 +10,7 @@ from pydantic import Field, ValidationError, field_validator
 from qtpy.QtCore import Signal
 from qtpy.QtWidgets import QWidget
 
-from bec_widgets.utils.bec_connector import ConnectionConfig
-from bec_widgets.utils.colors import Colors
+from bec_widgets.utils import Colors, ConnectionConfig
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.utils.side_panel import SidePanel
 from bec_widgets.widgets.control.device_input.device_combobox.device_combobox import DeviceComboBox

bec_widgets/widgets/plots/multi_waveform/settings/control_panel.py

@@ -2,9 +2,9 @@ import os
 
 from qtpy.QtWidgets import QVBoxLayout, QWidget
 
+from bec_widgets.utils import UILoader
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.settings_dialog import SettingWidget
-from bec_widgets.utils.ui_loader import UILoader
 from bec_widgets.utils.widget_io import WidgetIO
 
 

bec_widgets/widgets/plots/plot_base.py

@@ -8,10 +8,8 @@ from bec_lib import bec_logger
 from qtpy.QtCore import QPoint, QPointF, Qt, Signal
 from qtpy.QtWidgets import QHBoxLayout, QLabel, QMainWindow, QVBoxLayout, QWidget
 
-from bec_widgets.utils.bec_connector import ConnectionConfig
+from bec_widgets.utils import ConnectionConfig, Crosshair, EntryValidator
 from bec_widgets.utils.bec_widget import BECWidget
-from bec_widgets.utils.crosshair import Crosshair
-from bec_widgets.utils.entry_validator import EntryValidator
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.utils.fps_counter import FPSCounter
 from bec_widgets.utils.plot_indicator_items import BECArrowItem, BECTickItem

bec_widgets/widgets/plots/roi/image_roi.py

@@ -10,7 +10,7 @@ from qtpy import QtCore
 from qtpy.QtCore import QObject, Signal
 
 from bec_widgets import SafeProperty
-from bec_widgets.utils.bec_connector import BECConnector, ConnectionConfig
+from bec_widgets.utils import BECConnector, ConnectionConfig
 from bec_widgets.utils.colors import Colors
 
 if TYPE_CHECKING:

bec_widgets/widgets/plots/scatter_waveform/scatter_curve.py

@@ -8,8 +8,7 @@ from bec_lib import bec_logger
 from pydantic import BaseModel, Field, ValidationError, field_validator
 from qtpy import QtCore
 
-from bec_widgets.utils.bec_connector import BECConnector, ConnectionConfig
-from bec_widgets.utils.colors import Colors
+from bec_widgets.utils import BECConnector, Colors, ConnectionConfig
 
 if TYPE_CHECKING:  # pragma: no cover
     from bec_widgets.widgets.plots.scatter_waveform.scatter_waveform import ScatterWaveform

bec_widgets/widgets/plots/scatter_waveform/scatter_waveform.py

@@ -7,8 +7,7 @@ from pydantic import Field, ValidationError, field_validator
 from qtpy.QtCore import QTimer, Signal
 from qtpy.QtWidgets import QHBoxLayout, QMainWindow, QWidget
 
-from bec_widgets.utils.bec_connector import ConnectionConfig
-from bec_widgets.utils.colors import Colors
+from bec_widgets.utils import Colors, ConnectionConfig
 from bec_widgets.utils.error_popups import SafeProperty, SafeSlot
 from bec_widgets.utils.settings_dialog import SettingsDialog
 from bec_widgets.utils.toolbars.toolbar import MaterialIconAction

bec_widgets/widgets/plots/scatter_waveform/settings/scatter_curve_setting.py

@@ -2,9 +2,9 @@ import os
 
 from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout
 
+from bec_widgets.utils import UILoader
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.settings_dialog import SettingWidget
-from bec_widgets.utils.ui_loader import UILoader
 
 
 class ScatterCurveSettings(SettingWidget):

bec_widgets/widgets/plots/setting_menus/axis_settings.py

@@ -2,9 +2,9 @@ import os
 
 from qtpy.QtWidgets import QFrame, QScrollArea, QVBoxLayout, QWidget
 
+from bec_widgets.utils import UILoader
 from bec_widgets.utils.error_popups import SafeSlot
 from bec_widgets.utils.settings_dialog import SettingWidget
-from bec_widgets.utils.ui_loader import UILoader
 from bec_widgets.utils.widget_io import WidgetIO