android/feature/automation/src/main/kotlin/com/flagship/abox/manager/automation/data/AutomationDao.kt

@@ -55,4 +55,7 @@ interface AutomationDao {
 
     @Query("DELETE FROM automation_trigger_state WHERE profileId = :profileId AND sceneId = :sceneId")
     suspend fun deleteTriggerStates(profileId: String, sceneId: String): Int
+
+    @Query("DELETE FROM automation_trigger_state WHERE profileId = :profileId AND sceneId = :sceneId AND triggerId = :triggerId")
+    suspend fun deleteTriggerState(profileId: String, sceneId: String, triggerId: String): Int
 }

android/feature/automation/src/main/kotlin/com/flagship/abox/manager/automation/data/RoomSceneRepository.kt

@@ -57,14 +57,31 @@ class RoomSceneRepository(
             return DomainResult.Failure(DomainError.InvalidRequest(detail = "Scene profile mismatch"))
         }
         return runCatching {
-            if (requireExisting && dao.getScene(profileId.value, scene.id.value) == null) throw IllegalArgumentException("Scene not found")
+            val existing = dao.getScene(profileId.value, scene.id.value)
-            if (!requireExisting && dao.getScene(profileId.value, scene.id.value) != null) throw IllegalArgumentException("Scene already exists")
+            if (requireExisting && existing == null) throw IllegalArgumentException("Scene not found")
+            if (!requireExisting && existing != null) throw IllegalArgumentException("Scene already exists")
             dao.upsertScene(scene.toEntity())
-            dao.deleteTriggerStates(profileId.value, scene.id.value)
+            existing?.let(SceneDocumentCodec::decode)?.triggers.orEmpty()
+                .filter { previous -> scene.triggers.none { current -> current.hasSameDefinitionAs(previous) } }
+                .forEach { changed ->
+                    dao.deleteTriggerState(profileId.value, scene.id.value, changed.id.value)
+                }
             scene
         }.fold({ DomainResult.Success(it) }, { DomainResult.Failure(DomainError.InvalidRequest(detail = it.message)) })
     }
 
+    private fun SceneTrigger.hasSameDefinitionAs(other: SceneTrigger): Boolean = when {
+        this is SceneTrigger.Time && other is SceneTrigger.Time ->
+            id == other.id && timeOfDay == other.timeOfDay && daysOfWeek == other.daysOfWeek
+        this is SceneTrigger.Temperature && other is SceneTrigger.Temperature ->
+            id == other.id && deviceName == other.deviceName && operator == other.operator && thresholdCelsius == other.thresholdCelsius
+        this is SceneTrigger.Humidity && other is SceneTrigger.Humidity ->
+            id == other.id && deviceName == other.deviceName && operator == other.operator && thresholdPercent == other.thresholdPercent
+        this is SceneTrigger.DeviceState && other is SceneTrigger.DeviceState ->
+            id == other.id && deviceName == other.deviceName && expectedState == other.expectedState
+        else -> false
+    }
+
     private suspend fun ensureSeeded(profileId: ProviderProfileId) {
         val marker = "seed_v1_${profileId.value}"
         if (seedPreferences.getBoolean(marker, false)) return

android/feature/automation/src/main/kotlin/com/flagship/abox/manager/automation/runtime/AutomationEngine.kt

@@ -93,15 +93,6 @@ class DefaultAutomationEngine(
             }
             if (!newlyMatched) continue
             if (conditionEvaluator.evaluate(scene.conditions, snapshot, now) !is ConditionsEvaluation.Satisfied) {
-                newlyMatchedStateTriggers.forEach { trigger ->
-                    runtimeRepository.transitionMatch(
-                        profileId,
-                        scene.id,
-                        trigger.id,
-                        false,
-                        snapshot.observedAtEpochMillis,
-                    )
-                }
                 continue
             }
             if (matchedTimeTriggers.isNotEmpty()) {

domain/src/main/kotlin/com/flagship/abox/manager/domain/Automation.kt

@@ -69,8 +69,8 @@ class SceneTriggerEvaluator {
                 .map { date -> LocalDateTime.of(date, time) }
                 .firstOrNull { candidate ->
                     val dayMatches = trigger.daysOfWeek.isEmpty() || candidate.dayOfWeek.value in trigger.daysOfWeek
-                    val lateness = Duration.between(candidate, now).toMinutes()
+                    val latenessSeconds = Duration.between(candidate, now).seconds
-                    dayMatches && lateness in 0..TIME_TRIGGER_GRACE_MINUTES
+                    dayMatches && latenessSeconds in 0..TIME_TRIGGER_GRACE_SECONDS
                 }
             scheduled?.let { occurrence ->
                 TriggerEvaluation.Matched("${occurrence.toLocalDate()}:${trigger.timeOfDay}:${trigger.id.value}")
@@ -138,7 +138,7 @@ class SceneTriggerEvaluator {
     private companion object {
         const val TEMPERATURE_HYSTERESIS = 0.5
         const val HUMIDITY_HYSTERESIS = 2.0
-        const val TIME_TRIGGER_GRACE_MINUTES = 20L
+        const val TIME_TRIGGER_GRACE_SECONDS = 20L * 60L
     }
 }