feat(ai): polish the Agent chat UX [ADFA-6214]

Name the active chat with a backend-written title, grow the prompt and let it scroll, send with Shift+Enter, show user messages as right-aligned bubbles that fold when long, put a copy action on user and agent messages, and add a direction arrow to the sidebar toggle. Add a divider between the key section and the models in both settings panes.

Author: jatezzz

plugins/AI-Agent-Gemini/src/main/res/layout/fragment_gemini_settings.xml

@@ -110,6 +110,14 @@
         android:layout_marginTop="@dimen/space_sm"
         android:text="@string/btn_get_free_key" />
 
+    <!-- Divider: ends the key section before the models. The Model header's top margin below
+         mirrors this one's, so the line sits centred in the gap. -->
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="@dimen/space_xl"
+        android:background="@color/plugin_outline_variant" />
+
     <!-- Model. One dropdown, the same control the OpenAI pane uses: the catalog is whatever the
          key can reach, so the list is the only way to change it. The chevron is not declared here —
          declared as app:endIconDrawable it draws blank inside the host, so

plugins/AI-Agent-OpenAI/src/main/res/layout/fragment_openai_settings.xml

@@ -194,6 +194,14 @@
 
     </LinearLayout>
 
+    <!-- Divider: ends the key section before the models. The Model header's top margin below
+         mirrors this one's, so the line sits centred in the gap. -->
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginTop="@dimen/space_xl"
+        android:background="@color/plugin_outline_variant" />
+
     <!-- Model. One editable dropdown: type any name, or pick one the server reported. -->
 
     <TextView

plugins/AI-Core/build.gradle.kts

@@ -73,7 +73,6 @@ dependencies {
     implementation("androidx.fragment:fragment-ktx:1.8.8")
     implementation("com.google.android.material:material:1.10.0")
     implementation("androidx.recyclerview:recyclerview:1.3.2")
-    implementation("androidx.constraintlayout:constraintlayout:2.1.4")
     implementation("org.jetbrains.kotlin:kotlin-stdlib:2.3.0")
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-android:1.8.1")
 

plugins/AI-Core/src/main/assets/docs/index.html

@@ -203,6 +203,17 @@ <h2>Your Gemini API key</h2>
   app's data, for example — the stored key can no longer be read and will need to
   be entered again; tapping <b>Edit</b> tells you when that has happened.</p>
 
+  <h2>Writing a message</h2>
+  <ul>
+    <li>The prompt field grows as you type, up to about eight lines, and then scrolls: drag inside it to
+      read back over a long prompt without moving the panel it sits in.</li>
+    <li>With a hardware keyboard attached, <b>Shift+Enter</b> sends the message
+      and <b>Enter</b> starts a new line.</li>
+    <li>A message the agent cannot send — no backend configured, or no key saved
+      — is left in the field, so the warning never costs you what you typed. The
+      warning itself goes away on its own once the backend is configured.</li>
+  </ul>
+
   <h2>Reading the conversation</h2>
   <ul>
     <li><b>Retry</b> appears on a step that failed — including a tool call you
@@ -216,23 +227,32 @@ <h2>Reading the conversation</h2>
     <li><b>System log</b> rows are collapsed records of the agent's internal
       steps: tools run, files touched, backend errors. Tap the header to expand
       one. They are saved with the session but are not sent to the model.</li>
-    <li>Long-press a message to copy its text, or to edit and re-send one of
-      your own.</li>
+    <li>Your own messages longer than four lines are shown folded. Tap the
+      down arrow in the bubble's corner to read the whole message, and the up
+      arrow to fold it again. The model always receives all of it.</li>
+    <li>Tap the copy icon under a message, yours or the agent's, to copy its
+      text. It appears under a reply once the agent has finished writing it.</li>
   </ul>
 
   <h2>Keeping several chats</h2>
   <p>Chats belong to the project they were started in. Opening a project shows
   that project's chats and no one else's, and you can keep as many as you want —
   one for a build failure, one for a refactor, one for the feature you are adding
   — instead of letting a single conversation collect all three.</p>
+  <p>The header of the Agent tab names the chat you are in, shortened to one line;
+  long-press it for the same note as every other control on the screen.</p>
+  <p>After the agent's first reply in a chat, the backend you selected writes a short
+  title for it from your first message and that reply. Meanwhile the header reads
+  <i>Naming chat…</i>; if the backend cannot write one, the chat is named after the
+  first ten words of your first message.</p>
   <p>The button at the top right of the Agent tab slides a <b>sidebar</b> in over
   the conversation. Its three parts are fixed in place except the middle one, which
   is the only part that scrolls:</p>
   <ul>
     <li><b>New chat</b>, at the top, starts a fresh conversation. The one you were
       in is kept, and you can go back to it whenever you like.</li>
     <li><b>Recent</b>, in the middle, lists this project's conversations, newest
-      first, each named after its first message and dated from when it began, with
+      first, each named with a short title and dated from when it began, with
       a tick on the one you are in. It holds the newest to begin with and loads
       more as you scroll, so a project with a long history still opens at once.
       Tap a row to carry on with it: the agent reloads that conversation, so the
@@ -250,8 +270,8 @@ <h2>Keeping several chats</h2>
   left of that row closes the sidebar, as does tapping the dimmed conversation
   beside it or pressing <b>Back</b>.</p>
   <p>The <b>⋮</b> button on a row in <b>Recent</b> renames or deletes that chat. A
-  name you give it replaces the first-message title; clearing the name gives the
-  first-message title back. Deleting cannot be undone — and deleting the last chat
+  name you give it replaces the automatic title; clearing the name gives the
+  automatic title back. Deleting cannot be undone — and deleting the last chat
   leaves you an empty one to carry on in, rather than nothing.</p>
   <p>To clear out several at once, <b>long-press</b> a row. Every row gets a
   checkbox, tapping a row ticks it instead of opening it, and the bin at the top of

plugins/AI-Core/src/main/kotlin/com/itsaky/androidide/plugins/aicore/adapters/ChatAdapter.kt

@@ -1,21 +1,18 @@
 package com.itsaky.androidide.plugins.aicore.adapters
 
-import android.content.ClipData
-import android.content.ClipboardManager
-import android.content.Context
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import android.view.ViewTreeObserver
 import android.widget.Button
+import android.widget.ImageButton
 import android.widget.ImageView
 import android.widget.LinearLayout
-import android.widget.PopupMenu
 import android.widget.ProgressBar
 import android.widget.TextView
 import androidx.recyclerview.widget.DiffUtil
 import androidx.recyclerview.widget.ListAdapter
 import androidx.recyclerview.widget.RecyclerView
-import com.google.android.material.snackbar.Snackbar
 import com.itsaky.androidide.plugins.aicore.R
 import com.itsaky.androidide.plugins.aicore.logging.LOG_PREFIX
 import com.itsaky.androidide.plugins.aicore.models.ChatMessage
@@ -34,10 +31,16 @@ private const val TAG = "$LOG_PREFIX.ChatAdapter"
  * @param wireTooltip attaches this plugin's long-press help for a tag to a view. Supplied by
  *   ChatFragment, which owns the [com.itsaky.androidide.plugins.services.IdeTooltipService]
  *   lookup, so the adapter stays free of service plumbing. Defaults to a no-op for tests.
+ * @param isUserMessageExpanded whether a user bubble is unfolded; the state lives in ChatViewModel,
+ *   so a fold outlives this adapter. Defaults to always folded for tests.
+ * @param toggleUserMessageExpanded unfolds or folds a user bubble, returning its new state.
+ * @param onMessageAction runs one of the `ACTION_*` constants for a message, in ChatFragment.
  */
 class ChatAdapter(
     private val markwon: Markwon,
     private val wireTooltip: (View, String) -> Unit = { _, _ -> },
+    private val isUserMessageExpanded: (messageId: String) -> Boolean = { false },
+    private val toggleUserMessageExpanded: (messageId: String) -> Boolean = { false },
     private val onMessageAction: (action: String, message: ChatMessage) -> Unit
 ) : ListAdapter<ChatMessage, RecyclerView.ViewHolder>(DiffCallback) {
 
@@ -49,9 +52,11 @@ class ChatAdapter(
     companion object {
         private const val VIEW_TYPE_DEFAULT = 0
         private const val VIEW_TYPE_SYSTEM = 1
+        private const val VIEW_TYPE_USER = 2
+        private const val USER_MESSAGE_COLLAPSED_LINES = 4
 
-        const val ACTION_EDIT = "edit"
         const val ACTION_RETRY = "retry"
+        const val ACTION_COPY = "copy"
         const val ACTION_OPEN_SETTINGS = "open_settings"
     }
 
@@ -66,6 +71,10 @@ class ChatAdapter(
         val generatingDots: TextView = view.findViewById(R.id.generating_dots)
         val messageDuration: TextView = view.findViewById(R.id.message_duration)
         val btnRetry: Button = view.findViewById(R.id.btn_retry)
+        /** Fold toggle; only the user bubble layout has one. */
+        val btnToggleExpand: ImageButton? = view.findViewById(R.id.btn_toggle_expand)
+        val messageActions: LinearLayout = view.findViewById(R.id.message_actions)
+        val btnCopyMessage: ImageButton = view.findViewById(R.id.btn_copy_message)
 
         /**
          * Queued next step of the "..." animation, or null when it isn't running. Retained so
@@ -94,6 +103,8 @@ class ChatAdapter(
             VIEW_TYPE_DEFAULT
         } else if (message.sender == Sender.SYSTEM) {
             VIEW_TYPE_SYSTEM
+        } else if (message.sender == Sender.USER) {
+            VIEW_TYPE_USER
         } else {
             VIEW_TYPE_DEFAULT
         }
@@ -108,9 +119,23 @@ class ChatAdapter(
                 val view = inflater.inflate(R.layout.list_item_chat_system_message, parent, false)
                 SystemMessageViewHolder(view)
             }
+            // Own view type, so a recycled row never carries the bubble over to an agent message.
+            VIEW_TYPE_USER -> {
+                val view = inflater.inflate(R.layout.list_item_chat_user_message, parent, false)
+                DefaultMessageViewHolder(view).also(::wireMessageActions).apply {
+                    // The bubble is the sender cue, so the label would only repeat it.
+                    messageSender.visibility = View.GONE
+                    // A match_parent child can't widen a wrap_content bubble; it stays one word wide.
+                    messageContent.layoutParams.width = ViewGroup.LayoutParams.WRAP_CONTENT
+                    // Line count is only known once the text is laid out at its final width.
+                    messageContent.addOnLayoutChangeListener { _, _, _, _, _, _, _, _, _ ->
+                        updateExpandToggleVisibility(this)
+                    }
+                }
+            }
             else -> {
                 val view = inflater.inflate(R.layout.list_item_chat_message, parent, false)
-                DefaultMessageViewHolder(view)
+                DefaultMessageViewHolder(view).also(::wireMessageActions)
             }
         }
     }
@@ -164,6 +189,7 @@ class ChatAdapter(
                         holder.messageContent.text = payload.text
                     }
                 }
+                updateMessageActions(holder, message)
             } else if (payload is TextUpdatePayload && holder is SystemMessageViewHolder) {
                 markwon.setMarkdown(holder.messageContent, payload.text)
                 updateSystemMessageExpansion(holder, getItem(position))
@@ -178,12 +204,8 @@ class ChatAdapter(
         holder.messageSender.text = message.sender.name.lowercase(Locale.getDefault())
             .replaceFirstChar { it.titlecase(Locale.getDefault()) }
 
-        holder.itemView.setOnLongClickListener { view ->
-            if (message.status == MessageStatus.SENT) {
-                showContextMenu(view, message)
-            }
-            true
-        }
+        updateMessageActions(holder, message)
+        holder.btnToggleExpand?.let { bindExpandToggle(holder, it, message) }
 
         when (message.status) {
             MessageStatus.LOADING -> {
@@ -242,6 +264,83 @@ class ChatAdapter(
         }
     }
 
+    /** Wired once per holder: a streamed reply grows via payloads, so the tap reads the current item. */
+    private fun wireMessageActions(holder: DefaultMessageViewHolder) {
+        holder.btnCopyMessage.setOnClickListener {
+            val pos = holder.bindingAdapterPosition
+            if (pos != RecyclerView.NO_POSITION) onMessageAction(ACTION_COPY, getItem(pos))
+        }
+        wireTooltip(holder.btnCopyMessage, AiCorePlugin.TOOLTIP_TAG_MESSAGE_COPY)
+    }
+
+    /**
+     * Shows the actions under user and agent messages once their text is final: not while loading,
+     * nor while a reply is still streaming. System error rows share this layout but get none.
+     */
+    private fun updateMessageActions(holder: DefaultMessageViewHolder, message: ChatMessage) {
+        val streaming = message.sender == Sender.AGENT &&
+            message.status == MessageStatus.SENT && message.durationMs == null
+        val show = message.sender != Sender.SYSTEM && message.status != MessageStatus.LOADING && !streaming
+        holder.messageActions.visibility = if (show) View.VISIBLE else View.GONE
+    }
+
+    private fun bindExpandToggle(holder: DefaultMessageViewHolder, toggle: ImageButton, message: ChatMessage) {
+        applyUserMessageExpansion(holder, toggle, isUserMessageExpanded(message.id))
+        toggle.setOnClickListener {
+            val expanded = toggleUserMessageExpanded(message.id)
+            val rowTop = holder.itemView.top
+            applyUserMessageExpansion(holder, toggle, expanded)
+            keepRowTopInPlace(holder.itemView, rowTop)
+        }
+        wireTooltip(toggle, AiCorePlugin.TOOLTIP_TAG_USER_MESSAGE_EXPAND)
+    }
+
+    /**
+     * Folds the bubble to [USER_MESSAGE_COLLAPSED_LINES] or unfolds it, and turns the arrow and its
+     * spoken label to match: down/"show the whole message" while folded, up/"show less" once open.
+     */
+    private fun applyUserMessageExpansion(holder: DefaultMessageViewHolder, toggle: ImageButton, expanded: Boolean) {
+        holder.messageContent.maxLines = if (expanded) Int.MAX_VALUE else USER_MESSAGE_COLLAPSED_LINES
+        toggle.setImageResource(if (expanded) R.drawable.ic_expand_less else R.drawable.ic_expand_more)
+        toggle.contentDescription = toggle.context.getString(
+            if (expanded) R.string.desc_collapse_user_message else R.string.desc_expand_user_message
+        )
+    }
+
+    /**
+     * Scrolls [row] back to [rowTop] after its next layout, before that frame draws. The list stacks
+     * from the end, so a row that changes height moves its top: unfolding would push the start of
+     * the message off screen.
+     */
+    private fun keepRowTopInPlace(row: View, rowTop: Int) {
+        val list = row.parent as? RecyclerView ?: return
+        list.viewTreeObserver.addOnPreDrawListener(object : ViewTreeObserver.OnPreDrawListener {
+            override fun onPreDraw(): Boolean {
+                list.viewTreeObserver.removeOnPreDrawListener(this)
+                if (row.parent !== list) return true
+                val drift = row.top - rowTop
+                if (drift == 0) return true
+                list.scrollBy(0, drift)
+                // Skip this frame: it was laid out before the correction.
+                return false
+            }
+        })
+    }
+
+    /**
+     * Shows the toggle only when the text runs past the fold. lineCount counts every line even while
+     * maxLines hides some (no ellipsize is set), so this holds folded or not. Posted, since it runs
+     * mid-layout and a visibility change there would be deferred with a warning anyway.
+     */
+    private fun updateExpandToggleVisibility(holder: DefaultMessageViewHolder) {
+        val toggle = holder.btnToggleExpand ?: return
+        toggle.post {
+            val overflows = holder.messageContent.lineCount > USER_MESSAGE_COLLAPSED_LINES
+            val visibility = if (overflows) View.VISIBLE else View.GONE
+            if (toggle.visibility != visibility) toggle.visibility = visibility
+        }
+    }
+
     private fun bindSystemMessage(holder: SystemMessageViewHolder, message: ChatMessage) {
         markwon.setMarkdown(holder.messageContent, message.text)
         updateSystemMessageExpansion(holder, message)
@@ -387,34 +486,6 @@ class ChatAdapter(
         }
     }
 
-    private fun showContextMenu(view: View, message: ChatMessage) {
-        val context = view.context
-        val popup = PopupMenu(context, view)
-
-        popup.menu.add(0, 1, 0, "Copy Text")
-        if (message.sender == Sender.USER) {
-            popup.menu.add(0, 2, 0, "Edit Message")
-        }
-
-        popup.setOnMenuItemClickListener { item ->
-            when (item.itemId) {
-                1 -> {
-                    val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
-                    val clip = ClipData.newPlainText("chat_message", message.text)
-                    clipboard.setPrimaryClip(clip)
-                    Snackbar.make(view, view.context.getString(R.string.msg_copied), Snackbar.LENGTH_SHORT).show()
-                    true
-                }
-                2 -> {
-                    onMessageAction(ACTION_EDIT, message)
-                    true
-                }
-                else -> false
-            }
-        }
-        popup.show()
-    }
-
     override fun onCurrentListChanged(previousList: MutableList<ChatMessage>, currentList: MutableList<ChatMessage>) {
         super.onCurrentListChanged(previousList, currentList)
         expandedMessageIds.clear()