@@ -26,6 +26,7 @@ import androidx.compose.foundation.layout.Row
2626import androidx.compose.foundation.layout.Spacer
2727import androidx.compose.foundation.layout.fillMaxSize
2828import androidx.compose.foundation.layout.fillMaxWidth
29+import androidx.compose.foundation.layout.heightIn
2930import androidx.compose.foundation.layout.PaddingValues
3031import androidx.compose.foundation.layout.WindowInsets
3132import androidx.compose.foundation.layout.ime
@@ -45,6 +46,7 @@ import androidx.compose.material.icons.automirrored.filled.Send
4546import androidx.compose.material.icons.filled.ChatBubbleOutline
4647import androidx.compose.material.icons.filled.Close
4748import androidx.compose.material.icons.filled.KeyboardArrowDown
49+import androidx.compose.material.icons.filled.KeyboardArrowUp
4850import androidx.compose.material.icons.filled.Stop
4951import androidx.compose.material3.CircularProgressIndicator
5052import androidx.compose.material3.ExperimentalMaterial3Api
@@ -59,6 +61,7 @@ import androidx.compose.material3.OutlinedTextField
5961import androidx.compose.material3.Scaffold
6062import androidx.compose.material3.Surface
6163import androidx.compose.material3.Text
64+import androidx.compose.material3.TextButton
6265import androidx.compose.material3.TopAppBar
6366import androidx.compose.runtime.Composable
6467import androidx.compose.runtime.LaunchedEffect
@@ -72,6 +75,7 @@ import androidx.compose.ui.Alignment
7275import androidx.compose.ui.Modifier
7376import androidx.compose.ui.draw.clip
7477import androidx.compose.ui.hapticfeedback.HapticFeedbackType
78+import androidx.compose.ui.platform.LocalClipboardManager
7579import androidx.compose.ui.platform.LocalContext
7680import androidx.compose.ui.platform.LocalDensity
7781import androidx.compose.ui.platform.LocalHapticFeedback
@@ -109,6 +113,12 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {
109113 }
110114 }
111115
116+ // Offer a jump-to-top shortcut once the conversation is long and the user has
117+ // scrolled a few messages down — saves flick-scrolling back through history.
118+ val showScrollTop by remember {
119+ derivedStateOf { state.messages.size > 10 && listState.firstVisibleItemIndex > 3 }
120+ }
121+
112122 // Track how many messages the user has "seen" (i.e. was at the bottom for). While
113123 // they're scrolled up, any messages beyond that count are unseen — flag the FAB.
114124 var lastSeenCount by remember { mutableStateOf(0) }
@@ -259,6 +269,14 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {
259269 }
260270 },
261271 )
272+ ScrollToTopButton(
273+ visible = showScrollTop,
274+ onClick = {
275+ coroutineScope.launch {
276+ listState.animateScrollToItem(0)
277+ }
278+ },
279+ )
262280 }
263281 }
264282 }
@@ -298,6 +316,30 @@ private fun BoxScope.ScrollToBottomButton(visible: Boolean, showBadge: Boolean,
298316 }
299317}
300318
319+// Mirror of ScrollToBottomButton, pinned to the top-start corner. Same BoxScope
320+// extension trick so the top-level AnimatedVisibility overload resolves cleanly.
321+@Composable
322+private fun BoxScope.ScrollToTopButton(visible: Boolean, onClick: () -> Unit) {
323+ AnimatedVisibility(
324+ visible = visible,
325+ modifier = Modifier.align(Alignment.TopStart),
326+ enter = scaleIn() + fadeIn(),
327+ exit = scaleOut() + fadeOut(),
328+ ) {
329+ Box(Modifier.padding(16.dp)) {
330+ FloatingActionButton(
331+ onClick = onClick,
332+ modifier = Modifier.size(44.dp),
333+ ) {
334+ Icon(
335+ Icons.Filled.KeyboardArrowUp,
336+ contentDescription = "Scroll to top",
337+ )
338+ }
339+ }
340+ }
341+}
342+
301343private fun copyToClipboard(context: Context, text: String) {
302344 val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
303345 clipboard.setPrimaryClip(ClipData.newPlainText("session", text))
@@ -455,19 +497,41 @@ private fun ChatInputBar(
455497 onStop: () -> Unit,
456498) {
457499 val haptic = LocalHapticFeedback.current
500+ val clipboardManager = LocalClipboardManager.current
458501 Surface(tonalElevation = 3.dp) {
459− Row(
502+ Column(
460503 modifier = Modifier.fillMaxWidth().imePadding().padding(horizontal = 12.dp, vertical = 8.dp),
504+ ) {
505+ Row(
506+ modifier = Modifier.fillMaxWidth(),
461507 verticalAlignment = Alignment.Bottom,
462508 horizontalArrangement = Arrangement.spacedBy(8.dp),
463509 ) {
464510 OutlinedTextField(
465511 value = draft,
466512 onValueChange = onDraftChange,
467− modifier = Modifier.weight(1f),
513+ modifier = Modifier.weight(1f).heightIn(min = 48.dp),
468514 enabled = !loading,
469515 placeholder = { Text("Message opencode…") },
470516 maxLines = 5,
517+ // Offer a quick way to wipe the draft once there's something to clear
518+ // and we're not mid-generation (where the field is a poor place to fuss).
519+ trailingIcon = if (draft.isNotEmpty() && !generating) {
520+ {
521+ IconButton(
522+ onClick = { onDraftChange("") },
523+ modifier = Modifier.size(20.dp),
524+ ) {
525+ Icon(
526+ Icons.Filled.Close,
527+ contentDescription = "Clear draft",
528+ modifier = Modifier.size(16.dp),
529+ )
530+ }
531+ }
532+ } else {
533+ null
534+ },
471535 // Surface a running count once the draft gets long, so the user has a
472536 // sense of scale before sending a wall of text.
473537 supportingText = if (draft.length > 500) {
@@ -510,5 +574,17 @@ private fun ChatInputBar(
510574 }
511575 }
512576 }
577+ // With nothing typed yet, offer a one-tap way to drop in clipboard contents.
578+ if (draft.isEmpty() && !generating && !loading) {
579+ TextButton(
580+ onClick = {
581+ clipboardManager.getText()?.text?.let { onDraftChange(it) }
582+ },
583+ contentPadding = PaddingValues(0.dp),
584+ ) {
585+ Text("Paste")
586+ }
587+ }
588+ }
513589 }
514590}