@@ -26,7 +26,6 @@ import androidx.compose.foundation.layout.Row
26import androidx.compose.foundation.layout.Spacer
26import androidx.compose.foundation.layout.Spacer
27import androidx.compose.foundation.layout.fillMaxSize
27import androidx.compose.foundation.layout.fillMaxSize
28import androidx.compose.foundation.layout.fillMaxWidth
28import androidx.compose.foundation.layout.fillMaxWidth
29−import androidx.compose.foundation.layout.heightIn
30import androidx.compose.foundation.layout.PaddingValues
29import androidx.compose.foundation.layout.PaddingValues
31import androidx.compose.foundation.layout.WindowInsets
30import androidx.compose.foundation.layout.WindowInsets
32import androidx.compose.foundation.layout.ime
31import androidx.compose.foundation.layout.ime
@@ -46,7 +45,6 @@ import androidx.compose.material.icons.automirrored.filled.Send
46import androidx.compose.material.icons.filled.ChatBubbleOutline
45import androidx.compose.material.icons.filled.ChatBubbleOutline
47import androidx.compose.material.icons.filled.Close
46import androidx.compose.material.icons.filled.Close
48import androidx.compose.material.icons.filled.KeyboardArrowDown
47import androidx.compose.material.icons.filled.KeyboardArrowDown
49−import androidx.compose.material.icons.filled.KeyboardArrowUp
50import androidx.compose.material.icons.filled.Stop
48import androidx.compose.material.icons.filled.Stop
51import androidx.compose.material3.CircularProgressIndicator
49import androidx.compose.material3.CircularProgressIndicator
52import androidx.compose.material3.ExperimentalMaterial3Api
50import androidx.compose.material3.ExperimentalMaterial3Api
@@ -61,7 +59,6 @@ import androidx.compose.material3.OutlinedTextField
61import androidx.compose.material3.Scaffold
59import androidx.compose.material3.Scaffold
62import androidx.compose.material3.Surface
60import androidx.compose.material3.Surface
63import androidx.compose.material3.Text
61import androidx.compose.material3.Text
64−import androidx.compose.material3.TextButton
65import androidx.compose.material3.TopAppBar
62import androidx.compose.material3.TopAppBar
66import androidx.compose.runtime.Composable
63import androidx.compose.runtime.Composable
67import androidx.compose.runtime.LaunchedEffect
64import androidx.compose.runtime.LaunchedEffect
@@ -75,7 +72,6 @@ import androidx.compose.ui.Alignment
75import androidx.compose.ui.Modifier
72import androidx.compose.ui.Modifier
76import androidx.compose.ui.draw.clip
73import androidx.compose.ui.draw.clip
77import androidx.compose.ui.hapticfeedback.HapticFeedbackType
74import androidx.compose.ui.hapticfeedback.HapticFeedbackType
78−import androidx.compose.ui.platform.LocalClipboardManager
79import androidx.compose.ui.platform.LocalContext
75import androidx.compose.ui.platform.LocalContext
80import androidx.compose.ui.platform.LocalDensity
76import androidx.compose.ui.platform.LocalDensity
81import androidx.compose.ui.platform.LocalHapticFeedback
77import androidx.compose.ui.platform.LocalHapticFeedback
@@ -113,12 +109,6 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {
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 }
122 // Track how many messages the user has "seen" (i.e. was at the bottom for). While
112 // Track how many messages the user has "seen" (i.e. was at the bottom for). While
123 // they're scrolled up, any messages beyond that count are unseen — flag the FAB.
113 // they're scrolled up, any messages beyond that count are unseen — flag the FAB.
124 var lastSeenCount by remember { mutableStateOf(0) }
114 var lastSeenCount by remember { mutableStateOf(0) }
@@ -269,14 +259,6 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {
273− visible = showScrollTop,
275− coroutineScope.launch {
276− listState.animateScrollToItem(0)
@@ -316,30 +298,6 @@ private fun BoxScope.ScrollToBottomButton(visible: Boolean, showBadge: Boolean,
319−// Mirror of ScrollToBottomButton, pinned to the top-start corner. Same BoxScope
320−// extension trick so the top-level AnimatedVisibility overload resolves cleanly.
322−private fun BoxScope.ScrollToTopButton(visible: Boolean, onClick: () -> Unit) {
325− modifier = Modifier.align(Alignment.TopStart),
326− enter = scaleIn() + fadeIn(),
327− exit = scaleOut() + fadeOut(),
329− Box(Modifier.padding(16.dp)) {
330− FloatingActionButton(
332− modifier = Modifier.size(44.dp),
335− Icons.Filled.KeyboardArrowUp,
336− contentDescription = "Scroll to top",
343private fun copyToClipboard(context: Context, text: String) {
301private fun copyToClipboard(context: Context, text: String) {
344 val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
302 val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager
345 clipboard.setPrimaryClip(ClipData.newPlainText("session", text))
303 clipboard.setPrimaryClip(ClipData.newPlainText("session", text))
@@ -497,41 +455,19 @@ private fun ChatInputBar(
497 onStop: () -> Unit,
455 onStop: () -> Unit,
499 val haptic = LocalHapticFeedback.current
457 val haptic = LocalHapticFeedback.current
500− val clipboardManager = LocalClipboardManager.current
501 Surface(tonalElevation = 3.dp) {
458 Surface(tonalElevation = 3.dp) {
503− modifier = Modifier.fillMaxWidth().imePadding().padding(horizontal = 12.dp, vertical = 8.dp),
506− modifier = Modifier.fillMaxWidth(),
460+ modifier = Modifier.fillMaxWidth().imePadding().padding(horizontal = 12.dp, vertical = 8.dp),
507 verticalAlignment = Alignment.Bottom,
461 verticalAlignment = Alignment.Bottom,
508 horizontalArrangement = Arrangement.spacedBy(8.dp),
462 horizontalArrangement = Arrangement.spacedBy(8.dp),
510 OutlinedTextField(
464 OutlinedTextField(
511 value = draft,
465 value = draft,
512 onValueChange = onDraftChange,
466 onValueChange = onDraftChange,
513− modifier = Modifier.weight(1f).heightIn(min = 48.dp),
467+ modifier = Modifier.weight(1f),
514 enabled = !loading,
468 enabled = !loading,
515 placeholder = { Text("Message opencode…") },
469 placeholder = { Text("Message opencode…") },
516 maxLines = 5,
470 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) {
522− onClick = { onDraftChange("") },
523− modifier = Modifier.size(20.dp),
527− contentDescription = "Clear draft",
528− modifier = Modifier.size(16.dp),
535 // Surface a running count once the draft gets long, so the user has a
471 // Surface a running count once the draft gets long, so the user has a
536 // sense of scale before sending a wall of text.
472 // sense of scale before sending a wall of text.
537 supportingText = if (draft.length > 500) {
473 supportingText = if (draft.length > 500) {
@@ -574,17 +510,5 @@ private fun ChatInputBar(
577− // With nothing typed yet, offer a one-tap way to drop in clipboard contents.
578− if (draft.isEmpty() && !generating && !loading) {
581− clipboardManager.getText()?.text?.let { onDraftChange(it) }
583− contentPadding = PaddingValues(0.dp),