feat: add sidebar-based workspace navigation

.gitignore

@@ -64,3 +64,6 @@ companion/oc-pocket/bin/
 
 # oc-pocket release/build artifacts
 companion/oc-pocket/dist/
+
+# Git worktrees
+.worktrees/

composeApp/src/commonMain/kotlin/com/ratulsarna/ocmobile/IosViewModelOwners.kt

@@ -12,9 +12,8 @@ import com.ratulsarna.ocmobile.ui.screen.chat.ChatViewModel
 import com.ratulsarna.ocmobile.ui.screen.connect.ConnectViewModel
 import com.ratulsarna.ocmobile.ui.screen.docs.MarkdownFileViewerViewModel
 import com.ratulsarna.ocmobile.ui.screen.filebrowser.FileBrowserViewModel
-import com.ratulsarna.ocmobile.ui.screen.sessions.SessionsViewModel
 import com.ratulsarna.ocmobile.ui.screen.settings.SettingsViewModel
-import com.ratulsarna.ocmobile.ui.screen.workspaces.WorkspacesViewModel
+import com.ratulsarna.ocmobile.ui.screen.sidebar.SidebarViewModel
 
 /**
  * iOS-facing ViewModel owners for SwiftUI.
@@ -44,8 +43,8 @@ class IosAppViewModelOwner : ViewModelStoreOwner {
     /** Matches Compose `viewModel(key = "settings") { AppModule.createSettingsViewModel() }` */
     fun settingsViewModel(): SettingsViewModel = get(key = "settings") { AppModule.createSettingsViewModel() }
 
-    /** Matches Compose `viewModel(key = "workspaces") { AppModule.createWorkspacesViewModel() }` */
-    fun workspacesViewModel(): WorkspacesViewModel = get(key = "workspaces") { AppModule.createWorkspacesViewModel() }
+    /** App-scoped sidebar combining workspaces + sessions. */
+    fun sidebarViewModel(): SidebarViewModel = get(key = "sidebar") { AppModule.createSidebarViewModel() }
 
     /** App-scoped: used for onboarding/pairing flow. */
     fun connectViewModel(): ConnectViewModel = get(key = "connect") { AppModule.createConnectViewModel() }
@@ -86,8 +85,6 @@ class IosScreenViewModelOwner : ViewModelStoreOwner {
         viewModelStore.clear()
     }
 
-    fun sessionsViewModel(): SessionsViewModel = get(key = "sessions") { AppModule.createSessionsViewModel() }
-
     /** Matches Compose `viewModel(key = "markdown-$path-$openId") { AppModule.createMarkdownFileViewerViewModel(path) }` */
     fun markdownFileViewerViewModel(path: String, openId: Long): MarkdownFileViewerViewModel =
         get(key = "markdown-$path-$openId") { AppModule.createMarkdownFileViewerViewModel(path) }

composeApp/src/commonMain/kotlin/com/ratulsarna/ocmobile/data/api/OpenCodeApi.kt

@@ -37,7 +37,8 @@ interface OpenCodeApi {
     suspend fun getSessions(
         search: String? = null,
         limit: Int? = null,
-        start: Long? = null
+        start: Long? = null,
+        directory: String? = null
     ): List<SessionDto>
 
     /**

composeApp/src/commonMain/kotlin/com/ratulsarna/ocmobile/data/api/OpenCodeApiImpl.kt

@@ -96,8 +96,13 @@ class OpenCodeApiImpl(
         return httpClient.get("$baseUrl/session/$sessionId").body()
     }
 
-    override suspend fun getSessions(search: String?, limit: Int?, start: Long?): List<SessionDto> {
+    override suspend fun getSessions(search: String?, limit: Int?, start: Long?, directory: String?): List<SessionDto> {
         return httpClient.get("$baseUrl/session") {
+            val dir = directory?.trim()?.takeIf { it.isNotBlank() }
+            if (dir != null) {
+                headers.remove("x-opencode-directory")
+                header("x-opencode-directory", dir)
+            }
             if (start != null) parameter("start", start)
             if (!search.isNullOrBlank()) parameter("search", search)
             if (limit != null) parameter("limit", limit)

composeApp/src/commonMain/kotlin/com/ratulsarna/ocmobile/data/mock/MockOpenCodeApi.kt

@@ -137,8 +137,8 @@ class MockOpenCodeApi(
     override suspend fun getSession(sessionId: String): SessionDto =
         state.getSession(sessionId) ?: throw RuntimeException("Session not found: $sessionId")
 
-    override suspend fun getSessions(search: String?, limit: Int?, start: Long?): List<SessionDto> =
-        state.getSessions(search = search, limit = limit, start = start)
+    override suspend fun getSessions(search: String?, limit: Int?, start: Long?, directory: String?): List<SessionDto> =
+        state.getSessions(search = search, limit = limit, start = start, directory = directory)
 
     override suspend fun createSession(request: CreateSessionRequest): SessionDto {
         return state.createSession(

composeApp/src/commonMain/kotlin/com/ratulsarna/ocmobile/data/mock/MockState.kt

@@ -329,8 +329,12 @@ class MockState {
         sessions[id]
     }
 
-    suspend fun getSessions(search: String?, limit: Int?, start: Long?): List<SessionDto> = mutex.withLock {
+    suspend fun getSessions(search: String?, limit: Int?, start: Long?, directory: String?): List<SessionDto> = mutex.withLock {
         val filtered = sessions.values.asSequence()
+            .filter { dto ->
+                if (directory.isNullOrBlank()) return@filter true
+                dto.directory == directory
+            }
             .filter { dto ->
                 if (start == null) return@filter true
                 dto.time.updated >= start

composeApp/src/commonMain/kotlin/com/ratulsarna/ocmobile/data/repository/SessionRepositoryImpl.kt

@@ -81,9 +81,9 @@ class SessionRepositoryImpl(
         }
     }
 
-    override suspend fun getSessions(search: String?, limit: Int?, start: Long?): Result<List<Session>> {
+    override suspend fun getSessions(search: String?, limit: Int?, start: Long?, directory: String?): Result<List<Session>> {
         return runCatching {
-            api.getSessions(search = search, limit = limit, start = start).map { it.toDomain() }
+            api.getSessions(search = search, limit = limit, start = start, directory = directory).map { it.toDomain() }
         }.recoverCatching { e ->
             when (e) {
                 is ClientRequestException -> {

composeApp/src/commonMain/kotlin/com/ratulsarna/ocmobile/di/AppModule.kt

@@ -35,9 +35,8 @@ import com.ratulsarna.ocmobile.ui.screen.chat.ChatViewModel
 import com.ratulsarna.ocmobile.ui.screen.docs.MarkdownFileViewerViewModel
 import com.ratulsarna.ocmobile.ui.screen.filebrowser.FileBrowserViewModel
 import com.ratulsarna.ocmobile.ui.screen.connect.ConnectViewModel
-import com.ratulsarna.ocmobile.ui.screen.sessions.SessionsViewModel
 import com.ratulsarna.ocmobile.ui.screen.settings.SettingsViewModel
-import com.ratulsarna.ocmobile.ui.screen.workspaces.WorkspacesViewModel
+import com.ratulsarna.ocmobile.ui.screen.sidebar.SidebarViewModel
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
 import kotlinx.coroutines.SupervisorJob
@@ -260,8 +259,9 @@ object AppModule {
         )
     }
 
-    fun createSessionsViewModel(): SessionsViewModel {
-        return SessionsViewModel(
+    fun createSidebarViewModel(): SidebarViewModel {
+        return SidebarViewModel(
+            workspaceRepository = graphWorkspaceRepository(),
             sessionRepository = graphSessionRepository(),
             appSettings = appSettings
         )
@@ -286,10 +286,6 @@ object AppModule {
         )
     }
 
-    fun createWorkspacesViewModel(): WorkspacesViewModel {
-        return WorkspacesViewModel(workspaceRepository = graphWorkspaceRepository())
-    }
-
     fun createMarkdownFileViewerViewModel(path: String): MarkdownFileViewerViewModel {
         return MarkdownFileViewerViewModel(path, graphVaultRepository())
     }

composeApp/src/commonMain/kotlin/com/ratulsarna/ocmobile/domain/repository/SessionRepository.kt

@@ -23,7 +23,8 @@ interface SessionRepository {
     suspend fun getSessions(
         search: String? = null,
         limit: Int? = null,
-        start: Long? = null
+        start: Long? = null,
+        directory: String? = null
     ): Result<List<Session>>
 
     /**

composeApp/src/commonMain/kotlin/com/ratulsarna/ocmobile/ui/screen/chat/ChatState.kt

@@ -14,6 +14,7 @@ import com.ratulsarna.ocmobile.domain.model.VaultEntry
  */
 data class ChatUiState(
     val currentSessionId: String? = null,
+    val currentSessionTitle: String? = null,
     /** If set, the session is in "reverted" state and messages after this point should be hidden. */
     val revertMessageId: String? = null,
     val messages: List<Message> = emptyList(),

composeApp/src/commonMain/kotlin/com/ratulsarna/ocmobile/ui/screen/chat/ChatViewModel.kt

@@ -156,6 +156,8 @@ class ChatViewModel(
         )
     }
 
+    private fun normalizedSessionTitle(title: String?): String? = title?.takeIf(String::isNotBlank)
+
     /** Current selected agent (from persistent storage) */
     private var currentAgent: String? = null
 
@@ -1156,6 +1158,7 @@ class ChatViewModel(
                         _uiState.update {
                             it.copy(
                                 currentSessionId = null,
+                                currentSessionTitle = null,
                                 revertMessageId = null,
                                 messages = emptyList(),
                                 lastGoodMessageId = null,
@@ -1176,6 +1179,7 @@ class ChatViewModel(
                     _uiState.update {
                         it.copy(
                             currentSessionId = newSessionId,
+                            currentSessionTitle = null,
                             revertMessageId = null,
                             messages = emptyList(),
                             lastGoodMessageId = null,
@@ -1190,7 +1194,11 @@ class ChatViewModel(
                     val session = sessionRepository.getSession(newSessionId).getOrNull()
                     if (newSessionId == _uiState.value.currentSessionId) {
                         val revertMessageId = session?.revert?.messageId
-                        _uiState.update { state -> applyRevertPointer(state, revertMessageId) }
+                        _uiState.update { state ->
+                            applyRevertPointer(state, revertMessageId).copy(
+                                currentSessionTitle = normalizedSessionTitle(session?.title)
+                            )
+                        }
                         viewModelScope.launch {
                             contextUsageRepository.updateUsage(_uiState.value.messages)
                         }
@@ -1233,15 +1241,25 @@ class ChatViewModel(
                 }
 
             OcMobileLog.d(TAG, "loadCurrentSession: REST returned sessionId=$sessionId")
-            _uiState.update { it.copy(currentSessionId = sessionId, revertMessageId = null) }
+            _uiState.update {
+                it.copy(
+                    currentSessionId = sessionId,
+                    currentSessionTitle = null,
+                    revertMessageId = null
+                )
+            }
             refreshPendingPermissions()
 
             // Resolve revert pointer before loading messages to avoid transiently rendering hidden messages,
             // and to keep derived state consistent.
             val session = sessionRepository.getSession(sessionId).getOrNull()
             if (sessionId == _uiState.value.currentSessionId) {
                 val revertMessageId = session?.revert?.messageId
-                _uiState.update { state -> applyRevertPointer(state, revertMessageId) }
+                _uiState.update { state ->
+                    applyRevertPointer(state, revertMessageId).copy(
+                        currentSessionTitle = normalizedSessionTitle(session?.title)
+                    )
+                }
                 viewModelScope.launch {
                     contextUsageRepository.updateUsage(_uiState.value.messages)
                 }
@@ -1767,7 +1785,11 @@ class ChatViewModel(
 
         val revertMessageId = event.session.revert?.messageId
         val previousRevertMessageId = _uiState.value.revertMessageId
-        _uiState.update { state -> applyRevertPointer(state, revertMessageId) }
+        _uiState.update { state ->
+            applyRevertPointer(state, revertMessageId).copy(
+                currentSessionTitle = normalizedSessionTitle(event.session.title)
+            )
+        }
         viewModelScope.launch {
             contextUsageRepository.updateUsage(_uiState.value.messages)
         }
@@ -2102,6 +2124,7 @@ class ChatViewModel(
                             lastGoodMessageId = if (response.error == null) response.id else it.lastGoodMessageId,
                             // Update local state to actual session (handles session cycling)
                             currentSessionId = response.sessionId,
+                            currentSessionTitle = if (response.sessionId == it.currentSessionId) it.currentSessionTitle else null,
                             // After the user resumes, OpenCode cleans up reverted messages and clears the pointer.
                             revertMessageId = null
                         )
@@ -2399,6 +2422,7 @@ class ChatViewModel(
                     _uiState.update {
                         it.copy(
                             currentSessionId = newSession.id,
+                            currentSessionTitle = normalizedSessionTitle(newSession.title),
                             revertMessageId = null,
                             messages = emptyList(),
                             lastGoodMessageId = null,
@@ -2576,6 +2600,7 @@ class ChatViewModel(
             _uiState.update {
                 it.copy(
                     currentSessionId = sessionId,
+                    currentSessionTitle = null,
                     revertMessageId = null,
                     messages = emptyList(), // Clear while loading
                     isLoading = true,
@@ -2589,7 +2614,11 @@ class ChatViewModel(
             val session = sessionRepository.getSession(sessionId).getOrNull()
             if (sessionId == _uiState.value.currentSessionId) {
                 val revertMessageId = session?.revert?.messageId
-                _uiState.update { state -> applyRevertPointer(state, revertMessageId) }
+                _uiState.update { state ->
+                    applyRevertPointer(state, revertMessageId).copy(
+                        currentSessionTitle = normalizedSessionTitle(session?.title)
+                    )
+                }
                 viewModelScope.launch {
                     contextUsageRepository.updateUsage(_uiState.value.messages)
                 }