From 475297aa7e13dcc66505df235566d86f99221c1e Mon Sep 17 00:00:00 2001 From: CjiW Date: Wed, 21 Oct 2026 14:12:30 +0000 Subject: [PATCH 1/2] feat(sessions): choose the working directory when creating a chat The server's POST /api/chats/create takes only label/subscription/model -- there is no work_dir field -- so the working directory has to be set right after creation through RPC set_cwd with force=true, the same two-step flow the web client uses. force matters: it is the explicit-user-action path, so the server applies the path verbatim instead of substituting an inferred one. Create dialog gains a work-directory field plus one-tap candidates. There is no directory browsing endpoint on the server (the path lives on the host, not on the phone), so the candidates are the recently used paths (AppPrefs, max 5, newest first) merged with work_dir values from existing sessions -- a pure function so it can be unit-tested. set_cwd failing is not creation failing: the chat is kept and the reason is surfaced through a one-shot notice/snackbar; the path can still be changed later from the session. versionCode 23 (0.3.5), CHANGELOG 0.3.5 entry, and docs/agent/sessions.md covering the create -> set_cwd flow. AGENTS.md records the worktree gotcha that release builds need keystore.properties copied in. --- AGENTS.md | 6 ++ CHANGELOG.md | 11 ++++ .../java/dev/xbot/android/data/AppPrefs.kt | 31 +++++++++ .../xbot/android/data/WorkDirSuggestions.kt | 26 ++++++++ .../java/dev/xbot/android/data/XbotApi.kt | 22 +++++++ .../xbot/android/sessions/SessionsScreen.kt | 66 ++++++++++++++++--- .../android/sessions/SessionsViewModel.kt | 40 +++++++++-- .../android/data/WorkDirSuggestionsTest.kt | 60 +++++++++++++++++ docs/agent/sessions.md | 40 +++++++++++ version.properties | 4 +- 10 files changed, 290 insertions(+), 16 deletions(-) create mode 100644 app/src/main/java/dev/xbot/android/data/WorkDirSuggestions.kt create mode 100644 app/src/test/java/dev/xbot/android/data/WorkDirSuggestionsTest.kt create mode 100644 docs/agent/sessions.md diff --git a/AGENTS.md b/AGENTS.md index 075063c..4795607 100644 --- a/AGENTS.md +++ b/AGENTS.md @@ -35,6 +35,11 @@ iteration 按序号合并,checkpoint 替换 / delta 追加,收到 turn 结 - **本机默认没有可用的 Android SDK**:直接 `./gradlew` 会报 `SDK location not found`。仓库里只有 `tools/sdk/cmdline-tools`(`tools/` 整体 gitignored),先装平台再写 `local.properties`: `tools/sdk/cmdline-tools/latest/bin/sdkmanager --sdk_root=$PWD/tools/sdk "platforms;android-35" "build-tools;35.0.0"` +- **在 worktree 里第一次 `assembleRelease` 会失败**:`keystore.properties` / `keystore/` 是 gitignored, + 新 worktree 里没有,报 `SigningConfig "release" is missing required property "storeFile"`。 + 从主仓库 `cp keystore.properties . && mkdir -p keystore && cp ../xbot-android/keystore/xbot-release.jks keystore/` + 即可(同样是 gitignored,不会被提交)。另外 `aapt2`/`apksigner` 在 worktree 里没有 `tools/sdk`, + 要用主仓库的绝对路径 `/home/cjw/xbot-android/tools/sdk/build-tools/35.0.0/`。 - **`tools/` `dist/` `keystore.properties` `keystore/` `local.properties` 全部 gitignored**,不要在这些目录里找源码或提交它们。 - **Compose 里 `TopAppBar` 的 title 只拿「剩余宽度」**(先量 navigationIcon、再量 actions)。 往 `actions` 里塞长文本会把标题挤成单字。详见 `docs/agent/ui.md`。 @@ -49,6 +54,7 @@ iteration 按序号合并,checkpoint 替换 / delta 追加,收到 turn 结 ## 知识文件 +- `docs/agent/sessions.md` — 新建会话与工作目录(create 不收 work_dir,建完走 set_cwd(force)) - `docs/agent/chat.md` — 历史装载的两条路径(替换 vs 合并)、Rewind 后为什么必须整体重载 - `docs/agent/ui.md` — Compose 界面约定、TopAppBar 布局陷阱、聊天页结构 - `docs/agent/ui-composer.md` — 输入区高度(为什么必须 `BasicTextField`)、上下文预算指示器的数据来源与三种口径 diff --git a/CHANGELOG.md b/CHANGELOG.md index c55258b..9340665 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,17 @@ 写进更新清单的 `changelog` 字段,最终显示在 app 的更新卡片上。小节标题请严格保持 `## [版本号]` 的形式,最新版本放最上面。 +## [0.3.5] + +新建会话时可以选择工作目录。 + +### 新增 +- 新建会话弹窗增加「工作目录」输入框,并给出候选(最近用过的 + 现有会话里出现过的路径),点一下即可填入;留空则用服务器默认工作目录。 +- 目录设置失败不会影响会话创建,会单独提示一条原因,之后仍可在会话里改。 + +### 说明 +- 服务端 `POST /api/chats/create` 不接受 `work_dir`,因此客户端在建好会话后调用 RPC `set_cwd`(`force=true`,与 Web 端同一流程);成功后把路径记入本地「最近使用」(最多 5 个)。 + ## [0.3.4] 输入区变矮,并给出上下文预算。 diff --git a/app/src/main/java/dev/xbot/android/data/AppPrefs.kt b/app/src/main/java/dev/xbot/android/data/AppPrefs.kt index 5d79897..c5f3121 100644 --- a/app/src/main/java/dev/xbot/android/data/AppPrefs.kt +++ b/app/src/main/java/dev/xbot/android/data/AppPrefs.kt @@ -10,6 +10,8 @@ import javax.crypto.Cipher import javax.crypto.KeyGenerator import javax.crypto.SecretKey import javax.crypto.spec.GCMParameterSpec +import kotlinx.serialization.decodeFromString +import kotlinx.serialization.encodeToString /** * Tiny encrypted-at-rest store for the login credentials. @@ -114,6 +116,33 @@ class AppPrefs(context: Context) { get() = prefs.getLong(KEY_UPDATE_CHECK_AT, 0L) set(value) = prefs.edit().putLong(KEY_UPDATE_CHECK_AT, value).apply() + /** + * 最近用过的工作目录(新建会话弹窗的快捷选项),最新在前,最多 [MAX_RECENT_WORK_DIRS] 个。 + * 纯本地状态:服务端没有「最近目录」接口,Web 端也是存 localStorage。 + */ + var recentWorkDirs: List + get() { + val raw = prefs.getString(KEY_RECENT_WORK_DIRS, "").orEmpty() + if (raw.isBlank()) return emptyList() + return runCatching { + XbotJson.decodeFromString>(raw) + }.getOrDefault(emptyList()).filter { it.isNotBlank() } + } + set(value) { + prefs.edit() + .putString(KEY_RECENT_WORK_DIRS, XbotJson.encodeToString(value.take(MAX_RECENT_WORK_DIRS))) + .apply() + } + + /** 记住一个工作目录(去重、置顶、截断),返回更新后的列表。 */ + fun rememberWorkDir(dir: String): List { + val path = dir.trim() + if (path.isEmpty()) return recentWorkDirs + val next = (listOf(path) + recentWorkDirs.filterNot { it == path }).take(MAX_RECENT_WORK_DIRS) + recentWorkDirs = next + return next + } + fun lastSeq(chatId: String): Long = if (chatId.isBlank()) 0L else prefs.getLong("$KEY_SEQ_PREFIX$chatId", 0L) @@ -141,6 +170,8 @@ class AppPrefs(context: Context) { const val KEY_UPDATE_URL = "update_manifest_url" const val KEY_UPDATE_CHECK_AT = "update_last_check_at" const val KEY_MEDIA_URL = "media_base_url" + const val KEY_RECENT_WORK_DIRS = "recent_work_dirs" + const val MAX_RECENT_WORK_DIRS = 5 } } diff --git a/app/src/main/java/dev/xbot/android/data/WorkDirSuggestions.kt b/app/src/main/java/dev/xbot/android/data/WorkDirSuggestions.kt new file mode 100644 index 0000000..4188d50 --- /dev/null +++ b/app/src/main/java/dev/xbot/android/data/WorkDirSuggestions.kt @@ -0,0 +1,26 @@ +package dev.xbot.android.data + +/** + * 新建会话时的工作目录候选。 + * + * 服务端没有「浏览目录」接口(工作目录在服务器上,手机侧看不到),所以只能给候选 + 手输: + * 先放最近用过的(`AppPrefs.recentWorkDirs`,最新在前),再补现有会话里出现过的 `work_dir`, + * 去重后截断。纯函数,便于单测。 + */ +fun workDirSuggestions( + recent: List, + sessions: List, + limit: Int = 5, +): List { + if (limit <= 0) return emptyList() + val out = LinkedHashSet() + recent.forEach { raw -> + val path = raw.trim() + if (path.isNotEmpty()) out += path + } + sessions.forEach { session -> + val path = session.workDir.trim() + if (path.isNotEmpty()) out += path + } + return out.take(limit) +} diff --git a/app/src/main/java/dev/xbot/android/data/XbotApi.kt b/app/src/main/java/dev/xbot/android/data/XbotApi.kt index 205223f..c0cbf59 100644 --- a/app/src/main/java/dev/xbot/android/data/XbotApi.kt +++ b/app/src/main/java/dev/xbot/android/data/XbotApi.kt @@ -104,6 +104,28 @@ class XbotApi(private val prefs: AppPrefs) { return decodeEnvelope(execute(post("/api/chats/create", body))).chatId } + /** + * 设置会话的工作目录。 + * + * `force = true` 表示这是**显式用户动作**(新建会话弹窗 / 会话信息里改路径), + * 服务端会原样采用传入路径,不会被既有 cwd 或自动推断值顶掉 + * (见服务端 `rpc_table.go` 的 set_cwd 与 web 端 `setCwd`)。 + * + * 注意:`POST /api/chats/create` 没有 work_dir 参数,所以只能在建完会话后设置; + * 这一步失败不代表会话创建失败。 + */ + suspend fun setCwd(chatId: String, dir: String, channel: String = "web") { + rpc( + "set_cwd", + buildJsonObject { + put("channel", channel) + put("chat_id", chatId) + put("dir", dir) + put("force", true) + }, + ) + } + suspend fun switchChat(chatId: String, channel: String = "web") { val url = urlBuilder("/api/chats/${encodePath(chatId)}/switch") .addQueryParameter("channel", channel) diff --git a/app/src/main/java/dev/xbot/android/sessions/SessionsScreen.kt b/app/src/main/java/dev/xbot/android/sessions/SessionsScreen.kt index db93da9..441bd32 100644 --- a/app/src/main/java/dev/xbot/android/sessions/SessionsScreen.kt +++ b/app/src/main/java/dev/xbot/android/sessions/SessionsScreen.kt @@ -2,6 +2,7 @@ package dev.xbot.android.sessions import androidx.compose.foundation.background import androidx.compose.foundation.clickable +import androidx.compose.foundation.horizontalScroll import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.Column @@ -15,6 +16,7 @@ import androidx.compose.foundation.layout.size import androidx.compose.foundation.layout.width import androidx.compose.foundation.lazy.LazyColumn import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.rememberScrollState import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons @@ -36,6 +38,9 @@ import androidx.compose.material3.LinearProgressIndicator import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField import androidx.compose.material3.Scaffold +import androidx.compose.material3.SnackbarHost +import androidx.compose.material3.SnackbarHostState +import androidx.compose.material3.SuggestionChip import androidx.compose.material3.Text import androidx.compose.material3.TextButton import androidx.compose.material3.TopAppBar @@ -56,6 +61,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.repeatOnLifecycle import androidx.lifecycle.viewmodel.compose.viewModel import dev.xbot.android.data.UserChat +import dev.xbot.android.ui.components.shortenPath import dev.xbot.android.ui.components.PathText import dev.xbot.android.update.UpdateViewModel import java.time.Instant @@ -76,6 +82,7 @@ fun SessionsScreen( var deleteTarget by remember { mutableStateOf(null) } var forkTarget by remember { mutableStateOf(null) } var createLabel by remember { mutableStateOf("") } + var createWorkDir by remember { mutableStateOf("") } var renameLabel by remember { mutableStateOf("") } var forkLabel by remember { mutableStateOf("") } @@ -94,7 +101,16 @@ fun SessionsScreen( } } + val snackbar = remember { SnackbarHostState() } + LaunchedEffect(state.notice) { + state.notice?.let { + snackbar.showSnackbar(it) + vm.consumeNotice() + } + } + Scaffold( + snackbarHost = { SnackbarHost(snackbar) }, topBar = { TopAppBar( title = { @@ -315,21 +331,55 @@ fun SessionsScreen( onDismissRequest = { showCreate = false }, title = { Text("新建会话") }, text = { - OutlinedTextField( - value = createLabel, - onValueChange = { createLabel = it }, - label = { Text("会话名称(可选)") }, - singleLine = true, - modifier = Modifier.fillMaxWidth(), - ) + Column(verticalArrangement = Arrangement.spacedBy(10.dp)) { + OutlinedTextField( + value = createLabel, + onValueChange = { createLabel = it }, + label = { Text("会话名称(可选)") }, + singleLine = true, + modifier = Modifier.fillMaxWidth(), + ) + OutlinedTextField( + value = createWorkDir, + onValueChange = { createWorkDir = it }, + label = { Text("工作目录(可选)") }, + placeholder = { Text("默认:服务器工作目录") }, + supportingText = { Text("服务器上的绝对路径,例如 /home/cjw/project") }, + singleLine = true, + modifier = Modifier.fillMaxWidth(), + ) + if (state.workDirSuggestions.isNotEmpty()) { + Row( + modifier = Modifier + .fillMaxWidth() + .horizontalScroll(rememberScrollState()), + horizontalArrangement = Arrangement.spacedBy(6.dp), + ) { + state.workDirSuggestions.forEach { dir -> + SuggestionChip( + onClick = { createWorkDir = dir }, + label = { + Text( + shortenPath(dir), + style = MaterialTheme.typography.labelSmall, + maxLines = 1, + ) + }, + ) + } + } + } + } }, confirmButton = { TextButton( onClick = { showCreate = false val label = createLabel + val workDir = createWorkDir createLabel = "" - vm.createChat(label) { chatId -> + createWorkDir = "" + vm.createChat(label, workDir) { chatId -> val created = UserChat( chatId = chatId, channel = "web", diff --git a/app/src/main/java/dev/xbot/android/sessions/SessionsViewModel.kt b/app/src/main/java/dev/xbot/android/sessions/SessionsViewModel.kt index d6fb767..0481d51 100644 --- a/app/src/main/java/dev/xbot/android/sessions/SessionsViewModel.kt +++ b/app/src/main/java/dev/xbot/android/sessions/SessionsViewModel.kt @@ -6,6 +6,7 @@ import androidx.lifecycle.viewModelScope import dev.xbot.android.XbotApp import dev.xbot.android.data.UnauthorizedException import dev.xbot.android.data.UserChat +import dev.xbot.android.data.workDirSuggestions import kotlinx.coroutines.Job import kotlinx.coroutines.delay import kotlinx.coroutines.flow.MutableStateFlow @@ -22,12 +23,17 @@ data class SessionsUiState( val error: String? = null, val authenticated: Boolean = true, val serverUrl: String = "", + /** 一次性提示(snackbar 用),读完即清。 */ + val notice: String? = null, + /** 新建会话弹窗的工作目录候选(最近用过 + 现有会话),由 VM 算好给 UI 渲染。 */ + val workDirSuggestions: List = emptyList(), ) class SessionsViewModel(app: Application) : AndroidViewModel(app) { private val container = (app as XbotApp).container private val api = container.api + private val prefs = container.prefs private val _state = MutableStateFlow( SessionsUiState(serverUrl = api.baseUrl()), @@ -70,6 +76,7 @@ class SessionsViewModel(app: Application) : AndroidViewModel(app) { sessions = tree.sessions, error = null, authenticated = true, + workDirSuggestions = workDirSuggestions(prefs.recentWorkDirs, tree.sessions), ) } } catch (e: UnauthorizedException) { @@ -93,16 +100,37 @@ class SessionsViewModel(app: Application) : AndroidViewModel(app) { } } - fun createChat(label: String, onCreated: (String) -> Unit) { + fun consumeNotice() { + _state.update { it.copy(notice = null) } + } + + /** + * 新建会话,可选指定工作目录。 + * + * 服务端 `POST /api/chats/create` 不接受 work_dir,只能在会话建好之后调 RPC `set_cwd` + * (force=true,Web 端同样是这个流程)。因此**目录设置失败不等于创建失败**: + * 会话照常返回,只弹一条提示,用户在会话信息里还能再改。 + */ + fun createChat(label: String, workDir: String = "", onCreated: (String) -> Unit) { + val dir = workDir.trim() viewModelScope.launch { - runCatching { withAuthRetry { api.createChat(label) } } - .onSuccess { chatId -> - refresh(showLoading = false) - onCreated(chatId) - } + val created = runCatching { withAuthRetry { api.createChat(label) } } .onFailure { e -> _state.update { it.copy(error = e.message ?: "创建会话失败") } } + val chatId = created.getOrNull() ?: return@launch + + if (dir.isNotEmpty()) { + runCatching { withAuthRetry { api.setCwd(chatId, dir) } } + .onSuccess { prefs.rememberWorkDir(dir) } + .onFailure { e -> + _state.update { + it.copy(notice = "会话已创建,但工作目录设置失败:${e.message ?: "未知错误"}") + } + } + } + refresh(showLoading = false) + onCreated(chatId) } } diff --git a/app/src/test/java/dev/xbot/android/data/WorkDirSuggestionsTest.kt b/app/src/test/java/dev/xbot/android/data/WorkDirSuggestionsTest.kt new file mode 100644 index 0000000..8cf750f --- /dev/null +++ b/app/src/test/java/dev/xbot/android/data/WorkDirSuggestionsTest.kt @@ -0,0 +1,60 @@ +package dev.xbot.android.data + +import org.junit.Assert.assertEquals +import org.junit.Test + +/** + * 新建会话弹窗的工作目录候选:最近用过的在前,其次来自现有会话,去重并截断。 + * 服务端没有目录浏览接口,这串候选就是手机侧唯一能给的「方便输入」。 + */ +class WorkDirSuggestionsTest { + + private fun chat(id: String, workDir: String) = UserChat(chatId = id, channel = "web", workDir = workDir) + + @Test + fun `recent dirs come first and stay in order`() { + val result = workDirSuggestions( + recent = listOf("/home/cjw/b", "/home/cjw/a"), + sessions = emptyList(), + ) + + assertEquals(listOf("/home/cjw/b", "/home/cjw/a"), result) + } + + @Test + fun `session work dirs fill the gaps without duplicating recent ones`() { + val result = workDirSuggestions( + recent = listOf("/home/cjw/xbot"), + sessions = listOf( + chat("c1", "/home/cjw/xbot"), + chat("c2", "/home/cjw/blog"), + chat("c3", "/home/cjw/blog"), + ), + ) + + assertEquals(listOf("/home/cjw/xbot", "/home/cjw/blog"), result) + } + + @Test + fun `blank entries are skipped and the list is capped`() { + val result = workDirSuggestions( + recent = listOf("", " "), + sessions = listOf( + chat("c1", " /a "), + chat("c2", ""), + chat("c3", "/b"), + chat("c4", "/c"), + chat("c5", "/d"), + chat("c6", "/e"), + ), + limit = 3, + ) + + assertEquals(listOf("/a", "/b", "/c"), result) + } + + @Test + fun `no candidates yields an empty list`() { + assertEquals(emptyList(), workDirSuggestions(emptyList(), emptyList())) + } +} diff --git a/docs/agent/sessions.md b/docs/agent/sessions.md new file mode 100644 index 0000000..57e5f9f --- /dev/null +++ b/docs/agent/sessions.md @@ -0,0 +1,40 @@ +# 会话(sessions/)——新建会话与工作目录 + +`SessionsScreen` + `SessionsViewModel`:会话列表、新建/Fork/重命名/删除。 + +## 新建会话时指定工作目录 + +**服务端的 `POST /api/chats/create` 只接受 `label` / `subscription_id` / `model`,没有 `work_dir`。** +工作目录只能建完会话后单独设置: + +``` +POST /api/chats/create {label} → chat_id +POST /api/rpc set_cwd {channel, chat_id, dir, force: true} +``` + +`force: true` 是**显式用户动作**的语义(服务端 `rpc_table.go` 注释里直接写了「新建会话弹窗等」): +传什么路径就用什么路径,不会被既有 cwd 或自动推断值顶掉。Web 端 `components/agent/api.ts` 的 +`setCwd` 同样是 `force: true`,两端行为一致。**不要传 `force: false`**,否则服务端可能按自己的规则改写路径。 + +失败处理:`set_cwd` 失败**不代表会话创建失败**。`SessionsViewModel.createChat` 会保留会话、 +通过 `SessionsUiState.notice` 弹一条 snackbar(「会话已创建,但工作目录设置失败:…」), +用户仍可在会话里再改。 + +## 候选目录从哪来 + +工作目录在**服务器**上,手机侧看不到文件系统,服务端也没有目录浏览接口 +(`channel/web` 里没有 `list_dir` / `fs/list` 之类的端点)。所以 UI 是「手输 + 候选」: + +- `AppPrefs.recentWorkDirs`:最近用过的,最新在前,最多 5 个,存 SharedPreferences(JSON 数组)。 + 只有 `set_cwd` 成功才记;纯本地状态,跨设备不同步(Web 端存 localStorage)。 +- 现有会话里出现过的 `work_dir` 作为补充。 +- 合并逻辑是纯函数 `data/WorkDirSuggestions.kt: workDirSuggestions(recent, sessions, limit)`, + 去重、跳过空串、截断,`WorkDirSuggestionsTest` 覆盖。 + +候选在 `SessionsViewModel.refresh()` 里算好放进 `SessionsUiState.workDirSuggestions`, +UI 只负责渲染(项目约定:UI 层不做数据推导)。 + +## 与「会话项显示工作目录」的关系 + +列表项用的是 `UserChat.workDir`(服务端 `work_dir`,`omitempty`),新建会话成功后由 `refresh()` 重新拉取, +所以刚建好就能看到路径;`set_cwd` 失败时该字段为空,列表里自然不显示。 diff --git a/version.properties b/version.properties index f6d9e19..12d2ec2 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -versionCode=22 -versionName=0.3.4 +versionCode=23 +versionName=0.3.5 From 73d7bcaa4ed7f36ca19b015bffae0ade127a1d4b Mon Sep 17 00:00:00 2001 From: CjiW Date: Wed, 21 Oct 2026 16:19:03 +0000 Subject: [PATCH 2/2] feat(sessions): browse the server directory tree for the work dir MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Free-text was the wrong shape for this: the working directory lives on the host, so Android's SAF picker cannot reach it, but the server already exposes the same listing the web file tree uses -- POST /api/fs/list {path, show_hidden} -> entries[name, isDir, size, mode, modTime]. Tapping the folder icon on the work-dir field now opens a browser dialog: list subdirectories, walk into them, go up, and '使用此目录' writes the path back. Only directories are listed; an empty directory and a failed read are reported differently, and results are dropped if the path moved on while the request was in flight (fast tapping used to be able to overwrite a newer listing). Path assembly is client-side because the server returns bare names -- joinPath/parentPath handle root, trailing slash and empty input, pinned by FilePathTest. The recent-path suggestions stay as one-tap chips. versionCode 24 (still 0.3.5). --- CHANGELOG.md | 3 +- .../java/dev/xbot/android/data/FileSystem.kt | 42 ++++++++ .../java/dev/xbot/android/data/XbotApi.kt | 13 +++ .../xbot/android/sessions/SessionsScreen.kt | 98 +++++++++++++++++++ .../android/sessions/SessionsViewModel.kt | 67 +++++++++++++ .../dev/xbot/android/data/FilePathTest.kt | 61 ++++++++++++ docs/agent/sessions.md | 16 ++- version.properties | 2 +- 8 files changed, 298 insertions(+), 4 deletions(-) create mode 100644 app/src/main/java/dev/xbot/android/data/FileSystem.kt create mode 100644 app/src/test/java/dev/xbot/android/data/FilePathTest.kt diff --git a/CHANGELOG.md b/CHANGELOG.md index 9340665..97194fc 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,7 +9,8 @@ 新建会话时可以选择工作目录。 ### 新增 -- 新建会话弹窗增加「工作目录」输入框,并给出候选(最近用过的 + 现有会话里出现过的路径),点一下即可填入;留空则用服务器默认工作目录。 +- 新建会话弹窗增加「工作目录」输入框,点右侧文件夹图标可在**服务器目录树**里逐级浏览(列子目录 / 上一级 / 使用此目录),也可以手输;留空则用服务器默认工作目录。 +- 输入框下方给出候选(最近用过的 + 现有会话里出现过的路径),点一下即可填入。 - 目录设置失败不会影响会话创建,会单独提示一条原因,之后仍可在会话里改。 ### 说明 diff --git a/app/src/main/java/dev/xbot/android/data/FileSystem.kt b/app/src/main/java/dev/xbot/android/data/FileSystem.kt new file mode 100644 index 0000000..a2a445f --- /dev/null +++ b/app/src/main/java/dev/xbot/android/data/FileSystem.kt @@ -0,0 +1,42 @@ +package dev.xbot.android.data + +import kotlinx.serialization.SerialName +import kotlinx.serialization.Serializable + +/** `POST /api/fs/list` 的一条目录项(服务端 `fsListEntry`)。 */ +@Serializable +data class FsEntry( + val name: String = "", + @SerialName("isDir") val isDir: Boolean = false, + val size: Long = 0L, + val mode: String = "", + @SerialName("modTime") val modTime: String = "", +) + +@Serializable +data class FsListResponse( + val entries: List = emptyList(), +) + +/** 拼子路径:保留根的 `/`,不产生 `//`。 */ +fun joinPath(parent: String, name: String): String { + val base = parent.trim() + if (name.isEmpty()) return base.ifEmpty { "/" } + if (base.isEmpty()) return "/$name" + return if (base.endsWith("/")) "$base$name" else "$base/$name" +} + +/** 上一级:`/a/b` → `/a`,`/a` → `/`,`/` → `/`。 */ +fun parentPath(path: String): String { + val trimmed = path.trim().trimEnd('/') + if (trimmed.isEmpty()) return "/" + val cut = trimmed.lastIndexOf('/') + return if (cut <= 0) "/" else trimmed.substring(0, cut) +} + +/** + * 目录浏览只关心目录,但要保留错误信息:服务端返回空列表说明这个目录是空的, + * 而不是「加载失败」,UI 文案不同。 + */ +fun FsListResponse.directories(): List = + entries.filter { it.isDir && it.name.isNotEmpty() }.sortedBy { it.name.lowercase() } diff --git a/app/src/main/java/dev/xbot/android/data/XbotApi.kt b/app/src/main/java/dev/xbot/android/data/XbotApi.kt index c0cbf59..aefd34e 100644 --- a/app/src/main/java/dev/xbot/android/data/XbotApi.kt +++ b/app/src/main/java/dev/xbot/android/data/XbotApi.kt @@ -114,6 +114,19 @@ class XbotApi(private val prefs: AppPrefs) { * 注意:`POST /api/chats/create` 没有 work_dir 参数,所以只能在建完会话后设置; * 这一步失败不代表会话创建失败。 */ + /** + * 列出服务器上某个目录的内容(Web 端目录树用的同一个接口)。 + * 新建会话时的工作目录选择器靠它做逐级浏览:工作目录在**服务器**上, + * 手机侧的文件选择器(SAF)拿不到这种路径。 + */ + suspend fun listDir(path: String, showHidden: Boolean = false): List { + val body = buildJsonObject { + put("path", path) + put("show_hidden", showHidden) + }.toString() + return decodeEnvelope(execute(post("/api/fs/list", body))).entries + } + suspend fun setCwd(chatId: String, dir: String, channel: String = "web") { rpc( "set_cwd", diff --git a/app/src/main/java/dev/xbot/android/sessions/SessionsScreen.kt b/app/src/main/java/dev/xbot/android/sessions/SessionsScreen.kt index 441bd32..f10c206 100644 --- a/app/src/main/java/dev/xbot/android/sessions/SessionsScreen.kt +++ b/app/src/main/java/dev/xbot/android/sessions/SessionsScreen.kt @@ -21,6 +21,8 @@ import androidx.compose.foundation.shape.CircleShape import androidx.compose.foundation.shape.RoundedCornerShape import androidx.compose.material.icons.Icons import androidx.compose.material.icons.filled.Add +import androidx.compose.material.icons.outlined.FolderOpen +import androidx.compose.material.icons.filled.ArrowUpward import androidx.compose.material.icons.filled.MoreVert import androidx.compose.material.icons.filled.Refresh import androidx.compose.material.icons.filled.Settings @@ -61,6 +63,7 @@ import androidx.lifecycle.compose.collectAsStateWithLifecycle import androidx.lifecycle.repeatOnLifecycle import androidx.lifecycle.viewmodel.compose.viewModel import dev.xbot.android.data.UserChat +import dev.xbot.android.data.joinPath import dev.xbot.android.ui.components.shortenPath import dev.xbot.android.ui.components.PathText import dev.xbot.android.update.UpdateViewModel @@ -346,6 +349,14 @@ fun SessionsScreen( placeholder = { Text("默认:服务器工作目录") }, supportingText = { Text("服务器上的绝对路径,例如 /home/cjw/project") }, singleLine = true, + trailingIcon = { + IconButton(onClick = { vm.openDirBrowser(createWorkDir) }) { + Icon( + Icons.Outlined.FolderOpen, + contentDescription = "浏览服务器目录", + ) + } + }, modifier = Modifier.fillMaxWidth(), ) if (state.workDirSuggestions.isNotEmpty()) { @@ -396,6 +407,93 @@ fun SessionsScreen( ) } + state.browser?.let { browser -> + AlertDialog( + onDismissRequest = { vm.closeDirBrowser() }, + title = { Text("选择工作目录") }, + text = { + Column(verticalArrangement = Arrangement.spacedBy(8.dp)) { + Row(verticalAlignment = Alignment.CenterVertically) { + IconButton( + onClick = { vm.browseUp() }, + enabled = browser.path != "/" && !browser.loading, + ) { + Icon(Icons.Filled.ArrowUpward, contentDescription = "上一级") + } + Text( + text = browser.path, + style = MaterialTheme.typography.labelMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + modifier = Modifier.weight(1f), + ) + } + when { + browser.loading -> Box( + modifier = Modifier + .fillMaxWidth() + .height(120.dp), + contentAlignment = Alignment.Center, + ) { + CircularProgressIndicator(Modifier.size(22.dp), strokeWidth = 2.dp) + } + + browser.error != null -> Text( + text = browser.error.orEmpty(), + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.error, + ) + + browser.dirs.isEmpty() -> Text( + text = "这个目录下没有子目录", + style = MaterialTheme.typography.bodySmall, + color = MaterialTheme.colorScheme.onSurfaceVariant, + ) + + else -> LazyColumn(modifier = Modifier.height(240.dp)) { + items(browser.dirs, key = { it.name }) { entry -> + Row( + modifier = Modifier + .fillMaxWidth() + .clickable { vm.browseDir(joinPath(browser.path, entry.name)) } + .padding(vertical = 10.dp, horizontal = 4.dp), + verticalAlignment = Alignment.CenterVertically, + ) { + Icon( + Icons.Outlined.FolderOpen, + contentDescription = null, + modifier = Modifier.size(18.dp), + tint = MaterialTheme.colorScheme.primary, + ) + Spacer(Modifier.width(8.dp)) + Text( + entry.name, + style = MaterialTheme.typography.bodyMedium, + maxLines = 1, + overflow = TextOverflow.Ellipsis, + ) + } + } + } + } + } + }, + confirmButton = { + TextButton( + onClick = { + createWorkDir = browser.path + vm.closeDirBrowser() + }, + enabled = !browser.loading && browser.error == null, + ) { Text("使用此目录") } + }, + dismissButton = { + TextButton(onClick = { vm.closeDirBrowser() }) { Text("取消") } + }, + ) + } + renameTarget?.let { target -> AlertDialog( onDismissRequest = { renameTarget = null }, diff --git a/app/src/main/java/dev/xbot/android/sessions/SessionsViewModel.kt b/app/src/main/java/dev/xbot/android/sessions/SessionsViewModel.kt index 0481d51..5ff96d6 100644 --- a/app/src/main/java/dev/xbot/android/sessions/SessionsViewModel.kt +++ b/app/src/main/java/dev/xbot/android/sessions/SessionsViewModel.kt @@ -5,7 +5,9 @@ import androidx.lifecycle.AndroidViewModel import androidx.lifecycle.viewModelScope import dev.xbot.android.XbotApp import dev.xbot.android.data.UnauthorizedException +import dev.xbot.android.data.FsEntry import dev.xbot.android.data.UserChat +import dev.xbot.android.data.parentPath import dev.xbot.android.data.workDirSuggestions import kotlinx.coroutines.Job import kotlinx.coroutines.delay @@ -16,6 +18,14 @@ import kotlinx.coroutines.flow.update import kotlinx.coroutines.isActive import kotlinx.coroutines.launch +/** 新建会话弹窗里的目录浏览状态(服务端 /api/fs/list)。 */ +data class DirBrowserUi( + val path: String = "/", + val dirs: List = emptyList(), + val loading: Boolean = false, + val error: String? = null, +) + data class SessionsUiState( val loading: Boolean = true, val refreshing: Boolean = false, @@ -27,6 +37,8 @@ data class SessionsUiState( val notice: String? = null, /** 新建会话弹窗的工作目录候选(最近用过 + 现有会话),由 VM 算好给 UI 渲染。 */ val workDirSuggestions: List = emptyList(), + /** 非 null 表示目录浏览对话框打开中。 */ + val browser: DirBrowserUi? = null, ) class SessionsViewModel(app: Application) : AndroidViewModel(app) { @@ -100,6 +112,61 @@ class SessionsViewModel(app: Application) : AndroidViewModel(app) { } } + /** + * 打开目录浏览:从 [startPath](空则用最近用过的目录,再退回 `/`)开始逐级浏览。 + * 工作目录在服务器上,只能用服务端 `/api/fs/list` 列目。 + */ + fun openDirBrowser(startPath: String = "") { + val start = startPath.trim().ifBlank { + _state.value.workDirSuggestions.firstOrNull().orEmpty().ifBlank { "/" } + } + _state.update { it.copy(browser = DirBrowserUi(path = start, loading = true)) } + loadDirs(start) + } + + fun browseDir(path: String) { + if (path.isBlank()) return + _state.update { it.copy(browser = (it.browser ?: DirBrowserUi()).copy(path = path, loading = true, error = null)) } + loadDirs(path) + } + + fun browseUp() { + val current = _state.value.browser ?: return + browseDir(parentPath(current.path)) + } + + fun closeDirBrowser() { + _state.update { it.copy(browser = null) } + } + + private fun loadDirs(path: String) { + viewModelScope.launch { + runCatching { withAuthRetry { api.listDir(path) } } + .onSuccess { entries -> + _state.update { current -> + val browser = current.browser ?: return@update current + // 只接受仍然指向同一路径的结果,避免快速连点时的错序覆盖 + if (browser.path != path) current else current.copy( + browser = browser.copy( + dirs = entries.filter { it.isDir && it.name.isNotEmpty() } + .sortedBy { it.name.lowercase() }, + loading = false, + error = null, + ), + ) + } + } + .onFailure { e -> + _state.update { current -> + val browser = current.browser ?: return@update current + if (browser.path != path) current else current.copy( + browser = browser.copy(loading = false, error = e.message ?: "无法读取该目录"), + ) + } + } + } + } + fun consumeNotice() { _state.update { it.copy(notice = null) } } diff --git a/app/src/test/java/dev/xbot/android/data/FilePathTest.kt b/app/src/test/java/dev/xbot/android/data/FilePathTest.kt new file mode 100644 index 0000000..d8530a2 --- /dev/null +++ b/app/src/test/java/dev/xbot/android/data/FilePathTest.kt @@ -0,0 +1,61 @@ +package dev.xbot.android.data + +import org.junit.Assert.assertEquals +import org.junit.Test + +/** + * 目录浏览器的路径拼接/上级计算。服务端返回的是子项名字(`entries[].name`), + * 手机侧要自己拼出完整路径,这里钉住边界:根目录、尾斜杠、空值。 + */ +class FilePathTest { + + @Test + fun `join keeps a single slash`() { + assertEquals("/home/cjw/proj", joinPath("/home/cjw", "proj")) + assertEquals("/home", joinPath("/", "home")) + assertEquals("/home/cjw", joinPath("/home/", "cjw")) + assertEquals("/home", joinPath("/home", "")) + assertEquals("/proj", joinPath("", "proj")) + } + + @Test + fun `parent walks up and stops at root`() { + assertEquals("/home/cjw", parentPath("/home/cjw/proj")) + assertEquals("/home", parentPath("/home/cjw/")) + assertEquals("/", parentPath("/home")) + assertEquals("/", parentPath("/")) + assertEquals("/", parentPath("")) + } + + @Test + fun `directories filter out files and sort case-insensitively`() { + val response = FsListResponse( + entries = listOf( + FsEntry(name = "zeta", isDir = true), + FsEntry(name = "Alpha", isDir = true), + FsEntry(name = "notes.txt", isDir = false), + FsEntry(name = "", isDir = true), + ), + ) + + assertEquals(listOf("Alpha", "zeta"), response.directories().map { it.name }) + } + + @Test + fun `fs list decodes the server payload`() { + val payload = """ + {"ok":true,"data":{"entries":[ + {"name":"xbot","isDir":true,"size":0,"mode":"drwxr-xr-x","modTime":"2026-10-21T14:00:00Z"}, + {"name":"a.txt","isDir":false,"size":12,"mode":"-rw-r--r--","modTime":"2026-10-21T14:00:00Z"} + ]},"error":null} + """.trimIndent() + + val envelope = XbotJson.decodeFromString>(payload) + val entries = envelope.data!!.entries + + assertEquals(2, entries.size) + assertEquals(true, entries[0].isDir) + assertEquals("a.txt", entries[1].name) + assertEquals(12L, entries[1].size) + } +} diff --git a/docs/agent/sessions.md b/docs/agent/sessions.md index 57e5f9f..e3c1b66 100644 --- a/docs/agent/sessions.md +++ b/docs/agent/sessions.md @@ -22,8 +22,20 @@ POST /api/rpc set_cwd {channel, chat_id, dir, force: true} ## 候选目录从哪来 -工作目录在**服务器**上,手机侧看不到文件系统,服务端也没有目录浏览接口 -(`channel/web` 里没有 `list_dir` / `fs/list` 之类的端点)。所以 UI 是「手输 + 候选」: +工作目录在**服务器**上,手机侧看不到那台机器的文件系统,所以不能用 Android 的 SAF 选目录, +要走服务端的文件接口(Web 端目录树用的同一套): + +``` +POST /api/fs/list {"path": "/home/cjw", "show_hidden": false} +→ {"entries": [{"name":"xbot","isDir":true,"size":0,"mode":"drwxr-xr-x","modTime":"..."}]} +``` + +- 新建会话弹窗里点输入框右侧的文件夹图标 → 目录浏览对话框:列子目录、进出、回上一级, + 「使用此目录」把当前路径写回输入框。`FsEntry` / `joinPath` / `parentPath` 在 `data/FileSystem.kt`, + 路径边界(根 `/`、尾斜杠、空值)由 `FilePathTest` 钉住。 +- 服务端只返回名字(`entries[].name`),完整路径由手机侧拼,所以别把 `name` 当绝对路径用。 +- 只显示 `isDir` 的项;空目录与「读取失败」要分开提示(前者是正常空态)。 +- 另外还给「一点即填」的候选: - `AppPrefs.recentWorkDirs`:最近用过的,最新在前,最多 5 个,存 SharedPreferences(JSON 数组)。 只有 `set_cwd` 成功才记;纯本地状态,跨设备不同步(Web 端存 localStorage)。 diff --git a/version.properties b/version.properties index 12d2ec2..10098d4 100644 --- a/version.properties +++ b/version.properties @@ -1,2 +1,2 @@ -versionCode=23 +versionCode=24 versionName=0.3.5