experimaestro 2.0.0b8__py3-none-any.whl → 2.0.0b17__py3-none-any.whl

experimaestro/scheduler/state_provider.py

@@ -1,164 +1,170 @@
-"""Unified workspace state provider for accessing experiment and job information
+"""State provider interfaces for accessing experiment and job information
 
-This module provides a single WorkspaceStateProvider class that accesses state
-from the workspace-level database (.experimaestro/workspace.db). This replaces
-the previous multi-provider architecture with a unified approach.
+This module provides the abstract StateProvider interface and related data classes.
+The concrete implementations are in db_state_provider.py (DbStateProvider) and
+remote/client.py (SSHStateProviderClient).
 
 Key features:
-- Single .experimaestro/workspace.db database shared across all experiments
-- Support for multiple runs per experiment
-- Run-scoped tags (fixes GH #128)
-- Thread-safe database access via thread-local connections
-- Real-time updates via scheduler listener interface
-- Push notifications via listener callbacks (for reactive UI)
+- StateProvider ABC: Abstract base class for all state providers
+- Mock classes: Concrete implementations for database-loaded state objects
+- StateListener: Type alias for listener callbacks
+
+Note: Event classes are defined in state_status.py (EventBase and subclasses).
 """
 
 import json
 import logging
-import socket
 import threading
-import time
 from dataclasses import dataclass
 from datetime import datetime
-from enum import Enum, auto
 from pathlib import Path
 from abc import ABC, abstractmethod
-from typing import Callable, Dict, List, Optional, Set, Tuple, TYPE_CHECKING
-
-from watchdog.events import FileSystemEventHandler
-from watchdog.observers.api import ObservedWatch
-
-from experimaestro.scheduler.state_db import (
-    ExperimentModel,
-    ExperimentRunModel,
-    JobModel,
-    JobTagModel,
-    ServiceModel,
-    PartialModel,
-    JobPartialModel,
-    WorkspaceSyncMetadata,
-    ALL_MODELS,
-    CURRENT_DB_VERSION,
-)
+from typing import Callable, Dict, List, Optional, Set, Tuple
+
 from experimaestro.scheduler.interfaces import (
     BaseJob,
     BaseExperiment,
     BaseService,
+    ExperimentJobInformation,
+    ExperimentStatus,
     JobState,
     JobFailureStatus,
     STATE_NAME_TO_JOBSTATE,
+    deserialize_timestamp,
 )
-
-if TYPE_CHECKING:
-    from experimaestro.scheduler.jobs import Job
-    from experimaestro.scheduler.services import Service
+from experimaestro.scheduler.transient import TransientMode
+from experimaestro.notifications import (
+    ProgressInformation,
+    get_progress_information_from_dict,
+)
+from experimaestro.scheduler.state_status import EventBase
 
 logger = logging.getLogger("xpm.state")
 
 
-# Event types for state provider notifications
-class StateEventType(Enum):
-    """Types of state change events"""
-
-    EXPERIMENT_UPDATED = auto()
-    RUN_UPDATED = auto()
-    JOB_UPDATED = auto()
-    SERVICE_UPDATED = auto()
+# =============================================================================
+# Process Information
+# =============================================================================
 
 
 @dataclass
-class StateEvent:
-    """Base class for state change events
+class ProcessInfo:
+    """Information about a running or completed process"""
 
-    Attributes:
-        event_type: Type of the event
-        data: Event-specific data dictionary
-    """
+    pid: int
+    """Process ID"""
+
+    type: str
+    """Process type (e.g., 'local', 'slurm', 'oar')"""
 
-    event_type: StateEventType
-    data: Dict
+    running: bool = False
+    """Whether the process is currently running"""
 
+    cpu_percent: Optional[float] = None
+    """CPU usage percentage (if available)"""
 
-# Type alias for listener callbacks
-StateListener = Callable[[StateEvent], None]
+    memory_mb: Optional[float] = None
+    """Memory usage in MB (if available)"""
+
+    num_threads: Optional[int] = None
+    """Number of threads (if available)"""
+
+
+# Type alias for listener callbacks (uses EventBase from state_status)
+StateListener = Callable[[EventBase], None]
+
+
+# =============================================================================
+# State Provider ABC
+# =============================================================================
 
 
 class StateProvider(ABC):
     """Abstract base class for state providers
 
     Defines the interface that all state providers must implement.
-    This enables both local (WorkspaceStateProvider) and remote
-    (SSHStateProviderClient) providers to be used interchangeably.
+    This enables both local (DbStateProvider), remote (SSHStateProviderClient),
+    and live (Scheduler) providers to be used interchangeably.
+
+    Concrete implementations:
+    - Scheduler: Live in-memory state from running experiments
+    - OfflineStateProvider: Base for cached/persistent state (in db_state_provider.py)
+      - DbStateProvider: SQLite database-backed state
+      - SSHStateProviderClient: Remote SSH-based state
 
-    Provides common service caching logic to preserve service instances
-    (and their URLs) across calls to get_services(). Subclasses should call
-    _init_service_cache() in their __init__ and implement _fetch_services_from_storage().
+    State listener management is provided by the base class with default implementations.
     """
 
-    def _init_service_cache(self) -> None:
-        """Initialize service cache - call from subclass __init__"""
-        self._service_cache: Dict[Tuple[str, str], Dict[str, "BaseService"]] = {}
-        self._service_cache_lock = threading.Lock()
+    #: Whether this provider is connected to a live scheduler
+    is_live: bool = False
 
-    def _clear_service_cache(self) -> None:
-        """Clear the service cache"""
-        with self._service_cache_lock:
-            self._service_cache.clear()
+    def __init__(self) -> None:
+        """Initialize state listener management"""
+        self._state_listeners: Set[StateListener] = set()
+        self._state_listener_lock = threading.Lock()
 
-    def get_services(
-        self, experiment_id: Optional[str] = None, run_id: Optional[str] = None
-    ) -> List[BaseService]:
-        """Get services for an experiment
+    def add_listener(self, listener: StateListener) -> None:
+        """Register a listener for state change events
 
-        Uses caching to preserve service instances (and their URLs) across calls.
-        Subclasses can override _get_live_services() for live service support
-        and must implement _fetch_services_from_storage() for persistent storage.
+        Args:
+            listener: Callback function that receives StateEvent objects
         """
-        # Resolve run_id if needed
-        if experiment_id is not None and run_id is None:
-            run_id = self.get_current_run(experiment_id)
-            if run_id is None:
-                return []
+        with self._state_listener_lock:
+            self._state_listeners.add(listener)
 
-        cache_key = (experiment_id or "", run_id or "")
+    def remove_listener(self, listener: StateListener) -> None:
+        """Unregister a listener
 
-        with self._service_cache_lock:
-            # Try to get live services (scheduler, etc.) - may return None
-            live_services = self._get_live_services(experiment_id, run_id)
-            if live_services is not None:
-                # Cache and return live services
-                self._service_cache[cache_key] = {s.id: s for s in live_services}
-                return live_services
+        Args:
+            listener: Previously registered callback function
+        """
+        with self._state_listener_lock:
+            self._state_listeners.discard(listener)
 
-            # Check cache
-            cached = self._service_cache.get(cache_key)
-            if cached is not None:
-                return list(cached.values())
+    def _notify_state_listeners(self, event: EventBase) -> None:
+        """Notify all state listeners of an event
 
-            # Fetch from persistent storage (DB or remote)
-            services = self._fetch_services_from_storage(experiment_id, run_id)
-            self._service_cache[cache_key] = {s.id: s for s in services}
-            return services
+        Args:
+            event: State change event to broadcast
+        """
+        with self._state_listener_lock:
+            listeners = list(self._state_listeners)
 
-    def _get_live_services(
-        self, experiment_id: Optional[str], run_id: Optional[str]
-    ) -> Optional[List[BaseService]]:
-        """Get live services if available (e.g., from scheduler).
+        logger.debug(
+            "Notifying %d listeners of %s", len(listeners), type(event).__name__
+        )
+        for listener in listeners:
+            try:
+                listener(event)
+            except Exception as e:
+                logger.exception("Error in state listener: %s", e)
 
-        Returns None if no live services are available (default).
-        Subclasses may override to check for live services.
+    def service_state_changed(self, service) -> None:
+        """Called when a service's state changes - emit event to listeners
+
+        StateProvider registers itself as a listener on services it returns,
+        so this method is called when those services' states change.
         """
-        return None
+        from experimaestro.scheduler.state_status import ServiceStateChangedEvent
 
-    @abstractmethod
-    def _fetch_services_from_storage(
-        self, experiment_id: Optional[str], run_id: Optional[str]
-    ) -> List[BaseService]:
-        """Fetch services from persistent storage (DB or remote).
+        experiment_id = getattr(service, "_experiment_id", "") or ""
+        run_id = getattr(service, "_run_id", "") or ""
+        state_name = service.state.name if hasattr(service.state, "name") else "UNKNOWN"
 
-        Called when no live services and cache is empty.
-        """
-        ...
+        logger.debug(
+            "Service %s state changed to %s (experiment=%s)",
+            service.id,
+            state_name,
+            experiment_id,
+        )
+
+        event = ServiceStateChangedEvent(
+            experiment_id=experiment_id,
+            run_id=run_id,
+            service_id=service.id,
+            state=state_name,
+        )
+        self._notify_state_listeners(event)
 
     @abstractmethod
     def get_experiments(self, since: Optional[datetime] = None) -> List[BaseExperiment]:
@@ -171,8 +177,13 @@ class StateProvider(ABC):
         ...
 
     @abstractmethod
-    def get_experiment_runs(self, experiment_id: str) -> List[Dict]:
-        """Get all runs for an experiment"""
+    def get_experiment_runs(self, experiment_id: str) -> List[BaseExperiment]:
+        """Get all runs for an experiment
+
+        Returns:
+            List of BaseExperiment instances (MockExperiment for past runs,
+            or live experiment for the current run in Scheduler)
+        """
         ...
 
     @abstractmethod
@@ -210,25 +221,55 @@ class StateProvider(ABC):
         """Get all jobs across all experiments"""
         ...
 
-    # Note: get_services is implemented in base class using _fetch_services_from_storage
-
     @abstractmethod
-    def get_services_raw(
-        self, experiment_id: Optional[str] = None, run_id: Optional[str] = None
-    ) -> List[Dict]:
-        """Get raw service data as dictionaries (for serialization)"""
+    def get_tags_map(
+        self,
+        experiment_id: str,
+        run_id: Optional[str] = None,
+    ) -> Dict[str, Dict[str, str]]:
+        """Get tags map for jobs in an experiment/run
+
+        Tags are stored per (job_id, experiment_id, run_id) in JobTagModel.
+        This method returns a map from job_id to {tag_key: tag_value}.
+
+        Args:
+            experiment_id: Experiment identifier
+            run_id: Run identifier (None = current run)
+
+        Returns:
+            Dictionary mapping job identifiers to their tags dict
+        """
         ...
 
     @abstractmethod
-    def add_listener(self, listener: StateListener) -> None:
-        """Register a listener for state change events"""
+    def get_dependencies_map(
+        self,
+        experiment_id: str,
+        run_id: Optional[str] = None,
+    ) -> Dict[str, List[str]]:
+        """Get dependencies map for jobs in an experiment/run
+
+        Dependencies are stored per (job_id, experiment_id, run_id) in JobDependenciesModel.
+        This method returns a map from job_id to list of job_ids it depends on.
+
+        Args:
+            experiment_id: Experiment identifier
+            run_id: Run identifier (None = current run)
+
+        Returns:
+            Dictionary mapping job identifiers to list of job IDs they depend on
+        """
         ...
 
     @abstractmethod
-    def remove_listener(self, listener: StateListener) -> None:
-        """Unregister a listener"""
+    def get_services(
+        self, experiment_id: Optional[str] = None, run_id: Optional[str] = None
+    ) -> List[BaseService]:
+        """Get services for an experiment"""
         ...
 
+    # add_listener and remove_listener are implemented in base class
+
     @abstractmethod
     def kill_job(self, job: BaseJob, perform: bool = False) -> bool:
         """Kill a running job"""
@@ -257,6 +298,19 @@ class StateProvider(ABC):
         """Get orphan jobs (jobs not associated with any experiment run)"""
         return []
 
+    def get_stray_jobs(self) -> List[BaseJob]:
+        """Get stray jobs (running jobs not associated with any active experiment)
+
+        Stray jobs are a subset of orphan jobs - they are orphan jobs that are
+        currently running or scheduled. These represent jobs where the experimental
+        plan changed but the job process is still running.
+
+        Returns:
+            List of running/scheduled jobs not in any active experiment
+        """
+        # Default implementation: filter orphan jobs to running ones
+        return [j for j in self.get_orphan_jobs() if j.state and j.state.running()]
+
     def delete_job_safely(self, job: BaseJob, perform: bool = True) -> Tuple[bool, str]:
         """Safely delete a job and its data"""
         return False, "Not implemented"
@@ -271,6 +325,13 @@ class StateProvider(ABC):
         """Clean up orphan partial directories"""
         return []
 
+    def get_process_info(self, job: BaseJob) -> Optional[ProcessInfo]:
+        """Get process information for a job
+
+        Returns a ProcessInfo dataclass or None if not available.
+        """
+        return None
+
     def get_last_sync_time(self) -> Optional[datetime]:
         """Get the last sync time (for incremental updates)"""
         return None
@@ -290,165 +351,102 @@ class StateProvider(ABC):
         return False
 
 
-class _DatabaseChangeDetector:
-    """Background thread that detects database changes and notifies listeners
+# =============================================================================
+# Offline State Provider (with service caching)
+# =============================================================================
 
-    Uses a semaphore pattern so that the watchdog event handler never blocks.
-    The watchdog just signals the semaphore, and this thread does the actual
-    database queries and listener notifications.
 
-    Thread safety:
-    - Uses a lock to protect start/stop transitions
-    - Once stop() is called, the stop event cannot be cleared by start()
-    - Uses a Condition for atomic wait-and-clear of change notifications
+class OfflineStateProvider(StateProvider):
+    """State provider for offline/cached state access
+
+    Provides state listener management and service caching shared by
+    WorkspaceStateProvider and SSHStateProviderClient.
+
+    This is an intermediate class between StateProvider (the ABC) and concrete
+    implementations that need state listener support and service caching.
     """
 
-    def __init__(self, state_provider: "WorkspaceStateProvider"):
-        self.state_provider = state_provider
-        self._last_check_time: Optional[datetime] = None
-        self._change_condition = threading.Condition()
-        self._change_pending = False  # Protected by _change_condition
-        self._thread: Optional[threading.Thread] = None
-        self._debounce_seconds = 0.5  # Wait before processing to batch rapid changes
-        self._state_lock = threading.Lock()  # Protects start/stop transitions
-        self._stopped = False  # Once True, cannot be restarted
-
-    def start(self) -> None:
-        """Start the change detection thread"""
-        with self._state_lock:
-            # Once stopped, cannot restart
-            if self._stopped:
-                logger.debug("Cannot start change detector - already stopped")
-                return
-
-            if self._thread is not None and self._thread.is_alive():
-                return  # Already running
-
-            self._thread = threading.Thread(
-                target=self._run,
-                daemon=True,
-                name="DBChangeDetector",
-            )
-            self._thread.start()
-            logger.debug("Started database change detector thread")
-
-    def stop(self) -> None:
-        """Stop the change detection thread"""
-        with self._state_lock:
-            self._stopped = True  # Mark as permanently stopped
-
-        # Wake up the thread so it can exit
-        with self._change_condition:
-            self._change_condition.notify_all()
-
-        # Join outside the lock to avoid deadlock
-        if self._thread is not None:
-            self._thread.join(timeout=2.0)
-            self._thread = None
-        logger.debug("Stopped database change detector thread")
-
-    def signal_change(self) -> None:
-        """Signal that a database change was detected (non-blocking)"""
-        with self._change_condition:
-            self._change_pending = True
-            self._change_condition.notify()
-
-    def _run(self) -> None:
-        """Main loop: wait for changes and process them"""
-        while not self._stopped:
-            # Wait for a change signal and clear it atomically
-            with self._change_condition:
-                while not self._change_pending and not self._stopped:
-                    self._change_condition.wait()
-
-                if self._stopped:
-                    break
-
-                # Clear the pending flag atomically while holding the lock
-                self._change_pending = False
-
-            # Debounce - wait a bit for more changes to accumulate
-            time.sleep(self._debounce_seconds)
-
-            # Process all accumulated changes
-            self._detect_and_notify_changes()
-
-    def _detect_and_notify_changes(self) -> None:
-        """Query the database to detect what changed and send events"""
-        try:
-            since = self._last_check_time
-            self._last_check_time = datetime.now()
-
-            # Query for changed experiments
-            with self.state_provider.workspace_db.bind_ctx([ExperimentModel]):
-                query = ExperimentModel.select()
-                if since:
-                    query = query.where(ExperimentModel.updated_at > since)
-
-                for exp in query:
-                    self.state_provider._notify_listeners(
-                        StateEvent(
-                            event_type=StateEventType.EXPERIMENT_UPDATED,
-                            data={
-                                "experiment_id": exp.experiment_id,
-                            },
-                        )
-                    )
-
-            # Query for changed jobs
-            with self.state_provider.workspace_db.bind_ctx([JobModel]):
-                query = JobModel.select()
-                if since:
-                    query = query.where(JobModel.updated_at > since)
-
-                for job in query:
-                    self.state_provider._notify_listeners(
-                        StateEvent(
-                            event_type=StateEventType.JOB_UPDATED,
-                            data={
-                                "jobId": job.job_id,
-                                "experimentId": job.experiment_id,
-                                "runId": job.run_id,
-                                "status": job.state,
-                            },
-                        )
-                    )
+    def __init__(self):
+        """Initialize offline state provider with service cache and listener management"""
+        super().__init__()  # Initialize state listener management
+        self._init_service_cache()
 
-        except Exception as e:
-            logger.warning("Error detecting database changes: %s", e)
+    # =========================================================================
+    # Service caching methods
+    # =========================================================================
 
+    def _init_service_cache(self) -> None:
+        """Initialize service cache - call from subclass __init__"""
+        self._service_cache: Dict[tuple[str, str], Dict[str, "BaseService"]] = {}
+        self._service_cache_lock = threading.Lock()
 
-class _DatabaseFileHandler(FileSystemEventHandler):
-    """Watchdog handler for SQLite database file changes
+    def _clear_service_cache(self) -> None:
+        """Clear the service cache"""
+        with self._service_cache_lock:
+            self._service_cache.clear()
 
-    Simply signals the change detector when database files are modified.
-    Does not block - all processing happens in the detector thread.
-    """
+    def get_services(
+        self, experiment_id: Optional[str] = None, run_id: Optional[str] = None
+    ) -> List["BaseService"]:
+        """Get services for an experiment
+
+        Uses caching to preserve service instances (and their URLs) across calls.
+        Subclasses can override _get_live_services() for live service support
+        and must implement _fetch_services_from_storage() for persistent storage.
+        """
+        # Resolve run_id if needed
+        if experiment_id is not None and run_id is None:
+            run_id = self.get_current_run(experiment_id)
+            if run_id is None:
+                return []
+
+        cache_key = (experiment_id or "", run_id or "")
+
+        with self._service_cache_lock:
+            # Try to get live services (scheduler, etc.) - may return None
+            live_services = self._get_live_services(experiment_id, run_id)
+            if live_services is not None:
+                # Cache and return live services
+                self._service_cache[cache_key] = {s.id: s for s in live_services}
+                return live_services
+
+            # Check cache
+            cached = self._service_cache.get(cache_key)
+            if cached is not None:
+                return list(cached.values())
+
+            # Fetch from persistent storage (filesystem or remote)
+            services = self._fetch_services_from_storage(experiment_id, run_id)
+            self._service_cache[cache_key] = {s.id: s for s in services}
+            return services
+
+    def _get_live_services(
+        self, experiment_id: Optional[str], run_id: Optional[str]
+    ) -> Optional[List["BaseService"]]:
+        """Get live services if available (e.g., from scheduler).
 
-    def __init__(self, change_detector: _DatabaseChangeDetector):
-        super().__init__()
-        self.change_detector = change_detector
+        Returns None if no live services are available (default).
+        Subclasses may override to check for live services.
+        """
+        return None
 
-    def on_any_event(self, event) -> None:
-        """Handle all file system events"""
-        # Only handle modification-like events
-        if event.event_type not in ("modified", "created", "moved"):
-            return
+    @abstractmethod
+    def _fetch_services_from_storage(
+        self, experiment_id: Optional[str], run_id: Optional[str]
+    ) -> List["BaseService"]:
+        """Fetch services from persistent storage (filesystem or remote).
 
-        if event.is_directory:
-            return
+        Called when no live services and cache is empty.
+        """
+        ...
 
-        # Only react to database files
-        path = Path(event.src_path)
-        if path.name not in ("workspace.db", "workspace.db-wal"):
-            return
+    # State listener methods (add_listener, remove_listener, _notify_state_listeners)
+    # are inherited from StateProvider base class
 
-        logger.debug(
-            "Database file changed: %s (event: %s)", path.name, event.event_type
-        )
 
-        # Signal the detector thread (non-blocking)
-        self.change_detector.signal_change()
+# =============================================================================
+# Mock Classes for Database-Loaded State
+# =============================================================================
 
 
 class MockJob(BaseJob):
@@ -458,28 +456,69 @@ class MockJob(BaseJob):
     as opposed to live Job instances which are created during experiment runs.
     """
 
+    def apply_event(self, event: "EventBase") -> None:
+        """Apply a job event to update this job's state"""
+        from experimaestro.scheduler.state_status import (
+            JobStateChangedEvent,
+            JobProgressEvent,
+        )
+        from experimaestro.notifications import LevelInformation
+
+        if isinstance(event, JobStateChangedEvent):
+            self.state = STATE_NAME_TO_JOBSTATE.get(event.state, self.state)
+            if event.failure_reason:
+                try:
+                    self.failure_reason = JobFailureStatus[event.failure_reason]
+                except KeyError:
+                    pass
+            if event.submitted_time is not None:
+                self.submittime = event.submitted_time
+            if event.started_time is not None:
+                self.starttime = event.started_time
+            if event.ended_time is not None:
+                self.endtime = event.ended_time
+            if event.exit_code is not None:
+                self.exit_code = event.exit_code
+            if event.retry_count:
+                self.retry_count = event.retry_count
+            logger.debug(
+                "Applied state change to job %s: %s", self.identifier, self.state
+            )
+
+        elif isinstance(event, JobProgressEvent):
+            level = event.level
+            # Truncate to level + 1 entries
+            self.progress = self.progress[: (level + 1)]
+            # Extend if needed
+            while len(self.progress) <= level:
+                self.progress.append(LevelInformation(len(self.progress), None, 0.0))
+            # Update the level's progress and description
+            if event.desc:
+                self.progress[-1].desc = event.desc
+            self.progress[-1].progress = event.progress
+            logger.debug(
+                "Applied progress to job %s: %s", self.identifier, self.progress
+            )
+
     def __init__(
         self,
         identifier: str,
         task_id: str,
-        locator: str,
         path: Path,
         state: str,  # State name string from DB
         submittime: Optional[float],
         starttime: Optional[float],
         endtime: Optional[float],
-        progress: List[Dict],
-        tags: Dict[str, str],
-        experiment_id: str,
-        run_id: str,
+        progress: ProgressInformation,
         updated_at: str,
         exit_code: Optional[int] = None,
         retry_count: int = 0,
         failure_reason: Optional[JobFailureStatus] = None,
+        transient: TransientMode = TransientMode.NONE,
+        process: dict | None = None,
     ):
         self.identifier = identifier
         self.task_id = task_id
-        self.locator = locator
         self.path = path
         # Convert state name to JobState instance
         self.state = STATE_NAME_TO_JOBSTATE.get(state, JobState.UNSCHEDULED)
@@ -487,56 +526,16 @@ class MockJob(BaseJob):
         self.starttime = starttime
         self.endtime = endtime
         self.progress = progress
-        self.tags = tags
-        self.experiment_id = experiment_id
-        self.run_id = run_id
         self.updated_at = updated_at
         self.exit_code = exit_code
         self.retry_count = retry_count
         self.failure_reason = failure_reason
+        self.transient = transient
+        self._process_dict = process
 
-    @classmethod
-    def from_disk(cls, path: Path) -> Optional["MockJob"]:
-        """Create a MockJob by reading metadata from disk
-
-        Args:
-            path: Path to the job directory
-
-        Returns:
-            MockJob instance if metadata exists, None otherwise
-        """
-        metadata_path = path / ".xpm_metadata.json"
-        if not metadata_path.exists():
-            return None
-
-        try:
-            import json
-
-            with metadata_path.open("r") as f:
-                metadata = json.load(f)
-
-            return cls(
-                identifier=metadata.get("job_id", path.name),
-                task_id=metadata.get(
-                    "task_id", path.parent.name if path.parent else "unknown"
-                ),
-                locator=metadata.get("job_id", path.name),
-                path=path,
-                state=metadata.get("state", "unscheduled"),
-                submittime=metadata.get("submitted_time"),
-                starttime=metadata.get("started_time"),
-                endtime=metadata.get("ended_time"),
-                progress=[],  # Progress not stored in metadata
-                tags={},  # Tags come from jobs.jsonl, not metadata
-                experiment_id="",  # Not stored in job metadata
-                run_id="",  # Not stored in job metadata
-                updated_at=str(metadata.get("last_updated", "")),
-                exit_code=metadata.get("exit_code"),
-                retry_count=metadata.get("retry_count", 0),
-            )
-        except Exception as e:
-            logger.warning("Failed to read job metadata from %s: %s", path, e)
-            return None
+    def process_state_dict(self) -> dict | None:
+        """Get process state as dictionary."""
+        return self._process_dict
 
     def getprocess(self):
         """Get process handle for running job
@@ -565,2202 +564,436 @@ class MockJob(BaseJob):
             logger.warning("Could not get process for job at %s: %s", self.path, e)
             return None
 
+    @classmethod
+    def from_state_dict(cls, d: Dict, workspace_path: Path) -> "MockJob":
+        """Create MockJob from state dictionary
+
+        Args:
+            d: Dictionary from state_dict()
+            workspace_path: Workspace path to compute job path if not provided
+
+        Returns:
+            MockJob instance
+        """
+        task_id = d["task_id"]
+        identifier = d["job_id"]
+
+        # Use path from dict if it's already a Path, otherwise compute it
+        path = d.get("path")
+        if path is None:
+            path = workspace_path / "jobs" / task_id / identifier
+        elif isinstance(path, str):
+            path = Path(path)
+
+        failure_reason = None
+        if d.get("failure_reason"):
+            failure_reason = JobFailureStatus[d["failure_reason"]]
+
+        # Convert progress dicts to LevelInformation objects
+        progress_list = get_progress_information_from_dict(d.get("progress", []))
+
+        return cls(
+            identifier=identifier,
+            task_id=task_id,
+            path=path,
+            state=d["state"],
+            submittime=deserialize_timestamp(d.get("submitted_time")),
+            starttime=deserialize_timestamp(d.get("started_time")),
+            endtime=deserialize_timestamp(d.get("ended_time")),
+            progress=progress_list,
+            updated_at=d.get("updated_at", ""),
+            exit_code=d.get("exit_code"),
+            retry_count=d.get("retry_count", 0),
+            failure_reason=failure_reason,
+            process=d.get("process"),
+        )
+
 
 class MockExperiment(BaseExperiment):
-    """Concrete implementation of BaseExperiment for database-loaded experiments
+    """Concrete implementation of BaseExperiment for loaded experiments
 
-    This class is used when loading experiment information from the database,
+    This class is used when loading experiment information from disk,
     as opposed to live experiment instances which are created during runs.
+
+    It stores all experiment state including jobs, services, tags,
+    dependencies, and event tracking (replaces StatusData).
     """
 
     def __init__(
         self,
         workdir: Path,
-        current_run_id: Optional[str],
-        total_jobs: int,
-        finished_jobs: int,
-        failed_jobs: int,
-        updated_at: str,
+        run_id: str,
+        *,
+        status: ExperimentStatus = ExperimentStatus.RUNNING,
+        events_count: int = 0,
+        hostname: Optional[str] = None,
         started_at: Optional[float] = None,
         ended_at: Optional[float] = None,
-        hostname: Optional[str] = None,
+        job_infos: Optional[Dict[str, "ExperimentJobInformation"]] = None,
+        services: Optional[Dict[str, "MockService"]] = None,
+        dependencies: Optional[Dict[str, List[str]]] = None,
+        experiment_id_override: Optional[str] = None,
+        finished_jobs: int = 0,
+        failed_jobs: int = 0,
     ):
         self.workdir = workdir
-        self.current_run_id = current_run_id
-        self.total_jobs = total_jobs
-        self.finished_jobs = finished_jobs
-        self.failed_jobs = failed_jobs
-        self.updated_at = updated_at
-        self.started_at = started_at
-        self.ended_at = ended_at
-        self.hostname = hostname
+        self.run_id = run_id
+        self._status = status
+        self._events_count = events_count
+        self._hostname = hostname
+        self._started_at = started_at
+        self._ended_at = ended_at
+        self._job_infos = job_infos or {}
+        self._services = services or {}
+        self._dependencies = dependencies or {}
+        self._experiment_id_override = experiment_id_override
+        self._finished_jobs = finished_jobs
+        self._failed_jobs = failed_jobs
 
     @property
     def experiment_id(self) -> str:
-        """Experiment identifier derived from workdir name"""
-        return self.workdir.name
+        """Return experiment_id (overriding base class if needed for v1 layout)"""
+        if self._experiment_id_override:
+            return self._experiment_id_override
+        return super().experiment_id
 
+    # Implement abstract properties from BaseExperiment
 
-class MockService(BaseService):
-    """Mock service object for remote monitoring
+    @property
+    def status(self) -> ExperimentStatus:
+        return self._status
 
-    This class provides a service-like interface for services loaded from
-    the remote server. It mimics the Service class interface sufficiently
-    for display in the TUI ServicesList widget.
-    """
-
-    def __init__(
-        self,
-        service_id: str,
-        description_text: str,
-        state_dict_data: dict,
-        experiment_id: Optional[str] = None,
-        run_id: Optional[str] = None,
-        url: Optional[str] = None,
-        state: str = "STOPPED",
-    ):
-        self.id = service_id
-        self._description = description_text
-        self._state_name = state
-        self._state_dict_data = state_dict_data
-        self.experiment_id = experiment_id
-        self.run_id = run_id
-        self.url = url
+    @property
+    def job_infos(self) -> Dict[str, "ExperimentJobInformation"]:
+        """Lightweight job info from jobs.jsonl (job_id, task_id, tags, timestamp)"""
+        return self._job_infos
 
     @property
-    def state(self):
-        """Return state as a ServiceState-like object with a name attribute"""
-        from experimaestro.scheduler.services import ServiceState
-
-        # Convert state name to ServiceState enum
-        try:
-            return ServiceState[self._state_name]
-        except KeyError:
-            # Return a mock object with name attribute for unknown states
-            class MockState:
-                def __init__(self, name):
-                    self.name = name
-
-            return MockState(self._state_name)
-
-    def description(self) -> str:
-        """Return service description"""
-        return self._description
-
-    def state_dict(self) -> dict:
-        """Return state dictionary for service recreation"""
-        return self._state_dict_data
-
-
-def _with_db_context(func):
-    """Decorator to wrap method in database bind context
-
-    This ensures all database queries have the models bound to the database.
-    """
-    from functools import wraps
-
-    @wraps(func)
-    def wrapper(self, *args, **kwargs):
-        try:
-            with self.workspace_db.bind_ctx(ALL_MODELS):
-                return func(self, *args, **kwargs)
-        except Exception as e:
-            logger.exception("Error in %s with database context: %s", func.__name__, e)
-            raise
-
-    return wrapper
-
-
-class WorkspaceStateProvider(StateProvider):
-    """Unified state provider for workspace-level database (singleton per workspace path)
-
-    Provides access to experiment and job state from a single workspace database.
-    Supports both read-only (monitoring) and read-write (scheduler) modes.
-
-    Only one WorkspaceStateProvider instance exists per workspace path. Subsequent
-    requests for the same path return the existing instance.
-
-    Thread safety:
-    - Database connections are thread-local (managed by state_db module)
-    - Singleton registry is protected by a lock
-    - Each thread gets its own database connection
-
-    Run tracking:
-    - Each experiment can have multiple runs
-    - Jobs/services are scoped to (experiment_id, run_id)
-    - Tags are scoped to (job_id, experiment_id, run_id) - fixes GH #128
-    """
-
-    # Registry of state provider instances by absolute path
-    _instances: Dict[Path, "WorkspaceStateProvider"] = {}
-    _lock = threading.Lock()
-
-    @classmethod
-    def get_instance(
-        cls,
-        workspace_path: Path,
-        read_only: bool = False,
-        sync_on_start: bool = False,
-        sync_interval_minutes: int = 5,
-    ) -> "WorkspaceStateProvider":
-        """Get or create WorkspaceStateProvider instance for a workspace path
-
-        Args:
-            workspace_path: Root workspace directory
-            read_only: If True, database is in read-only mode
-            sync_on_start: If True, sync from disk on initialization
-            sync_interval_minutes: Minimum interval between syncs (default: 5)
-
-        Returns:
-            WorkspaceStateProvider instance (singleton per path)
-        """
-        # Normalize path
-        if isinstance(workspace_path, Path):
-            workspace_path = workspace_path.absolute()
-        else:
-            workspace_path = Path(workspace_path).absolute()
-
-        # Check if instance already exists
-        with cls._lock:
-            if workspace_path in cls._instances:
-                existing = cls._instances[workspace_path]
-                # Fail if requesting different read_only mode than cached instance
-                if existing.read_only != read_only:
-                    raise RuntimeError(
-                        f"WorkspaceStateProvider for {workspace_path} already exists "
-                        f"with read_only={existing.read_only}, cannot open with "
-                        f"read_only={read_only}. Close the existing instance first."
-                    )
-                return existing
-
-            # Create new instance - register BEFORE __init__ to handle
-            # nested get_instance calls during sync_on_start
-            instance = object.__new__(cls)
-            cls._instances[workspace_path] = instance
-
-        # Initialize outside the lock to avoid deadlock during sync
-        try:
-            instance.__init__(
-                workspace_path, read_only, sync_on_start, sync_interval_minutes
-            )
-        except Exception:
-            # Remove from registry if initialization fails
-            with cls._lock:
-                cls._instances.pop(workspace_path, None)
-            raise
-        return instance
-
-    def __init__(
-        self,
-        workspace_path: Path,
-        read_only: bool = False,
-        sync_on_start: bool = False,
-        sync_interval_minutes: int = 5,
-    ):
-        """Initialize workspace state provider (called by get_instance())
-
-        Args:
-            workspace_path: Root workspace directory
-            read_only: If True, database is in read-only mode
-            sync_on_start: If True, sync from disk on initialization
-            sync_interval_minutes: Minimum interval between syncs (default: 5)
-        """
-        # Normalize path
-        if isinstance(workspace_path, Path):
-            workspace_path = workspace_path.absolute()
-        else:
-            workspace_path = Path(workspace_path).absolute()
-
-        self.workspace_path = workspace_path
-        self._read_only = read_only
-        self.sync_interval_minutes = sync_interval_minutes
-
-        # Listeners for push notifications
-        self._listeners: Set[StateListener] = set()
-        self._listeners_lock = threading.Lock()
-
-        # Service cache (from base class)
-        self._init_service_cache()
+    def services(self) -> Dict[str, "BaseService"]:
+        return self._services
 
-        # File watcher for database changes (started when listeners are added)
-        self._change_detector: Optional[_DatabaseChangeDetector] = None
-        self._db_file_handler: Optional[_DatabaseFileHandler] = None
-        self._db_file_watch: Optional[ObservedWatch] = None
-
-        # Check and update workspace version
-        from .workspace import WORKSPACE_VERSION
-
-        version_file = self.workspace_path / ".__experimaestro__"
-
-        if version_file.exists():
-            # Read existing version
-            content = version_file.read_text().strip()
-            if content == "":
-                # Empty file = v0
-                workspace_version = 0
-            else:
-                try:
-                    workspace_version = int(content)
-                except ValueError:
-                    raise RuntimeError(
-                        f"Invalid workspace version file at {version_file}: "
-                        f"expected integer, got '{content}'"
-                    )
-
-            # Check if workspace version is supported
-            if workspace_version > WORKSPACE_VERSION:
-                raise RuntimeError(
-                    f"Workspace version {workspace_version} is not supported by "
-                    f"this version of experimaestro (supports up to version "
-                    f"{WORKSPACE_VERSION}). Please upgrade experimaestro."
-                )
-            if workspace_version < WORKSPACE_VERSION:
-                raise RuntimeError(
-                    f"Workspace version {workspace_version} is not supported by "
-                    "this version of experimaestro (please upgrade the experimaestro "
-                    "workspace)"
-                )
-        else:
-            # New workspace - create the file
-            workspace_version = WORKSPACE_VERSION
-
-        # Write current version to file (update empty v0 workspaces)
-        if not read_only and (
-            not version_file.exists() or version_file.read_text().strip() == ""
-        ):
-            version_file.write_text(str(WORKSPACE_VERSION))
-
-        # Initialize workspace database in hidden .experimaestro directory
-        from .state_db import initialize_workspace_database
+    @property
+    def tags(self) -> Dict[str, Dict[str, str]]:
+        """Build tags dict from job_infos"""
+        return {
+            job_id: job_info.tags
+            for job_id, job_info in self._job_infos.items()
+            if job_info.tags
+        }
 
-        experimaestro_dir = self.workspace_path / ".experimaestro"
-        if not read_only:
-            experimaestro_dir.mkdir(parents=True, exist_ok=True)
+    @property
+    def dependencies(self) -> Dict[str, List[str]]:
+        return self._dependencies
 
-        db_path = experimaestro_dir / "workspace.db"
-        self.workspace_db, needs_resync = initialize_workspace_database(
-            db_path, read_only=read_only
-        )
-        self._db_dir = experimaestro_dir  # Store for file watcher
+    @property
+    def events_count(self) -> int:
+        return self._events_count
 
-        # Sync from disk if needed due to schema version change
-        if needs_resync and not read_only:
-            logger.info(
-                "Database schema version changed, triggering full resync from disk"
-            )
-            sync_on_start = True  # Force sync
-
-        # Optionally sync from disk on start (only in write mode)
-        # Syncing requires write access to update the database and sync timestamp
-        if sync_on_start and not read_only:
-            from .state_sync import sync_workspace_from_disk
-
-            sync_workspace_from_disk(
-                self.workspace_path,
-                write_mode=True,
-                force=needs_resync,  # Force full sync if schema changed
-                sync_interval_minutes=sync_interval_minutes,
-            )
+    @property
+    def hostname(self) -> Optional[str]:
+        return self._hostname
 
-            # Update db_version after successful sync
-            if needs_resync:
-                with self.workspace_db.bind_ctx([WorkspaceSyncMetadata]):
-                    WorkspaceSyncMetadata.update(db_version=CURRENT_DB_VERSION).where(
-                        WorkspaceSyncMetadata.id == "workspace"
-                    ).execute()
-                logger.info("Database schema updated to version %d", CURRENT_DB_VERSION)
-
-        logger.info(
-            "WorkspaceStateProvider initialized (read_only=%s, workspace=%s)",
-            read_only,
-            workspace_path,
-        )
+    @property
+    def started_at(self) -> Optional[float]:
+        return self._started_at
 
     @property
-    def read_only(self) -> bool:
-        """Whether this provider is read-only"""
-        return self._read_only
+    def ended_at(self) -> Optional[float]:
+        return self._ended_at
 
-    # Experiment management methods
+    @property
+    def total_jobs(self) -> int:
+        return len(self._job_infos)
 
-    @_with_db_context
-    def ensure_experiment(self, experiment_id: str):
-        """Create or update experiment record
+    @property
+    def finished_jobs(self) -> int:
+        return self._finished_jobs
 
-        Args:
-            experiment_id: Unique identifier for the experiment
-        """
-        if self.read_only:
-            raise RuntimeError("Cannot modify experiments in read-only mode")
+    @property
+    def failed_jobs(self) -> int:
+        return self._failed_jobs
 
-        now = datetime.now()
-        ExperimentModel.insert(
-            experiment_id=experiment_id,
-            created_at=now,
-            updated_at=now,
-        ).on_conflict(
-            conflict_target=[ExperimentModel.experiment_id],
-            update={
-                ExperimentModel.updated_at: now,
-            },
-        ).execute()
-
-        logger.debug("Ensured experiment: %s", experiment_id)
-
-        # Notify listeners
-        exp_path = str(self.workspace_path / "xp" / experiment_id)
-        self._notify_listeners(
-            StateEvent(
-                event_type=StateEventType.EXPERIMENT_UPDATED,
-                data={
-                    "experiment_id": experiment_id,
-                    "workdir_path": exp_path,
-                    "updated_at": now.isoformat(),
-                },
-            )
-        )
+    # state_dict() is inherited from BaseExperiment
 
-    @_with_db_context
-    def create_run(self, experiment_id: str, run_id: Optional[str] = None) -> str:
-        """Create a new run for an experiment
+    @classmethod
+    def from_disk(
+        cls, run_dir: Path, workspace_path: Path
+    ) -> Optional["MockExperiment"]:
+        """Load MockExperiment from status.json and jobs.jsonl on disk
 
         Args:
-            experiment_id: Experiment identifier
-            run_id: Optional run ID (auto-generated from timestamp if not provided)
+            run_dir: Path to the run directory containing status.json
+            workspace_path: Workspace path for resolving relative paths
 
         Returns:
-            The run_id that was created
-
-        Raises:
-            RuntimeError: If in read-only mode
+            MockExperiment instance or None if status.json doesn't exist
         """
-        if self.read_only:
-            raise RuntimeError("Cannot create runs in read-only mode")
-
-        # Auto-generate run_id from timestamp if not provided
-        if run_id is None:
-            now = datetime.now()
-            run_id = now.strftime("%Y%m%d_%H%M%S") + f"_{now.microsecond:06d}"
+        import fasteners
 
-        # Capture hostname
-        hostname = socket.gethostname()
-        started_at = datetime.now()
+        status_path = run_dir / "status.json"
+        if not status_path.exists():
+            return None
 
-        # Create run record with hostname
-        ExperimentRunModel.insert(
-            experiment_id=experiment_id,
-            run_id=run_id,
-            started_at=started_at,
-            status="active",
-            hostname=hostname,
-        ).execute()
-
-        # Persist to disk in experiment folder (informations.json)
-        exp_dir = self.workspace_path / "xp" / experiment_id
-        exp_dir.mkdir(parents=True, exist_ok=True)
-        info_file = exp_dir / "informations.json"
-
-        # Merge with existing data (may have multiple runs)
-        info_data: Dict = {}
-        if info_file.exists():
+        lock_path = status_path.parent / f".{status_path.name}.lock"
+        lock = fasteners.InterProcessLock(str(lock_path))
+        with lock:
             try:
-                info_data = json.loads(info_file.read_text())
-            except json.JSONDecodeError:
-                logger.warning("Could not parse existing informations.json")
-
-        if "runs" not in info_data:
-            info_data["runs"] = {}
-        info_data["runs"][run_id] = {
-            "hostname": hostname,
-            "started_at": started_at.isoformat(),
-        }
-        info_file.write_text(json.dumps(info_data, indent=2))
-
-        # Update experiment's current_run_id and updated_at
-        now = datetime.now()
-        ExperimentModel.update(
-            current_run_id=run_id,
-            updated_at=now,
-        ).where(ExperimentModel.experiment_id == experiment_id).execute()
-
-        logger.info(
-            "Created run %s for experiment %s on host %s",
-            run_id,
-            experiment_id,
-            hostname,
-        )
-
-        # Notify listeners
-        self._notify_listeners(
-            StateEvent(
-                event_type=StateEventType.RUN_UPDATED,
-                data={
-                    "experiment_id": experiment_id,
-                    "run_id": run_id,
-                    "status": "active",
-                    "started_at": now.isoformat(),
-                    "hostname": hostname,
-                },
-            )
-        )
-
-        return run_id
-
-    @_with_db_context
-    def get_current_run(self, experiment_id: str) -> Optional[str]:
-        """Get the current/latest run_id for an experiment
+                with status_path.open("r") as f:
+                    data = json.load(f)
+            except (json.JSONDecodeError, OSError) as e:
+                logger.warning("Failed to read %s: %s", status_path, e)
+                return None
 
-        Args:
-            experiment_id: Experiment identifier
+        # Create experiment from status.json
+        exp = cls.from_state_dict(data, workspace_path)
 
-        Returns:
-            Current run_id or None if no runs exist
-        """
-        try:
-            experiment = ExperimentModel.get(
-                ExperimentModel.experiment_id == experiment_id
-            )
-            return experiment.current_run_id
-        except ExperimentModel.DoesNotExist:
-            return None
+        # Load jobs from jobs.jsonl
+        jobs_jsonl_path = run_dir / "jobs.jsonl"
+        if jobs_jsonl_path.exists():
+            try:
+                with jobs_jsonl_path.open("r") as f:
+                    for line in f:
+                        line = line.strip()
+                        if not line:
+                            continue
+                        try:
+                            record = json.loads(line)
+                            job_info = ExperimentJobInformation.from_dict(record)
+                            exp._job_infos[job_info.job_id] = job_info
+                        except (json.JSONDecodeError, KeyError):
+                            continue
+            except OSError as e:
+                logger.warning("Failed to read %s: %s", jobs_jsonl_path, e)
+
+        return exp
 
-    @_with_db_context
-    def get_experiments(self, since: Optional[datetime] = None) -> List[MockExperiment]:
-        """Get list of all experiments
+    @classmethod
+    def from_state_dict(cls, d: Dict, workspace_path: Path) -> "MockExperiment":
+        """Create MockExperiment from state dictionary
 
         Args:
-            since: If provided, only return experiments updated after this timestamp
+            d: Dictionary from state_dict()
+            workspace_path: Workspace path to compute experiment path if not provided
 
         Returns:
-            List of MockExperiment objects with attributes:
-            - workdir: Path to experiment directory
-            - experiment_id: Unique identifier (property derived from workdir.name)
-            - current_run_id: Current/latest run ID
-            - total_jobs: Total number of jobs (for current run)
-            - finished_jobs: Number of completed jobs (for current run)
-            - failed_jobs: Number of failed jobs (for current run)
-            - updated_at: When experiment was last modified
-            - hostname: Host where the current run was launched
+            MockExperiment instance
         """
-        experiments = []
-
-        query = ExperimentModel.select()
-        if since is not None:
-            query = query.where(ExperimentModel.updated_at > since)
-
-        for exp_model in query:
-            # Count jobs for current run
-            total_jobs = 0
-            finished_jobs = 0
-            failed_jobs = 0
-
-            started_at = None
-            ended_at = None
-            hostname = None
-
-            if exp_model.current_run_id:
-                total_jobs = (
-                    JobModel.select()
-                    .where(
-                        (JobModel.experiment_id == exp_model.experiment_id)
-                        & (JobModel.run_id == exp_model.current_run_id)
-                    )
-                    .count()
-                )
-                finished_jobs = (
-                    JobModel.select()
-                    .where(
-                        (JobModel.experiment_id == exp_model.experiment_id)
-                        & (JobModel.run_id == exp_model.current_run_id)
-                        & (JobModel.state == "done")
-                    )
-                    .count()
-                )
-                failed_jobs = (
-                    JobModel.select()
-                    .where(
-                        (JobModel.experiment_id == exp_model.experiment_id)
-                        & (JobModel.run_id == exp_model.current_run_id)
-                        & (JobModel.state == "error")
-                    )
-                    .count()
-                )
-
-                # Get run timestamps and hostname
-                try:
-                    run_model = ExperimentRunModel.get(
-                        (ExperimentRunModel.experiment_id == exp_model.experiment_id)
-                        & (ExperimentRunModel.run_id == exp_model.current_run_id)
-                    )
-                    if run_model.started_at:
-                        started_at = run_model.started_at.timestamp()
-                    if run_model.ended_at:
-                        ended_at = run_model.ended_at.timestamp()
-                    hostname = run_model.hostname
-                except ExperimentRunModel.DoesNotExist:
-                    pass
-
-            # Compute experiment path from workspace_path and experiment_id
-            exp_path = self.workspace_path / "xp" / exp_model.experiment_id
-
-            experiments.append(
-                MockExperiment(
-                    workdir=exp_path,
-                    current_run_id=exp_model.current_run_id,
-                    total_jobs=total_jobs,
-                    finished_jobs=finished_jobs,
-                    failed_jobs=failed_jobs,
-                    updated_at=exp_model.updated_at.isoformat(),
-                    started_at=started_at,
-                    ended_at=ended_at,
-                    hostname=hostname,
-                )
-            )
+        experiment_id = d.get("experiment_id", "")
+        run_id = d.get("run_id", "")
 
-        return experiments
-
-    @_with_db_context
-    def get_experiment(self, experiment_id: str) -> Optional[MockExperiment]:
-        """Get a specific experiment by ID
-
-        Args:
-            experiment_id: Experiment identifier
+        # Use workdir from dict if provided, otherwise compute it
+        workdir = d.get("workdir")
+        if workdir is None:
+            # New layout: experiments/{experiment_id}/{run_id}/
+            workdir = workspace_path / "experiments" / experiment_id / run_id
+        elif isinstance(workdir, str):
+            workdir = Path(workdir)
 
-        Returns:
-            MockExperiment object or None if not found
-        """
+        # Parse status from string to enum
+        status_str = d.get("status", "running")
         try:
-            exp_model = ExperimentModel.get(
-                ExperimentModel.experiment_id == experiment_id
-            )
-        except ExperimentModel.DoesNotExist:
-            return None
-
-        # Count jobs for current run
-        total_jobs = 0
-        finished_jobs = 0
-        failed_jobs = 0
-        hostname = None
-
-        if exp_model.current_run_id:
-            total_jobs = (
-                JobModel.select()
-                .where(
-                    (JobModel.experiment_id == exp_model.experiment_id)
-                    & (JobModel.run_id == exp_model.current_run_id)
-                )
-                .count()
-            )
-            finished_jobs = (
-                JobModel.select()
-                .where(
-                    (JobModel.experiment_id == exp_model.experiment_id)
-                    & (JobModel.run_id == exp_model.current_run_id)
-                    & (JobModel.state == "done")
-                )
-                .count()
-            )
-            failed_jobs = (
-                JobModel.select()
-                .where(
-                    (JobModel.experiment_id == exp_model.experiment_id)
-                    & (JobModel.run_id == exp_model.current_run_id)
-                    & (JobModel.state == "error")
-                )
-                .count()
-            )
+            status = ExperimentStatus(status_str)
+        except ValueError:
+            # Handle legacy status values
+            if status_str in ("active", "running"):
+                status = ExperimentStatus.RUNNING
+            elif status_str in ("completed", "done"):
+                status = ExperimentStatus.DONE
+            elif status_str == "failed":
+                status = ExperimentStatus.FAILED
+            else:
+                status = ExperimentStatus.RUNNING
+
+        # Parse services from dict (can be list or dict)
+        services_data = d.get("services", {})
+        if isinstance(services_data, list):
+            services = {
+                s.get("service_id", ""): MockService.from_full_state_dict(s)
+                for s in services_data
+            }
+        else:
+            services = {
+                k: MockService.from_full_state_dict(v) for k, v in services_data.items()
+            }
 
-            # Get hostname from run model
-            try:
-                run_model = ExperimentRunModel.get(
-                    (ExperimentRunModel.experiment_id == exp_model.experiment_id)
-                    & (ExperimentRunModel.run_id == exp_model.current_run_id)
-                )
-                hostname = run_model.hostname
-            except ExperimentRunModel.DoesNotExist:
-                pass
-
-        # Compute experiment path from workspace_path and experiment_id
-        exp_path = self.workspace_path / "xp" / exp_model.experiment_id
-
-        return MockExperiment(
-            workdir=exp_path,
-            current_run_id=exp_model.current_run_id,
-            total_jobs=total_jobs,
-            finished_jobs=finished_jobs,
-            failed_jobs=failed_jobs,
-            updated_at=exp_model.updated_at.isoformat(),
-            hostname=hostname,
+        return cls(
+            workdir=workdir,
+            run_id=run_id,
+            status=status,
+            events_count=d.get("events_count", 0),
+            hostname=d.get("hostname"),
+            started_at=d.get("started_at"),
+            ended_at=d.get("ended_at"),
+            services=services,
+            dependencies=d.get("dependencies", {}),
+            finished_jobs=d.get("finished_jobs", 0),
+            failed_jobs=d.get("failed_jobs", 0),
         )
 
-    @_with_db_context
-    def get_experiment_runs(self, experiment_id: str) -> List[Dict]:
-        """Get all runs for an experiment
+    def apply_event(self, event: "EventBase") -> None:
+        """Apply an event to update experiment state
 
         Args:
-            experiment_id: Experiment identifier
-
-        Returns:
-            List of run dictionaries with keys:
-            - experiment_id: Experiment ID
-            - run_id: Run ID
-            - started_at: When run started
-            - ended_at: When run completed (None if active)
-            - status: Run status (active, completed, failed, abandoned)
+            event: Event to apply
         """
-        runs = []
-        for run_model in (
-            ExperimentRunModel.select()
-            .where(ExperimentRunModel.experiment_id == experiment_id)
-            .order_by(ExperimentRunModel.started_at.desc())
-        ):
-            runs.append(
-                {
-                    "experiment_id": run_model.experiment_id,
-                    "run_id": run_model.run_id,
-                    "started_at": run_model.started_at.isoformat(),
-                    "ended_at": (
-                        run_model.ended_at.isoformat() if run_model.ended_at else None
-                    ),
-                    "status": run_model.status,
-                }
-            )
-        return runs
-
-    @_with_db_context
-    def complete_run(self, experiment_id: str, run_id: str, status: str = "completed"):
-        """Mark a run as completed
-
-        Args:
-            experiment_id: Experiment identifier
-            run_id: Run identifier
-            status: Final status (completed, failed, abandoned)
+        from experimaestro.scheduler.state_status import (
+            JobSubmittedEvent,
+            JobStateChangedEvent,
+            ServiceAddedEvent,
+            RunCompletedEvent,
+        )
 
-        Raises:
-            RuntimeError: If in read-only mode
-        """
-        if self.read_only:
-            raise RuntimeError("Cannot modify runs in read-only mode")
+        if isinstance(event, JobSubmittedEvent):
+            # Add lightweight job info (tags are stored in ExperimentJobInformation)
+            self._job_infos[event.job_id] = ExperimentJobInformation(
+                job_id=event.job_id,
+                task_id=event.task_id,
+                tags=event.tags or {},
+                timestamp=event.timestamp,
+            )
+            if event.depends_on:
+                self._dependencies[event.job_id] = event.depends_on
+
+        elif isinstance(event, ServiceAddedEvent):
+            self._services[event.service_id] = MockService(
+                service_id=event.service_id,
+                description_text=event.description,
+                state_dict_data=event.state_dict,
+                service_class=event.service_class,
+                experiment_id=self.experiment_id,
+                run_id=self.run_id,
+            )
+
+        elif isinstance(event, JobStateChangedEvent):
+            # Update finished/failed counters when jobs complete
+            if event.state == "done":
+                self._finished_jobs += 1
+            elif event.state == "error":
+                self._failed_jobs += 1
+
+        elif isinstance(event, RunCompletedEvent):
+            # Map status string to ExperimentStatus
+            if event.status in ("completed", "done"):
+                self._status = ExperimentStatus.DONE
+            elif event.status == "failed":
+                self._status = ExperimentStatus.FAILED
+            else:
+                self._status = ExperimentStatus.RUNNING
+            self._ended_at = event.ended_at
 
-        ExperimentRunModel.update(ended_at=datetime.now(), status=status).where(
-            (ExperimentRunModel.experiment_id == experiment_id)
-            & (ExperimentRunModel.run_id == run_id)
-        ).execute()
 
-        logger.info("Marked run %s/%s as %s", experiment_id, run_id, status)
+class MockService(BaseService):
+    """Mock service object for remote monitoring
 
-    # Job operations
+    This class provides a service-like interface for services loaded from
+    the remote server. It mimics the Service class interface sufficiently
+    for display in the TUI ServicesList widget.
+    """
 
-    @_with_db_context
-    def get_jobs(
+    def __init__(
         self,
+        service_id: str,
+        description_text: str,
+        state_dict_data: dict,
+        service_class: Optional[str] = None,
         experiment_id: Optional[str] = None,
         run_id: Optional[str] = None,
-        task_id: Optional[str] = None,
-        state: Optional[str] = None,
-        tags: Optional[Dict[str, str]] = None,
-        since: Optional[datetime] = None,
-    ) -> List[MockJob]:
-        """Query jobs with optional filters
-
-        Args:
-            experiment_id: Filter by experiment (None = all experiments)
-            run_id: Filter by run (None = current run if experiment_id provided)
-            task_id: Filter by task class identifier
-            state: Filter by job state
-            tags: Filter by tags (all tags must match)
-            since: If provided, only return jobs updated after this timestamp
-
-        Returns:
-            List of MockJob objects
-        """
-        # Build base query
-        query = JobModel.select()
-
-        # Apply since filter for incremental updates
-        if since is not None:
-            query = query.where(JobModel.updated_at > since)
-
-        # Apply experiment filter
-        if experiment_id is not None:
-            # If experiment_id provided but not run_id, use current run
-            if run_id is None:
-                current_run = self.get_current_run(experiment_id)
-                if current_run is None:
-                    return []  # No runs exist for this experiment
-                run_id = current_run
-
-            query = query.where(
-                (JobModel.experiment_id == experiment_id) & (JobModel.run_id == run_id)
-            )
-
-        # Apply task_id filter
-        if task_id is not None:
-            query = query.where(JobModel.task_id == task_id)
-
-        # Apply state filter
-        if state is not None:
-            query = query.where(JobModel.state == state)
-
-        # Apply tag filters
-        if tags:
-            for tag_key, tag_value in tags.items():
-                # Join with JobTagModel for each tag filter
-                query = query.join(
-                    JobTagModel,
-                    on=(
-                        (JobTagModel.job_id == JobModel.job_id)
-                        & (JobTagModel.experiment_id == JobModel.experiment_id)
-                        & (JobTagModel.run_id == JobModel.run_id)
-                        & (JobTagModel.tag_key == tag_key)
-                        & (JobTagModel.tag_value == tag_value)
-                    ),
-                )
-
-        # Execute query and convert to dictionaries
-        jobs = []
-        for job_model in query:
-            # Get tags for this job
-            job_tags = self._get_job_tags(
-                job_model.job_id, job_model.experiment_id, job_model.run_id
-            )
-
-            jobs.append(self._job_model_to_dict(job_model, job_tags))
-
-        return jobs
-
-    @_with_db_context
-    def get_job(
-        self, job_id: str, experiment_id: str, run_id: Optional[str] = None
-    ) -> Optional[MockJob]:
-        """Get a specific job
-
-        Args:
-            job_id: Job identifier
-            experiment_id: Experiment identifier
-            run_id: Run identifier (None = current run)
+        url: Optional[str] = None,
+    ):
+        self.id = service_id
+        self._description = description_text
+        self._state_name = "MOCK"  # MockService always has MOCK state
+        self._state_dict_data = state_dict_data
+        self._service_class = service_class
+        self.experiment_id = experiment_id
+        self.run_id = run_id
+        self.url = url
 
-        Returns:
-            MockJob object or None if not found
-        """
-        # Use current run if not specified
-        if run_id is None:
-            run_id = self.get_current_run(experiment_id)
-            if run_id is None:
-                return None
+    @property
+    def state(self):
+        """Return state as a ServiceState-like object with a name attribute"""
+        from experimaestro.scheduler.services import ServiceState
 
+        # Convert state name to ServiceState enum
         try:
-            job_model = JobModel.get(
-                (JobModel.job_id == job_id)
-                & (JobModel.experiment_id == experiment_id)
-                & (JobModel.run_id == run_id)
-            )
-        except JobModel.DoesNotExist:
-            return None
-
-        # Get tags for this job
-        job_tags = self._get_job_tags(job_id, experiment_id, run_id)
-
-        return self._job_model_to_dict(job_model, job_tags)
-
-    @_with_db_context
-    def update_job_submitted(self, job: "Job", experiment_id: str, run_id: str):
-        """Record that a job has been submitted
-
-        Args:
-            job: Job instance
-            experiment_id: Experiment identifier
-            run_id: Run identifier
-
-        Raises:
-            RuntimeError: If in read-only mode
-        """
-        if self.read_only:
-            raise RuntimeError("Cannot update jobs in read-only mode")
-
-        task_id = str(job.type.identifier)
-
-        # Create or update job record
-        now = datetime.now()
-        JobModel.insert(
-            job_id=job.identifier,
-            experiment_id=experiment_id,
-            run_id=run_id,
-            task_id=task_id,
-            locator=job.identifier,
-            state=job.state.name,
-            submitted_time=job.submittime,
-            updated_at=now,
-        ).on_conflict(
-            conflict_target=[JobModel.job_id, JobModel.experiment_id, JobModel.run_id],
-            update={
-                JobModel.state: job.state.name,
-                JobModel.submitted_time: job.submittime,
-                JobModel.updated_at: now,
-                JobModel.failure_reason: None,  # Clear old failure reason on resubmit
-            },
-        ).execute()
-
-        # Update tags (run-scoped)
-        self.update_job_tags(job.identifier, experiment_id, run_id, job.tags)
-
-        # Register partials for all declared subparameters
-        subparameters = job.type._subparameters
-        for name, sp in subparameters.items():
-            partial_id = job.config.__xpm__.get_partial_identifier(sp)
-            partial_id_hex = partial_id.all.hex()
-
-            # Register the partial directory
-            self.register_partial(partial_id_hex, task_id, name)
-
-            # Link job to partial
-            self.register_job_partial(
-                job.identifier, experiment_id, run_id, partial_id_hex
-            )
+            return ServiceState[self._state_name]
+        except KeyError:
+            # Return a mock object with name attribute for unknown states
+            class MockState:
+                def __init__(self, name):
+                    self.name = name
 
-        logger.debug(
-            "Recorded job submission: %s (experiment=%s, run=%s)",
-            job.identifier,
-            experiment_id,
-            run_id,
-        )
+            return MockState(self._state_name)
 
-        # Notify listeners
-        job_path = str(
-            self.workspace_path / "jobs" / str(job.type.identifier) / job.identifier
-        )
-        self._notify_listeners(
-            StateEvent(
-                event_type=StateEventType.JOB_UPDATED,
-                data={
-                    "jobId": job.identifier,
-                    "taskId": str(job.type.identifier),
-                    "experimentId": experiment_id,
-                    "runId": run_id,
-                    "status": job.state.name,
-                    "path": job_path,
-                    "updatedAt": now.isoformat(),
-                },
-            )
-        )
+    def description(self) -> str:
+        """Return service description"""
+        return self._description
 
-    @_with_db_context
-    def update_job_state(self, job: "Job", experiment_id: str, run_id: str):
-        """Update the state of a job
+    def state_dict(self) -> dict:
+        """Return service state for recreation"""
+        return self._state_dict_data
 
-        Args:
-            job: Job instance
-            experiment_id: Experiment identifier
-            run_id: Run identifier
+    def full_state_dict(self) -> dict:
+        """Get full state as dictionary for JSON serialization.
 
-        Raises:
-            RuntimeError: If in read-only mode
+        Overrides BaseService.full_state_dict() to preserve the original
+        service class name instead of using MockService's class name.
         """
-        if self.read_only:
-            raise RuntimeError("Cannot update jobs in read-only mode")
-
-        # Build update dict with updated_at timestamp
-        now = datetime.now()
-        update_data = {
-            JobModel.state: job.state.name,
-            JobModel.updated_at: now,
+        return {
+            "service_id": self.id,
+            "description": self._description,
+            "class": self._service_class,
+            "state_dict": self._state_dict_data,
         }
 
-        # Add or clear failure reason based on state
-        from experimaestro.scheduler.jobs import JobStateError
-
-        if isinstance(job.state, JobStateError) and job.state.failure_reason:
-            update_data[JobModel.failure_reason] = job.state.failure_reason.name
-        else:
-            # Clear failure reason when job is not in error state
-            update_data[JobModel.failure_reason] = None
-
-        # Add timing information
-        if job.starttime:
-            update_data[JobModel.started_time] = job.starttime
-        if job.endtime:
-            update_data[JobModel.ended_time] = job.endtime
-
-        # Add progress information
-        if job._progress:
-            update_data[JobModel.progress] = json.dumps(
-                [
-                    {"level": p.level, "progress": p.progress, "desc": p.desc}
-                    for p in job._progress
-                ]
-            )
+    @property
+    def service_class(self) -> Optional[str]:
+        """Return service class name"""
+        return self._service_class
 
-        # Update the job record
-        JobModel.update(update_data).where(
-            (JobModel.job_id == job.identifier)
-            & (JobModel.experiment_id == experiment_id)
-            & (JobModel.run_id == run_id)
-        ).execute()
+    @classmethod
+    def from_full_state_dict(cls, d: Dict) -> "MockService":
+        """Create MockService from full state dictionary
 
-        logger.debug(
-            "Updated job state: %s -> %s (experiment=%s, run=%s)",
-            job.identifier,
-            job.state.name,
-            experiment_id,
-            run_id,
-        )
+        Args:
+            d: Dictionary from full_state_dict()
 
-        # Notify listeners
-        job_path = str(
-            self.workspace_path / "jobs" / str(job.type.identifier) / job.identifier
-        )
-        self._notify_listeners(
-            StateEvent(
-                event_type=StateEventType.JOB_UPDATED,
-                data={
-                    "jobId": job.identifier,
-                    "taskId": str(job.type.identifier),
-                    "experimentId": experiment_id,
-                    "runId": run_id,
-                    "status": job.state.name,
-                    "path": job_path,
-                    "updatedAt": now.isoformat(),
-                },
-            )
+        Returns:
+            MockService instance (state is always MOCK, not from dict)
+        """
+        return cls(
+            service_id=d["service_id"],
+            description_text=d.get("description", ""),
+            state_dict_data=d.get("state_dict", {}),
+            service_class=d.get("class"),
+            experiment_id=d.get("experiment_id"),
+            run_id=d.get("run_id"),
+            url=d.get("url"),
         )
 
-    @_with_db_context
-    def update_job_tags(
-        self, job_id: str, experiment_id: str, run_id: str, tags_dict: Dict[str, str]
-    ):
-        """Update tags for a job (run-scoped - fixes GH #128)
+    def to_service(self) -> "BaseService":
+        """Try to recreate a live Service instance from this mock.
 
-        Deletes existing tags for this (job_id, experiment_id, run_id) combination
-        and inserts new tags. This ensures that the same job in different runs can
-        have different tags.
-
-        Args:
-            job_id: Job identifier
-            experiment_id: Experiment identifier
-            run_id: Run identifier
-            tags_dict: Dictionary of tag key-value pairs
-
-        Raises:
-            RuntimeError: If in read-only mode
-        """
-        if self.read_only:
-            raise RuntimeError("Cannot update tags in read-only mode")
-
-        # Delete existing tags for this job/experiment/run
-        JobTagModel.delete().where(
-            (JobTagModel.job_id == job_id)
-            & (JobTagModel.experiment_id == experiment_id)
-            & (JobTagModel.run_id == run_id)
-        ).execute()
-
-        # Insert new tags
-        if tags_dict:
-            tag_records = [
-                {
-                    "job_id": job_id,
-                    "experiment_id": experiment_id,
-                    "run_id": run_id,
-                    "tag_key": key,
-                    "tag_value": value,
-                }
-                for key, value in tags_dict.items()
-            ]
-            JobTagModel.insert_many(tag_records).execute()
-
-        logger.debug(
-            "Updated tags for job %s (experiment=%s, run=%s): %s",
-            job_id,
-            experiment_id,
-            run_id,
-            tags_dict,
-        )
-
-    @_with_db_context
-    def delete_job(self, job_id: str, experiment_id: str, run_id: str):
-        """Remove a job, its tags, and partial references
-
-        Args:
-            job_id: Job identifier
-            experiment_id: Experiment identifier
-            run_id: Run identifier
-
-        Raises:
-            RuntimeError: If in read-only mode
-        """
-        if self.read_only:
-            raise RuntimeError("Cannot delete jobs in read-only mode")
-
-        # Delete tags first (foreign key constraint)
-        JobTagModel.delete().where(
-            (JobTagModel.job_id == job_id)
-            & (JobTagModel.experiment_id == experiment_id)
-            & (JobTagModel.run_id == run_id)
-        ).execute()
-
-        # Delete partial references
-        JobPartialModel.delete().where(
-            (JobPartialModel.job_id == job_id)
-            & (JobPartialModel.experiment_id == experiment_id)
-            & (JobPartialModel.run_id == run_id)
-        ).execute()
-
-        # Delete job
-        JobModel.delete().where(
-            (JobModel.job_id == job_id)
-            & (JobModel.experiment_id == experiment_id)
-            & (JobModel.run_id == run_id)
-        ).execute()
-
-        logger.debug(
-            "Deleted job %s (experiment=%s, run=%s)", job_id, experiment_id, run_id
-        )
-
-    # CLI utility methods for job management
-
-    @_with_db_context
-    def get_all_jobs(
-        self,
-        state: Optional[str] = None,
-        tags: Optional[Dict[str, str]] = None,
-        since: Optional[datetime] = None,
-    ) -> List[MockJob]:
-        """Query all jobs across all experiments/runs
-
-        This method is designed for CLI tools that need to list or manage jobs
-        across the entire workspace, regardless of experiment or run.
-
-        Args:
-            state: Filter by job state (e.g., "done", "error", "running")
-            tags: Filter by tags (all tags must match)
-            since: If provided, only return jobs updated after this timestamp
-
-        Returns:
-            List of MockJob objects
-        """
-        # Build base query
-        query = JobModel.select()
-
-        # Apply since filter for incremental updates
-        if since is not None:
-            query = query.where(JobModel.updated_at > since)
-
-        # Apply state filter
-        if state is not None:
-            query = query.where(JobModel.state == state)
-
-        # Apply tag filters
-        if tags:
-            for tag_key, tag_value in tags.items():
-                query = query.join(
-                    JobTagModel,
-                    on=(
-                        (JobTagModel.job_id == JobModel.job_id)
-                        & (JobTagModel.experiment_id == JobModel.experiment_id)
-                        & (JobTagModel.run_id == JobModel.run_id)
-                        & (JobTagModel.tag_key == tag_key)
-                        & (JobTagModel.tag_value == tag_value)
-                    ),
-                )
-
-        # Execute query and convert to MockJob objects
-        jobs = []
-        for job_model in query:
-            # Get tags for this job
-            job_tags = self._get_job_tags(
-                job_model.job_id, job_model.experiment_id, job_model.run_id
-            )
-            jobs.append(self._job_model_to_dict(job_model, job_tags))
-
-        return jobs
-
-    def kill_job(self, job: MockJob, perform: bool = False) -> bool:
-        """Kill a running job process
-
-        This method finds the process associated with a running job and kills it.
-        It also updates the job state in the database to ERROR.
-
-        Args:
-            job: MockJob instance to kill
-            perform: If True, actually kill the process. If False, just check
-                if the job can be killed (dry run).
+        Attempts to recreate the service using the stored configuration.
+        If recreation fails, returns self.
 
         Returns:
-            True if job was killed (or would be killed in dry run),
-            False if job is not running or process not found
-        """
-        # Check if job is in a running state
-        if not job.state.running():
-            logger.debug("Job %s is not running (state=%s)", job.identifier, job.state)
-            return False
-
-        # Get process from job
-        process = job.getprocess()
-        if process is None:
-            logger.warning("Could not get process for job %s", job.identifier)
-            return False
-
-        if perform:
-            try:
-                logger.info("Killing job %s (process: %s)", job.identifier, process)
-                process.kill()
-
-                # Update job state in database
-                if not self.read_only:
-                    self._update_job_state_to_error(job, "killed")
-            except Exception as e:
-                logger.error("Error killing job %s: %s", job.identifier, e)
-                return False
-
-        return True
-
-    def _update_job_state_to_error(self, job: MockJob, reason: str):
-        """Update job state to ERROR in database
-
-        Args:
-            job: MockJob instance
-            reason: Failure reason
-        """
-        if self.read_only:
-            return
-
-        now = datetime.now()
-        with self.workspace_db.bind_ctx([JobModel]):
-            JobModel.update(
-                state="error",
-                failure_reason=reason,
-                ended_time=now.timestamp(),
-                updated_at=now,
-            ).where(
-                (JobModel.job_id == job.identifier)
-                & (JobModel.experiment_id == job.experiment_id)
-                & (JobModel.run_id == job.run_id)
-            ).execute()
-
-        logger.debug(
-            "Updated job %s state to error (reason=%s)", job.identifier, reason
-        )
-
-    def clean_job(self, job: MockJob, perform: bool = False) -> bool:
-        """Clean a finished job (delete directory and DB entry)
-
-        This method removes the job's working directory and its database entry.
-        Only finished jobs (DONE or ERROR state) can be cleaned.
-
-        Args:
-            job: MockJob instance to clean
-            perform: If True, actually delete the job. If False, just check
-                if the job can be cleaned (dry run).
-
-        Returns:
-            True if job was cleaned (or would be cleaned in dry run),
-            False if job is not finished or cannot be cleaned
-        """
-        from shutil import rmtree
-
-        # Check if job is in a finished state
-        if not job.state.finished():
-            logger.debug(
-                "Job %s is not finished (state=%s), cannot clean",
-                job.identifier,
-                job.state,
-            )
-            return False
-
-        if perform:
-            # Delete job directory
-            if job.path.exists():
-                logger.info("Cleaning job %s: removing %s", job.identifier, job.path)
-                rmtree(job.path)
-            else:
-                logger.warning("Job directory does not exist: %s", job.path)
-
-            # Delete from database
-            if not self.read_only:
-                self.delete_job(job.identifier, job.experiment_id, job.run_id)
-
-        return True
-
-    def kill_jobs(self, jobs: List[MockJob], perform: bool = False) -> int:
-        """Kill multiple jobs
-
-        Args:
-            jobs: List of MockJob instances to kill
-            perform: If True, actually kill the processes. If False, dry run.
-
-        Returns:
-            Number of jobs that were killed (or would be killed in dry run)
-        """
-        count = 0
-        for job in jobs:
-            if self.kill_job(job, perform=perform):
-                count += 1
-        return count
-
-    def clean_jobs(self, jobs: List[MockJob], perform: bool = False) -> int:
-        """Clean multiple finished jobs
-
-        Args:
-            jobs: List of MockJob instances to clean
-            perform: If True, actually delete the jobs. If False, dry run.
-
-        Returns:
-            Number of jobs that were cleaned (or would be cleaned in dry run)
-        """
-        count = 0
-        for job in jobs:
-            if self.clean_job(job, perform=perform):
-                count += 1
-        return count
-
-    def delete_job_safely(
-        self, job: MockJob, cascade_orphans: bool = True
-    ) -> tuple[bool, str]:
-        """Delete a job with proper locking and orphan cleanup
-
-        This method is designed for TUI/UI use. It acquires a lock on the job
-        to prevent race conditions, then deletes the job directory and DB entry.
-
-        Args:
-            job: MockJob instance to delete
-            cascade_orphans: If True, clean up orphan partials after deletion
-
-        Returns:
-            Tuple of (success: bool, message: str)
-        """
-        import fasteners
-        from shutil import rmtree
-
-        # Check if job is running
-        if job.state.running():
-            return False, "Cannot delete a running job"
-
-        # Check if path exists
-        if not job.path or not job.path.exists():
-            # Just delete from database if path doesn't exist
-            if not self.read_only:
-                self.delete_job(job.identifier, job.experiment_id, job.run_id)
-            if cascade_orphans:
-                self.cleanup_orphan_partials(perform=True)
-            return True, f"Job {job.identifier} deleted (directory already gone)"
-
-        # Try to acquire job lock (non-blocking)
-        # Lock file is typically {script_name}.lock, but we use .lock for general locking
-        lock_path = job.path / ".lock"
-        lock = fasteners.InterProcessLock(str(lock_path))
-
-        if not lock.acquire(blocking=False):
-            return False, "Job is currently locked (possibly running)"
-
-        try:
-            # Delete all files except the lock file
-            for item in job.path.iterdir():
-                if item.name != ".lock":
-                    if item.is_dir():
-                        rmtree(item)
-                    else:
-                        item.unlink()
-
-            # Mark job as "phantom" in database (don't delete - keep as phantom)
-            if not self.read_only:
-                from datetime import datetime
-
-                JobModel.update(
-                    state="phantom",
-                    updated_at=datetime.now(),
-                ).where(
-                    (JobModel.job_id == job.identifier)
-                    & (JobModel.experiment_id == job.experiment_id)
-                    & (JobModel.run_id == job.run_id)
-                ).execute()
-
-        finally:
-            lock.release()
-            # Now delete the lock file and directory
-            try:
-                lock_path.unlink(missing_ok=True)
-                if job.path.exists() and not any(job.path.iterdir()):
-                    job.path.rmdir()
-            except Exception as e:
-                logger.warning("Could not clean up lock file: %s", e)
-
-        # Clean up orphan partials if requested
-        if cascade_orphans:
-            self.cleanup_orphan_partials(perform=True)
-
-        return True, f"Job {job.identifier} deleted successfully"
-
-    @_with_db_context
-    def delete_experiment(
-        self, experiment_id: str, delete_jobs: bool = False
-    ) -> tuple[bool, str]:
-        """Delete an experiment from the database
-
-        Args:
-            experiment_id: Experiment identifier
-            delete_jobs: If True, also delete associated jobs (default: False)
-
-        Returns:
-            Tuple of (success: bool, message: str)
-        """
-        from shutil import rmtree
-
-        if self.read_only:
-            return False, "Cannot delete in read-only mode"
-
-        # Get all jobs for this experiment
-        jobs = self.get_jobs(experiment_id)
-        running_jobs = [j for j in jobs if j.state.running()]
-
-        if running_jobs:
-            return (
-                False,
-                f"Cannot delete experiment with {len(running_jobs)} running job(s)",
-            )
-
-        # Delete jobs if requested
-        if delete_jobs:
-            for job in jobs:
-                success, msg = self.delete_job_safely(job, cascade_orphans=False)
-                if not success:
-                    logger.warning("Failed to delete job %s: %s", job.identifier, msg)
-
-        # Delete experiment runs
-        ExperimentRunModel.delete().where(
-            ExperimentRunModel.experiment_id == experiment_id
-        ).execute()
-
-        # Delete experiment
-        ExperimentModel.delete().where(
-            ExperimentModel.experiment_id == experiment_id
-        ).execute()
-
-        # Optionally delete experiment directory
-        exp_path = self.workspace_path / "xp" / experiment_id
-        if exp_path.exists():
-            try:
-                rmtree(exp_path)
-            except Exception as e:
-                logger.warning("Could not delete experiment directory: %s", e)
-
-        # Clean up orphan partials
-        self.cleanup_orphan_partials(perform=True)
-
-        return True, f"Experiment {experiment_id} deleted successfully"
-
-    @_with_db_context
-    def get_orphan_jobs(self) -> List[MockJob]:
-        """Find jobs that have no associated experiment in the database
-
-        Returns:
-            List of MockJob instances for orphan jobs
-        """
-        # Get all jobs
-        all_jobs = self.get_all_jobs()
-
-        # Get all experiment IDs
-        experiments = self.get_experiments()
-        experiment_ids = {exp.experiment_id for exp in experiments}
-
-        # Find jobs with no matching experiment
-        orphan_jobs = [
-            job for job in all_jobs if job.experiment_id not in experiment_ids
-        ]
-
-        return orphan_jobs
-
-    # Service operations
-
-    @_with_db_context
-    def register_service(
-        self,
-        service_id: str,
-        experiment_id: str,
-        run_id: str,
-        description: str,
-        state_dict: Optional[str] = None,
-    ):
-        """Register a service in the database
-
-        Services are only added or removed, not updated. Runtime state
-        is managed by the Service object itself.
-
-        Args:
-            service_id: Service identifier
-            experiment_id: Experiment identifier
-            run_id: Run identifier
-            description: Human-readable description
-            state_dict: JSON serialized state_dict for service recreation
-
-        Raises:
-            RuntimeError: If in read-only mode
-        """
-        if self.read_only:
-            raise RuntimeError("Cannot register services in read-only mode")
-
-        insert_data = {
-            "service_id": service_id,
-            "experiment_id": experiment_id,
-            "run_id": run_id,
-            "description": description,
-            "created_at": datetime.now(),
-        }
-
-        if state_dict is not None:
-            insert_data["state_dict"] = state_dict
-
-        # Use INSERT OR IGNORE - services are only added, not updated
-        ServiceModel.insert(**insert_data).on_conflict_ignore().execute()
-
-        logger.debug(
-            "Registered service %s (experiment=%s, run=%s)",
-            service_id,
-            experiment_id,
-            run_id,
-        )
-
-        # Notify listeners
-        self._notify_listeners(
-            StateEvent(
-                event_type=StateEventType.SERVICE_UPDATED,
-                data={
-                    "serviceId": service_id,
-                    "experimentId": experiment_id,
-                    "runId": run_id,
-                    "description": description,
-                },
-            )
-        )
-
-    def _get_live_services(
-        self, experiment_id: Optional[str], run_id: Optional[str]
-    ) -> Optional[List["Service"]]:
-        """Get live services from scheduler if available.
-
-        Returns None if no live services (experiment not in scheduler).
-        """
-        if experiment_id is None:
-            return None
-
-        try:
-            from experimaestro.scheduler.base import Scheduler
-
-            if not Scheduler.has_instance():
-                return None
-
-            scheduler = Scheduler.instance()
-            if experiment_id not in scheduler.experiments:
-                logger.debug("Experiment %s not in scheduler", experiment_id)
-                return None
-
-            exp = scheduler.experiments[experiment_id]
-            services = list(exp.services.values())
-            logger.debug(
-                "Returning %d live services for experiment %s",
-                len(services),
-                experiment_id,
-            )
-            return services
-
-        except Exception as e:
-            logger.warning("Could not get live services: %s", e)
-            return None
-
-    @_with_db_context
-    def _fetch_services_from_storage(
-        self, experiment_id: Optional[str], run_id: Optional[str]
-    ) -> List["Service"]:
-        """Fetch services from database.
-
-        Called when no live services and cache is empty.
-        """
-        from experimaestro.scheduler.services import Service
-
-        query = ServiceModel.select()
-
-        if experiment_id is not None:
-            query = query.where(
-                (ServiceModel.experiment_id == experiment_id)
-                & (ServiceModel.run_id == run_id)
-            )
-
-        services = []
-
-        for service_model in query:
-            service_id = service_model.service_id
-
-            # Try to recreate service from state_dict
-            state_dict_json = service_model.state_dict
-            if state_dict_json and state_dict_json != "{}":
-                try:
-                    state_dict = json.loads(state_dict_json)
-                    if "__class__" in state_dict:
-                        service = Service.from_state_dict(state_dict)
-                except Exception as e:
-                    service = MockService(
-                        service_id,
-                        f"error: {e}",
-                        {},
-                        experiment_id=experiment_id,
-                        run_id=run_id,
-                    )
-
-                    logger.warning(
-                        "Failed to recreate service %s from state_dict: %s",
-                        service_id,
-                        e,
-                    )
-            else:
-                # If we can't recreate, skip this service (it's not usable)
-                logger.debug(
-                    "Service %s has no state_dict for recreation, skipping",
-                    service_id,
-                )
-                service = MockService(
-                    service_id,
-                    "error: no state_dict",
-                    {},
-                    experiment_id=experiment_id,
-                    run_id=run_id,
-                )
-
-            # Add to services
-            service.id = service_id
-            services.append(service)
-            continue
-
-        return services
-
-    @_with_db_context
-    def get_services_raw(
-        self, experiment_id: Optional[str] = None, run_id: Optional[str] = None
-    ) -> List[Dict]:
-        """Get raw service data from database without recreating Service objects
-
-        This is useful for remote monitoring where the client may have different
-        modules installed than the server. Returns dictionaries with service
-        metadata that can be serialized over JSON-RPC.
-
-        Args:
-            experiment_id: Filter by experiment (None = all)
-            run_id: Filter by run (None = current run if experiment_id provided)
-
-        Returns:
-            List of dictionaries with service data
-        """
-        query = ServiceModel.select()
-
-        if experiment_id is not None:
-            # Use current run if not specified
-            if run_id is None:
-                run_id = self.get_current_run(experiment_id)
-                if run_id is None:
-                    return []
-
-            query = query.where(
-                (ServiceModel.experiment_id == experiment_id)
-                & (ServiceModel.run_id == run_id)
-            )
-
-        services = []
-        for service_model in query:
-            state_dict = {}
-            if service_model.state_dict and service_model.state_dict != "{}":
-                try:
-                    state_dict = json.loads(service_model.state_dict)
-                except json.JSONDecodeError:
-                    pass
-
-            services.append(
-                {
-                    "service_id": service_model.service_id,
-                    "description": service_model.description,
-                    "state_dict": state_dict,
-                    "experiment_id": service_model.experiment_id,
-                    "run_id": service_model.run_id,
-                }
-            )
-
-        return services
-
-    def get_live_job_states(self, experiment_id: str) -> Dict[str, str]:
-        """Get live job states from the scheduler if available
-
-        This is useful for debugging to compare live state vs database state.
-
-        Args:
-            experiment_id: The experiment ID to get live jobs for
-
-        Returns:
-            Dict mapping job identifier to live state name, empty if scheduler
-            not available or experiment not registered
-        """
-        try:
-            from experimaestro.scheduler.base import Scheduler
-
-            if not Scheduler.has_instance():
-                logger.debug("No scheduler instance available for live states")
-                return {}
-
-            scheduler = Scheduler.instance()
-            live_states = {}
-
-            logger.debug(
-                "get_live_job_states: looking for exp=%s, scheduler has %d jobs",
-                experiment_id,
-                len(scheduler.jobs),
-            )
-
-            for job_id, job in scheduler.jobs.items():
-                # Filter by experiment if needed
-                if hasattr(job, "experiment") and job.experiment is not None:
-                    if hasattr(job.experiment, "workdir"):
-                        job_exp_id = job.experiment.workdir.name
-                        if job_exp_id == experiment_id:
-                            live_states[job_id] = job.state.name
-                        else:
-                            logger.debug(
-                                "Job %s exp_id=%s != requested %s",
-                                job_id[:8],
-                                job_exp_id,
-                                experiment_id,
-                            )
-                else:
-                    # Job not associated with experiment, include it anyway
-                    live_states[job_id] = job.state.name
-                    logger.debug(
-                        "Job %s has no experiment, including anyway", job_id[:8]
-                    )
-
-            logger.debug("Returning %d live job states", len(live_states))
-            return live_states
-
-        except Exception as e:
-            logger.debug("Could not get live job states: %s", e)
-            return {}
-
-    # Sync metadata methods
-
-    @_with_db_context
-    def get_last_sync_time(self) -> Optional[datetime]:
-        """Get the timestamp of the last successful sync
-
-        Returns:
-            datetime of last sync, or None if never synced
-        """
-        from peewee import OperationalError
-
-        from .state_db import WorkspaceSyncMetadata
-
-        try:
-            metadata = WorkspaceSyncMetadata.get_or_none(
-                WorkspaceSyncMetadata.id == "workspace"
-            )
-            if metadata and metadata.last_sync_time:
-                return metadata.last_sync_time
-        except OperationalError:
-            # Table might not exist in older workspaces opened in read-only mode
-            pass
-        return None
-
-    @_with_db_context
-    def update_last_sync_time(self) -> None:
-        """Update the last sync timestamp to now
-
-        Raises:
-            RuntimeError: If in read-only mode
-        """
-        if self.read_only:
-            raise RuntimeError("Cannot update sync time in read-only mode")
-
-        from .state_db import WorkspaceSyncMetadata
-
-        WorkspaceSyncMetadata.insert(
-            id="workspace", last_sync_time=datetime.now()
-        ).on_conflict(
-            conflict_target=[WorkspaceSyncMetadata.id],
-            update={WorkspaceSyncMetadata.last_sync_time: datetime.now()},
-        ).execute()
-        logger.debug("Updated last sync time")
-
-    # Partial management methods
-
-    @_with_db_context
-    def register_partial(
-        self, partial_id: str, task_id: str, subparameters_name: str
-    ) -> None:
-        """Register a partial directory (creates if not exists)
-
-        Args:
-            partial_id: Hex hash of the partial identifier
-            task_id: Task class identifier
-            subparameters_name: Name of the subparameters definition
-
-        Raises:
-            RuntimeError: If in read-only mode
-        """
-        if self.read_only:
-            raise RuntimeError("Cannot register partials in read-only mode")
-
-        PartialModel.insert(
-            partial_id=partial_id,
-            task_id=task_id,
-            subparameters_name=subparameters_name,
-            created_at=datetime.now(),
-        ).on_conflict_ignore().execute()
-
-        logger.debug(
-            "Registered partial: %s (task=%s, subparams=%s)",
-            partial_id,
-            task_id,
-            subparameters_name,
-        )
-
-    @_with_db_context
-    def register_job_partial(
-        self, job_id: str, experiment_id: str, run_id: str, partial_id: str
-    ) -> None:
-        """Link a job to a partial directory it uses
-
-        Args:
-            job_id: Job identifier
-            experiment_id: Experiment identifier
-            run_id: Run identifier
-            partial_id: Partial directory identifier
-
-        Raises:
-            RuntimeError: If in read-only mode
-        """
-        if self.read_only:
-            raise RuntimeError("Cannot register job partials in read-only mode")
-
-        JobPartialModel.insert(
-            job_id=job_id,
-            experiment_id=experiment_id,
-            run_id=run_id,
-            partial_id=partial_id,
-        ).on_conflict_ignore().execute()
-
-        logger.debug(
-            "Linked job %s to partial %s (experiment=%s, run=%s)",
-            job_id,
-            partial_id,
-            experiment_id,
-            run_id,
-        )
-
-    @_with_db_context
-    def unregister_job_partials(
-        self, job_id: str, experiment_id: str, run_id: str
-    ) -> None:
-        """Remove all partial links for a job
-
-        Called when a job is deleted to clean up its partial references.
-
-        Args:
-            job_id: Job identifier
-            experiment_id: Experiment identifier
-            run_id: Run identifier
-
-        Raises:
-            RuntimeError: If in read-only mode
-        """
-        if self.read_only:
-            raise RuntimeError("Cannot unregister job partials in read-only mode")
-
-        JobPartialModel.delete().where(
-            (JobPartialModel.job_id == job_id)
-            & (JobPartialModel.experiment_id == experiment_id)
-            & (JobPartialModel.run_id == run_id)
-        ).execute()
-
-        logger.debug(
-            "Unregistered partials for job %s (experiment=%s, run=%s)",
-            job_id,
-            experiment_id,
-            run_id,
-        )
-
-    @_with_db_context
-    def get_orphan_partials(self) -> List[Dict]:
-        """Find partial directories that are not referenced by any job
-
-        Returns:
-            List of dictionaries with partial_id, task_id, subparameters_name
-        """
-        # Find partials that have no job references
-        # Using a subquery to find referenced partial_ids
-        referenced_partials = JobPartialModel.select(JobPartialModel.partial_id)
-
-        orphan_query = PartialModel.select().where(
-            PartialModel.partial_id.not_in(referenced_partials)
-        )
-
-        orphans = []
-        for partial in orphan_query:
-            orphans.append(
-                {
-                    "partial_id": partial.partial_id,
-                    "task_id": partial.task_id,
-                    "subparameters_name": partial.subparameters_name,
-                    "created_at": partial.created_at.isoformat(),
-                }
-            )
-
-        return orphans
-
-    def cleanup_orphan_partials(self, perform: bool = False) -> List[Path]:
-        """Clean up orphan partial directories
-
-        Finds partial directories not referenced by any job and removes them.
-
-        Args:
-            perform: If True, actually delete. If False, dry run (list only).
-
-        Returns:
-            List of paths that were deleted (or would be deleted in dry run)
-        """
-        from shutil import rmtree
-
-        orphans = self.get_orphan_partials()
-        deleted_paths = []
-
-        for orphan in orphans:
-            # Reconstruct path: WORKSPACE/partials/TASK_ID/SUBPARAM_NAME/PARTIAL_ID
-            partial_path = (
-                self.workspace_path
-                / "partials"
-                / orphan["task_id"]
-                / orphan["subparameters_name"]
-                / orphan["partial_id"]
-            )
-
-            if perform:
-                # Delete directory if it exists
-                if partial_path.exists():
-                    logger.info("Cleaning orphan partial: %s", partial_path)
-                    rmtree(partial_path)
-
-                # Delete from database
-                if not self.read_only:
-                    with self.workspace_db.bind_ctx([PartialModel]):
-                        PartialModel.delete().where(
-                            PartialModel.partial_id == orphan["partial_id"]
-                        ).execute()
-
-            deleted_paths.append(partial_path)
-
-        return deleted_paths
-
-    # Utility methods
-
-    def close(self):
-        """Close the database connection and remove from registry
-
-        This should be called when done with the workspace to free resources.
-        """
-        # Stop file watcher if running
-        self._stop_file_watcher()
-
-        # Close database connection
-        if hasattr(self, "workspace_db") and self.workspace_db is not None:
-            from .state_db import close_workspace_database
-
-            close_workspace_database(self.workspace_db)
-            self.workspace_db = None
-
-        # Remove from registry
-        with WorkspaceStateProvider._lock:
-            if self.workspace_path in WorkspaceStateProvider._instances:
-                del WorkspaceStateProvider._instances[self.workspace_path]
-
-        logger.debug("WorkspaceStateProvider closed for %s", self.workspace_path)
-
-    # Listener methods for push notifications
-
-    def add_listener(self, listener: StateListener) -> None:
-        """Register a listener for state change notifications
-
-        Listeners are called synchronously when state changes occur.
-        For UI applications, listeners should queue updates for their
-        own event loop to avoid blocking database operations.
-
-        When the first listener is added, starts watching the database
-        file for changes to enable push notifications.
-
-        Args:
-            listener: Callback function that receives StateEvent objects
-        """
-        with self._listeners_lock:
-            was_empty = len(self._listeners) == 0
-            self._listeners.add(listener)
-
-        # Start file watcher when first listener is added
-        if was_empty:
-            self._start_file_watcher()
-
-        logger.info(
-            "Added state listener: %s (total: %d)", listener, len(self._listeners)
-        )
-
-    def remove_listener(self, listener: StateListener) -> None:
-        """Unregister a state change listener
-
-        When the last listener is removed, stops watching the database file.
-
-        Args:
-            listener: Previously registered callback function
-        """
-        with self._listeners_lock:
-            self._listeners.discard(listener)
-            is_empty = len(self._listeners) == 0
-
-        # Stop file watcher when last listener is removed
-        if is_empty:
-            self._stop_file_watcher()
-
-        logger.debug("Removed state listener: %s", listener)
-
-    def _start_file_watcher(self) -> None:
-        """Start watching the database file for changes"""
-        if self._db_file_watch is not None:
-            logger.info("File watcher already running for %s", self._db_dir)
-            return  # Already watching
-
-        from experimaestro.ipc import ipcom
-
-        # Create and start the change detector thread
-        self._change_detector = _DatabaseChangeDetector(self)
-        self._change_detector.start()
-
-        # Create the file handler that signals the detector
-        self._db_file_handler = _DatabaseFileHandler(self._change_detector)
-        self._db_file_watch = ipcom().fswatch(
-            self._db_file_handler,
-            self._db_dir,
-            recursive=False,
-        )
-        logger.info("Started database file watcher for %s", self._db_dir)
-
-    def _stop_file_watcher(self) -> None:
-        """Stop watching the database file"""
-        if self._db_file_watch is None:
-            return  # Not watching
-
-        from experimaestro.ipc import ipcom
-
-        # Stop the file watcher first
-        ipcom().fsunwatch(self._db_file_watch)
-        self._db_file_watch = None
-        self._db_file_handler = None
-
-        # Stop the change detector thread
-        if self._change_detector is not None:
-            self._change_detector.stop()
-            self._change_detector = None
-
-        logger.debug("Stopped database file watcher for %s", self.workspace_path)
-
-    def _notify_listeners(self, event: StateEvent) -> None:
-        """Notify all registered listeners of a state change
-
-        This is called internally by state-modifying methods.
-        Listeners are called synchronously - they should be fast.
-
-        Args:
-            event: State change event to broadcast
-        """
-        with self._listeners_lock:
-            listeners = list(self._listeners)
-
-        for listener in listeners:
-            try:
-                listener(event)
-            except Exception as e:
-                logger.warning("Listener %s raised exception: %s", listener, e)
-
-    # Helper methods
-
-    @_with_db_context
-    def _get_job_tags(
-        self, job_id: str, experiment_id: str, run_id: str
-    ) -> Dict[str, str]:
-        """Get tags for a job
-
-        Args:
-            job_id: Job identifier
-            experiment_id: Experiment identifier
-            run_id: Run identifier
-
-        Returns:
-            Dictionary of tag key-value pairs
-        """
-        tags = {}
-        for tag_model in JobTagModel.select().where(
-            (JobTagModel.job_id == job_id)
-            & (JobTagModel.experiment_id == experiment_id)
-            & (JobTagModel.run_id == run_id)
-        ):
-            tags[tag_model.tag_key] = tag_model.tag_value
-        return tags
-
-    def _job_model_to_dict(self, job_model: JobModel, tags: Dict[str, str]) -> MockJob:
-        """Convert a JobModel to a MockJob object
-
-        Args:
-            job_model: JobModel instance
-            tags: Dictionary of tags for this job
-
-        Returns:
-            MockJob object
-        """
-        # Parse progress JSON
-        progress_list = json.loads(job_model.progress)
-
-        # Compute job path from workspace_path, task_id, and job_id
-        job_path = self.workspace_path / "jobs" / job_model.task_id / job_model.job_id
-
-        # Convert failure_reason string to enum if present
-        failure_reason = None
-        if job_model.failure_reason:
-            try:
-                failure_reason = JobFailureStatus[job_model.failure_reason]
-            except KeyError:
-                pass  # Unknown failure reason, leave as None
-
-        return MockJob(
-            identifier=job_model.job_id,
-            task_id=job_model.task_id,
-            locator=job_model.locator,
-            path=job_path,
-            state=job_model.state,
-            submittime=job_model.submitted_time,
-            starttime=job_model.started_time,
-            endtime=job_model.ended_time,
-            progress=progress_list,
-            tags=tags,
-            experiment_id=job_model.experiment_id,
-            run_id=job_model.run_id,
-            updated_at=job_model.updated_at.isoformat(),
-            failure_reason=failure_reason,
-        )
-
-    def _format_time(self, timestamp: Optional[float]) -> str:
-        """Format timestamp for UI
-
-        Args:
-            timestamp: Unix timestamp or None
-
-        Returns:
-            ISO format datetime string or empty string
-        """
-        if not timestamp:
-            return ""
-        return datetime.fromtimestamp(timestamp).isoformat()
-
-
-# Scheduler listener adapter
-class SchedulerListener:
-    """Adapter to connect scheduler events to WorkspaceStateProvider
-
-    This class implements the scheduler listener interface and forwards
-    events to the WorkspaceStateProvider. It tracks which experiment/run
-    each job belongs to for proper database updates.
-    """
-
-    def __init__(self, state_provider: WorkspaceStateProvider):
-        """Initialize listener
-
-        Args:
-            state_provider: WorkspaceStateProvider instance to update
-        """
-        self.state_provider = state_provider
-        # Map job_id -> (experiment_id, run_id) for tracking
-        self.job_experiments: Dict[str, tuple] = {}
-
-        logger.info("SchedulerListener initialized")
-
-    @_with_db_context
-    def job_submitted(self, job: "Job", experiment_id: str, run_id: str):
-        """Called when a job is submitted
-
-        Args:
-            job: The submitted job
-            experiment_id: Experiment this job belongs to
-            run_id: Run this job belongs to
-        """
-        # Track job's experiment/run
-        self.job_experiments[job.identifier] = (experiment_id, run_id)
-
-        # Update state provider
-        try:
-            self.state_provider.update_job_submitted(job, experiment_id, run_id)
-        except Exception as e:
-            logger.exception(
-                "Error updating job submission for %s: %s", job.identifier, e
-            )
-
-    @_with_db_context
-    def job_state(self, job: "Job"):
-        """Called when a job's state changes
-
-        Args:
-            job: The job with updated state
-        """
-        # Look up job's experiment/run
-        if job.identifier not in self.job_experiments:
-            logger.warning(
-                "State change for unknown job %s (not tracked by listener)",
-                job.identifier,
-            )
-            return
-
-        experiment_id, run_id = self.job_experiments[job.identifier]
-
-        # Update state provider
-        try:
-            self.state_provider.update_job_state(job, experiment_id, run_id)
-        except Exception as e:
-            logger.exception("Error updating job state for %s: %s", job.identifier, e)
-
-    @_with_db_context
-    def service_add(self, service: "Service", experiment_id: str, run_id: str):
-        """Called when a service is added
-
-        Args:
-            service: The added service
-            experiment_id: Experiment identifier
-            run_id: Run identifier
-        """
-        from experimaestro.scheduler.services import Service
-
-        try:
-            # Get state_dict for service recreation
-            state_dict_json = None
-            try:
-                # _full_state_dict includes __class__ automatically
-                state_dict = service._full_state_dict()
-                # Serialize paths automatically
-                serialized = Service.serialize_state_dict(state_dict)
-                state_dict_json = json.dumps(serialized)
-            except Exception as e:
-                # Service cannot be serialized - store unserializable marker
-                logger.warning(
-                    "Could not get state_dict for service %s: %s", service.id, e
-                )
-                state_dict_json = json.dumps(
-                    {
-                        "__class__": f"{service.__class__.__module__}.{service.__class__.__name__}",
-                        "__unserializable__": True,
-                        "__reason__": f"Cannot serialize: {e}",
-                    }
-                )
-
-            self.state_provider.register_service(
-                service.id,
-                experiment_id,
-                run_id,
-                service.description(),
-                state_dict=state_dict_json,
-            )
-        except Exception as e:
-            logger.exception("Error updating service %s: %s", service.id, e)
+            A live Service instance or self if recreation is not possible
+        """
+        # Just return self - service recreation from config not implemented
+        return self
+
+
+__all__ = [
+    # Data classes
+    "ProcessInfo",
+    # Listener type alias
+    "StateListener",
+    # ABC
+    "StateProvider",
+    "OfflineStateProvider",
+    # Mock classes
+    "MockJob",
+    "MockExperiment",
+    "MockService",
+]