@@ -40,3 +40,4 @@
     kapt(libs.hilt.compiler)
     implementation(libs.androidx.work.runtime.ktx)
+    implementation(libs.androidx.hilt.work)
     implementation(platform(libs.compose.bom))

@@ -69,6 +93,7 @@ class SceneTriggerEvaluator {
         result: DomainResult<TemperatureHumidityReading>?,

@@ -26,5 +26,5 @@
                 sessionCoordinator.observeActiveSession(),
             ) { active, session -> active to session }.collectLatest { (active, session) ->
                 previousProfileId?.takeIf { it != active?.id }?.let { scheduler.cancel(it) }
                 previousProfileId = active?.id
                 if (active != null && session?.profileId == active.id) {

@@ -70,3 +98,4 @@
         operator: ComparisonOperator,
         threshold: Double,
+        hysteresis: Double = 0.0,
         value: (TemperatureHumidityReading) -> String?,

@@ -91,5 +91,5 @@
                     }
                 }
             }
             if (!newlyMatched) continue
             if (conditionEvaluator.evaluate(scene.conditions, snapshot, now) !is ConditionsEvaluation.Satisfied) {

@@ -59,5 +59,5 @@
         return runCatching {
             if (requireExisting && dao.getScene(profileId.value, scene.id.value) == null) throw IllegalArgumentException("Scene not found")
             if (!requireExisting && dao.getScene(profileId.value, scene.id.value) != null) throw IllegalArgumentException("Scene already exists")
             dao.upsertScene(scene.toEntity())
             dao.deleteTriggerStates(profileId.value, scene.id.value)

@@ -31,5 +31,5 @@
                 profileStore.observeActiveProfile(),
                 sessionCoordinator.observeActiveSession(),
                 isForeground,
             ) { active, session, foreground -> Triple(active, session, foreground) }
                 .collectLatest { (active, session, foreground) ->

@@ -64,5 +64,5 @@
 
     private fun evaluateOne(trigger: SceneTrigger, snapshot: AutomationSnapshot, now: LocalDateTime): TriggerEvaluation? = when (trigger) {
         is SceneTrigger.Time -> {
             val time = parseTime(trigger.timeOfDay) ?: return TriggerEvaluation.Unavailable(DomainError.InvalidRequest(detail = "Invalid trigger time"))
             val scheduled = listOf(now.toLocalDate(), now.toLocalDate().minusDays(1))

@@ -36,7 +36,7 @@ class ProfileAutomationScheduler(
     override suspend fun reconcile(profileId: ProviderProfileId): DomainResult<Unit> {
         val active = profileStore.activeProfile()
         if (active?.id != profileId) return DomainResult.Failure(DomainError.InvalidRequest(detail = "Provider profile is not active"))
-        return when (val validity = sessionGateway.validateSession(profileId)) {

@@ -84,5 +84,5 @@
                         is DomainResult.Failure -> return state
                         is DomainResult.Success -> state.value
                     }
                 }
                 val evaluation = if (

@@ -34,5 +34,5 @@
             ) { active, session -> active to session }
                 .collectLatest { (active, session) ->
                 previousProfileId?.takeIf { it != active?.id }?.let { scheduler.cancel(it) }
                 previousProfileId = active?.id
                 if (active != null && session?.profileId == active.id) {

@@ -27,5 +27,5 @@
         val profileId = ProviderProfileId(rawProfileId)
         if (profileStore.activeProfile()?.id != profileId) return Result.success()
 
         sessionCoordinator.bootstrap()
         return when (val validity = sessionCoordinator.validateSession(profileId)) {

@@ -85,5 +85,5 @@
                         is DomainResult.Failure -> return state
                         is DomainResult.Success -> state.value
                     }
                 }
                 val evaluation = if (

@@ -32,5 +32,5 @@
         ) {
             return
         }
 
         val permissionState = getSharedPreferences(NOTIFICATION_PERMISSION_STATE, MODE_PRIVATE)

@@ -39,4 +51,4 @@
                 )
             }
             postNotification()
             DomainResult.Success(Unit)

@@ -120,5 +120,5 @@
             if (!newlyMatched) continue
             if (conditionEvaluator.evaluate(scene.conditions, snapshot, now) !is ConditionsEvaluation.Satisfied) {
                 continue
             }
             if (matchedTimeTriggers.isNotEmpty()) {

@@ -38,5 +38,5 @@
     private fun timeWorkName(profileId: ProviderProfileId) = "automation-time:${profileId.value}"
 
     private fun scheduleNextTimeTrigger(profileId: ProviderProfileId, scenes: List<Scene>) {
         val now = LocalDateTime.now()
         val next = scenes.flatMap { scene ->

@@ -38,5 +38,5 @@
         ) {
             return
         }
 
         val permissionState = getSharedPreferences(NOTIFICATION_PERMISSION_STATE, MODE_PRIVATE)

@@ -117,5 +117,5 @@
                     }
                 }
             }
             if (!newlyMatched) continue
             if (conditionEvaluator.evaluate(scene.conditions, snapshot, now) !is ConditionsEvaluation.Satisfied) {

@@ -55,5 +55,5 @@
     private suspend fun save(profileId: ProviderProfileId, scene: Scene, requireExisting: Boolean): DomainResult<Scene> {
         if (scene.profileId != profileId || scene.actions.any { it.profileId != profileId }) {
             return DomainResult.Failure(DomainError.InvalidRequest(detail = "Scene profile mismatch"))
         }
         return runCatching {

@@ -39,5 +39,5 @@
                 previousProfileId = active?.id
                 if (active != null && session?.profileId == active.id) {
                     while (true) {
                         isForeground.first { it }
                         when (val validity = sessionCoordinator.validateSession(active.id)) {

@@ -25,3 +37,4 @@
         workManager.cancelUniqueWork(workName(profileId))
+        workManager.cancelAllWorkByTag(timeWorkTag(profileId))
         return DomainResult.Success(Unit)
     }

@@ -56,5 +56,5 @@
 
     override suspend fun evaluate(
         profileId: ProviderProfileId,
         scheduledOccurrence: ScheduledAutomationOccurrence?,
     ): DomainResult<Int> = evaluationMutex.withLock {

@@ -48,5 +48,5 @@
         val now = LocalDateTime.now()
         val scheduledAt = nextOccurrence(trigger, now) ?: return
         val delay = Duration.between(now.atZone(ZoneId.systemDefault()).toInstant(), scheduledAt.atZone(ZoneId.systemDefault()).toInstant())
         val scheduledAtInstant = scheduledAt.atZone(ZoneId.systemDefault()).toInstant()
         val maximumExpiry = scheduledAtInstant.plus(MAXIMUM_OCCURRENCE_LATENESS)

@@ -47,5 +47,5 @@
         val now = LocalDateTime.now()
         val scheduledAt = nextOccurrence(trigger, now) ?: return
         val delay = Duration.between(now.atZone(ZoneId.systemDefault()).toInstant(), scheduledAt.atZone(ZoneId.systemDefault()).toInstant())
         val scheduledAtInstant = scheduledAt.atZone(ZoneId.systemDefault()).toInstant()
         val maximumExpiry = scheduledAtInstant.plus(MAXIMUM_OCCURRENCE_LATENESS)

@@ -25,3 +36,4 @@
         workManager.cancelUniqueWork(workName(profileId))
+        workManager.cancelAllWorkByTag(timeWorkTag(profileId))
         return DomainResult.Success(Unit)
     }

@@ -399,2 +402,4 @@
+                        current.copy(isSaving = false, isSaved = true)
+                    }
                     is DomainResult.Failure -> current.copy(
                         isSaving = false,

@@ -146,5 +146,5 @@
                     continue
                 }
                 ConditionsEvaluation.Satisfied -> Unit
             }
             var executionCount = if (newlyMatchedStateTriggers.isEmpty()) 0 else 1

@@ -25,3 +36,4 @@
         workManager.cancelUniqueWork(workName(profileId))
+        workManager.cancelAllWorkByTag(timeWorkTag(profileId))
         return DomainResult.Success(Unit)
     }

@@ -37,5 +37,5 @@
                 .collectLatest { (active, session) ->
                 previousProfileId?.takeIf { it != active?.id }?.let { scheduler.cancel(it) }
                 previousProfileId = active?.id
                 if (active != null && session?.profileId == active.id) {
                     var scheduleReady = false