feat: Introduce ChoresChangedEvent and update chore manager to handle scene changes

Author: oldrev

client/lib/core/models/events.dart

@@ -49,3 +49,8 @@ class DeviceGroupDeletedEvent {
 }
 
 final class DeviceManagerReadyEvent {}
+
+final class ChoresChangedEvent {
+  final SceneEntity scene;
+  const ChoresChangedEvent(this.scene);
+}

client/lib/core/services/chore_manager_impl.dart

@@ -1,3 +1,4 @@
+import 'package:borneo_app/core/models/events.dart';
 import 'package:borneo_app/core/services/chore_manager.dart';
 import 'package:borneo_app/core/services/clock.dart';
 import 'package:borneo_app/core/services/scene_manager.dart';
@@ -38,6 +39,11 @@ final class ChoreManagerImpl implements IChoreManager {
     this.logger,
   }) : _historyStore = ChoreHistoryStore(_db) {
     allChores.addAll([PowerOffAllChore(), FeedModeChore(), WaterChangeModeChore(), DryScapeModeChore()]);
+
+    // Subscribe to device reload events and publish a ChoresChangedEvent so UI can refresh
+    _globalBus.on<CurrentSceneDevicesReloadedEvent>().listen((event) {
+      _globalBus.fire(ChoresChangedEvent(event.scene));
+    });
   }
 
   @override

client/lib/core/services/devices/device_manager_impl.dart

@@ -93,9 +93,7 @@ final class DeviceManagerImpl extends IDeviceManager {
 
         final currentScene = _sceneManager.current;
         _globalBus.fire(CurrentSceneDevicesReloadedEvent(currentScene));
-        logger?.d('Fired CurrentSceneDevicesReloadedEvent for initial scene: ${currentScene.name}');
       }());
-
       logger?.i('DeviceManagerImpl has been initialized successfully.');
     } finally {
       _isInitialized = true;
@@ -277,7 +275,6 @@ final class DeviceManagerImpl extends IDeviceManager {
     // Fire event to notify that devices in current scene have been reloaded
     final currentScene = _sceneManager.current;
     _globalBus.fire(CurrentSceneDevicesReloadedEvent(currentScene));
-    logger?.d('Fired CurrentSceneDevicesReloadedEvent after adding device: ${device.name}');
     return device;
   }
 
@@ -413,7 +410,6 @@ final class DeviceManagerImpl extends IDeviceManager {
     // Fire event to notify that devices for current scene have been reloaded
     final currentScene = _sceneManager.current;
     _globalBus.fire(CurrentSceneDevicesReloadedEvent(currentScene));
-    logger?.d('Fired CurrentSceneDevicesReloadedEvent for scene: ${currentScene.name}');
   }
 
   /// Dispose all existing WotThings

client/lib/features/chores/models/abstract_chore.dart

@@ -3,7 +3,7 @@ import 'package:borneo_app/features/chores/models/actions/power_action.dart';
 import 'package:borneo_app/features/chores/models/actions/chore_action.dart';
 import 'package:borneo_app/core/services/devices/device_manager.dart';
 import 'package:borneo_app/core/models/scene_entity.dart';
-import 'package:borneo_kernel_abstractions/models/bound_device.dart';
+import 'package:lw_wot/thing.dart';
 
 import '../../../shared/models/base_entity.dart';
 
@@ -22,9 +22,8 @@ abstract class AbstractChore with BaseEntity {
   });
 
   bool checkAvailable(SceneEntity scene, IDeviceManager deviceManager) {
-    final devices = deviceManager.getBoundDevicesInCurrentScene();
-    final isAvailable = devices.any((d) => matchAllCapabilities(d, deviceManager));
-
+    final things = deviceManager.wotThingsInCurrentScene;
+    final isAvailable = things.any(matchAllCapabilities);
     return isAvailable;
   }
 
@@ -36,22 +35,20 @@ abstract class AbstractChore with BaseEntity {
 
   Future<List<Map<String, dynamic>>> execute(SceneEntity currentScene, IDeviceManager deviceManager);
 
-  bool matchAllCapabilities(BoundDevice bound, IDeviceManager deviceManager) {
-    return requiredCapabilities.every((capability) => _hasCapability(bound, capability, deviceManager));
+  bool matchAllCapabilities(WotThing thing) {
+    return requiredCapabilities.every((capability) => _hasCapability(thing, capability));
   }
 
-  bool _hasCapability(BoundDevice bound, String capability, IDeviceManager deviceManager) {
-    final wotThing = deviceManager.getWotThing(bound.device.id);
-
-    final types = wotThing.type;
+  bool _hasCapability(WotThing thing, String capability) {
+    final types = thing.type;
     if (types.contains(capability)) return true;
 
     // Check for capability-specific properties that indicate the capability
     switch (capability) {
       case "OnOffSwitch":
-        return wotThing.hasProperty("on");
-      case "LyfiDevice":
-        return wotThing.hasProperty("state") && wotThing.hasProperty("mode");
+        return thing.hasProperty("on");
+      case "LyfiThing":
+        return thing.hasProperty("state") && thing.hasProperty("mode");
       default:
         return false;
     }

client/lib/features/chores/models/builtin_chores.dart

@@ -15,14 +15,13 @@ final class PowerOffAllChore extends AbstractBuiltinChore {
   @override
   Future<List<Map<String, dynamic>>> execute(SceneEntity currentScene, IDeviceManager deviceManager) async {
     final steps = <PowerAction>[];
-    for (final bound in deviceManager.boundDevices) {
-      final wotThing = deviceManager.getWotThing(bound.device.id);
+    for (final wotThing in deviceManager.wotThingsInCurrentScene) {
       final onValue = wotThing.getProperty("on");
       if (onValue != null) {
         final prevState = onValue as bool;
         if (prevState) {
           wotThing.setProperty("on", false);
-          steps.add(PowerAction(deviceId: bound.device.id, prevState: prevState));
+          steps.add(PowerAction(deviceId: wotThing.id, prevState: prevState));
         }
       }
     }

client/lib/features/chores/view_models/chores_view_model.dart

@@ -34,19 +34,18 @@ class ChoresViewModel extends ChangeNotifier {
   bool get isLoading => _isLoading;
   String? get error => _error;
 
-  late final StreamSubscription<CurrentSceneChangedEvent> _currentSceneChangedSub;
-  late final StreamSubscription<CurrentSceneDevicesReloadedEvent> _devicesReloadedSub;
+  late final StreamSubscription<ChoresChangedEvent> _choresChangedSub;
 
   void _setupEventListeners() {
-    _currentSceneChangedSub = _eventBus.on<CurrentSceneChangedEvent>().listen(_onCurrentSceneChanged);
-    _devicesReloadedSub = _eventBus.on<CurrentSceneDevicesReloadedEvent>().listen(_onDevicesReloaded);
+    _choresChangedSub = _eventBus.on<ChoresChangedEvent>().listen(_onChoresChanged);
   }
 
   Future<void> initialize() async {
     assert(_isLoading);
     _error = null;
     try {
       await _reloadChores();
+      notifyListeners();
     } catch (e) {
       _error = e.toString();
     } finally {
@@ -56,6 +55,7 @@ class ChoresViewModel extends ChangeNotifier {
 
   Future<void> refresh() async {
     await _reloadChores();
+    notifyListeners();
   }
 
   Future<void> _reloadChores() async {
@@ -64,26 +64,15 @@ class ChoresViewModel extends ChangeNotifier {
     } catch (e, stackTrace) {
       _logger?.e('Failed to reload chores: $e', error: e, stackTrace: stackTrace);
       _error = e.toString();
-    } finally {
-      notifyListeners();
     }
   }
 
-  void _onCurrentSceneChanged(CurrentSceneChangedEvent event) {
-    _logger?.d('Scene changed from ${event.from.name} to ${event.to.name}, waiting for devices to reload...');
-    // Enter loading state immediately when the current scene changes so the UI
-    // can show a loading indicator while devices and chores are reloaded.
-    _isLoading = true;
-    _error = null;
-    _chores = [];
-    notifyListeners();
-  }
-
-  void _onDevicesReloaded(CurrentSceneDevicesReloadedEvent event) {
-    // Devices for the new scene have finished reloading. Refresh chores and
-    // exit loading state after refresh completes so the UI updates smoothly.
+  void _onChoresChanged(ChoresChangedEvent event) {
+    _logger?.d('Chores changed for scene: ${event.scene.name}, reloading chores...');
     unawaited(() async {
       try {
+        _isLoading = true;
+        _error = null;
         await _reloadChores();
       } finally {
         _isLoading = false;
@@ -94,8 +83,7 @@ class ChoresViewModel extends ChangeNotifier {
 
   @override
   void dispose() {
-    _currentSceneChangedSub.cancel();
-    _devicesReloadedSub.cancel();
+    _choresChangedSub.cancel();
     super.dispose();
   }
 }

client/packages/borneo_kernel/lib/drivers/borneo/lyfi/wot/wot_thing.dart

@@ -42,7 +42,7 @@ class LyfiThing extends BorneoThing implements WotWriteGuard, WotActionGuard {
 
   LyfiThing({required this.kernel, required this.deviceId, required super.title, this.logger})
     : deviceEvents = DeviceEventBus(),
-      super(id: deviceId, type: ["OnOffSwitch", "Light"], description: "Lyfi LED lighting device") {
+      super(id: deviceId, type: ["OnOffSwitch", "LyfiThing", "Light"], description: "Lyfi LED lighting device") {
     _createPropertiesWithDefaults();
     _createActions();
     _setupKernelEventSubscriptions();

client/packages/borneo_kernel/pubspec.yaml

@@ -19,6 +19,7 @@ dependencies:
   pub_semver: ^2.2.0
   synchronized: ^3.4.0
   retry: ^3.1.2
+  polly_dart: ^0.0.7
 
   # in this project
   borneo_common:

client/packages/lw_wot/pubspec.yaml

@@ -11,6 +11,7 @@ dependencies:
   cancellation_token: ^2.0.1
   event_bus: ^2.0.1
   pub_semver: ^2.2.0
+  polly_dart: ^0.0.7
 
 dev_dependencies:
   lints: ^6.1.0

client/pubspec.lock

@@ -1371,6 +1371,14 @@ packages:
       url: "https://pub.dev"
     source: hosted
     version: "0.10.3"
+  polly_dart:
+    dependency: "direct main"
+    description:
+      name: polly_dart
+      sha256: "440dac3bbf4f5d62746dcf8ff02cd1c2be72bda323ec6b916ab05d7dac75e59b"
+      url: "https://pub.dev"
+    source: hosted
+    version: "0.0.7"
   pool:
     dependency: transitive
     description: