pr_34.diff

diff --git a/core/data/src/main/kotlin/com/awan/app/core/data/home/remote/HomeRemoteDataSource.kt b/core/data/src/main/kotlin/com/awan/app/core/data/home/remote/HomeRemoteDataSource.kt
index d9073442..95996b7f 100644
--- a/core/data/src/main/kotlin/com/awan/app/core/data/home/remote/HomeRemoteDataSource.kt
+++ b/core/data/src/main/kotlin/com/awan/app/core/data/home/remote/HomeRemoteDataSource.kt
@@ -8,6 +8,8 @@ import com.awan.app.core.network.dto.zone.ZoneDto
 import com.awan.app.core.network.dto.onboarding.CompleteOnboardingResponse
 import com.awan.app.core.network.dto.session.SessionDto
 
+import com.awan.app.core.network.dto.task.TaskInfoResponse
+
 interface HomeRemoteDataSource {
     suspend fun getZonesByDate(date: String): Result<List<ZoneDto>>
     suspend fun getTasksByDate(date: String): Result<List<TaskWithSessionsDto>>
@@ -18,10 +20,28 @@ interface HomeRemoteDataSource {
 
     suspend fun getUserProfile(): Result<CompleteOnboardingResponse>
 
+    suspend fun getSession(sessionId: String): Result<SessionDto>
+
+    suspend fun getTask(taskId: String): Result<TaskInfoResponse>
+
     suspend fun updateSession(
         sessionId: String,
         status: String? = null,
+        locked: Boolean? = null,
         startIso: String? = null,
         endIso: String? = null,
     ): Result<SessionDto>
+
+    suspend fun lockSession(sessionId: String): Result<SessionDto>
+
+    suspend fun unlockSession(sessionId: String): Result<SessionDto>
+
+    suspend fun updateTask(
+        taskId: String,
+        request: com.awan.app.core.network.dto.task.TaskUpdateRequest,
+    ): Result<TaskInfoResponse>
+
+    suspend fun deleteSession(sessionId: String): Result<Unit>
+
+    suspend fun deleteTask(taskId: String, cascade: Boolean = true): Result<Unit>
 }
diff --git a/core/data/src/main/kotlin/com/awan/app/core/data/home/remote/HomeRemoteDataSourceImpl.kt b/core/data/src/main/kotlin/com/awan/app/core/data/home/remote/HomeRemoteDataSourceImpl.kt
index 0b93d67d..1aea4df4 100644
--- a/core/data/src/main/kotlin/com/awan/app/core/data/home/remote/HomeRemoteDataSourceImpl.kt
+++ b/core/data/src/main/kotlin/com/awan/app/core/data/home/remote/HomeRemoteDataSourceImpl.kt
@@ -21,6 +21,7 @@ import com.awan.app.core.network.dto.onboarding.CompleteOnboardingResponse
 import com.awan.app.core.network.api.SessionApiService
 import com.awan.app.core.network.dto.session.SessionDto
 import com.awan.app.core.network.dto.session.UpdateSessionRequest
+import com.awan.app.core.network.dto.task.TaskInfoResponse
 
 class HomeRemoteDataSourceImpl @Inject constructor(
     private val zonesApiService: ZoneApiService,
@@ -57,9 +58,20 @@ class HomeRemoteDataSourceImpl @Inject constructor(
             userApiService.getUserProfile()
         }
 
+    override suspend fun getSession(sessionId: String): Result<SessionDto> =
+        safeApiCall(dispatcher = ioDispatcher, json = json) {
+            sessionApiService.getSession(sessionId)
+        }
+
+    override suspend fun getTask(taskId: String): Result<com.awan.app.core.network.dto.task.TaskInfoResponse> =
+        safeApiCall(dispatcher = ioDispatcher, json = json) {
+            taskApiService.getTask(taskId)
+        }
+
     override suspend fun updateSession(
         sessionId: String,
         status: String?,
+        locked: Boolean?,
         startIso: String?,
         endIso: String?,
     ): Result<SessionDto> =
@@ -70,7 +82,36 @@ class HomeRemoteDataSourceImpl @Inject constructor(
                     start = startIso,
                     end = endIso,
                     status = status,
+                    locked = locked,
                 ),
             )
         }
+
+    override suspend fun lockSession(sessionId: String): Result<SessionDto> =
+        safeApiCall(dispatcher = ioDispatcher, json = json) {
+            sessionApiService.lockSession(sessionId)
+        }
+
+    override suspend fun unlockSession(sessionId: String): Result<SessionDto> =
+        safeApiCall(dispatcher = ioDispatcher, json = json) {
+            sessionApiService.unlockSession(sessionId)
+        }
+
+    override suspend fun updateTask(
+        taskId: String,
+        request: com.awan.app.core.network.dto.task.TaskUpdateRequest,
+    ): Result<TaskInfoResponse> =
+        safeApiCall(dispatcher = ioDispatcher, json = json) {
+            taskApiService.updateTask(taskId, request)
+        }
+
+    override suspend fun deleteSession(sessionId: String): Result<Unit> =
+        safeApiCall(dispatcher = ioDispatcher, json = json) {
+            sessionApiService.deleteSession(sessionId)
+        }
+
+    override suspend fun deleteTask(taskId: String, cascade: Boolean): Result<Unit> =
+        safeApiCall(dispatcher = ioDispatcher, json = json) {
+            taskApiService.deleteTask(taskId, cascade)
+        }
 }
diff --git a/core/data/src/main/kotlin/com/awan/app/core/data/home/repository/HomeRepositoryImpl.kt b/core/data/src/main/kotlin/com/awan/app/core/data/home/repository/HomeRepositoryImpl.kt
index 402e6f3a..1998ae19 100644
--- a/core/data/src/main/kotlin/com/awan/app/core/data/home/repository/HomeRepositoryImpl.kt
+++ b/core/data/src/main/kotlin/com/awan/app/core/data/home/repository/HomeRepositoryImpl.kt
@@ -15,6 +15,9 @@ import com.awan.app.core.database.dao.UserDao
 import com.awan.app.core.database.model.UserEntity
 import com.awan.app.core.domain.home.model.SessionStatus
 import com.awan.app.core.domain.home.model.UserProfileInfo
+import com.awan.app.core.model.SessionDetailInfo
+import com.awan.app.core.model.SessionTaskDetail
+import com.awan.app.core.model.TaskDetailInfo
 
 @Singleton
 class HomeRepositoryImpl @Inject constructor(
@@ -105,6 +108,63 @@ class HomeRepositoryImpl @Inject constructor(
         return Result.Success(schedule)
     }
 
+    override suspend fun getSessionDetail(sessionId: String): Result<SessionTaskDetail> {
+        val sessionResult = remoteDataSource.getSession(sessionId)
+        if (sessionResult is Result.Error) {
+            return Result.Error(sessionResult.error)
+        }
+        if (sessionResult !is Result.Success) {
+            return Result.Error(AppError.Unknown(Throwable("Failed to fetch session")))
+        }
+
+        val sessionDto = sessionResult.data
+        val taskId = sessionDto.taskId
+        if (taskId.isNullOrBlank()) {
+            return Result.Error(AppError.Unknown(Throwable("Session does not have a valid taskId")))
+        }
+
+        val taskResult = remoteDataSource.getTask(taskId)
+        if (taskResult is Result.Error) {
+            return Result.Error(taskResult.error)
+        }
+        if (taskResult !is Result.Success) {
+            return Result.Error(AppError.Unknown(Throwable("Failed to fetch task")))
+        }
+
+        val taskDto = taskResult.data
+
+        val sessionDetailInfo = SessionDetailInfo(
+            id = sessionDto.id,
+            start = sessionDto.start,
+            end = sessionDto.end,
+            status = sessionDto.status ?: "SCHEDULED",
+            locked = sessionDto.locked,
+            zoneId = sessionDto.zoneId,
+            taskId = taskId,
+        )
+
+        val taskDetailInfo = TaskDetailInfo(
+            id = taskDto.id,
+            title = taskDto.title,
+            description = taskDto.description,
+            estimatedDuration = taskDto.estimatedDuration,
+            status = taskDto.status ?: "SCHEDULED",
+            mandatory = taskDto.mandatory ?: false,
+            estimatedPoints = taskDto.estimatedPoints ?: 0,
+            allowTaskSplitting = taskDto.allowTaskSplitting ?: false,
+            goalId = taskDto.goalId,
+            categoryName = taskDto.category?.name,
+            dependsOnTaskIds = taskDto.dependsOnTaskIds ?: emptyList(),
+        )
+
+        return Result.Success(
+            SessionTaskDetail(
+                session = sessionDetailInfo,
+                task = taskDetailInfo,
+            )
+        )
+    }
+
 
     @Suppress("NewApi")
     private suspend fun resolveZoneFallback(date: LocalDate, dateStr: String): List<ZoneDto> {
@@ -131,6 +191,7 @@ class HomeRepositoryImpl @Inject constructor(
     override suspend fun updateSessionStatus(
         sessionId: String,
         status: SessionStatus,
+        locked: Boolean?,
         startIso: String?,
         endIso: String?,
     ): Result<Unit> {
@@ -143,6 +204,7 @@ class HomeRepositoryImpl @Inject constructor(
         val result = remoteDataSource.updateSession(
             sessionId = sessionId,
             status = statusString,
+            locked = locked,
             startIso = startIso,
             endIso = endIso,
         )
@@ -162,4 +224,63 @@ class HomeRepositoryImpl @Inject constructor(
             else -> Result.Error(AppError.Unknown(Throwable("Failed to update session status")))
         }
     }
+
+    override suspend fun updateSessionLock(
+        sessionId: String,
+        locked: Boolean,
+    ): Result<Unit> {
+        val result = if (locked) {
+            remoteDataSource.lockSession(sessionId)
+        } else {
+            remoteDataSource.unlockSession(sessionId)
+        }
+        return when (result) {
+            is Result.Success -> Result.Success(Unit)
+            is Result.Error -> Result.Error(result.error)
+            else -> Result.Error(AppError.Unknown(Throwable("Failed to update session lock state")))
+        }
+    }
+
+    override suspend fun updateTaskDetails(
+        taskId: String,
+        title: String?,
+        description: String?,
+        estimatedDuration: Int?,
+        estimatedPoints: Int?,
+        mandatory: Boolean?,
+        allowTaskSplitting: Boolean?,
+    ): Result<Unit> {
+        val request = com.awan.app.core.network.dto.task.TaskUpdateRequest(
+            title = title,
+            description = description,
+            estimatedDuration = estimatedDuration,
+            estimatedPoints = estimatedPoints,
+            mandatory = mandatory,
+            allowTaskSplitting = allowTaskSplitting,
+        )
+        val result = remoteDataSource.updateTask(taskId, request)
+        return when (result) {
+            is Result.Success -> Result.Success(Unit)
+            is Result.Error -> Result.Error(result.error)
+            else -> Result.Error(AppError.Unknown(Throwable("Failed to update task details")))
+        }
+    }
+
+    override suspend fun deleteSession(sessionId: String): Result<Unit> {
+        val result = remoteDataSource.deleteSession(sessionId)
+        return when (result) {
+            is Result.Success -> Result.Success(Unit)
+            is Result.Error -> Result.Error(result.error)
+            else -> Result.Error(AppError.Unknown(Throwable("Failed to delete session")))
+        }
+    }
+
+    override suspend fun deleteTask(taskId: String): Result<Unit> {
+        val result = remoteDataSource.deleteTask(taskId, cascade = true)
+        return when (result) {
+            is Result.Success -> Result.Success(Unit)
+            is Result.Error -> Result.Error(result.error)
+            else -> Result.Error(AppError.Unknown(Throwable("Failed to delete task")))
+        }
+    }
 }
diff --git a/core/data/src/test/java/com/awan/app/core/data/home/HomeRepositoryImplTest.kt b/core/data/src/test/java/com/awan/app/core/data/home/HomeRepositoryImplTest.kt
new file mode 100644
index 00000000..9955bdd1
--- /dev/null
+++ b/core/data/src/test/java/com/awan/app/core/data/home/HomeRepositoryImplTest.kt
@@ -0,0 +1,131 @@
+package com.awan.app.core.data.home
+
+import com.awan.app.core.common.error.AppError
+import com.awan.app.core.common.result.Result
+import com.awan.app.core.database.dao.UserDao
+import com.awan.app.core.database.model.UserEntity
+import com.awan.app.core.database.model.UserPreferencesEntity
+import com.awan.app.core.database.model.UserWithPreferences
+import com.awan.app.core.data.home.remote.HomeRemoteDataSource
+import com.awan.app.core.data.home.repository.HomeRepositoryImpl
+import com.awan.app.core.network.dto.category.CategoryDto
+import com.awan.app.core.network.dto.onboarding.CompleteOnboardingResponse
+import com.awan.app.core.network.dto.session.SessionDto
+import com.awan.app.core.network.dto.task.TaskInfoResponse
+import com.awan.app.core.network.dto.task.TaskWithSessionsDto
+import com.awan.app.core.network.dto.zone.TemplateOverrideDto
+import com.awan.app.core.network.dto.zone.WeeklyTemplateDto
+import com.awan.app.core.network.dto.zone.ZoneDto
+import kotlinx.coroutines.flow.Flow
+import kotlinx.coroutines.flow.flowOf
+import kotlinx.coroutines.test.runTest
+import org.junit.Assert.assertEquals
+import org.junit.Assert.assertTrue
+import org.junit.Test
+
+private class FakeHomeRemoteDataSource : HomeRemoteDataSource {
+    var sessionResult: Result<SessionDto> = Result.Error(AppError.Unknown())
+    var taskResult: Result<TaskInfoResponse> = Result.Error(AppError.Unknown())
+
+    override suspend fun getZonesByDate(date: String): Result<List<ZoneDto>> = Result.Success(emptyList())
+    override suspend fun getTasksByDate(date: String): Result<List<TaskWithSessionsDto>> = Result.Success(emptyList())
+    override suspend fun getTemplates(): Result<List<WeeklyTemplateDto>> = Result.Success(emptyList())
+    override suspend fun getTemplateOverrides(): Result<List<TemplateOverrideDto>> = Result.Success(emptyList())
+    override suspend fun getUserProfile(): Result<CompleteOnboardingResponse> = Result.Error(AppError.Unknown())
+    override suspend fun getSession(sessionId: String): Result<SessionDto> = sessionResult
+    override suspend fun getTask(taskId: String): Result<TaskInfoResponse> = taskResult
+    override suspend fun updateSession(
+        sessionId: String,
+        status: String?,
+        locked: Boolean?,
+        startIso: String?,
+        endIso: String?,
+    ): Result<SessionDto> = Result.Error(AppError.Unknown())
+
+    override suspend fun lockSession(sessionId: String): Result<SessionDto> = sessionResult
+    override suspend fun unlockSession(sessionId: String): Result<SessionDto> = sessionResult
+    override suspend fun updateTask(
+        taskId: String,
+        request: com.awan.app.core.network.dto.task.TaskUpdateRequest,
+    ): Result<TaskInfoResponse> = taskResult
+    override suspend fun deleteSession(sessionId: String): Result<Unit> = Result.Success(Unit)
+    override suspend fun deleteTask(taskId: String, cascade: Boolean): Result<Unit> = Result.Success(Unit)
+}
+
+private class FakeUserDao : UserDao {
+    override suspend fun upsertUser(user: UserEntity) {}
+    override fun observeUser(userId: String): Flow<UserEntity?> = flowOf(null)
+    override suspend fun getUser(userId: String): UserEntity? = null
+    override suspend fun getFirstUser(): UserEntity? = null
+    override suspend fun deleteUser(userId: String) {}
+    override suspend fun upsertPreferences(preferences: UserPreferencesEntity) {}
+    override fun observePreferences(userId: String): Flow<UserPreferencesEntity?> = flowOf(null)
+    override suspend fun getPreferences(userId: String): UserPreferencesEntity? = null
+    override fun observeUserWithPreferences(userId: String): Flow<UserWithPreferences?> = flowOf(null)
+    override suspend fun getUserWithPreferences(userId: String): UserWithPreferences? = null
+}
+
+class HomeRepositoryImplTest {
+
+    @Test
+    fun `getSessionDetail fetches session and task sequentially and returns success`() = runTest {
+        val fakeRemote = FakeHomeRemoteDataSource()
+        val repository = HomeRepositoryImpl(fakeRemote, FakeUserDao())
+
+        val sessionId = "session-123"
+        val taskId = "task-456"
+
+        fakeRemote.sessionResult = Result.Success(
+            SessionDto(
+                id = sessionId,
+                start = "2026-08-05T09:00:00",
+                end = "2026-08-05T09:30:00",
+                status = "SCHEDULED",
+                locked = false,
+                zoneId = "zone-789",
+                taskId = taskId,
+            )
+        )
+
+        fakeRemote.taskResult = Result.Success(
+            TaskInfoResponse(
+                id = taskId,
+                title = "Study French Vocabulary",
+                description = "Review 50 new words",
+                estimatedDuration = 30,
+                status = "SCHEDULED",
+                mandatory = true,
+                estimatedPoints = 10,
+                allowTaskSplitting = false,
+                goalId = "goal-000",
+                category = CategoryDto(id = "cat-1", name = "Language Learning"),
+                dependsOnTaskIds = emptyList(),
+            )
+        )
+
+        val result = repository.getSessionDetail(sessionId)
+
+        assertTrue(result is Result.Success)
+        val data = (result as Result.Success).data
+        assertEquals(sessionId, data.session.id)
+        assertEquals(taskId, data.task.id)
+        assertEquals("Study French Vocabulary", data.task.title)
+        assertEquals("Language Learning", data.task.categoryName)
+        assertEquals(true, data.task.mandatory)
+    }
+
+    @Test
+    fun `getSessionDetail returns error if session call fails`() = runTest {
+        val fakeRemote = FakeHomeRemoteDataSource()
+        val repository = HomeRepositoryImpl(fakeRemote, FakeUserDao())
+
+        val sessionId = "session-error"
+        val error = AppError.Network
+        fakeRemote.sessionResult = Result.Error(error)
+
+        val result = repository.getSessionDetail(sessionId)
+
+        assertTrue(result is Result.Error)
+        assertEquals(error, (result as Result.Error).error)
+    }
+}
diff --git a/core/data/src/test/java/com/awan/app/core/data/task/remote/TaskRemoteDataSourceTest.kt b/core/data/src/test/java/com/awan/app/core/data/task/remote/TaskRemoteDataSourceTest.kt
index aad543b4..56bbe887 100644
--- a/core/data/src/test/java/com/awan/app/core/data/task/remote/TaskRemoteDataSourceTest.kt
+++ b/core/data/src/test/java/com/awan/app/core/data/task/remote/TaskRemoteDataSourceTest.kt
@@ -44,6 +44,13 @@ private open class FakeTaskApiService : TaskApiService {
         note: RequestBody?,
     ): TaskProposalResponse = error("not used")
 
+    override suspend fun getTask(taskId: String): TaskInfoResponse = error("not used")
+
+    override suspend fun updateTask(
+        taskId: String,
+        request: com.awan.app.core.network.dto.task.TaskUpdateRequest,
+    ): TaskInfoResponse = error("not used")
+
     override suspend fun getTasksByDate(date: String): List<TaskWithSessionsDto> = error("not used")
 
     override suspend fun scheduleTask(request: ScheduleTaskRequest): TaskScheduleResponse =
diff --git a/core/design-system/src/main/java/com/awan/app/core/designsystem/AwanScheduleTaskCard.kt b/core/design-system/src/main/java/com/awan/app/core/designsystem/AwanScheduleTaskCard.kt
index af471e0a..c33990b2 100644
--- a/core/design-system/src/main/java/com/awan/app/core/designsystem/AwanScheduleTaskCard.kt
+++ b/core/design-system/src/main/java/com/awan/app/core/designsystem/AwanScheduleTaskCard.kt
@@ -60,6 +60,7 @@ fun AwanScheduleTaskCard(
     isDragging: Boolean = false,
     displayMode: SessionDisplayMode = SessionDisplayMode.Full,
     onStatusToggle: (() -> Unit)? = null,
+    onClick: (() -> Unit)? = null,
     modifier: Modifier = Modifier,
 ) {
     val isCompleted = status is TaskStatus.Completed
@@ -79,10 +80,16 @@ fun AwanScheduleTaskCard(
         label = "cardBg",
     )
 
+    val cardModifier = if (onClick != null && !isDragging) {
+        modifier.clickable(onClick = onClick)
+    } else {
+        modifier
+    }
+
     when (displayMode) {
         SessionDisplayMode.Pill -> {
             Box(
-                modifier = modifier
+                modifier = cardModifier
                     .fillMaxSize()
                     .clip(RoundedCornerShape(8.dp))
                     .background(
@@ -103,7 +110,7 @@ fun AwanScheduleTaskCard(
 
         SessionDisplayMode.Compact -> {
             Box(
-                modifier = modifier
+                modifier = cardModifier
                     .fillMaxSize()
                     .shadow(
                         elevation = if (isDragging) 0.dp else 1.dp,
@@ -159,7 +166,7 @@ fun AwanScheduleTaskCard(
 
         SessionDisplayMode.Full -> {
             Box(
-                modifier = modifier
+                modifier = cardModifier
                     .fillMaxSize()
                     .shadow(
                         elevation = if (isDragging) 0.dp else 2.dp,
diff --git a/core/design-system/src/main/java/com/awan/app/core/designsystem/AwanScheduleTimeline.kt b/core/design-system/src/main/java/com/awan/app/core/designsystem/AwanScheduleTimeline.kt
index a8ecb6a0..4b895347 100644
--- a/core/design-system/src/main/java/com/awan/app/core/designsystem/AwanScheduleTimeline.kt
+++ b/core/design-system/src/main/java/com/awan/app/core/designsystem/AwanScheduleTimeline.kt
@@ -68,6 +68,7 @@ fun AwanScheduleTimeline(
     onToggleZoneCollapse: (zoneId: String) -> Unit = {},
     onAddSessionToZone: (zoneId: String) -> Unit = {},
     onSessionStatusToggle: (sessionId: String) -> Unit = {},
+    onSessionClick: (sessionId: String) -> Unit = {},
     onSessionMoved: (sessionId: String, newStartMinutes: Int) -> Unit = { _, _ -> },
     onReorderSessionsInZone: (zoneId: String, fromIndex: Int, toIndex: Int) -> Unit = { _, _, _ -> },
     scrollState: ScrollState = rememberScrollState(),
@@ -154,7 +155,7 @@ fun AwanScheduleTimeline(
     )
 
     val activeZone = remember(zones, currentTimeMinutes) {
-        zones.find { currentTimeMinutes in (it.startHour * 60)..(it.endHour * 60) }
+        zones.find { currentTimeMinutes in it.startMinutes..it.endMinutes }
     }
     val activePointerColor = activeZone?.category?.color ?: AwanTheme.colors.sky
 
@@ -207,8 +208,8 @@ fun AwanScheduleTimeline(
                             .padding(start = axisWidthDp),
                     ) {
                         zones.forEach { zone ->
-                            val topY = contentTopPadding + (zone.startHour * effectiveHourHeightDpValue).dp
-                            val bandHeight = ((zone.endHour - zone.startHour) * effectiveHourHeightDpValue).dp
+                            val topY = contentTopPadding + ((zone.startMinutes.toDouble() / 60.0) * effectiveHourHeightDpValue).dp
+                            val bandHeight = (((zone.endMinutes - zone.startMinutes).toDouble() / 60.0) * effectiveHourHeightDpValue).dp
 
                             Box(
                                 modifier = Modifier
@@ -222,7 +223,7 @@ fun AwanScheduleTimeline(
                     }
 
                     zones.forEach { zone ->
-                        val topY = contentTopPadding + (zone.startHour * effectiveHourHeightDpValue).dp
+                        val topY = contentTopPadding + ((zone.startMinutes.toDouble() / 60.0) * effectiveHourHeightDpValue).dp
 
                         AwanText(
                             text = zone.category.name.uppercase(),
@@ -315,6 +316,7 @@ fun AwanScheduleTimeline(
                                     displayMode = displayMode,
                                     onSessionMoved = onSessionMoved,
                                     onSessionStatusToggle = onSessionStatusToggle,
+                                    onSessionClick = onSessionClick,
                                 )
                             }
                         }
diff --git a/core/design-system/src/main/java/com/awan/app/core/designsystem/DraggableTimelineSessionCard.kt b/core/design-system/src/main/java/com/awan/app/core/designsystem/DraggableTimelineSessionCard.kt
index 21a64858..74f880b4 100644
--- a/core/design-system/src/main/java/com/awan/app/core/designsystem/DraggableTimelineSessionCard.kt
+++ b/core/design-system/src/main/java/com/awan/app/core/designsystem/DraggableTimelineSessionCard.kt
@@ -47,6 +47,7 @@ fun DraggableTimelineSessionCard(
     viewportHeightPx: Float,
     onSessionMoved: (sessionId: String, newStartMinutes: Int) -> Unit,
     onSessionStatusToggle: (sessionId: String) -> Unit,
+    onSessionClick: (sessionId: String) -> Unit = {},
     displayMode: SessionDisplayMode = SessionDisplayMode.Full,
     modifier: Modifier = Modifier,
 ) {
@@ -191,6 +192,7 @@ fun DraggableTimelineSessionCard(
             isDragging = isDragging,
             displayMode = displayMode,
             onStatusToggle = { onSessionStatusToggle(session.id) },
+            onClick = { onSessionClick(session.id) },
             modifier = Modifier
                 .fillMaxWidth()
                 .height(sessionHeightDp),
diff --git a/core/design-system/src/main/java/com/awan/app/core/designsystem/ScheduleZone.kt b/core/design-system/src/main/java/com/awan/app/core/designsystem/ScheduleZone.kt
index 76783aa9..012c773e 100644
--- a/core/design-system/src/main/java/com/awan/app/core/designsystem/ScheduleZone.kt
+++ b/core/design-system/src/main/java/com/awan/app/core/designsystem/ScheduleZone.kt
@@ -7,7 +7,28 @@ data class ScheduleZone(
     val id: String,
     val categoryId: String,
     val category: TaskCategory,
-    val startHour: Int,
-    val endHour: Int,
+    val startMinutes: Int,
+    val endMinutes: Int,
     val isCollapsed: Boolean = false,
-)
+) {
+    val startHour: Int get() = startMinutes / 60
+    val endHour: Int get() = endMinutes / 60
+
+    companion object {
+        fun fromHours(
+            id: String,
+            categoryId: String,
+            category: TaskCategory,
+            startHour: Int,
+            endHour: Int,
+            isCollapsed: Boolean = false,
+        ): ScheduleZone = ScheduleZone(
+            id = id,
+            categoryId = categoryId,
+            category = category,
+            startMinutes = startHour * 60,
+            endMinutes = endHour * 60,
+            isCollapsed = isCollapsed,
+        )
+    }
+}
diff --git a/core/design-system/src/main/java/com/awan/app/core/designsystem/TimelineHourAxis.kt b/core/design-system/src/main/java/com/awan/app/core/designsystem/TimelineHourAxis.kt
index e58b08a0..78526321 100644
--- a/core/design-system/src/main/java/com/awan/app/core/designsystem/TimelineHourAxis.kt
+++ b/core/design-system/src/main/java/com/awan/app/core/designsystem/TimelineHourAxis.kt
@@ -46,9 +46,11 @@ fun TimelineHourAxis(
         val hourTopY   = hourYOffsets[hour] ?: 0.dp
         val hourHeight = hourSlotHeights[hour] ?: 0.dp
 
-        val overlappingZone    = zones.find { hour >= it.startHour && hour < it.endHour }
-        val isMiddleCollapsed  = overlappingZone != null &&
-                overlappingZone.isCollapsed && hour > overlappingZone.startHour
+        val hStartMins = hour * 60
+        val hEndMins = (hour + 1) * 60
+        val overlappingZone = zones.find { hStartMins < it.endMinutes && hEndMins > it.startMinutes }
+        val isMiddleCollapsed = overlappingZone != null &&
+                overlappingZone.isCollapsed && hStartMins > overlappingZone.startMinutes
         if (isMiddleCollapsed) continue
 
         AwanText(
diff --git a/core/design-system/src/main/java/com/awan/app/core/designsystem/TimelineTrackCanvas.kt b/core/design-system/src/main/java/com/awan/app/core/designsystem/TimelineTrackCanvas.kt
index d6ff8b7c..e161e886 100644
--- a/core/design-system/src/main/java/com/awan/app/core/designsystem/TimelineTrackCanvas.kt
+++ b/core/design-system/src/main/java/com/awan/app/core/designsystem/TimelineTrackCanvas.kt
@@ -43,13 +43,14 @@ fun TimelineTrackCanvas(
         val pastGray    = hourLineColor.copy(alpha = 0.55f)
 
         fun getTrackColorAtHour(hour: Int): Color {
-            val insideZone = zones.find { hour > it.startHour && hour < it.endHour }
+            val hMins = hour * 60
+            val insideZone = zones.find { hMins > it.startMinutes && hMins < it.endMinutes }
             if (insideZone != null) return insideZone.category.color
 
-            val startZone = zones.find { hour == it.startHour }
+            val startZone = zones.find { hMins == it.startMinutes }
             if (startZone != null) return startZone.category.color
 
-            val endZone = zones.find { hour == it.endHour }
+            val endZone = zones.find { hMins == it.endMinutes }
             if (endZone != null) return endZone.category.color
 
             val hourTopPx = (hourYOffsets[hour] ?: (hour * hourHeightDp).dp).toPx()
diff --git a/core/domain/src/main/kotlin/com/awan/app/core/domain/home/repository/HomeRepository.kt b/core/domain/src/main/kotlin/com/awan/app/core/domain/home/repository/HomeRepository.kt
index a79998b1..0f4c6c55 100644
--- a/core/domain/src/main/kotlin/com/awan/app/core/domain/home/repository/HomeRepository.kt
+++ b/core/domain/src/main/kotlin/com/awan/app/core/domain/home/repository/HomeRepository.kt
@@ -7,13 +7,32 @@ import java.time.LocalDate
 
 import com.awan.app.core.domain.home.model.SessionStatus
 
+import com.awan.app.core.model.SessionTaskDetail
+
 interface HomeRepository {
     suspend fun getDaySchedule(date: LocalDate): Result<DaySchedule>
     suspend fun getUserProfile(): Result<UserProfileInfo>
+    suspend fun getSessionDetail(sessionId: String): Result<SessionTaskDetail>
     suspend fun updateSessionStatus(
         sessionId: String,
         status: SessionStatus,
+        locked: Boolean? = null,
         startIso: String? = null,
         endIso: String? = null,
     ): Result<Unit>
+    suspend fun updateSessionLock(
+        sessionId: String,
+        locked: Boolean,
+    ): Result<Unit>
+    suspend fun updateTaskDetails(
+        taskId: String,
+        title: String? = null,
+        description: String? = null,
+        estimatedDuration: Int? = null,
+        estimatedPoints: Int? = null,
+        mandatory: Boolean? = null,
+        allowTaskSplitting: Boolean? = null,
+    ): Result<Unit>
+    suspend fun deleteSession(sessionId: String): Result<Unit>
+    suspend fun deleteTask(taskId: String): Result<Unit>
 }
diff --git a/core/domain/src/main/kotlin/com/awan/app/core/domain/home/usecase/DeleteSessionUseCase.kt b/core/domain/src/main/kotlin/com/awan/app/core/domain/home/usecase/DeleteSessionUseCase.kt
new file mode 100644
index 00000000..9ef9aaa1
--- /dev/null
+++ b/core/domain/src/main/kotlin/com/awan/app/core/domain/home/usecase/DeleteSessionUseCase.kt
@@ -0,0 +1,12 @@
+package com.awan.app.core.domain.home.usecase
+
+import com.awan.app.core.common.result.Result
+import com.awan.app.core.domain.home.repository.HomeRepository
+import javax.inject.Inject
+
+class DeleteSessionUseCase @Inject constructor(
+    private val homeRepository: HomeRepository,
+) {
+    suspend operator fun invoke(sessionId: String): Result<Unit> =
+        homeRepository.deleteSession(sessionId)
+}
diff --git a/core/domain/src/main/kotlin/com/awan/app/core/domain/home/usecase/DeleteTaskUseCase.kt b/core/domain/src/main/kotlin/com/awan/app/core/domain/home/usecase/DeleteTaskUseCase.kt
new file mode 100644
index 00000000..dd46e6eb
--- /dev/null
+++ b/core/domain/src/main/kotlin/com/awan/app/core/domain/home/usecase/DeleteTaskUseCase.kt
@@ -0,0 +1,12 @@
+package com.awan.app.core.domain.home.usecase
+
+import com.awan.app.core.common.result.Result
+import com.awan.app.core.domain.home.repository.HomeRepository
+import javax.inject.Inject
+
+class DeleteTaskUseCase @Inject constructor(
+    private val homeRepository: HomeRepository,
+) {
+    suspend operator fun invoke(taskId: String): Result<Unit> =
+        homeRepository.deleteTask(taskId)
+}
diff --git a/core/domain/src/main/kotlin/com/awan/app/core/domain/home/usecase/GetSessionDetailUseCase.kt b/core/domain/src/main/kotlin/com/awan/app/core/domain/home/usecase/GetSessionDetailUseCase.kt
new file mode 100644
index 00000000..4ccf5e02
--- /dev/null
+++ b/core/domain/src/main/kotlin/com/awan/app/core/domain/home/usecase/GetSessionDetailUseCase.kt
@@ -0,0 +1,13 @@
+package com.awan.app.core.domain.home.usecase
+
+import com.awan.app.core.common.result.Result
+import com.awan.app.core.domain.home.repository.HomeRepository
+import com.awan.app.core.model.SessionTaskDetail
+import javax.inject.Inject
+
+class GetSessionDetailUseCase @Inject constructor(
+    private val homeRepository: HomeRepository,
+) {
+    suspend operator fun invoke(sessionId: String): Result<SessionTaskDetail> =
+        homeRepository.getSessionDetail(sessionId)
+}
diff --git a/core/domain/src/main/kotlin/com/awan/app/core/domain/home/usecase/UpdateTaskDetailUseCase.kt b/core/domain/src/main/kotlin/com/awan/app/core/domain/home/usecase/UpdateTaskDetailUseCase.kt
new file mode 100644
index 00000000..f292ee12
--- /dev/null
+++ b/core/domain/src/main/kotlin/com/awan/app/core/domain/home/usecase/UpdateTaskDetailUseCase.kt
@@ -0,0 +1,27 @@
+package com.awan.app.core.domain.home.usecase
+
+import com.awan.app.core.common.result.Result
+import com.awan.app.core.domain.home.repository.HomeRepository
+import javax.inject.Inject
+
+class UpdateTaskDetailUseCase @Inject constructor(
+    private val homeRepository: HomeRepository,
+) {
+    suspend operator fun invoke(
+        taskId: String,
+        title: String? = null,
+        description: String? = null,
+        estimatedDuration: Int? = null,
+        estimatedPoints: Int? = null,
+        mandatory: Boolean? = null,
+        allowTaskSplitting: Boolean? = null,
+    ): Result<Unit> = homeRepository.updateTaskDetails(
+        taskId = taskId,
+        title = title,
+        description = description,
+        estimatedDuration = estimatedDuration,
+        estimatedPoints = estimatedPoints,
+        mandatory = mandatory,
+        allowTaskSplitting = allowTaskSplitting,
+    )
+}
diff --git a/core/model/src/main/kotlin/com/awan/app/core/model/SessionTaskDetail.kt b/core/model/src/main/kotlin/com/awan/app/core/model/SessionTaskDetail.kt
new file mode 100644
index 00000000..fa7ef03d
--- /dev/null
+++ b/core/model/src/main/kotlin/com/awan/app/core/model/SessionTaskDetail.kt
@@ -0,0 +1,31 @@
+package com.awan.app.core.model
+
+data class SessionDetailInfo(
+    val id: String,
+    val start: String,
+    val end: String,
+    val status: String,
+    val locked: Boolean,
+    val zoneId: String?,
+    val taskId: String,
+)
+
+data class TaskDetailInfo(
+    val id: String,
+    val title: String,
+    val description: String?,
+    val estimatedDuration: Int?,
+    val status: String,
+    val mandatory: Boolean,
+    val estimatedPoints: Int,
+    val allowTaskSplitting: Boolean,
+    val goalId: String?,
+    val categoryName: String?,
+    val dependsOnTaskIds: List<String>,
+)
+
+data class SessionTaskDetail(
+    val session: SessionDetailInfo,
+    val task: TaskDetailInfo,
+    val relatedSessions: List<SessionDetailInfo> = emptyList(),
+)
diff --git a/core/network/src/main/kotlin/com/awan/app/core/network/api/SessionApiService.kt b/core/network/src/main/kotlin/com/awan/app/core/network/api/SessionApiService.kt
index e1663fd0..b2f066a6 100644
--- a/core/network/src/main/kotlin/com/awan/app/core/network/api/SessionApiService.kt
+++ b/core/network/src/main/kotlin/com/awan/app/core/network/api/SessionApiService.kt
@@ -6,11 +6,34 @@ import retrofit2.http.Body
 import retrofit2.http.PUT
 import retrofit2.http.Path
 
+import retrofit2.http.GET
+import retrofit2.http.PATCH
+
 interface SessionApiService {
 
+    @GET("v1/sessions/{sessionId}")
+    suspend fun getSession(
+        @Path("sessionId") sessionId: String,
+    ): SessionDto
+
     @PUT("v1/sessions/{sessionId}")
     suspend fun updateSession(
         @Path("sessionId") sessionId: String,
         @Body request: UpdateSessionRequest,
     ): SessionDto
+
+    @PATCH("v1/sessions/{sessionId}/lock")
+    suspend fun lockSession(
+        @Path("sessionId") sessionId: String,
+    ): SessionDto
+
+    @PATCH("v1/sessions/{sessionId}/unlock")
+    suspend fun unlockSession(
+        @Path("sessionId") sessionId: String,
+    ): SessionDto
+
+    @retrofit2.http.DELETE("v1/sessions/{sessionId}")
+    suspend fun deleteSession(
+        @Path("sessionId") sessionId: String,
+    )
 }
diff --git a/core/network/src/main/kotlin/com/awan/app/core/network/api/TaskApiService.kt b/core/network/src/main/kotlin/com/awan/app/core/network/api/TaskApiService.kt
index a7cb3aa6..a2dbae29 100644
--- a/core/network/src/main/kotlin/com/awan/app/core/network/api/TaskApiService.kt
+++ b/core/network/src/main/kotlin/com/awan/app/core/network/api/TaskApiService.kt
@@ -59,6 +59,17 @@ interface TaskApiService {
         @Part("note") note: RequestBody?,
     ): TaskProposalResponse
 
+    @GET("v1/tasks/{taskId}")
+    suspend fun getTask(
+        @Path("taskId") taskId: String,
+    ): TaskInfoResponse
+
+    @retrofit2.http.PATCH("v1/tasks/{taskId}")
+    suspend fun updateTask(
+        @Path("taskId") taskId: String,
+        @Body request: com.awan.app.core.network.dto.task.TaskUpdateRequest,
+    ): TaskInfoResponse
+
     @GET("v1/tasks/date/{date}")
     suspend fun getTasksByDate(
         @Path("date") date: String,
diff --git a/core/network/src/main/kotlin/com/awan/app/core/network/dto/session/UpdateSessionRequest.kt b/core/network/src/main/kotlin/com/awan/app/core/network/dto/session/UpdateSessionRequest.kt
index 00cfa8cf..1a894a81 100644
--- a/core/network/src/main/kotlin/com/awan/app/core/network/dto/session/UpdateSessionRequest.kt
+++ b/core/network/src/main/kotlin/com/awan/app/core/network/dto/session/UpdateSessionRequest.kt
@@ -8,4 +8,5 @@ data class UpdateSessionRequest(
     @SerialName("start") val start: String? = null,
     @SerialName("end") val end: String? = null,
     @SerialName("status") val status: String? = null,
+    @SerialName("locked") val locked: Boolean? = null,
 )
diff --git a/core/network/src/main/kotlin/com/awan/app/core/network/dto/task/TaskUpdateRequest.kt b/core/network/src/main/kotlin/com/awan/app/core/network/dto/task/TaskUpdateRequest.kt
new file mode 100644
index 00000000..eb9352a0
--- /dev/null
+++ b/core/network/src/main/kotlin/com/awan/app/core/network/dto/task/TaskUpdateRequest.kt
@@ -0,0 +1,16 @@
+package com.awan.app.core.network.dto.task
+
+import kotlinx.serialization.SerialName
+import kotlinx.serialization.Serializable
+
+@Serializable
+data class TaskUpdateRequest(
+    @SerialName("title") val title: String? = null,
+    @SerialName("description") val description: String? = null,
+    @SerialName("status") val status: String? = null,
+    @SerialName("mandatory") val mandatory: Boolean? = null,
+    @SerialName("estimatedDuration") val estimatedDuration: Int? = null,
+    @SerialName("estimatedPoints") val estimatedPoints: Int? = null,
+    @SerialName("allowTaskSplitting") val allowTaskSplitting: Boolean? = null,
+    @SerialName("categoryId") val categoryId: String? = null,
+)
diff --git a/feature/home/impl/build.gradle.kts b/feature/home/impl/build.gradle.kts
index 29b3a0a1..a216482e 100644
--- a/feature/home/impl/build.gradle.kts
+++ b/feature/home/impl/build.gradle.kts
@@ -12,4 +12,5 @@ dependencies {
     implementation(project(":core:domain"))
     implementation(project(":core:common"))
     implementation(project(":core:design-system"))
+    implementation(libs.androidx.compose.material.icons.extended)
 }
diff --git a/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/HomeScreen.kt b/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/HomeScreen.kt
index 50e0aea0..f2c740c3 100644
--- a/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/HomeScreen.kt
+++ b/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/HomeScreen.kt
@@ -43,6 +43,7 @@ import com.awan.app.core.designsystem.AwanScheduleTimeline
 import com.awan.app.core.designsystem.AwanText
 import com.awan.app.core.designsystem.AwanTheme
 import com.awan.feature.home.impl.R
+import com.awan.feature.home.impl.ui.components.SessionTaskDetailDialog
 import java.time.LocalDate
 
 private sealed interface TimelineContentState {
@@ -190,6 +191,7 @@ fun HomeScreen(
                             onToggleZoneCollapse = viewModel::toggleZoneCollapse,
                             onAddSessionToZone = viewModel::addSessionToZone,
                             onSessionStatusToggle = viewModel::toggleSessionStatus,
+                            onSessionClick = viewModel::onSessionClicked,
                             onSessionMoved = viewModel::moveSession,
                             onReorderSessionsInZone = viewModel::reorderSessionsInZone,
                             scrollState = timelineScrollState,
@@ -200,6 +202,26 @@ fun HomeScreen(
             }
         }
 
+        uiState.selectedSessionDetailState?.let { dialogState ->
+            SessionTaskDetailDialog(
+                state = dialogState,
+                onDismiss = viewModel::dismissSessionDetail,
+                onRetry = viewModel::retryLoadSessionDetail,
+                onToggleStatus = viewModel::toggleSessionStatusFromDialog,
+                onToggleLock = viewModel::toggleSessionLockFromDialog,
+                onStartEditing = viewModel::startEditingSessionDetail,
+                onCancelEditing = viewModel::cancelEditingSessionDetail,
+                onTitleChange = viewModel::onEditTitleChanged,
+                onDescriptionChange = viewModel::onEditDescriptionChanged,
+                onDurationChange = viewModel::onEditDurationChanged,
+                onSaveEdits = viewModel::saveSessionDetailEdits,
+                onDeleteClick = viewModel::requestDeleteSession,
+                onSelectDeleteTarget = viewModel::selectDeleteTargetType,
+                onConfirmDelete = viewModel::confirmDeleteAction,
+                onCancelDelete = viewModel::dismissDeleteConfirmDialog,
+            )
+        }
+
         if (uiState.hasConflict) {
             Dialog(
                 onDismissRequest = viewModel::dismissConflict,
diff --git a/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/HomeUiMappers.kt b/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/HomeUiMappers.kt
index 63ade2a0..7f0b96e8 100644
--- a/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/HomeUiMappers.kt
+++ b/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/HomeUiMappers.kt
@@ -14,8 +14,8 @@ internal fun DayZone.toUiZone(): ScheduleZone = ScheduleZone(
     id = id,
     categoryId = categoryId,
     category = resolveCategoryWithColor(categoryName, color),
-    startHour = startMinutes / 60,
-    endHour = ceilHour(endMinutes),
+    startMinutes = startMinutes,
+    endMinutes = endMinutes,
     isCollapsed = false,
 )
 
diff --git a/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/HomeUiState.kt b/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/HomeUiState.kt
index 7df678e3..af2b709d 100644
--- a/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/HomeUiState.kt
+++ b/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/HomeUiState.kt
@@ -13,6 +13,7 @@ import com.awan.feature.home.impl.R
 import java.time.LocalDate
 import java.time.format.DateTimeFormatter
 import java.util.Locale
+import com.awan.app.core.model.SessionTaskDetail
 
 internal fun formatSelectedDate(date: LocalDate): UiText {
     val today = LocalDate.now()
@@ -26,6 +27,26 @@ internal fun formatSelectedDate(date: LocalDate): UiText {
     }
 }
 
+enum class DeleteTargetType {
+    SESSION,
+    TASK,
+}
+
+data class SessionDetailDialogState(
+    val sessionId: String,
+    val isLoading: Boolean = true,
+    val detail: SessionTaskDetail? = null,
+    val errorMessage: UiText? = null,
+    val isEditing: Boolean = false,
+    val editTitle: String = "",
+    val editDescription: String = "",
+    val editDurationMinutes: Int = 30,
+    val isSaving: Boolean = false,
+    val showDeleteConfirmDialog: Boolean = false,
+    val isDeleting: Boolean = false,
+    val deleteTargetType: DeleteTargetType = DeleteTargetType.SESSION,
+)
+
 data class HomeUiState(
     val userName: String = "",
     val greetingPrefix: UiText = UiText.StringResource(R.string.home_greeting_afternoon),
@@ -53,4 +74,5 @@ data class HomeUiState(
     val conflictMessage: String = "",
     val isLoading: Boolean = false,
     val errorMessage: UiText? = null,
+    val selectedSessionDetailState: SessionDetailDialogState? = null,
 )
diff --git a/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/HomeViewModel.kt b/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/HomeViewModel.kt
index 121cf144..93f21fa2 100644
--- a/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/HomeViewModel.kt
+++ b/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/HomeViewModel.kt
@@ -39,9 +39,19 @@ import kotlin.time.Duration.Companion.milliseconds
 
 
 
+import com.awan.app.core.domain.home.usecase.GetSessionDetailUseCase
+import com.awan.app.core.domain.home.usecase.UpdateTaskDetailUseCase
+import com.awan.app.core.domain.home.usecase.DeleteSessionUseCase
+import com.awan.app.core.domain.home.usecase.DeleteTaskUseCase
+import com.awan.feature.home.impl.ui.components.calculateDurationMinutes
+
 @HiltViewModel
 class HomeViewModel @Inject constructor(
     private val getDayScheduleUseCase: GetDayScheduleUseCase,
+    private val getSessionDetailUseCase: GetSessionDetailUseCase,
+    private val updateTaskDetailUseCase: UpdateTaskDetailUseCase,
+    private val deleteSessionUseCase: DeleteSessionUseCase,
+    private val deleteTaskUseCase: DeleteTaskUseCase,
     private val homeRepository: HomeRepository,
 ) : ViewModel() {
 
@@ -115,8 +125,8 @@ class HomeViewModel @Inject constructor(
                     id = orphanZoneId,
                     categoryId = orphanZoneId,
                     category = category,
-                    startHour = startMin / 60,
-                    endHour = ceilHour(endMin),
+                    startMinutes = startMin,
+                    endMinutes = endMin,
                     isCollapsed = false,
                 )
                 zones.add(synthetic)
@@ -130,8 +140,8 @@ class HomeViewModel @Inject constructor(
                 id = "zone_default",
                 categoryId = "personal",
                 category = TaskCategory.Personal,
-                startHour = (startMin / 60).coerceIn(0, 23),
-                endHour = ceilHour(endMin).coerceIn(1, 24),
+                startMinutes = startMin,
+                endMinutes = endMin,
                 isCollapsed = false,
             )
             zones.add(fallbackZone)
@@ -188,8 +198,8 @@ class HomeViewModel @Inject constructor(
             val matchedZone = state.zones.find { it.id == zoneId } ?: return@update state
             val zoneSessions = state.sessions.filter { it.zoneId == zoneId }
             val lastEnd = zoneSessions.maxOfOrNull { it.startMinutes + it.durationMinutes }
-                ?: (matchedZone.startHour * 60)
-            val newStart = if (lastEnd < matchedZone.endHour * 60) lastEnd else matchedZone.startHour * 60
+                ?: matchedZone.startMinutes
+            val newStart = if (lastEnd < matchedZone.endMinutes) lastEnd else matchedZone.startMinutes
 
             val titles = listOf("New Task Session", "Practice Exercise", "Deep Focus", "Review Notes")
             val newSession = ScheduleSession(
@@ -291,7 +301,7 @@ class HomeViewModel @Inject constructor(
                     val maxAllowedStart = (24 * 60 - session.durationMinutes).coerceAtLeast(0)
                     val clampedStartMinutes = newStartMinutes.coerceIn(0, maxAllowedStart)
                     val matchedZone = state.zones.find { zone ->
-                        clampedStartMinutes in (zone.startHour * 60)..(zone.endHour * 60)
+                        clampedStartMinutes in zone.startMinutes..zone.endMinutes
                     }
                     val updatedSession = session.copy(
                         startMinutes = clampedStartMinutes,
@@ -346,7 +356,7 @@ class HomeViewModel @Inject constructor(
             val movedItem = zoneSessions.removeAt(fromIndex)
             zoneSessions.add(toIndex, movedItem)
 
-            var currentStart = zone.startHour * 60
+            var currentStart = zone.startMinutes
             val resequencedZoneSessions = zoneSessions.map { session ->
                 val updated = session.copy(startMinutes = currentStart)
                 currentStart += session.durationMinutes
@@ -378,6 +388,363 @@ class HomeViewModel @Inject constructor(
     fun dismissConflict() = _uiState.update { it.copy(hasConflict = false) }
 
 
+    fun onSessionClicked(sessionId: String) {
+        _uiState.update { state ->
+            state.copy(
+                selectedSessionDetailState = SessionDetailDialogState(
+                    sessionId = sessionId,
+                    isLoading = true,
+                )
+            )
+        }
+        viewModelScope.launch {
+            when (val result = getSessionDetailUseCase(sessionId)) {
+                is Result.Success -> {
+                    _uiState.update { state ->
+                        val taskId = result.data.task.id
+                        val taskSessions = state.sessions.filter { it.taskId == taskId }.map { s ->
+                            val startMins = s.startMinutes
+                            val endMins = s.startMinutes + s.durationMinutes
+                            val startStr = com.awan.app.core.designsystem.formatTime(startMins)
+                            val endStr = com.awan.app.core.designsystem.formatTime(endMins)
+                            val isDone = s.status == com.awan.app.core.designsystem.TaskStatus.Completed
+                            com.awan.app.core.model.SessionDetailInfo(
+                                id = s.id,
+                                start = startStr,
+                                end = endStr,
+                                status = if (isDone) "COMPLETED" else "SCHEDULED",
+                                locked = s.isFixed,
+                                zoneId = s.zoneId,
+                                taskId = taskId,
+                            )
+                        }
+                        val enrichedDetail = result.data.copy(relatedSessions = taskSessions)
+                        state.copy(
+                            selectedSessionDetailState = state.selectedSessionDetailState?.copy(
+                                isLoading = false,
+                                detail = enrichedDetail,
+                                errorMessage = null,
+                            )
+                        )
+                    }
+                }
+                is Result.Error -> {
+                    _uiState.update { state ->
+                        state.copy(
+                            selectedSessionDetailState = state.selectedSessionDetailState?.copy(
+                                isLoading = false,
+                                errorMessage = result.error.toReadableMessage(),
+                            )
+                        )
+                    }
+                }
+                else -> Unit
+            }
+        }
+    }
+
+    fun dismissSessionDetail() {
+        _uiState.update { state ->
+            state.copy(selectedSessionDetailState = null)
+        }
+    }
+
+    fun retryLoadSessionDetail() {
+        val currentSessionId = uiState.value.selectedSessionDetailState?.sessionId ?: return
+        onSessionClicked(currentSessionId)
+    }
+
+    fun toggleSessionStatusFromDialog() {
+        val currentDialogState = uiState.value.selectedSessionDetailState ?: return
+        val currentDetail = currentDialogState.detail ?: return
+        val sessionId = currentDialogState.sessionId
+
+        val isCurrentlyCompleted = currentDetail.session.status.uppercase() == "COMPLETED"
+        val newStatusStr = if (isCurrentlyCompleted) "SCHEDULED" else "COMPLETED"
+
+        toggleSessionStatus(sessionId)
+
+        _uiState.update { state ->
+            val updatedDetail = state.selectedSessionDetailState?.detail?.let { detail ->
+                detail.copy(
+                    session = detail.session.copy(status = newStatusStr),
+                    task = detail.task.copy(status = newStatusStr),
+                )
+            }
+            state.copy(
+                selectedSessionDetailState = state.selectedSessionDetailState?.copy(
+                    detail = updatedDetail
+                )
+            )
+        }
+    }
+
+    fun toggleSessionLockFromDialog() {
+        val currentDialogState = uiState.value.selectedSessionDetailState ?: return
+        val currentDetail = currentDialogState.detail ?: return
+        val sessionId = currentDialogState.sessionId
+
+        val newLocked = !currentDetail.session.locked
+
+        _uiState.update { state ->
+            val updatedSessions = state.sessions.map { session ->
+                if (session.id == sessionId) {
+                    session.copy(isFixed = newLocked)
+                } else session
+            }
+            val updatedDetail = state.selectedSessionDetailState?.detail?.let { detail ->
+                detail.copy(session = detail.session.copy(locked = newLocked))
+            }
+            state.copy(
+                sessions = updatedSessions,
+                selectedSessionDetailState = state.selectedSessionDetailState?.copy(
+                    detail = updatedDetail
+                )
+            )
+        }
+
+        viewModelScope.launch {
+            val result = homeRepository.updateSessionLock(sessionId, newLocked)
+            if (result is Result.Error) {
+                _uiState.update { state ->
+                    val revertedSessions = state.sessions.map { session ->
+                        if (session.id == sessionId) {
+                            session.copy(isFixed = !newLocked)
+                        } else session
+                    }
+                    val revertedDetail = state.selectedSessionDetailState?.detail?.let { detail ->
+                        detail.copy(session = detail.session.copy(locked = !newLocked))
+                    }
+                    state.copy(
+                        sessions = revertedSessions,
+                        selectedSessionDetailState = state.selectedSessionDetailState?.copy(
+                            detail = revertedDetail
+                        )
+                    )
+                }
+            }
+        }
+    }
+
+    fun startEditingSessionDetail() {
+        _uiState.update { state ->
+            val dialogState = state.selectedSessionDetailState ?: return@update state
+            val detail = dialogState.detail ?: return@update state
+            val duration = calculateDurationMinutes(detail.session.start, detail.session.end)
+                ?: detail.task.estimatedDuration ?: 30
+
+            state.copy(
+                selectedSessionDetailState = dialogState.copy(
+                    isEditing = true,
+                    editTitle = detail.task.title,
+                    editDescription = detail.task.description ?: "",
+                    editDurationMinutes = duration,
+                )
+            )
+        }
+    }
+
+    fun cancelEditingSessionDetail() {
+        _uiState.update { state ->
+            val dialogState = state.selectedSessionDetailState ?: return@update state
+            state.copy(
+                selectedSessionDetailState = dialogState.copy(isEditing = false)
+            )
+        }
+    }
+
+    fun onEditTitleChanged(newTitle: String) {
+        _uiState.update { state ->
+            val dialogState = state.selectedSessionDetailState ?: return@update state
+            state.copy(
+                selectedSessionDetailState = dialogState.copy(editTitle = newTitle)
+            )
+        }
+    }
+
+    fun onEditDescriptionChanged(newDesc: String) {
+        _uiState.update { state ->
+            val dialogState = state.selectedSessionDetailState ?: return@update state
+            state.copy(
+                selectedSessionDetailState = dialogState.copy(editDescription = newDesc)
+            )
+        }
+    }
+
+    fun onEditDurationChanged(newDuration: Int) {
+        _uiState.update { state ->
+            val dialogState = state.selectedSessionDetailState ?: return@update state
+            state.copy(
+                selectedSessionDetailState = dialogState.copy(editDurationMinutes = newDuration)
+            )
+        }
+    }
+
+    fun saveSessionDetailEdits() {
+        val dialogState = uiState.value.selectedSessionDetailState ?: return
+        val detail = dialogState.detail ?: return
+        val sessionId = detail.session.id
+        val taskId = detail.task.id
+        val newDuration = dialogState.editDurationMinutes
+
+        _uiState.update { state ->
+            state.copy(
+                selectedSessionDetailState = state.selectedSessionDetailState?.copy(isSaving = true)
+            )
+        }
+
+        viewModelScope.launch {
+            // 1. Update task title & description
+            val taskResult = updateTaskDetailUseCase(
+                taskId = taskId,
+                title = dialogState.editTitle,
+                description = dialogState.editDescription,
+            )
+
+            // 2. Update specific session end time if duration changed
+            val currentDuration = calculateDurationMinutes(detail.session.start, detail.session.end) ?: 30
+            var newEndIso = detail.session.end
+            if (newDuration != currentDuration) {
+                val calculatedEnd = com.awan.feature.home.impl.ui.components.calculateEndIso(detail.session.start, newDuration)
+                if (calculatedEnd != null) {
+                    newEndIso = calculatedEnd
+                    val currentStatus = if (detail.session.status.uppercase() == "COMPLETED") {
+                        com.awan.app.core.domain.home.model.SessionStatus.COMPLETED
+                    } else {
+                        com.awan.app.core.domain.home.model.SessionStatus.SCHEDULED
+                    }
+                    homeRepository.updateSessionStatus(
+                        sessionId = sessionId,
+                        status = currentStatus,
+                        startIso = detail.session.start,
+                        endIso = calculatedEnd,
+                    )
+                }
+            }
+
+            if (taskResult is Result.Success) {
+                _uiState.update { state ->
+                    val updatedDetail = state.selectedSessionDetailState?.detail?.let { d ->
+                        val updatedSession = d.session.copy(end = newEndIso)
+                        val updatedRelatedSessions = d.relatedSessions.map { s ->
+                            if (s.id == sessionId) s.copy(end = newEndIso) else s
+                        }
+                        d.copy(
+                            session = updatedSession,
+                            task = d.task.copy(
+                                title = dialogState.editTitle,
+                                description = dialogState.editDescription,
+                            ),
+                            relatedSessions = updatedRelatedSessions,
+                        )
+                    }
+
+                    // Update local schedule sessions: durationMinutes ONLY for this specific session!
+                    val updatedSessions = state.sessions.map { s ->
+                        if (s.id == sessionId) {
+                            s.copy(
+                                taskTitle = dialogState.editTitle,
+                                durationMinutes = newDuration,
+                            )
+                        } else if (s.taskId == taskId) {
+                            s.copy(taskTitle = dialogState.editTitle)
+                        } else s
+                    }
+
+                    state.copy(
+                        sessions = updatedSessions,
+                        selectedSessionDetailState = state.selectedSessionDetailState?.copy(
+                            isEditing = false,
+                            isSaving = false,
+                            detail = updatedDetail,
+                        )
+                    )
+                }
+            } else {
+                _uiState.update { state ->
+                    state.copy(
+                        selectedSessionDetailState = state.selectedSessionDetailState?.copy(isSaving = false)
+                    )
+                }
+            }
+        }
+    }
+
+    fun requestDeleteSession() {
+        _uiState.update { state ->
+            val dialogState = state.selectedSessionDetailState ?: return@update state
+            state.copy(
+                selectedSessionDetailState = dialogState.copy(
+                    showDeleteConfirmDialog = true,
+                    deleteTargetType = DeleteTargetType.SESSION,
+                )
+            )
+        }
+    }
+
+    fun selectDeleteTargetType(type: DeleteTargetType) {
+        _uiState.update { state ->
+            val dialogState = state.selectedSessionDetailState ?: return@update state
+            state.copy(
+                selectedSessionDetailState = dialogState.copy(deleteTargetType = type)
+            )
+        }
+    }
+
+    fun dismissDeleteConfirmDialog() {
+        _uiState.update { state ->
+            val dialogState = state.selectedSessionDetailState ?: return@update state
+            state.copy(
+                selectedSessionDetailState = dialogState.copy(
+                    showDeleteConfirmDialog = false,
+                    isDeleting = false,
+                )
+            )
+        }
+    }
+
+    fun confirmDeleteAction() {
+        val dialogState = uiState.value.selectedSessionDetailState ?: return
+        val detail = dialogState.detail ?: return
+        val sessionId = detail.session.id
+        val taskId = detail.task.id
+        val deleteType = dialogState.deleteTargetType
+
+        _uiState.update { state ->
+            state.copy(
+                selectedSessionDetailState = state.selectedSessionDetailState?.copy(isDeleting = true)
+            )
+        }
+
+        viewModelScope.launch {
+            val result = if (deleteType == DeleteTargetType.SESSION) {
+                deleteSessionUseCase(sessionId)
+            } else {
+                deleteTaskUseCase(taskId)
+            }
+
+            if (result is Result.Success) {
+                _uiState.update { state ->
+                    val updatedSessions = if (deleteType == DeleteTargetType.SESSION) {
+                        state.sessions.filterNot { it.id == sessionId }
+                    } else {
+                        state.sessions.filterNot { it.taskId == taskId }
+                    }
+                    state.copy(
+                        sessions = updatedSessions,
+                        selectedSessionDetailState = null,
+                    )
+                }
+            } else {
+                _uiState.update { state ->
+                    state.copy(
+                        selectedSessionDetailState = state.selectedSessionDetailState?.copy(isDeleting = false)
+                    )
+                }
+            }
+        }
+    }
+
     private fun updateCurrentTime() {
         val cal = Calendar.getInstance()
         val hour24 = cal.get(Calendar.HOUR_OF_DAY)
diff --git a/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/components/DeleteSessionTaskContent.kt b/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/components/DeleteSessionTaskContent.kt
new file mode 100644
index 00000000..33b8ddd0
--- /dev/null
+++ b/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/components/DeleteSessionTaskContent.kt
@@ -0,0 +1,213 @@
+package com.awan.feature.home.impl.ui.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.filled.DeleteForever
+import androidx.compose.material.icons.filled.Warning
+import androidx.compose.material3.Icon
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.awan.app.core.designsystem.AwanButton
+import com.awan.app.core.designsystem.AwanButtonVariant
+import com.awan.app.core.designsystem.AwanText
+import com.awan.app.core.designsystem.AwanTheme
+import com.awan.feature.home.impl.R
+import com.awan.feature.home.impl.ui.DeleteTargetType
+
+@Composable
+internal fun DeleteSessionTaskContent(
+    selectedTarget: DeleteTargetType,
+    isDeleting: Boolean,
+    onSelectTarget: (DeleteTargetType) -> Unit,
+    onConfirmDelete: () -> Unit,
+    onCancel: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(vertical = 8.dp),
+        verticalArrangement = Arrangement.spacedBy(16.dp),
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(12.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            Box(
+                modifier = Modifier
+                    .size(44.dp)
+                    .clip(CircleShape)
+                    .background(AwanTheme.colors.destructive.copy(alpha = 0.12f)),
+                contentAlignment = Alignment.Center,
+            ) {
+                Icon(
+                    imageVector = Icons.Default.Warning,
+                    contentDescription = null,
+                    tint = AwanTheme.colors.destructive,
+                    modifier = Modifier.size(22.dp),
+                )
+            }
+
+            Column(verticalArrangement = Arrangement.spacedBy(2.dp)) {
+                AwanText(
+                    text = stringResource(R.string.home_delete_dialog_title),
+                    style = AwanTheme.typography.heading.copy(
+                        fontSize = 18.sp,
+                        fontWeight = FontWeight.Bold,
+                        color = AwanTheme.colors.textPrimary,
+                    ),
+                )
+                AwanText(
+                    text = stringResource(R.string.home_delete_dialog_subtitle),
+                    style = AwanTheme.typography.caption.copy(
+                        fontSize = 12.sp,
+                        color = AwanTheme.colors.textSecondary,
+                    ),
+                )
+            }
+        }
+
+        Column(
+            modifier = Modifier.fillMaxWidth(),
+            verticalArrangement = Arrangement.spacedBy(10.dp),
+        ) {
+            DeleteOptionItemCard(
+                icon = Icons.Default.Delete,
+                title = stringResource(R.string.home_delete_option_session_title),
+                subtitle = stringResource(R.string.home_delete_option_session_subtitle),
+                isSelected = selectedTarget == DeleteTargetType.SESSION,
+                onClick = { if (!isDeleting) onSelectTarget(DeleteTargetType.SESSION) },
+            )
+
+            DeleteOptionItemCard(
+                icon = Icons.Default.DeleteForever,
+                title = stringResource(R.string.home_delete_option_task_title),
+                subtitle = stringResource(R.string.home_delete_option_task_subtitle),
+                isSelected = selectedTarget == DeleteTargetType.TASK,
+                onClick = { if (!isDeleting) onSelectTarget(DeleteTargetType.TASK) },
+            )
+        }
+
+        Spacer(modifier = Modifier.height(6.dp))
+
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(12.dp),
+        ) {
+            AwanButton(
+                onClick = onCancel,
+                variant = AwanButtonVariant.Secondary,
+                enabled = !isDeleting,
+                modifier = Modifier.weight(1f),
+            ) {
+                AwanText(text = stringResource(R.string.home_action_cancel))
+            }
+
+            AwanButton(
+                onClick = onConfirmDelete,
+                variant = AwanButtonVariant.Destructive,
+                enabled = !isDeleting,
+                isLoading = isDeleting,
+                icon = {
+                    Icon(
+                        imageVector = Icons.Default.Delete,
+                        contentDescription = null,
+                        modifier = Modifier.size(16.dp),
+                    )
+                },
+                modifier = Modifier.weight(1f),
+            ) {
+                AwanText(text = stringResource(R.string.home_action_delete))
+            }
+        }
+    }
+}
+
+@Composable
+private fun DeleteOptionItemCard(
+    icon: ImageVector,
+    title: String,
+    subtitle: String,
+    isSelected: Boolean,
+    onClick: () -> Unit,
+) {
+    val borderColor = if (isSelected) AwanTheme.colors.destructive else AwanTheme.colors.line.copy(alpha = 0.5f)
+    val bgColor = if (isSelected) AwanTheme.colors.destructive.copy(alpha = 0.08f) else AwanTheme.colors.surface
+
+    Box(
+        modifier = Modifier
+            .fillMaxWidth()
+            .clip(RoundedCornerShape(16.dp))
+            .background(bgColor)
+            .border(
+                width = if (isSelected) 1.5.dp else 1.dp,
+                color = borderColor,
+                shape = RoundedCornerShape(16.dp),
+            )
+            .clickable(onClick = onClick)
+            .padding(14.dp),
+    ) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.spacedBy(12.dp),
+        ) {
+            Box(
+                modifier = Modifier
+                    .size(38.dp)
+                    .clip(RoundedCornerShape(10.dp))
+                    .background(
+                        if (isSelected) AwanTheme.colors.destructive.copy(alpha = 0.15f)
+                        else AwanTheme.colors.line.copy(alpha = 0.2f)
+                    ),
+                contentAlignment = Alignment.Center,
+            ) {
+                Icon(
+                    imageVector = icon,
+                    contentDescription = null,
+                    tint = if (isSelected) AwanTheme.colors.destructive else AwanTheme.colors.textSecondary,
+                    modifier = Modifier.size(18.dp),
+                )
+            }
+
+            Column(modifier = Modifier.weight(1f)) {
+                AwanText(
+                    text = title,
+                    style = AwanTheme.typography.body.copy(
+                        fontSize = 13.5.sp,
+                        fontWeight = FontWeight.Bold,
+                        color = if (isSelected) AwanTheme.colors.destructive else AwanTheme.colors.textPrimary,
+                    ),
+                )
+                AwanText(
+                    text = subtitle,
+                    style = AwanTheme.typography.caption.copy(
+                        fontSize = 11.5.sp,
+                        color = AwanTheme.colors.textSecondary,
+                    ),
+                )
+            }
+        }
+    }
+}
diff --git a/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/components/EditSessionTaskContent.kt b/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/components/EditSessionTaskContent.kt
new file mode 100644
index 00000000..24995dc2
--- /dev/null
+++ b/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/components/EditSessionTaskContent.kt
@@ -0,0 +1,180 @@
+package com.awan.feature.home.impl.ui.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.awan.app.core.designsystem.AwanButton
+import com.awan.app.core.designsystem.AwanButtonVariant
+import com.awan.app.core.designsystem.AwanText
+import com.awan.app.core.designsystem.AwanTextField
+import com.awan.app.core.designsystem.AwanTheme
+import com.awan.feature.home.impl.R
+
+@Composable
+internal fun EditSessionTaskContent(
+    editTitle: String,
+    editDescription: String,
+    editDurationMinutes: Int,
+    isSaving: Boolean,
+    onTitleChange: (String) -> Unit,
+    onDescriptionChange: (String) -> Unit,
+    onDurationChange: (Int) -> Unit,
+    onSave: () -> Unit,
+    onCancel: () -> Unit,
+    modifier: Modifier = Modifier,
+) {
+    Column(
+        modifier = modifier
+            .fillMaxWidth()
+            .padding(vertical = 8.dp),
+        verticalArrangement = Arrangement.spacedBy(16.dp),
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            AwanText(
+                text = stringResource(R.string.home_edit_session_title),
+                style = AwanTheme.typography.heading.copy(
+                    fontSize = 18.sp,
+                    fontWeight = FontWeight.Bold,
+                    color = AwanTheme.colors.textPrimary,
+                ),
+            )
+        }
+
+        Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
+            AwanText(
+                text = stringResource(R.string.home_edit_label_title),
+                style = AwanTheme.typography.caption.copy(
+                    fontSize = 12.sp,
+                    fontWeight = FontWeight.SemiBold,
+                    color = AwanTheme.colors.textSecondary,
+                ),
+            )
+            AwanTextField(
+                value = editTitle,
+                onValueChange = onTitleChange,
+                placeholder = stringResource(R.string.home_edit_placeholder_title),
+                modifier = Modifier.fillMaxWidth(),
+            )
+        }
+
+        Column(verticalArrangement = Arrangement.spacedBy(6.dp)) {
+            AwanText(
+                text = stringResource(R.string.home_edit_label_description),
+                style = AwanTheme.typography.caption.copy(
+                    fontSize = 12.sp,
+                    fontWeight = FontWeight.SemiBold,
+                    color = AwanTheme.colors.textSecondary,
+                ),
+            )
+            AwanTextField(
+                value = editDescription,
+                onValueChange = onDescriptionChange,
+                placeholder = stringResource(R.string.home_edit_placeholder_description),
+                modifier = Modifier.fillMaxWidth(),
+            )
+        }
+
+        Column(verticalArrangement = Arrangement.spacedBy(8.dp)) {
+            AwanText(
+                text = stringResource(R.string.home_edit_label_duration),
+                style = AwanTheme.typography.caption.copy(
+                    fontSize = 12.sp,
+                    fontWeight = FontWeight.SemiBold,
+                    color = AwanTheme.colors.textSecondary,
+                ),
+            )
+            val durationOptions = listOf(15, 30, 45, 60, 90, 120)
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
+            ) {
+                durationOptions.forEach { duration ->
+                    val isSelected = editDurationMinutes == duration
+                    val backgroundColor = if (isSelected) AwanTheme.colors.sky else AwanTheme.colors.surface
+                    val textColor = if (isSelected) AwanTheme.colors.onSky else AwanTheme.colors.textPrimary
+
+                    Box(
+                        modifier = Modifier
+                            .weight(1f)
+                            .clip(RoundedCornerShape(10.dp))
+                            .background(backgroundColor)
+                            .border(
+                                width = 1.dp,
+                                color = if (isSelected) AwanTheme.colors.sky else AwanTheme.colors.line,
+                                shape = RoundedCornerShape(10.dp),
+                            )
+                            .clickable { onDurationChange(duration) }
+                            .padding(vertical = 8.dp),
+                        contentAlignment = Alignment.Center,
+                    ) {
+                        AwanText(
+                            text = "${duration}m",
+                            style = AwanTheme.typography.caption.copy(
+                                fontSize = 11.sp,
+                                fontWeight = FontWeight.Bold,
+                                color = textColor,
+                                textAlign = TextAlign.Center,
+                            ),
+                        )
+                    }
+                }
+            }
+        }
+
+        Spacer(modifier = Modifier.height(8.dp))
+
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(12.dp),
+        ) {
+            AwanButton(
+                onClick = onCancel,
+                variant = AwanButtonVariant.Secondary,
+                modifier = Modifier.weight(1f),
+            ) {
+                AwanText(text = stringResource(R.string.home_action_cancel))
+            }
+
+            AwanButton(
+                onClick = onSave,
+                variant = AwanButtonVariant.Primary,
+                enabled = !isSaving && editTitle.isNotBlank(),
+                modifier = Modifier.weight(1f),
+            ) {
+                if (isSaving) {
+                    CircularProgressIndicator(
+                        modifier = Modifier.size(18.dp),
+                        color = AwanTheme.colors.onSky,
+                        strokeWidth = 2.dp,
+                    )
+                } else {
+                    AwanText(text = stringResource(R.string.home_action_save))
+                }
+            }
+        }
+    }
+}
diff --git a/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/components/SessionTaskDateTimeUtils.kt b/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/components/SessionTaskDateTimeUtils.kt
new file mode 100644
index 00000000..28d48b04
--- /dev/null
+++ b/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/components/SessionTaskDateTimeUtils.kt
@@ -0,0 +1,51 @@
+@file:Suppress("NewApi")
+
+package com.awan.feature.home.impl.ui.components
+
+import java.time.LocalDate
+import java.time.LocalDateTime
+import java.time.format.DateTimeFormatter
+import java.util.Locale
+
+internal fun calculateDurationMinutes(startIso: String, endIso: String): Int? {
+    return try {
+        val start = LocalDateTime.parse(startIso)
+        val end = LocalDateTime.parse(endIso)
+        java.time.Duration.between(start, end).toMinutes().toInt()
+    } catch (e: Exception) {
+        null
+    }
+}
+
+internal fun calculateEndIso(startIso: String, durationMinutes: Int): String? {
+    return try {
+        val start = LocalDateTime.parse(startIso)
+        val end = start.plusMinutes(durationMinutes.toLong())
+        end.toString()
+    } catch (e: Exception) {
+        null
+    }
+}
+
+internal fun formatIsoDate(isoString: String): String {
+    return try {
+        val dt = LocalDateTime.parse(isoString)
+        dt.format(DateTimeFormatter.ofPattern("MMM d, yyyy", Locale.getDefault()))
+    } catch (e: Exception) {
+        try {
+            val date = LocalDate.parse(isoString.take(10))
+            date.format(DateTimeFormatter.ofPattern("MMM d, yyyy", Locale.getDefault()))
+        } catch (e: Exception) {
+            isoString
+        }
+    }
+}
+
+internal fun formatIsoTime(isoString: String): String {
+    return try {
+        val dt = LocalDateTime.parse(isoString)
+        dt.format(DateTimeFormatter.ofPattern("hh:mm a", Locale.getDefault()))
+    } catch (e: Exception) {
+        isoString
+    }
+}
diff --git a/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/components/SessionTaskDetailDialog.kt b/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/components/SessionTaskDetailDialog.kt
new file mode 100644
index 00000000..8cb81bca
--- /dev/null
+++ b/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/components/SessionTaskDetailDialog.kt
@@ -0,0 +1,217 @@
+package com.awan.feature.home.impl.ui.components
+
+import androidx.compose.animation.AnimatedContent
+import androidx.compose.animation.SizeTransform
+import androidx.compose.animation.fadeIn
+import androidx.compose.animation.fadeOut
+import androidx.compose.animation.slideInHorizontally
+import androidx.compose.animation.slideOutHorizontally
+import androidx.compose.animation.togetherWith
+import androidx.compose.foundation.background
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.filled.CloudOff
+import androidx.compose.material3.CircularProgressIndicator
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.Icon
+import androidx.compose.material3.ModalBottomSheet
+import androidx.compose.material3.ModalBottomSheetProperties
+import androidx.compose.material3.rememberModalBottomSheetState
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.awan.app.core.designsystem.AwanButton
+import com.awan.app.core.designsystem.AwanButtonVariant
+import com.awan.app.core.designsystem.AwanText
+import com.awan.app.core.designsystem.AwanTheme
+import com.awan.feature.home.impl.R
+import com.awan.feature.home.impl.ui.SessionDetailDialogState
+
+private enum class SheetScreen { DETAIL, EDIT, DELETE, LOADING, ERROR }
+
+private fun SessionDetailDialogState.currentScreen(): SheetScreen = when {
+    isLoading -> SheetScreen.LOADING
+    errorMessage != null -> SheetScreen.ERROR
+    showDeleteConfirmDialog -> SheetScreen.DELETE
+    isEditing -> SheetScreen.EDIT
+    else -> SheetScreen.DETAIL
+}
+
+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun SessionTaskDetailDialog(
+    state: SessionDetailDialogState,
+    onDismiss: () -> Unit,
+    onRetry: () -> Unit,
+    onToggleStatus: () -> Unit,
+    onToggleLock: () -> Unit,
+    onStartEditing: () -> Unit = {},
+    onCancelEditing: () -> Unit = {},
+    onTitleChange: (String) -> Unit = {},
+    onDescriptionChange: (String) -> Unit = {},
+    onDurationChange: (Int) -> Unit = {},
+    onSaveEdits: () -> Unit = {},
+    onDeleteClick: () -> Unit = {},
+    onSelectDeleteTarget: (com.awan.feature.home.impl.ui.DeleteTargetType) -> Unit = {},
+    onConfirmDelete: () -> Unit = {},
+    onCancelDelete: () -> Unit = {},
+    modifier: Modifier = Modifier,
+) {
+    val sheetState = rememberModalBottomSheetState(skipPartiallyExpanded = true)
+
+    ModalBottomSheet(
+        onDismissRequest = onDismiss,
+        sheetState = sheetState,
+        containerColor = AwanTheme.colors.surface,
+        scrimColor = Color.Black.copy(alpha = 0.50f),
+        dragHandle = {
+            Box(
+                modifier = Modifier
+                    .padding(top = 12.dp, bottom = 8.dp)
+                    .width(38.dp)
+                    .height(4.dp)
+                    .clip(CircleShape)
+                    .background(AwanTheme.colors.line.copy(alpha = 0.6f)),
+            )
+        },
+        shape = RoundedCornerShape(topStart = 28.dp, topEnd = 28.dp),
+        properties = ModalBottomSheetProperties(
+            shouldDismissOnBackPress = true,
+        ),
+        modifier = modifier,
+    ) {
+        val currentScreen = state.currentScreen()
+
+        AnimatedContent(
+            targetState = currentScreen,
+            transitionSpec = {
+                val forward = targetState.ordinal > initialState.ordinal
+                val enter = slideInHorizontally(
+                    initialOffsetX = { width -> if (forward) width else -width },
+                ) + fadeIn()
+                val exit = slideOutHorizontally(
+                    targetOffsetX = { width -> if (forward) -width else width },
+                ) + fadeOut()
+                (enter togetherWith exit).using(SizeTransform(clip = false))
+            },
+            label = "SheetScreenTransition",
+            modifier = Modifier
+                .fillMaxWidth()
+                .padding(horizontal = 20.dp)
+                .padding(bottom = 24.dp),
+        ) { screen ->
+            when (screen) {
+                SheetScreen.LOADING -> {
+                    Box(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .height(220.dp),
+                        contentAlignment = Alignment.Center,
+                    ) {
+                        Column(
+                            horizontalAlignment = Alignment.CenterHorizontally,
+                        ) {
+                            CircularProgressIndicator(
+                                color = AwanTheme.colors.sky,
+                                strokeWidth = 3.dp,
+                            )
+                            Spacer(modifier = Modifier.height(14.dp))
+                            AwanText(
+                                text = stringResource(R.string.home_session_detail_loading),
+                                style = AwanTheme.typography.body.copy(
+                                    fontSize = 14.sp,
+                                    color = AwanTheme.colors.textSecondary,
+                                ),
+                            )
+                        }
+                    }
+                }
+
+                SheetScreen.ERROR -> {
+                    Column(
+                        modifier = Modifier
+                            .fillMaxWidth()
+                            .padding(vertical = 20.dp),
+                        horizontalAlignment = Alignment.CenterHorizontally,
+                    ) {
+                        Icon(
+                            imageVector = Icons.Default.CloudOff,
+                            contentDescription = null,
+                            tint = AwanTheme.colors.sky,
+                            modifier = Modifier.size(44.dp),
+                        )
+                        Spacer(modifier = Modifier.height(12.dp))
+                        AwanText(
+                            text = state.errorMessage?.asString() ?: "",
+                            style = AwanTheme.typography.body.copy(
+                                fontSize = 14.sp,
+                                color = AwanTheme.colors.textPrimary,
+                                textAlign = TextAlign.Center,
+                            ),
+                        )
+                        Spacer(modifier = Modifier.height(16.dp))
+                        AwanButton(
+                            onClick = onRetry,
+                            variant = AwanButtonVariant.Primary,
+                        ) {
+                            AwanText(text = stringResource(R.string.retry))
+                        }
+                    }
+                }
+
+                SheetScreen.DELETE -> {
+                    DeleteSessionTaskContent(
+                        selectedTarget = state.deleteTargetType,
+                        isDeleting = state.isDeleting,
+                        onSelectTarget = onSelectDeleteTarget,
+                        onConfirmDelete = onConfirmDelete,
+                        onCancel = onCancelDelete,
+                    )
+                }
+
+                SheetScreen.EDIT -> {
+                    EditSessionTaskContent(
+                        editTitle = state.editTitle,
+                        editDescription = state.editDescription,
+                        editDurationMinutes = state.editDurationMinutes,
+                        isSaving = state.isSaving,
+                        onTitleChange = onTitleChange,
+                        onDescriptionChange = onDescriptionChange,
+                        onDurationChange = onDurationChange,
+                        onSave = onSaveEdits,
+                        onCancel = onCancelEditing,
+                    )
+                }
+
+                SheetScreen.DETAIL -> {
+                    if (state.detail != null) {
+                        UnifiedSessionTaskContent(
+                            detail = state.detail,
+                            onToggleStatus = onToggleStatus,
+                            onToggleLock = onToggleLock,
+                            onEditClick = onStartEditing,
+                            onDeleteClick = onDeleteClick,
+                        )
+                    } else {
+                        Spacer(modifier = Modifier.height(1.dp))
+                    }
+                }
+            }
+        }
+    }
+}
diff --git a/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/components/SessionTaskInfoChips.kt b/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/components/SessionTaskInfoChips.kt
new file mode 100644
index 00000000..59fa9259
--- /dev/null
+++ b/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/components/SessionTaskInfoChips.kt
@@ -0,0 +1,98 @@
+package com.awan.feature.home.impl.ui.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.material3.Icon
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.vector.ImageVector
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.awan.app.core.designsystem.AwanText
+import com.awan.app.core.designsystem.AwanTheme
+
+@Composable
+internal fun InfoChip(
+    icon: ImageVector,
+    label: String,
+    modifier: Modifier = Modifier,
+) {
+    Box(
+        modifier = modifier
+            .clip(RoundedCornerShape(12.dp))
+            .background(AwanTheme.colors.surface)
+            .border(
+                width = 1.dp,
+                color = AwanTheme.colors.line.copy(alpha = 0.5f),
+                shape = RoundedCornerShape(12.dp),
+            )
+            .padding(horizontal = 8.dp, vertical = 8.dp),
+        contentAlignment = Alignment.Center,
+    ) {
+        Row(
+            verticalAlignment = Alignment.CenterVertically,
+            horizontalArrangement = Arrangement.Center,
+        ) {
+            Icon(
+                imageVector = icon,
+                contentDescription = null,
+                tint = AwanTheme.colors.sky,
+                modifier = Modifier.size(14.dp),
+            )
+            Spacer(modifier = Modifier.width(6.dp))
+            AwanText(
+                text = label,
+                style = AwanTheme.typography.caption.copy(
+                    fontSize = 11.sp,
+                    fontWeight = FontWeight.Bold,
+                    color = AwanTheme.colors.textPrimary,
+                ),
+                maxLines = 1,
+                overflow = TextOverflow.Ellipsis,
+            )
+        }
+    }
+}
+
+@Composable
+internal fun DetailRow(
+    label: String,
+    value: String,
+    modifier: Modifier = Modifier,
+) {
+    Row(
+        modifier = modifier.fillMaxWidth(),
+        horizontalArrangement = Arrangement.SpaceBetween,
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        AwanText(
+            text = label,
+            style = AwanTheme.typography.body.copy(
+                fontSize = 13.sp,
+                color = AwanTheme.colors.textSecondary,
+            ),
+        )
+        AwanText(
+            text = value,
+            style = AwanTheme.typography.body.copy(
+                fontSize = 13.sp,
+                fontWeight = FontWeight.SemiBold,
+                color = AwanTheme.colors.textPrimary,
+            ),
+        )
+    }
+}
diff --git a/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/components/UnifiedSessionTaskContent.kt b/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/components/UnifiedSessionTaskContent.kt
new file mode 100644
index 00000000..cadd5e4e
--- /dev/null
+++ b/feature/home/impl/src/main/java/com/awan/feature/home/impl/ui/components/UnifiedSessionTaskContent.kt
@@ -0,0 +1,505 @@
+package com.awan.feature.home.impl.ui.components
+
+import androidx.compose.foundation.background
+import androidx.compose.foundation.border
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Arrangement
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.Column
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.height
+import androidx.compose.foundation.layout.heightIn
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.foundation.rememberScrollState
+import androidx.compose.foundation.shape.CircleShape
+import androidx.compose.foundation.shape.RoundedCornerShape
+import androidx.compose.foundation.verticalScroll
+import androidx.compose.material.icons.Icons
+import androidx.compose.material.icons.automirrored.filled.CallSplit
+import androidx.compose.material.icons.automirrored.filled.Undo
+import androidx.compose.material.icons.filled.Check
+import androidx.compose.material.icons.filled.CheckCircle
+import androidx.compose.material.icons.filled.Close
+import androidx.compose.material.icons.filled.Delete
+import androidx.compose.material.icons.filled.Edit
+import androidx.compose.material.icons.filled.Lightbulb
+import androidx.compose.material.icons.filled.Lock
+import androidx.compose.material.icons.filled.LockOpen
+import androidx.compose.material.icons.filled.PushPin
+import androidx.compose.material.icons.filled.Schedule
+import androidx.compose.material.icons.filled.Star
+import androidx.compose.material3.HorizontalDivider
+import androidx.compose.material3.Icon
+import androidx.compose.material3.IconButton
+import androidx.compose.material3.Surface
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.draw.clip
+import androidx.compose.ui.graphics.Color
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.text.style.TextOverflow
+import androidx.compose.ui.unit.dp
+import androidx.compose.ui.unit.sp
+import com.awan.app.core.designsystem.AwanText
+import com.awan.app.core.designsystem.AwanTheme
+import com.awan.app.core.model.SessionTaskDetail
+import com.awan.feature.home.impl.R
+
+@Composable
+internal fun UnifiedSessionTaskContent(
+    detail: SessionTaskDetail,
+    onToggleStatus: () -> Unit,
+    onToggleLock: () -> Unit,
+    onEditClick: (() -> Unit)? = null,
+    onDeleteClick: (() -> Unit)? = null,
+    modifier: Modifier = Modifier,
+) {
+    val isCompleted = detail.session.status.uppercase() == "COMPLETED" ||
+        detail.task.status.uppercase() == "COMPLETED"
+    val isLocked = detail.session.locked
+
+    val scrollState = rememberScrollState()
+
+    Column(
+        modifier = modifier.fillMaxWidth(),
+    ) {
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.SpaceBetween,
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            val defaultCategory = stringResource(R.string.home_task_default_category)
+            val categoryName = (detail.task.categoryName ?: defaultCategory).uppercase()
+            Box(
+                modifier = Modifier
+                    .clip(CircleShape)
+                    .background(AwanTheme.colors.sky.copy(alpha = 0.12f))
+                    .padding(horizontal = 12.dp, vertical = 5.dp),
+            ) {
+                AwanText(
+                    text = categoryName,
+                    style = AwanTheme.typography.caption.copy(
+                        fontSize = 11.sp,
+                        fontWeight = FontWeight.ExtraBold,
+                        color = AwanTheme.colors.sky,
+                        letterSpacing = 0.8.sp,
+                    ),
+                )
+            }
+
+            Row(
+                verticalAlignment = Alignment.CenterVertically,
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
+            ) {
+                if (onEditClick != null) {
+                    Box(
+                        modifier = Modifier
+                            .size(36.dp)
+                            .clip(CircleShape)
+                            .background(AwanTheme.colors.sky.copy(alpha = 0.12f))
+                            .clickable(onClick = onEditClick),
+                        contentAlignment = Alignment.Center,
+                    ) {
+                        Icon(
+                            imageVector = Icons.Default.Edit,
+                            contentDescription = stringResource(R.string.home_action_edit),
+                            tint = AwanTheme.colors.sky,
+                            modifier = Modifier.size(16.dp),
+                        )
+                    }
+                }
+
+                if (onDeleteClick != null) {
+                    Box(
+                        modifier = Modifier
+                            .size(36.dp)
+                            .clip(CircleShape)
+                            .background(AwanTheme.colors.destructive.copy(alpha = 0.12f))
+                            .clickable(onClick = onDeleteClick),
+                        contentAlignment = Alignment.Center,
+                    ) {
+                        Icon(
+                            imageVector = Icons.Default.Delete,
+                            contentDescription = stringResource(R.string.home_action_delete),
+                            tint = AwanTheme.colors.destructive,
+                            modifier = Modifier.size(16.dp),
+                        )
+                    }
+                }
+            }
+        }
+
+        Spacer(modifier = Modifier.height(12.dp))
+
+        // Task Title & Description Header
+        AwanText(
+            text = detail.task.title,
+            style = AwanTheme.typography.heading.copy(
+                fontSize = 20.sp,
+                fontWeight = FontWeight.Bold,
+                color = AwanTheme.colors.textPrimary,
+                lineHeight = 26.sp,
+            ),
+        )
+
+        detail.task.description?.takeIf { it.isNotBlank() }?.let { desc ->
+            Spacer(modifier = Modifier.height(6.dp))
+            AwanText(
+                text = desc,
+                style = AwanTheme.typography.body.copy(
+                    fontSize = 14.sp,
+                    color = AwanTheme.colors.textSecondary,
+                    lineHeight = 20.sp,
+                ),
+            )
+        }
+
+        Spacer(modifier = Modifier.height(16.dp))
+
+        Column(
+            modifier = Modifier
+                .fillMaxWidth()
+                .weight(1f, fill = false)
+                .verticalScroll(scrollState),
+            verticalArrangement = Arrangement.spacedBy(14.dp),
+        ) {
+            // Highlighted Session Duration & Time Card
+            val dateStr = formatIsoDate(detail.session.start)
+            val startTime = formatIsoTime(detail.session.start)
+            val endTime = formatIsoTime(detail.session.end)
+            val durationMins = calculateDurationMinutes(detail.session.start, detail.session.end)
+                ?: detail.task.estimatedDuration ?: 30
+
+            Box(
+                modifier = Modifier
+                    .fillMaxWidth()
+                    .clip(RoundedCornerShape(16.dp))
+                    .background(AwanTheme.colors.surface)
+                    .border(
+                        width = 1.dp,
+                        color = AwanTheme.colors.line.copy(alpha = 0.6f),
+                        shape = RoundedCornerShape(16.dp),
+                    )
+                    .padding(14.dp),
+            ) {
+                Row(
+                    modifier = Modifier.fillMaxWidth(),
+                    horizontalArrangement = Arrangement.SpaceBetween,
+                    verticalAlignment = Alignment.CenterVertically,
+                ) {
+                    Column {
+                        AwanText(
+                            text = "$startTime - $endTime",
+                            style = AwanTheme.typography.heading.copy(
+                                fontSize = 16.sp,
+                                fontWeight = FontWeight.Bold,
+                                color = AwanTheme.colors.textPrimary,
+                            ),
+                        )
+                        Spacer(modifier = Modifier.height(2.dp))
+                        AwanText(
+                            text = dateStr,
+                            style = AwanTheme.typography.caption.copy(
+                                fontSize = 12.sp,
+                                color = AwanTheme.colors.textSecondary,
+                            ),
+                        )
+                    }
+
+                    Box(
+                        modifier = Modifier
+                            .clip(RoundedCornerShape(10.dp))
+                            .background(AwanTheme.colors.sky.copy(alpha = 0.15f))
+                            .padding(horizontal = 10.dp, vertical = 6.dp),
+                    ) {
+                        Row(
+                            verticalAlignment = Alignment.CenterVertically,
+                            horizontalArrangement = Arrangement.spacedBy(4.dp),
+                        ) {
+                            Icon(
+                                imageVector = Icons.Default.Schedule,
+                                contentDescription = null,
+                                tint = AwanTheme.colors.sky,
+                                modifier = Modifier.size(13.dp),
+                            )
+                            AwanText(
+                                text = "${durationMins}m",
+                                style = AwanTheme.typography.caption.copy(
+                                    fontSize = 12.sp,
+                                    fontWeight = FontWeight.Bold,
+                                    color = AwanTheme.colors.sky,
+                                ),
+                            )
+                        }
+                    }
+                }
+            }
+
+            // Task Related Sessions List (if multiple sessions exist for task)
+            if (detail.relatedSessions.isNotEmpty()) {
+                Column(
+                    verticalArrangement = Arrangement.spacedBy(8.dp),
+                ) {
+                    Row(
+                        modifier = Modifier.fillMaxWidth(),
+                        horizontalArrangement = Arrangement.SpaceBetween,
+                        verticalAlignment = Alignment.CenterVertically,
+                    ) {
+                        AwanText(
+                            text = stringResource(R.string.home_task_sessions_header),
+                            style = AwanTheme.typography.caption.copy(
+                                fontSize = 12.sp,
+                                fontWeight = FontWeight.Bold,
+                                color = AwanTheme.colors.textSecondary,
+                                letterSpacing = 0.5.sp,
+                            ),
+                        )
+                        val doneCount = detail.relatedSessions.count { it.status.uppercase() == "COMPLETED" }
+                        AwanText(
+                            text = "$doneCount/${detail.relatedSessions.size} ${stringResource(R.string.home_status_completed)}",
+                            style = AwanTheme.typography.caption.copy(
+                                fontSize = 11.sp,
+                                fontWeight = FontWeight.SemiBold,
+                                color = AwanTheme.colors.sky,
+                            ),
+                        )
+                    }
+
+                    Column(
+                        verticalArrangement = Arrangement.spacedBy(6.dp),
+                    ) {
+                        detail.relatedSessions.forEachIndexed { index, s ->
+                            val isCurrent = s.id == detail.session.id
+                            val isSessionDone = s.status.uppercase() == "COMPLETED"
+                            val sStart = formatIsoTime(s.start)
+                            val sEnd = formatIsoTime(s.end)
+
+                            Box(
+                                modifier = Modifier
+                                    .fillMaxWidth()
+                                    .clip(RoundedCornerShape(12.dp))
+                                    .background(
+                                        if (isCurrent) AwanTheme.colors.sky.copy(alpha = 0.08f)
+                                        else AwanTheme.colors.surface
+                                    )
+                                    .border(
+                                        width = if (isCurrent) 1.5.dp else 1.dp,
+                                        color = if (isCurrent) AwanTheme.colors.sky else AwanTheme.colors.line.copy(alpha = 0.4f),
+                                        shape = RoundedCornerShape(12.dp),
+                                    )
+                                    .padding(horizontal = 12.dp, vertical = 8.dp),
+                            ) {
+                                Row(
+                                    modifier = Modifier.fillMaxWidth(),
+                                    horizontalArrangement = Arrangement.SpaceBetween,
+                                    verticalAlignment = Alignment.CenterVertically,
+                                ) {
+                                    Row(
+                                        verticalAlignment = Alignment.CenterVertically,
+                                        horizontalArrangement = Arrangement.spacedBy(8.dp),
+                                    ) {
+                                        Icon(
+                                            imageVector = if (isSessionDone) Icons.Default.CheckCircle else Icons.Default.Schedule,
+                                            contentDescription = null,
+                                            tint = if (isSessionDone) AwanTheme.colors.success else AwanTheme.colors.sky,
+                                            modifier = Modifier.size(16.dp),
+                                        )
+                                        AwanText(
+                                            text = stringResource(R.string.home_task_session_item, index + 1, sStart, sEnd),
+                                            style = AwanTheme.typography.body.copy(
+                                                fontSize = 12.5.sp,
+                                                fontWeight = if (isCurrent) FontWeight.Bold else FontWeight.Medium,
+                                                color = AwanTheme.colors.textPrimary,
+                                            ),
+                                        )
+                                    }
+
+                                    Box(
+                                        modifier = Modifier
+                                            .clip(CircleShape)
+                                            .background(
+                                                if (isSessionDone) AwanTheme.colors.success.copy(alpha = 0.15f)
+                                                else AwanTheme.colors.line.copy(alpha = 0.3f)
+                                            )
+                                            .padding(horizontal = 8.dp, vertical = 3.dp),
+                                    ) {
+                                        AwanText(
+                                            text = if (isSessionDone) stringResource(R.string.home_status_completed)
+                                            else stringResource(R.string.home_status_scheduled),
+                                            style = AwanTheme.typography.caption.copy(
+                                                fontSize = 10.sp,
+                                                fontWeight = FontWeight.Bold,
+                                                color = if (isSessionDone) AwanTheme.colors.success else AwanTheme.colors.textSecondary,
+                                            ),
+                                        )
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+
+            // Quick Info Chips Row (Points, Mandatory, Splitting)
+            Row(
+                modifier = Modifier.fillMaxWidth(),
+                horizontalArrangement = Arrangement.spacedBy(8.dp),
+            ) {
+                if (detail.task.estimatedPoints > 0) {
+                    InfoChip(
+                        icon = Icons.Default.Star,
+                        label = stringResource(R.string.home_task_points_value, detail.task.estimatedPoints),
+                        modifier = Modifier.weight(1f),
+                    )
+                }
+
+                InfoChip(
+                    icon = if (detail.task.mandatory) Icons.Default.PushPin else Icons.Default.Lightbulb,
+                    label = if (detail.task.mandatory) stringResource(R.string.home_task_mandatory)
+                    else stringResource(R.string.home_task_optional),
+                    modifier = Modifier.weight(1f),
+                )
+
+                InfoChip(
+                    icon = Icons.AutoMirrored.Filled.CallSplit,
+                    label = if (detail.task.allowTaskSplitting) stringResource(R.string.home_task_splitting_allowed)
+                    else stringResource(R.string.home_task_splitting_not_allowed),
+                    modifier = Modifier.weight(1f),
+                )
+            }
+
+            HorizontalDivider(color = AwanTheme.colors.line.copy(alpha = 0.4f))
+
+            // Metadata Info Rows
+            Column(
+                verticalArrangement = Arrangement.spacedBy(10.dp),
+            ) {
+                val statusString = when (detail.session.status.uppercase()) {
+                    "COMPLETED" -> stringResource(R.string.home_status_completed)
+                    "IN_PROGRESS" -> stringResource(R.string.home_status_in_progress)
+                    "SKIPPED" -> stringResource(R.string.home_status_skipped)
+                    else -> stringResource(R.string.home_status_scheduled)
+                }
+
+                DetailRow(
+                    label = stringResource(R.string.home_session_status_label),
+                    value = statusString,
+                )
+
+                DetailRow(
+                    label = stringResource(R.string.home_session_locked_label),
+                    value = if (isLocked) stringResource(R.string.home_session_locked_yes)
+                    else stringResource(R.string.home_session_locked_no),
+                )
+            }
+        }
+
+        Spacer(modifier = Modifier.height(20.dp))
+
+        // Action Buttons Bar (Mark Done & Lock/Unlock side by side)
+        Row(
+            modifier = Modifier.fillMaxWidth(),
+            horizontalArrangement = Arrangement.spacedBy(10.dp),
+            verticalAlignment = Alignment.CenterVertically,
+        ) {
+            // Mark Done / Pending Button
+            Box(
+                modifier = Modifier
+                    .weight(1f)
+                    .heightIn(min = 48.dp)
+                    .clip(RoundedCornerShape(16.dp))
+                    .background(
+                        if (isCompleted) AwanTheme.colors.surface
+                        else AwanTheme.colors.success
+                    )
+                    .border(
+                        width = 1.dp,
+                        color = if (isCompleted) AwanTheme.colors.line else Color.Transparent,
+                        shape = RoundedCornerShape(16.dp),
+                    )
+                    .clickable(onClick = onToggleStatus)
+                    .padding(vertical = 8.dp, horizontal = 6.dp),
+                contentAlignment = Alignment.Center,
+            ) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.Center,
+                ) {
+                    Icon(
+                        imageVector = if (isCompleted) Icons.AutoMirrored.Filled.Undo else Icons.Default.Check,
+                        contentDescription = null,
+                        tint = if (isCompleted) AwanTheme.colors.textPrimary else Color.White,
+                        modifier = Modifier.size(16.dp),
+                    )
+                    Spacer(modifier = Modifier.width(6.dp))
+                    AwanText(
+                        text = if (isCompleted) stringResource(R.string.home_action_mark_pending)
+                        else stringResource(R.string.home_action_mark_done),
+                        style = AwanTheme.typography.button.copy(
+                            fontSize = 11.5.sp,
+                            lineHeight = 14.sp,
+                            fontWeight = FontWeight.Bold,
+                            color = if (isCompleted) AwanTheme.colors.textPrimary else Color.White,
+                            textAlign = TextAlign.Center,
+                        ),
+                        maxLines = 2,
+                        overflow = TextOverflow.Clip,
+                    )
+                }
+            }
+
+            // Lock / Unlock Button
+            Box(
+                modifier = Modifier
+                    .weight(1f)
+                    .heightIn(min = 48.dp)
+                    .clip(RoundedCornerShape(16.dp))
+                    .background(
+                        if (isLocked) AwanTheme.colors.sky.copy(alpha = 0.15f)
+                        else AwanTheme.colors.surface
+                    )
+                    .border(
+                        width = 1.dp,
+                        color = if (isLocked) AwanTheme.colors.sky else AwanTheme.colors.line.copy(alpha = 0.6f),
+                        shape = RoundedCornerShape(16.dp),
+                    )
+                    .clickable(onClick = onToggleLock)
+                    .padding(vertical = 8.dp, horizontal = 6.dp),
+                contentAlignment = Alignment.Center,
+            ) {
+                Row(
+                    verticalAlignment = Alignment.CenterVertically,
+                    horizontalArrangement = Arrangement.Center,
+                ) {
+                    Icon(
+                        imageVector = if (isLocked) Icons.Default.LockOpen else Icons.Default.Lock,
+                        contentDescription = null,
+                        tint = if (isLocked) AwanTheme.colors.sky else AwanTheme.colors.textPrimary,
+                        modifier = Modifier.size(15.dp),
+                    )
+                    Spacer(modifier = Modifier.width(6.dp))
+                    AwanText(
+                        text = if (isLocked) stringResource(R.string.home_action_unlock)
+                        else stringResource(R.string.home_action_lock),
+                        style = AwanTheme.typography.button.copy(
+                            fontSize = 11.5.sp,
+                            lineHeight = 14.sp,
+                            fontWeight = FontWeight.Bold,
+                            color = if (isLocked) AwanTheme.colors.sky else AwanTheme.colors.textPrimary,
+                            textAlign = TextAlign.Center,
+                        ),
+                        maxLines = 2,
+                        overflow = TextOverflow.Clip,
+                    )
+                }
+            }
+        }
+    }
+}
diff --git a/feature/home/impl/src/main/res/values-ar/strings.xml b/feature/home/impl/src/main/res/values-ar/strings.xml
index ab7b4045..47b89556 100644
--- a/feature/home/impl/src/main/res/values-ar/strings.xml
+++ b/feature/home/impl/src/main/res/values-ar/strings.xml
@@ -28,4 +28,54 @@
     <string name="home_error_something_went_wrong">╪ص╪»╪س ╪«╪╖╪ث ┘à╪د.</string>
     <string name="home_error_serialization">╪د╪│╪ز╪ش╪د╪ذ╪ر ╪║┘è╪▒ ┘à╪ز┘ê┘é╪╣╪ر ┘à┘† ╪د┘„╪«╪د╪»┘à. ┘è╪▒╪ش┘ë ╪ز╪ص╪»┘è╪س ╪د┘„╪ز╪╖╪ذ┘è┘é.</string>
     <string name="home_error_unknown">╪ص╪»╪س ╪«╪╖╪ث ╪║┘è╪▒ ┘à╪ز┘ê┘é╪╣.</string>
+
+    <string name="home_session_details_title">╪ز┘╪د╪╡┘è┘„ ╪د┘„╪ش┘„╪│╪ر</string>
+    <string name="home_task_details_title">╪ز┘╪د╪╡┘è┘„ ╪د┘„┘à┘ç┘à╪ر</string>
+    <string name="home_session_status_label">╪د┘„╪ص╪د┘„╪ر</string>
+    <string name="home_session_locked_label">╪د┘„┘é┘┘„</string>
+    <string name="home_session_locked_yes">┘à┘é┘┘„╪ر</string>
+    <string name="home_session_locked_no">╪║┘è╪▒ ┘à┘é┘┘„╪ر</string>
+    <string name="home_task_duration_label">╪د┘„┘à╪»╪ر</string>
+    <string name="home_task_duration_value">%1$d ╪»┘é┘è┘é╪ر</string>
+    <string name="home_task_points_label">╪د┘„┘†┘é╪د╪╖</string>
+    <string name="home_task_points_value">%1$d ┘†┘é╪╖╪ر</string>
+    <string name="home_task_category_label">╪د┘„┘╪خ╪ر</string>
+    <string name="home_task_requirement_label">╪د┘„┘†┘ê╪╣</string>
+    <string name="home_task_mandatory">╪ح┘„╪▓╪د┘à┘è╪ر</string>
+    <string name="home_task_optional">╪د╪«╪ز┘è╪د╪▒┘è╪ر</string>
+    <string name="home_task_splitting_label">╪ز┘é╪│┘è┘à ╪د┘„┘à┘ç┘à╪ر</string>
+    <string name="home_task_splitting_allowed">┘à╪│┘à┘ê╪ص</string>
+    <string name="home_task_splitting_not_allowed">╪ش┘„╪│╪ر ┘ê╪د╪ص╪»╪ر</string>
+    <string name="home_dialog_close">╪ح╪║┘„╪د┘é</string>
+    <string name="home_session_detail_loading">╪ش╪د╪▒┘è ╪ز╪ص┘à┘è┘„ ╪ز┘╪د╪╡┘è┘„ ╪د┘„╪ش┘„╪│╪رظ€خ</string>
+    <string name="home_action_mark_done">╪ز╪ص╪»┘è╪» ┘â┘à┘â╪ز┘à┘„</string>
+    <string name="home_action_mark_pending">╪ح┘„╪║╪د╪ة ╪د┘„╪ح┘â╪ز┘à╪د┘„</string>
+    <string name="home_action_lock">┘é┘┘„ ╪د┘„╪ش┘„╪│╪ر</string>
+    <string name="home_action_unlock">╪ح┘„╪║╪د╪ة ┘é┘┘„ ╪د┘„╪ش┘„╪│╪ر</string>
+    <string name="home_session_duration_chip">┘à╪»╪ر ╪د┘„╪ش┘„╪│╪ر: %1$d ╪»┘é┘è┘é╪ر</string>
+    <string name="home_task_default_category">┘à┘ç┘à╪ر</string>
+    <string name="home_status_completed">┘à┘â╪ز┘à┘„╪ر</string>
+    <string name="home_status_scheduled">┘à╪ش╪»┘ê┘„╪ر</string>
+    <string name="home_status_in_progress">┘é┘è╪» ╪د┘„╪ز┘†┘┘è╪░</string>
+    <string name="home_status_skipped">╪ز┘à ╪ز╪«╪╖┘è┘ç╪د</string>
+    <string name="home_session_duration_value_with_icon">ظ▒ %1$d ╪»┘é┘è┘é╪ر</string>
+    <string name="home_edit_session_title">╪ز╪╣╪»┘è┘„ ╪د┘„╪ش┘„╪│╪ر ┘ê╪د┘„┘à┘ç┘à╪ر</string>
+    <string name="home_edit_label_title">╪╣┘†┘ê╪د┘† ╪د┘„┘à┘ç┘à╪ر</string>
+    <string name="home_edit_placeholder_title">╪ث╪»╪«┘„ ╪╣┘†┘ê╪د┘† ╪د┘„┘à┘ç┘à╪رظ€خ</string>
+    <string name="home_edit_label_description">╪د┘„┘ê╪╡┘</string>
+    <string name="home_edit_placeholder_description">╪ث╪»╪«┘„ ┘ê╪╡┘ ╪د┘„┘à┘ç┘à╪رظ€خ</string>
+    <string name="home_edit_label_duration">╪د┘„┘à╪»╪ر</string>
+    <string name="home_edit_label_points">╪د┘„┘†┘é╪د╪╖ ╪د┘„╪ز┘é╪»┘è╪▒┘è╪ر</string>
+    <string name="home_action_save">╪ص┘╪╕ ╪د┘„╪ز╪║┘è┘è╪▒╪د╪ز</string>
+    <string name="home_action_cancel">╪ح┘„╪║╪د╪ة</string>
+    <string name="home_action_edit">╪ز╪╣╪»┘è┘„</string>
+    <string name="home_action_delete">╪ص╪░┘</string>
+    <string name="home_task_sessions_header">╪ش┘„╪│╪د╪ز ╪د┘„┘à┘ç┘à╪ر</string>
+    <string name="home_delete_dialog_title">╪ز╪ث┘â┘è╪» ╪د┘„╪ص╪░┘</string>
+    <string name="home_delete_dialog_subtitle">╪د╪«╪ز╪▒ ┘à╪د ╪ز╪▒╪║╪ذ ┘┘è ╪ص╪░┘┘ç:</string>
+    <string name="home_delete_option_session_title">╪ص╪░┘ ┘ç╪░┘ç ╪د┘„╪ش┘„╪│╪ر ┘┘é╪╖</string>
+    <string name="home_delete_option_session_subtitle">┘è╪ص╪░┘ ╪د┘„┘╪ز╪▒╪ر ╪د┘„╪▓┘à┘†┘è╪ر ╪د┘„┘à╪ص╪»╪»╪ر ┘„┘ç╪░┘ç ╪د┘„╪ش┘„╪│╪ر ┘┘é╪╖.</string>
+    <string name="home_delete_option_task_title">╪ص╪░┘ ╪د┘„┘à┘ç┘à╪ر ┘ê╪ش┘à┘è╪╣ ╪د┘„╪ش┘„╪│╪د╪ز</string>
+    <string name="home_delete_option_task_subtitle">┘è╪ص╪░┘ ╪د┘„┘à┘ç┘à╪ر ┘ê╪ش┘à┘è╪╣ ╪د┘„╪ش┘„╪│╪د╪ز ╪د┘„┘à╪▒╪ز╪ذ╪╖╪ر ╪ذ┘ç╪د ┘†┘ç╪د╪خ┘è╪د┘ï.</string>
+    <string name="home_task_session_item">╪ش┘„╪│╪ر %1$d (%2$s - %3$s)</string>
 </resources>
diff --git a/feature/home/impl/src/main/res/values/strings.xml b/feature/home/impl/src/main/res/values/strings.xml
index 6def2813..4dcc45ac 100644
--- a/feature/home/impl/src/main/res/values/strings.xml
+++ b/feature/home/impl/src/main/res/values/strings.xml
@@ -28,4 +28,54 @@
     <string name="home_error_something_went_wrong">Something went wrong.</string>
     <string name="home_error_serialization">Unexpected server response. Please update the app.</string>
     <string name="home_error_unknown">An unexpected error occurred.</string>
+
+    <string name="home_session_details_title">Session Details</string>
+    <string name="home_task_details_title">Task Details</string>
+    <string name="home_session_status_label">Status</string>
+    <string name="home_session_locked_label">Locked</string>
+    <string name="home_session_locked_yes">Locked</string>
+    <string name="home_session_locked_no">Unlocked</string>
+    <string name="home_task_duration_label">Duration</string>
+    <string name="home_task_duration_value">%1$d min</string>
+    <string name="home_task_points_label">Points</string>
+    <string name="home_task_points_value">%1$d points</string>
+    <string name="home_task_category_label">Category</string>
+    <string name="home_task_requirement_label">Requirement</string>
+    <string name="home_task_mandatory">Mandatory</string>
+    <string name="home_task_optional">Optional</string>
+    <string name="home_task_splitting_label">Task Splitting</string>
+    <string name="home_task_splitting_allowed">Allowed</string>
+    <string name="home_task_splitting_not_allowed">Single Session</string>
+    <string name="home_dialog_close">Close</string>
+    <string name="home_session_detail_loading">Loading session detailsظ€خ</string>
+    <string name="home_action_mark_done">Mark as Done</string>
+    <string name="home_action_mark_pending">Mark as Pending</string>
+    <string name="home_action_lock">Lock Session</string>
+    <string name="home_action_unlock">Unlock Session</string>
+    <string name="home_session_duration_chip">Session Duration: %1$d min</string>
+    <string name="home_task_default_category">Task</string>
+    <string name="home_status_completed">Completed</string>
+    <string name="home_status_scheduled">Scheduled</string>
+    <string name="home_status_in_progress">In Progress</string>
+    <string name="home_status_skipped">Skipped</string>
+    <string name="home_session_duration_value_with_icon">ظ▒ %1$d min</string>
+    <string name="home_edit_session_title">Edit Session &amp; Task</string>
+    <string name="home_edit_label_title">Task Title</string>
+    <string name="home_edit_placeholder_title">Enter task titleظ€خ</string>
+    <string name="home_edit_label_description">Description</string>
+    <string name="home_edit_placeholder_description">Enter task descriptionظ€خ</string>
+    <string name="home_edit_label_duration">Duration</string>
+    <string name="home_edit_label_points">Estimated Points</string>
+    <string name="home_action_save">Save Changes</string>
+    <string name="home_action_cancel">Cancel</string>
+    <string name="home_action_edit">Edit</string>
+    <string name="home_action_delete">Delete</string>
+    <string name="home_task_sessions_header">Task Sessions</string>
+    <string name="home_delete_dialog_title">Delete Confirmation</string>
+    <string name="home_delete_dialog_subtitle">Choose what you would like to delete:</string>
+    <string name="home_delete_option_session_title">Delete This Session Only</string>
+    <string name="home_delete_option_session_subtitle">Removes only this scheduled time slot.</string>
+    <string name="home_delete_option_task_title">Delete Task &amp; All Sessions</string>
+    <string name="home_delete_option_task_subtitle">Removes the task and all associated sessions permanently.</string>
+    <string name="home_task_session_item">Session %1$d (%2$s - %3$s)</string>
 </resources>
\ No newline at end of file
diff --git a/feature/home/impl/src/test/java/com/awan/feature/home/impl/ui/HomeUiMappersTest.kt b/feature/home/impl/src/test/java/com/awan/feature/home/impl/ui/HomeUiMappersTest.kt
new file mode 100644
index 00000000..cb832956
--- /dev/null
+++ b/feature/home/impl/src/test/java/com/awan/feature/home/impl/ui/HomeUiMappersTest.kt
@@ -0,0 +1,46 @@
+package com.awan.feature.home.impl.ui
+
+import com.awan.app.core.domain.home.model.DayZone
+import org.junit.Assert.assertEquals
+import org.junit.Test
+
+class HomeUiMappersTest {
+
+    @Test
+    fun `toUiZone maps non-integer hour zones accurately without overlap`() {
+        // Zone 1: 1:30 PM (90 mins) to 3:30 PM (210 mins)
+        val dayZone1 = DayZone(
+            id = "zone_1",
+            name = "Work Zone",
+            categoryId = "cat_1",
+            categoryName = "Work",
+            color = "#FF0000",
+            startMinutes = 90,
+            endMinutes = 210,
+        )
+
+        // Zone 2: 3:30 PM (210 mins) to 5:30 PM (330 mins)
+        val dayZone2 = DayZone(
+            id = "zone_2",
+            name = "Study Zone",
+            categoryId = "cat_2",
+            categoryName = "Study",
+            color = "#00FF00",
+            startMinutes = 210,
+            endMinutes = 330,
+        )
+
+        val uiZone1 = dayZone1.toUiZone()
+        val uiZone2 = dayZone2.toUiZone()
+
+        assertEquals(90, uiZone1.startMinutes)
+        assertEquals(210, uiZone1.endMinutes)
+
+        assertEquals(210, uiZone2.startMinutes)
+        assertEquals(330, uiZone2.endMinutes)
+
+        // Verify Zone 1 (90..210) and Zone 2 (210..330) meet at 210 with zero minute overlap
+        val overlapMinutes = maxOf(0, minOf(uiZone1.endMinutes, uiZone2.endMinutes) - maxOf(uiZone1.startMinutes, uiZone2.startMinutes))
+        assertEquals(0, overlapMinutes)
+    }
+}