feat(ui): add persistent last workspace and cross-platform keymap

phodal · phodal · commit 25f606f2afed · 2025-11-14T15:53:05.000+08:00
#453 Implement persistent storage and auto-loading of the last opened workspace. Introduce a cross-platform keyboard shortcut keymap for desktop UI, and update menu shortcuts to use it.
diff --git a/mpp-ui/src/commonMain/kotlin/cc/unitmesh/devins/ui/compose/AutoDevApp.kt b/mpp-ui/src/commonMain/kotlin/cc/unitmesh/devins/ui/compose/AutoDevApp.kt
@@ -137,38 +137,60 @@ private fun AutoDevContent(
 
     LaunchedEffect(Unit) {
         if (!WorkspaceManager.hasActiveWorkspace()) {
-            val defaultPath = when {
-                Platform.isAndroid -> "/storage/emulated/0/Documents"
-                Platform.isJs -> "."
-                else -> "${Platform.getUserHomeDir()}/AutoDevProjects"
+            // Try to load last workspace first
+            val lastWorkspace = try {
+                ConfigManager.getLastWorkspace()
+            } catch (e: Exception) {
+                println("⚠️ 加载上次工作空间失败: ${e.message}")
+                null
+            }
+            
+            if (lastWorkspace != null) {
+                val fileSystem = DefaultFileSystem(lastWorkspace.path)
+                if (fileSystem.exists(lastWorkspace.path)) {
+                    println("✅ 加载上次工作空间: ${lastWorkspace.name} (${lastWorkspace.path})")
+                    WorkspaceManager.openWorkspace(lastWorkspace.name, lastWorkspace.path)
+                } else {
+                    println("⚠️ 上次工作空间不存在: ${lastWorkspace.path}")
+                    // Fall through to default workspace logic
+                }
             }
+            
+            // If last workspace not available or doesn't exist, use default
+            if (!WorkspaceManager.hasActiveWorkspace()) {
+                val defaultPath = when {
+                    Platform.isAndroid -> "/storage/emulated/0/Documents"
+                    Platform.isJs -> "."
+                    else -> "${Platform.getUserHomeDir()}/AutoDevProjects"
+                }
 
-            val fileSystem = DefaultFileSystem(defaultPath)
+                val fileSystem = DefaultFileSystem(defaultPath)
 
-            if (fileSystem.exists(defaultPath)) {
-                WorkspaceManager.openWorkspace("Default Workspace", defaultPath)
-            } else {
-                when {
-                    Platform.isAndroid -> {
-                        val fallbackPath = "/sdcard"
-                        println("⚠️ Documents 目录不存在，使用备用路径: $fallbackPath")
-                        WorkspaceManager.openWorkspace("Default Workspace", fallbackPath)
-                    }
+                if (fileSystem.exists(defaultPath)) {
+                    WorkspaceManager.openWorkspace("Default Workspace", defaultPath)
+                } else {
+                    when {
+                        Platform.isAndroid -> {
+                            val fallbackPath = "/sdcard"
+                            println("⚠️ Documents 目录不存在，使用备用路径: $fallbackPath")
+                            WorkspaceManager.openWorkspace("Default Workspace", fallbackPath)
+                        }
 
-                    Platform.isJs -> {
-                        println("⚠️ 使用当前工作目录")
-                        WorkspaceManager.openWorkspace("Current Directory", ".")
-                    }
+                        Platform.isJs -> {
+                            println("⚠️ 使用当前工作目录")
+                            WorkspaceManager.openWorkspace("Current Directory", ".")
+                        }
 
-                    else -> {
-                        try {
-                            fileSystem.createDirectory(defaultPath)
-                            println("✅ 创建默认工作空间目录: $defaultPath")
-                            WorkspaceManager.openWorkspace("Default Workspace", defaultPath)
-                        } catch (e: Exception) {
-                            println("⚠️ 无法创建默认目录，使用用户主目录")
-                            val homeDir = Platform.getUserHomeDir()
-                            WorkspaceManager.openWorkspace("Home Directory", homeDir)
+                        else -> {
+                            try {
+                                fileSystem.createDirectory(defaultPath)
+                                println("✅ 创建默认工作空间目录: $defaultPath")
+                                WorkspaceManager.openWorkspace("Default Workspace", defaultPath)
+                            } catch (e: Exception) {
+                                println("⚠️ 无法创建默认目录，使用用户主目录")
+                                val homeDir = Platform.getUserHomeDir()
+                                WorkspaceManager.openWorkspace("Home Directory", homeDir)
+                            }
                         }
                     }
                 }
@@ -249,6 +271,14 @@ private fun AutoDevContent(
                 try {
                     WorkspaceManager.openWorkspace(projectName, path)
                     println("📁 已切换项目路径: $path")
+                    
+                    // Save the last workspace to config
+                    try {
+                        ConfigManager.saveLastWorkspace(projectName, path)
+                        println("✅ 已保存工作空间到配置")
+                    } catch (e: Exception) {
+                        println("⚠️ 保存工作空间配置失败: ${e.message}")
+                    }
                 } catch (e: Exception) {
                     errorMessage = "切换工作空间失败: ${e.message}"
                     showErrorDialog = true
diff --git a/mpp-ui/src/commonMain/kotlin/cc/unitmesh/devins/ui/compose/agent/AgentInterfaceRouter.kt b/mpp-ui/src/commonMain/kotlin/cc/unitmesh/devins/ui/compose/agent/AgentInterfaceRouter.kt
@@ -2,7 +2,6 @@ package cc.unitmesh.devins.ui.compose.agent
 
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.Modifier
-import cc.unitmesh.agent.CodeReviewAgent
 import cc.unitmesh.devins.ui.compose.agent.codereview.CodeReviewPage
 import cc.unitmesh.llm.KoogLLMService
 
diff --git a/mpp-ui/src/commonMain/kotlin/cc/unitmesh/devins/ui/compose/agent/codereview/CodeReviewViewModel.kt b/mpp-ui/src/commonMain/kotlin/cc/unitmesh/devins/ui/compose/agent/codereview/CodeReviewViewModel.kt
@@ -228,7 +228,6 @@ open class CodeReviewViewModel(
                 AutoDevLogger.info("CodeReviewViewModel") {
                     "🤖 Auto-starting analysis with ${diffFiles.size} files"
                 }
-                startAnalysis()
             }
 
         } catch (e: Exception) {
diff --git a/mpp-ui/src/commonMain/kotlin/cc/unitmesh/devins/ui/config/ConfigFile.kt b/mpp-ui/src/commonMain/kotlin/cc/unitmesh/devins/ui/config/ConfigFile.kt
@@ -37,7 +37,8 @@ public data class ConfigFile(
     val mcpServers: Map<String, McpServerConfig>? = emptyMap(),
     val language: String? = "en", // Language preference: "en" or "zh"
     val remoteServer: RemoteServerConfig? = null,
-    val agentType: String? = "Local" // "Local" or "Remote" - which agent mode to use
+    val agentType: String? = "Local", // "Local" or "Remote" - which agent mode to use
+    val lastWorkspace: WorkspaceInfo? = null // Last opened workspace information
 )
 
 /**
@@ -50,6 +51,15 @@ data class RemoteServerConfig(
     val useServerConfig: Boolean = false // Whether to use server's LLM config instead of local
 )
 
+/**
+ * Last opened workspace information
+ */
+@Serializable
+data class WorkspaceInfo(
+    val name: String,
+    val path: String
+)
+
 class AutoDevConfigWrapper(val configFile: ConfigFile) {
     fun getActiveConfig(): NamedModelConfig? {
         if (configFile.active.isEmpty() || configFile.configs.isEmpty()) {
@@ -99,4 +109,8 @@ class AutoDevConfigWrapper(val configFile: ConfigFile) {
     fun getAgentType(): String {
         return configFile.agentType ?: "Local"
     }
+    
+    fun getLastWorkspace(): WorkspaceInfo? {
+        return configFile.lastWorkspace
+    }
 }
diff --git a/mpp-ui/src/commonMain/kotlin/cc/unitmesh/devins/ui/config/ConfigManager.kt b/mpp-ui/src/commonMain/kotlin/cc/unitmesh/devins/ui/config/ConfigManager.kt
@@ -105,4 +105,19 @@ expect object ConfigManager {
      * @return A unique name (either baseName or baseName-1, baseName-2, etc.)
      */
     fun generateUniqueConfigName(baseName: String, existingNames: List<String>): String
+    
+    /**
+     * Save last opened workspace
+     *
+     * @param name Workspace name
+     * @param path Workspace absolute path
+     */
+    suspend fun saveLastWorkspace(name: String, path: String)
+    
+    /**
+     * Get last opened workspace
+     *
+     * @return WorkspaceInfo or null if no workspace was saved
+     */
+    suspend fun getLastWorkspace(): WorkspaceInfo?
 }
diff --git a/mpp-ui/src/jvmMain/kotlin/cc/unitmesh/devins/ui/config/ConfigManager.jvm.kt b/mpp-ui/src/jvmMain/kotlin/cc/unitmesh/devins/ui/config/ConfigManager.jvm.kt
@@ -211,4 +211,19 @@ actual object ConfigManager {
     private fun toYaml(configFile: ConfigFile): String {
         return YamlUtils.dump(configFile, kotlinx.serialization.serializer())
     }
+    
+    actual suspend fun saveLastWorkspace(name: String, path: String) {
+        val wrapper = load()
+        val configFile = wrapper.configFile
+        
+        val updatedConfigFile = configFile.copy(
+            lastWorkspace = WorkspaceInfo(name = name, path = path)
+        )
+        save(updatedConfigFile)
+    }
+    
+    actual suspend fun getLastWorkspace(): WorkspaceInfo? {
+        val wrapper = load()
+        return wrapper.getLastWorkspace()
+    }
 }
diff --git a/mpp-ui/src/jvmMain/kotlin/cc/unitmesh/devins/ui/desktop/AutoDevMenuBar.kt b/mpp-ui/src/jvmMain/kotlin/cc/unitmesh/devins/ui/desktop/AutoDevMenuBar.kt
@@ -3,8 +3,6 @@ package cc.unitmesh.devins.ui.desktop
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.rememberCoroutineScope
 import androidx.compose.ui.ExperimentalComposeUiApi
-import androidx.compose.ui.input.key.Key
-import androidx.compose.ui.input.key.KeyShortcut
 import androidx.compose.ui.window.FrameWindowScope
 import androidx.compose.ui.window.MenuBar
 import cc.unitmesh.devins.ui.compose.theme.ThemeManager
@@ -16,7 +14,7 @@ import kotlinx.coroutines.launch
  * AutoDev Desktop 菜单栏
  * 
  * 提供常用的桌面应用菜单功能：
- * - File 菜单：打开项目 (Ctrl+O)、退出
+ * - File 菜单：打开项目 (Cmd+O on Mac / Ctrl+O on others)、退出
  * - Edit 菜单：复制、粘贴等（未来扩展）
  * - View 菜单：语言切换、主题切换
  * - Help 菜单：关于、文档等（未来扩展）
@@ -35,7 +33,7 @@ fun FrameWindowScope.AutoDevMenuBar(
             Item(
                 "Open Project...",
                 onClick = onOpenFile,
-                shortcut = KeyShortcut(Key.O, ctrl = true),
+                shortcut = Keymap.openProject,
                 mnemonic = 'O'
             )
             
@@ -44,7 +42,7 @@ fun FrameWindowScope.AutoDevMenuBar(
             Item(
                 "Exit",
                 onClick = onExit,
-                shortcut = KeyShortcut(Key.Q, ctrl = true),
+                shortcut = Keymap.exitApp,
                 mnemonic = 'x'
             )
         }
@@ -54,15 +52,15 @@ fun FrameWindowScope.AutoDevMenuBar(
             Item(
                 "Copy",
                 onClick = { /* TODO: 实现复制功能 */ },
-                shortcut = KeyShortcut(Key.C, ctrl = true),
+                shortcut = Keymap.copy,
                 mnemonic = 'C',
                 enabled = false
             )
             
             Item(
                 "Paste",
                 onClick = { /* TODO: 实现粘贴功能 */ },
-                shortcut = KeyShortcut(Key.V, ctrl = true),
+                shortcut = Keymap.paste,
                 mnemonic = 'P',
                 enabled = false
             )
@@ -98,23 +96,23 @@ fun FrameWindowScope.AutoDevMenuBar(
             // Theme submenu
             Menu("Theme") {
                 Item(
-                    "☀\uFE0F Light",
+                    "Light",
                     onClick = {
                         ThemeManager.setTheme(ThemeManager.ThemeMode.LIGHT)
                     },
                     mnemonic = 'L'
                 )
                 
                 Item(
-                    "\uD83C\uDF19 Dark",
+                    "Dark",
                     onClick = {
                         ThemeManager.setTheme(ThemeManager.ThemeMode.DARK)
                     },
                     mnemonic = 'D'
                 )
                 
                 Item(
-                    "\uD83D\uDD06 Auto (System)",
+                    "Auto (System)",
                     onClick = {
                         ThemeManager.setTheme(ThemeManager.ThemeMode.SYSTEM)
                     },
diff --git a/mpp-ui/src/jvmMain/kotlin/cc/unitmesh/devins/ui/desktop/Keymap.kt b/mpp-ui/src/jvmMain/kotlin/cc/unitmesh/devins/ui/desktop/Keymap.kt
@@ -0,0 +1,118 @@
+package cc.unitmesh.devins.ui.desktop
+
+import androidx.compose.ui.ExperimentalComposeUiApi
+import androidx.compose.ui.input.key.Key
+import androidx.compose.ui.input.key.KeyShortcut
+import cc.unitmesh.agent.Platform
+
+/**
+ * Cross-platform keyboard shortcut definitions
+ * 
+ * On macOS, uses Command (Meta) key for standard shortcuts
+ * On Windows/Linux, uses Ctrl key
+ * 
+ * Example:
+ * ```kotlin
+ * Item(
+ *     "Open Project...",
+ *     onClick = onOpenFile,
+ *     shortcut = Keymap.openProject,
+ *     mnemonic = 'O'
+ * )
+ * ```
+ */
+@OptIn(ExperimentalComposeUiApi::class)
+object Keymap {
+    private val isMac: Boolean = Platform.getOSName().contains("mac", ignoreCase = true)
+    
+    /**
+     * Open Project: Command+O (Mac) / Ctrl+O (Windows/Linux)
+     */
+    val openProject: KeyShortcut = KeyShortcut(
+        Key.O,
+        meta = isMac,
+        ctrl = !isMac
+    )
+    
+    /**
+     * Exit Application: Command+Q (Mac) / Ctrl+Q (Windows/Linux)
+     */
+    val exitApp: KeyShortcut = KeyShortcut(
+        Key.Q,
+        meta = isMac,
+        ctrl = !isMac
+    )
+    
+    /**
+     * Copy: Command+C (Mac) / Ctrl+C (Windows/Linux)
+     */
+    val copy: KeyShortcut = KeyShortcut(
+        Key.C,
+        meta = isMac,
+        ctrl = !isMac
+    )
+    
+    /**
+     * Paste: Command+V (Mac) / Ctrl+V (Windows/Linux)
+     */
+    val paste: KeyShortcut = KeyShortcut(
+        Key.V,
+        meta = isMac,
+        ctrl = !isMac
+    )
+    
+    /**
+     * Save: Command+S (Mac) / Ctrl+S (Windows/Linux)
+     */
+    val save: KeyShortcut = KeyShortcut(
+        Key.S,
+        meta = isMac,
+        ctrl = !isMac
+    )
+    
+    /**
+     * Undo: Command+Z (Mac) / Ctrl+Z (Windows/Linux)
+     */
+    val undo: KeyShortcut = KeyShortcut(
+        Key.Z,
+        meta = isMac,
+        ctrl = !isMac
+    )
+    
+    /**
+     * Redo: Command+Shift+Z (Mac) / Ctrl+Shift+Z (Windows/Linux)
+     */
+    val redo: KeyShortcut = KeyShortcut(
+        Key.Z,
+        meta = isMac,
+        ctrl = !isMac,
+        shift = true
+    )
+    
+    /**
+     * New: Command+N (Mac) / Ctrl+N (Windows/Linux)
+     */
+    val new: KeyShortcut = KeyShortcut(
+        Key.N,
+        meta = isMac,
+        ctrl = !isMac
+    )
+    
+    /**
+     * Find: Command+F (Mac) / Ctrl+F (Windows/Linux)
+     */
+    val find: KeyShortcut = KeyShortcut(
+        Key.F,
+        meta = isMac,
+        ctrl = !isMac
+    )
+    
+    /**
+     * Select All: Command+A (Mac) / Ctrl+A (Windows/Linux)
+     */
+    val selectAll: KeyShortcut = KeyShortcut(
+        Key.A,
+        meta = isMac,
+        ctrl = !isMac
+    )
+}

Original file line number	Diff line number	Diff line change
`@@ -228,7 +228,6 @@ open class CodeReviewViewModel(`
`228`	`228`	`AutoDevLogger.info("CodeReviewViewModel") {`
`229`	`229`	`"🤖 Auto-starting analysis with ${diffFiles.size} files"`
`230`	`230`	`}`
`231`		`- startAnalysis()`
`232`	`231`	`}`
`233`	`232`
`234`	`233`	`} catch (e: Exception) {`