Merge pull request #9 from tall-1997/feature/chat-pill-menu-drawer

会话页 PR-3 + PR-6：单行工具胶囊、菜单分组、紧凑宽度会话抽屉

Author: tall-1997

src/android/app/src/main/java/com/openminis/app/ui/chat/ChatAssistantMessageUI.kt

@@ -78,9 +78,9 @@ import androidx.compose.ui.graphics.toArgb
 import androidx.compose.ui.platform.LocalConfiguration
 import androidx.compose.ui.platform.LocalContext
 import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.text.font.FontFamily
 import androidx.compose.ui.text.font.FontWeight
-import androidx.compose.ui.text.style.TextOverflow
 import androidx.compose.ui.unit.dp
 import androidx.compose.foundation.layout.offset
 import androidx.compose.foundation.rememberScrollState

src/android/app/src/main/java/com/openminis/app/ui/chat/ChatComposerWidgets.kt

@@ -968,6 +968,33 @@ internal fun isFloatingProcessTool(
     return true
 }
 
+/**
+ * [P0-4] The blocks the floating activity pill may pin, derived from the
+ * LATEST assistant reply. ONE pure projection shared by the pill's mount
+ * gate (hasFloatingTools in ChatScreen, synchronous) and its data pipeline
+ * (lastToolBlocks, coroutine-side) — previously two hand-maintained filters
+ * that could drift: the gate scanned ALL messages while the pipeline read
+ * only the latest reply, and neither knew about the showFloatingToolBar
+ * pref or the streaming state, which left a 79dp bottom reserve for an
+ * overlay that never rendered after a fold-OFF turn ended.
+ *
+ * Fold-ON returns empty (single channel: the running round renders every
+ * step in-list). Sub-agent transcript cards are dropped while the
+ * sub-agent bar owns their display.
+ */
+internal fun floatingOverlayBlocks(
+    latestReply: ChatMessage?,
+    foldAiProcess: Boolean,
+    showSubAgentBar: Boolean,
+    activeSubAgentToolIds: Set<String>,
+): List<AssistantBlock> = latestReply?.toolBlocks.orEmpty()
+    .filter { isFloatingProcessTool(it, foldAiProcess) }
+    .filterNot {
+        showSubAgentBar && isSubAgentTranscriptCard(it) &&
+            (it.id in activeSubAgentToolIds ||
+                it.id.substringBefore("#sub-") in activeSubAgentToolIds)
+    }
+
 // ── [P1-3] Row rhythm ───────────────────────────────────────────────────
 //
 // Vertical spacing between list rows, replacing the flat LazyColumn

src/android/app/src/main/java/com/openminis/app/ui/chat/ChatFlatItems.kt

@@ -676,7 +676,6 @@ private fun parseInlineMarkdown(
 // [T-android-split-chat] internal (was private) — referenced from ChatScreen.kt
 // after the move.
 internal val LocalBrowserTabPool = compositionLocalOf<com.openminis.app.browser.BrowserTabPool?> { null }
-internal val LocalToolPreviewEnabled = compositionLocalOf { true }
 
 @Composable
 internal fun rememberBrowserLiveSnapshot(

src/android/app/src/main/java/com/openminis/app/ui/chat/ChatMiscViews.kt

@@ -7,9 +7,32 @@ package com.openminis.app.ui.chat
 import android.net.Uri
 import android.provider.OpenableColumns
 import java.io.File
+import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
+import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
+import androidx.window.core.layout.WindowSizeClass
+import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.setValue
 
+/**
+ * [P0-6] Whether the chat top bar has room for the three high-frequency
+ * quick actions (terminal / browser / chat files) as direct icons beside
+ * the "..." menu. Width ≥ 600dp (MEDIUM) — below that the centered
+ * two-line title (session title + provider·model row) needs the horizontal
+ * budget, and the menu's 快捷 section carries the entries instead.
+ *
+ * Same window-size source as `shouldUseTwoPane()` in ChatSplitScaffold
+ * (currentWindowAdaptiveInfo, NOT LocalConfiguration.screenWidthDp — the
+ * latter measures the display, so in split-screen/freeform windows the
+ * predicate would answer for a window the app does not have).
+ */
+@OptIn(ExperimentalMaterial3AdaptiveApi::class)
+@Composable
+internal fun shouldShowTopBarQuickActions(): Boolean =
+    currentWindowAdaptiveInfo().windowSizeClass.isWidthAtLeastBreakpoint(
+        WindowSizeClass.WIDTH_DP_MEDIUM_LOWER_BOUND,
+    )
+
 /**
  * Create an empty JPEG file under filesDir/camera-photos/ and return a
  * FileProvider content URI for it, plus the underlying File. The camera

src/android/app/src/main/java/com/openminis/app/ui/chat/ChatScreen.kt

@@ -363,9 +363,12 @@ internal fun subAgentToolTitle(name: String, args: String): String {
         "file_read" -> "读取文件"
         "file_write" -> "写入文件"
         "file_edit", "multi_edit" -> "编辑文件"
-        "grep_source" -> "搜索代码"
-        "web_search" -> "搜索网页"
+        "grep_source", "grep" -> "搜索代码"
+        "web_search", "clientfn_web_search" -> "搜索网页"
+        "web_fetch" -> "抓取网页"
         "browser_use" -> "浏览器"
+        "memory_get", "memory_write" -> "记忆"
+        "spawn_agent", "dispatch_agents" -> "子代理"
         else -> name
     }
     val preview = if (args.isBlank()) "" else SubAgentRunner.previewToolArgs(args).take(42)

src/android/app/src/main/java/com/openminis/app/ui/chat/ChatScreenHelpers.kt

@@ -14,6 +14,12 @@ import androidx.compose.foundation.layout.ColumnScope
 import androidx.compose.foundation.layout.IntrinsicSize
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.Row
+import androidx.compose.material3.Text
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.text.font.FontWeight
+import androidx.compose.ui.unit.sp
+import androidx.compose.ui.unit.dp
 import androidx.compose.foundation.layout.width
 import androidx.compose.foundation.layout.widthIn
 import androidx.compose.foundation.rememberScrollState
@@ -247,3 +253,27 @@ object MinisMenuDefaults {
         trailingIconColor = MaterialTheme.colorScheme.error,
     )
 }
+
+/**
+ * [P0-6] Small group label for a [MinisMenu] section. The chat top-bar menu
+ * used to be one flat 16+ item list; sections (快捷 / 会话 / 工具 / 设置)
+ * are what make it scannable. A header rather than another divider: a
+ * divider only says "break", a label says why.
+ */
+@Composable
+fun MinisMenuSectionHeader(
+    title: String,
+    modifier: Modifier = Modifier,
+) {
+    Row(
+        modifier = modifier.padding(start = 16.dp, end = 16.dp, top = 10.dp, bottom = 2.dp),
+        verticalAlignment = Alignment.CenterVertically,
+    ) {
+        Text(
+            text = title,
+            fontSize = 11.sp,
+            fontWeight = FontWeight.SemiBold,
+            color = MaterialTheme.colorScheme.onSurfaceVariant,
+        )
+    }
+}

src/android/app/src/main/java/com/openminis/app/ui/chat/ChatSubAgentBar.kt

@@ -20,8 +20,12 @@ import androidx.compose.material.icons.filled.Menu
 import androidx.compose.material3.Icon
 import androidx.compose.material3.IconButton
 import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.ModalDrawerSheet
+import androidx.compose.material3.ModalNavigationDrawer
 import androidx.compose.material3.Surface
 import androidx.compose.material3.Text
+import androidx.compose.material3.rememberDrawerState
+import androidx.compose.material3.DrawerValue
 import androidx.compose.material3.adaptive.ExperimentalMaterial3AdaptiveApi
 import androidx.compose.material3.adaptive.currentWindowAdaptiveInfo
 import androidx.compose.material3.adaptive.currentWindowSize
@@ -287,6 +291,15 @@ fun ChatSplitScaffold(
          */
         draftPlaceholderId: String?,
         onSessionSelected: (String) -> Unit,
+        /**
+         * [P1-6] True when the list is drawn inside the compact-width modal
+         * drawer rather than as a full screen or the two-pane sidebar. The
+         * list drops its own top bar then — the drawer sheet carries the
+         * chrome. Same composable either way; the pane navigator stays the
+         * single owner of list-vs-detail, which is what keeps chat switching
+         * identical across the three presentations.
+         */
+        embedded: Boolean,
     ) -> Unit,
     detailPane: @Composable (
         sessionId: String,
@@ -301,6 +314,13 @@ fun ChatSplitScaffold(
         onToggleSidebar: (() -> Unit)?,
         /** Whether the list is currently hidden — picks the icon direction. */
         sidebarCollapsed: Boolean,
+        /**
+         * [P1-6] Open the compact-width session drawer, or null in two-pane
+         * (the sidebar is already the list). The drawer state lives inside
+         * [ChatSplitScaffold], so the slot hands the opener to the detail
+         * pane instead of the pane reaching into scaffold internals.
+         */
+        onOpenSessionDrawer: (() -> Unit)?,
     ) -> Unit,
 ) {
     val twoPane = shouldUseTwoPane()
@@ -455,6 +475,13 @@ fun ChatSplitScaffold(
         )
         val scope = rememberCoroutineScope()
 
+        // [P1-6] Compact-width session drawer. State lives here, inside the
+        // navigator's key block, so a window-size rebuild (rotation, fold,
+        // split-screen) starts the drawer closed rather than resurrecting it
+        // over a layout that may now be two-pane.
+        val sessionDrawerState = rememberDrawerState(DrawerValue.Closed)
+        val openSessionDrawer: () -> Unit = { scope.launch { sessionDrawerState.open() } }
+
         val currentSessionId = navigator.currentDestination
             ?.takeIf { it.pane == ListDetailPaneScaffoldRole.Detail }
             ?.contentKey
@@ -509,6 +536,53 @@ fun ChatSplitScaffold(
     // Deliberately NOT focusable itself: preview events travel down from the
     // focus owner's ancestors, so this sees the chord without competing for
     // focus with the composer's text field.
+    //
+    // [P1-6] Compact-width session drawer. Wraps the WHOLE list/detail pair
+    // (including the two-pane layout) so the gesture surface is one thing at
+    // every window size: edge-swipe opens it, but the sheet only mounts while
+    // single-pane — at ≥840dp the persistent sidebar already shows the list
+    // and a second copy would be two lists of the same sessions. Switching a
+    // chat from the drawer goes through the SAME pane navigator as the
+    // full-screen list and the two-pane sidebar (see the selection callback
+    // below), so the three presentations cannot drift.
+    ModalNavigationDrawer(
+        drawerState = sessionDrawerState,
+        gesturesEnabled = !twoPane,
+        drawerContent = {
+            if (!twoPane) {
+                ModalDrawerSheet(modifier = Modifier.width(320.dp)) {
+                    listPane(
+                        // The drawer sits OVER the chat, so the current chat
+                        // is highlighted — same row the two-pane sidebar marks.
+                        if (currentSessionId != null) {
+                            com.openminis.app.ui.chat.ChatViewModelStore
+                                .rememberPersistedId(currentSessionId)
+                        } else null,
+                        if (currentSessionId != null &&
+                            isDraftSessionId(
+                                com.openminis.app.ui.chat.ChatViewModelStore
+                                    .rememberPersistedId(currentSessionId),
+                            )
+                        ) currentSessionId else null,
+                        { sessionId ->
+                            selectedSessionId = sessionId
+                            scope.launch {
+                                navigator.navigateTo(
+                                    ListDetailPaneScaffoldRole.Detail,
+                                    sessionId,
+                                )
+                                sessionDrawerState.close()
+                            }
+                        },
+                        // [P1-6] Drawer presentation — positional args: the
+                        // listPane slot is a function TYPE, whose call sites
+                        // cannot use named arguments.
+                        true,
+                    )
+                }
+            }
+        },
+    ) {
     Box(
         Modifier
             .fillMaxSize()
@@ -559,12 +633,17 @@ fun ChatSplitScaffold(
                                 .rememberPersistedId(currentSessionId),
                         )
                     ) currentSessionId else null,
-                ) { sessionId ->
-                    selectedSessionId = sessionId
-                    scope.launch {
-                        navigator.navigateTo(ListDetailPaneScaffoldRole.Detail, sessionId)
-                    }
-                }
+                    { sessionId ->
+                        selectedSessionId = sessionId
+                        scope.launch {
+                            navigator.navigateTo(ListDetailPaneScaffoldRole.Detail, sessionId)
+                        }
+                    },
+                    // Full screen / sidebar presentation — own top bar.
+                    // Positional: the listPane slot is a function TYPE, whose
+                    // call sites cannot use named arguments.
+                    false,
+                )
             }
         },
         detailPane = {
@@ -653,6 +732,9 @@ fun ChatSplitScaffold(
                             null
                         },
                         listCollapsed,
+                        // [P1-6] Drawer opener for compact width; null when
+                        // the sidebar already is the list.
+                        if (twoPane) null else openSessionDrawer,
                     )
                 }
                     }
@@ -714,6 +796,7 @@ fun ChatSplitScaffold(
         }
     }
     }
+    }
 }
 
 /**
@@ -882,7 +965,7 @@ fun ChatSplitScaffoldRoute(
 ) {
     ChatSplitScaffold(
         initialSessionId = initialSessionId,
-        listPane = { selectedSessionId, draftPlaceholderId, onSessionSelected ->
+        listPane = { selectedSessionId, draftPlaceholderId, onSessionSelected, embedded ->
             com.openminis.app.ui.sessions.SessionListScreen(
                 chatRepository = chatRepository,
                 providerRepository = providerRepository,
@@ -903,10 +986,12 @@ fun ChatSplitScaffoldRoute(
                 // [T-android-draft-placeholder-row] Synthetic "New Chat" row,
                 // never persisted — see the listPane param docs.
                 draftPlaceholderId = draftPlaceholderId,
+                // [P1-6] Drawer presentation drops the list's own top bar.
+                embedded = embedded,
             )
         },
         detailPane = { sessionId, onBackInPane, onNewChatInPane, onMoveToInPane,
-            onToggleSidebar, sidebarCollapsed ->
+            onToggleSidebar, sidebarCollapsed, onOpenSessionDrawer ->
             com.openminis.app.ui.chat.ChatScreen(
                 // The pane navigator's contentKey IS the session id, so a
                 // draft ("__new__…") flows through unchanged and ChatScreen's
@@ -930,6 +1015,9 @@ fun ChatSplitScaffoldRoute(
                 // looks for "get me back to the list".
                 onToggleSidebar = onToggleSidebar,
                 sidebarCollapsed = sidebarCollapsed,
+                // [P1-6] Compact width only — the drawer is not composed in
+                // two-pane (the sidebar is already the list).
+                onOpenSessionDrawer = onOpenSessionDrawer,
                 // Draft handling: the pane navigator gets a fresh `__new__…`
                 // key, so the list keeps its scroll position and simply stops
                 // highlighting a row (no persisted id matches a draft) — the

src/android/app/src/main/java/com/openminis/app/ui/components/MinisMenu.kt

@@ -501,6 +501,13 @@ fun SessionListScreen(
      * prepends the same placeholder in split mode.
      */
     draftPlaceholderId: String? = null,
+    /**
+     * [P1-6] Render the list WITHOUT its own top bar, for embedding inside
+     * the compact-width session drawer (ChatSplitScaffold owns the drawer
+     * chrome and the close affordance). Default false keeps the full-screen
+     * and two-pane-sidebar renderings byte-identical.
+     */
+    embedded: Boolean = false,
 ) {
     val context = LocalContext.current
     // T46: hoist VM ownership to the NavBackStackEntry's ViewModelStore so
@@ -778,7 +785,7 @@ fun SessionListScreen(
 
     Scaffold(
         topBar = {
-            MinisCenterTopBar(
+            if (!embedded) MinisCenterTopBar(
                 title = {
                     Text(
                             stringResource(R.string.app_name),