5244821..master · opencode-android

git.iko.soy/opencode-android

10 files changed+519−20

unifiedsplit

app/src/main/java/soy/iko/opencode/CoreViewModel.kt+5

@@ -23,6 +23,9 @@ class CoreViewModel(app: Application) : AndroidViewModel(app) {

2323 init {

2424 prefs.getString(KEY_URL, null)?.let { core.dispatch(Event.ServerUrlChanged(it)) }

2525 prefs.getString(KEY_USER, null)?.let { core.dispatch(Event.UsernameChanged(it)) }

26+ // The password is stored in plain text in SharedPreferences — a deliberate

27+ // convenience trade-off for a local dev tool so reconnecting is one tap.

28+ prefs.getString(KEY_PASSWORD, null)?.let { core.dispatch(Event.PasswordChanged(it)) }

2629

2730 // On a fresh process after a configuration change, resume the SSE stream if

2831 // the core is already connected (no-op otherwise — it guards on `connected`).

@@ -44,6 +47,7 @@ class CoreViewModel(app: Application) : AndroidViewModel(app) {

4447 prefs.edit {

4548 putString(KEY_URL, state.serverUrl)

4649 putString(KEY_USER, state.username)

50+ putString(KEY_PASSWORD, state.password)

4751 }

4852 }

4953 }

@@ -57,5 +61,6 @@ class CoreViewModel(app: Application) : AndroidViewModel(app) {

5761 private companion object {

5862 const val KEY_URL = "serverUrl"

5963 const val KEY_USER = "username"

64+ const val KEY_PASSWORD = "password"

6065 }

6166}

app/src/main/java/soy/iko/opencode/core/HttpClient.kt+1

@@ -51,6 +51,7 @@ class HttpClient(

5151 ): Result<HttpResp> = withContext(Dispatchers.IO) {

5252 runCatching {

5353 val builder = Request.Builder().url(url).method()

54+ builder.header("User-Agent", "opencode-android/1.0")

5455 if (auth != null) builder.header("Authorization", auth)

5556 await(okhttp.newCall(builder.build()))

5657 }

app/src/main/java/soy/iko/opencode/core/OpencodeCore.kt+38−2

@@ -69,6 +69,9 @@ class OpencodeCore(

6969 // Tracks the in-flight sendMessage coroutine so navigating away or switching sessions

7070 // can cancel it before its response handler touches stale message state.

7171 private var sendMessageJob: Job? = null

72+ // Tracks the in-flight abort coroutine (CancelGeneration) so rapid cancel taps don't

73+ // fire multiple abort requests, and navigating away can cancel it.

74+ private var abortJob: Job? = null

7275 // Message IDs removed via SSE; a late MessageUpdated for one must not resurrect it.

7376 private val removedMessageIds = mutableSetOf<String>()

7477

@@ -98,6 +101,7 @@ class OpencodeCore(

98101 }

99102

100103 Event.LoadSessions -> {

104+ if (!connected) { error = "Not connected"; emit(); return }

101105 loading = true; emit()

102106 loadSessionsJob?.cancel()

103107 loadSessionsJob = scope.launch { loadSessions() }

@@ -117,18 +121,23 @@ class OpencodeCore(

117121 generating = false

118122 error = null

119123 emit()

124+ connectJob?.cancel()

125+ abortJob?.cancel()

120126 sendMessageJob?.cancel()

127+ deleteSessionJob?.cancel()

121128 loadMessagesJob?.cancel()

122129 loadMessagesJob = scope.launch { loadMessages(event.id) }

123130 }

124131

125132 Event.CreateSession -> {

133+ if (!connected) { error = "Not connected"; emit(); return }

126134 loading = true; error = null; emit()

127135 createSessionJob?.cancel()

128136 createSessionJob = scope.launch { createSession() }

129137 }

130138

131139 is Event.DeleteSession -> {

140+ if (!connected) { error = "Not connected"; emit(); return }

132141 val id = event.id

133142 // Delete on the server first; only drop it from the UI once that

134143 // succeeds, so a failed request leaves the session recoverable.

@@ -167,7 +176,10 @@ class OpencodeCore(

167176 messages.forEach { it.streaming = false }

168177 emit()

169178 val id = currentSessionId ?: return

170− scope.launch { http.postJson("$serverUrl/session/$id/abort", "{}", authHeader()) }

179+ // Debounce rapid cancel taps: cancel any in-flight abort before firing

180+ // another so we don't stack duplicate abort requests.

181+ abortJob?.cancel()

182+ abortJob = scope.launch { http.postJson("$serverUrl/session/$id/abort", "{}", authHeader()) }

171183 }

172184

173185 Event.NavigateToSessions -> {

@@ -177,9 +189,13 @@ class OpencodeCore(

177189 removedMessageIds.clear()

178190 draft = ""

179191 generating = false

192+ // Clear any error from the chat (e.g. a failed send) so it doesn't

193+ // linger on the sessions list after the user navigates back.

194+ error = null

180195 loading = true

181196 emit()

182197 connectJob?.cancel()

198+ abortJob?.cancel()

183199 createSessionJob?.cancel()

184200 deleteSessionJob?.cancel()

185201 sendMessageJob?.cancel()

@@ -202,6 +218,7 @@ class OpencodeCore(

202218 // SSE connection can't flash the reconnecting banner on the next connect.

203219 sseConnected = true

204220 connectJob?.cancel()

221+ abortJob?.cancel()

205222 createSessionJob?.cancel()

206223 deleteSessionJob?.cancel()

207224 sendMessageJob?.cancel()

@@ -219,7 +236,18 @@ class OpencodeCore(

219236 if (connected && sse == null) startSse()

220237 }

221238

222− fun shutdown() = closeSse()

239+ fun shutdown() {

240+ // Cancel every tracked coroutine before tearing down the stream so none can

241+ // emit into a cancelled scope after the ViewModel is cleared.

242+ connectJob?.cancel()

243+ loadSessionsJob?.cancel()

244+ createSessionJob?.cancel()

245+ loadMessagesJob?.cancel()

246+ deleteSessionJob?.cancel()

247+ sendMessageJob?.cancel()

248+ abortJob?.cancel()

249+ closeSse()

250+ }

223251

224252 // ── Effects ────────────────────────────────────────────────────────────────

225253 private fun sendMessage(raw: String) {

@@ -278,6 +306,10 @@ class OpencodeCore(

278306 when {

279307 resp.code == 401 -> {

280308 loading = false

309+ // A prior connection may have succeeded (connected = true); a

310+ // re-probe returning 401 (e.g. expired credentials) means we're

311+ // no longer authenticated, so drop the connected flag.

312+ connected = false

281313 // Always reveal the auth fields so the user can see/edit

282314 // their credentials — even when the ones supplied were wrong.

283315 authRequired = true

@@ -340,6 +372,10 @@ class OpencodeCore(

340372 if (session != null) {

341373 if (sessions.none { it.id == session.id }) {

342374 sessions.add(0, SessionView(session.id, displayTitle(session.title)))

375+ // Restore the alphabetical order immediately (matching loadSessions /

376+ // SessionUpserted) so the new session doesn't sit out-of-order at the

377+ // top until the SSE SessionUpserted event arrives to re-sort.

378+ sessions.sortBy { it.title.lowercase() }

343379 }

344380 emit()

345381 // SelectSession takes over the loading state (loads messages).

app/src/main/java/soy/iko/opencode/core/SseClient.kt+1

@@ -33,6 +33,7 @@ class SseClient(

3333

3434 fun connect() {

3535 val builder = Request.Builder().url(url).header("Accept", "text/event-stream")

36+ builder.header("User-Agent", "opencode-android/1.0")

3637 if (auth != null) builder.header("Authorization", auth)

3738 source = EventSources.createFactory(client).newEventSource(builder.build(), listener)

3839 }

app/src/main/java/soy/iko/opencode/ui/OpencodeApp.kt+55−2

@@ -7,13 +7,19 @@ import androidx.compose.animation.slideOutHorizontally

77import androidx.compose.animation.togetherWith

88import androidx.compose.foundation.layout.fillMaxSize

99import androidx.compose.foundation.layout.padding

10+import androidx.compose.material3.AlertDialog

1011import androidx.compose.material3.Scaffold

1112import androidx.compose.material3.SnackbarDuration

1213import androidx.compose.material3.SnackbarHost

1314import androidx.compose.material3.SnackbarHostState

15+import androidx.compose.material3.Text

16+import androidx.compose.material3.TextButton

1417import androidx.compose.runtime.Composable

1518import androidx.compose.runtime.LaunchedEffect

19+import androidx.compose.runtime.getValue

20+import androidx.compose.runtime.mutableStateOf

1621import androidx.compose.runtime.remember

22+import androidx.compose.runtime.setValue

1723import androidx.compose.ui.Modifier

1824import soy.iko.opencode.core.Event

1925import soy.iko.opencode.core.Screen

@@ -25,6 +31,8 @@ import soy.iko.opencode.ui.screens.SessionsScreen

2531@Composable

2632fun OpencodeApp(state: UiState, dispatch: (Event) -> Unit) {

2733 val snackbar = remember { SnackbarHostState() }

34+ var showStopConfirm by remember { mutableStateOf(false) }

35+ var showDisconnectConfirm by remember { mutableStateOf(false) }

2836

2937 LaunchedEffect(state.error) {

3038 state.error?.let {

@@ -40,12 +48,57 @@ fun OpencodeApp(state: UiState, dispatch: (Event) -> Unit) {

4048

4149 BackHandler(enabled = state.screen != Screen.Connect) {

4250 when (state.screen) {

43− Screen.Chat -> dispatch(Event.NavigateToSessions)

44− Screen.Sessions -> dispatch(Event.NavigateToConnect)

51+ // Leaving mid-generation would silently drop the reply, so confirm first.

52+ Screen.Chat -> if (state.generating) showStopConfirm = true else dispatch(Event.NavigateToSessions)

53+ // Disconnecting drops the server session, so guard the back button.

54+ Screen.Sessions -> showDisconnectConfirm = true

4555 Screen.Connect -> Unit

4656 }

4757 }

4858

59+ if (showStopConfirm) {

60+ AlertDialog(

61+ onDismissRequest = { showStopConfirm = false },

62+ title = { Text("Stop generation?") },

63+ text = { Text("Leaving will stop the current generation.") },

64+ confirmButton = {

65+ TextButton(onClick = {

66+ showStopConfirm = false

67+ dispatch(Event.CancelGeneration)

68+ dispatch(Event.NavigateToSessions)

69+ }) {

70+ Text("Stop and leave")

71+ }

72+ },

73+ dismissButton = {

74+ TextButton(onClick = { showStopConfirm = false }) {

75+ Text("Stay")

76+ }

77+ },

78+ )

79+ }

80+

81+ if (showDisconnectConfirm) {

82+ AlertDialog(

83+ onDismissRequest = { showDisconnectConfirm = false },

84+ title = { Text("Disconnect?") },

85+ text = { Text("You will be disconnected from the server.") },

86+ confirmButton = {

87+ TextButton(onClick = {

88+ showDisconnectConfirm = false

89+ dispatch(Event.NavigateToConnect)

90+ }) {

91+ Text("Disconnect")

92+ }

93+ },

94+ dismissButton = {

95+ TextButton(onClick = { showDisconnectConfirm = false }) {

96+ Text("Cancel")

97+ }

98+ },

99+ )

100+ }

101+

49102 Scaffold(snackbarHost = { SnackbarHost(snackbar) }) { padding ->

50103 AnimatedContent(

51104 targetState = state.screen,

app/src/main/java/soy/iko/opencode/ui/components/MessageBubble.kt+182−1

@@ -4,6 +4,7 @@ import android.content.ClipData

44import android.content.ClipboardManager

55import android.content.Context

66import android.content.Intent

7+import android.net.Uri

78import android.widget.Toast

89import androidx.compose.foundation.ExperimentalFoundationApi

910import androidx.compose.foundation.background

@@ -41,10 +42,17 @@ import androidx.compose.ui.Modifier

4142import androidx.compose.ui.draw.clip

4243import androidx.compose.ui.graphics.Color

4344import androidx.compose.ui.platform.LocalContext

45+import androidx.compose.ui.text.AnnotatedString

46+import androidx.compose.ui.text.LinkAnnotation

4447import androidx.compose.ui.text.SpanStyle

48+import androidx.compose.ui.text.TextLinkStyles

4549import androidx.compose.ui.text.buildAnnotatedString

50+import androidx.compose.ui.text.font.FontFamily

4651import androidx.compose.ui.text.font.FontStyle

52+import androidx.compose.ui.text.font.FontWeight

53+import androidx.compose.ui.text.withLink

4754import androidx.compose.ui.text.withStyle

55+import androidx.compose.ui.text.style.TextDecoration

4856import androidx.compose.ui.text.style.TextOverflow

4957import androidx.compose.ui.unit.dp

5058import androidx.compose.ui.unit.sp

@@ -120,12 +128,29 @@ fun MessageBubble(message: MessageView, modifier: Modifier = Modifier, onRetry:

120128

121129 message.reasoning?.let { ReasoningBlock(it, context) }

122130

131+ // Give a quick overview of how many tools ran before listing them.

132+ if (message.tools.size > 1) {

133+ Text(

134+ text = "${message.tools.size} tool calls",

135+ style = MaterialTheme.typography.labelSmall,

136+ color = MaterialTheme.colorScheme.onSurfaceVariant,

137+ modifier = Modifier.padding(bottom = 4.dp),

138+ )

139+ }

140+

123141 message.tools.forEach { ToolRow(it) }

124142

125143 SelectionContainer {

126144 if (message.text.isNotEmpty()) {

145+ val linkColor = MaterialTheme.colorScheme.primary

146+ // Tint the code background off the bubble's own foreground colour so it

147+ // contrasts on both bubble types (user bubbles use primaryContainer).

148+ val codeBackground = (if (isUser) MaterialTheme.colorScheme.onPrimaryContainer else MaterialTheme.colorScheme.onSurface).copy(alpha = 0.08f)

149+ val annotatedText = remember(message.text, message.streaming, linkColor, codeBackground, context) {

150+ buildLinkedText(message.text, message.streaming, linkColor, codeBackground, context)

151+ }

127152 Text(

128− text = message.text + if (message.streaming) " ▌" else "",

153+ text = annotatedText,

129154 color = textColor,

130155 // Give assistant replies (often long, code-heavy) extra line

131156 // spacing for readability; user bubbles keep the default.

@@ -161,6 +186,162 @@ private fun copyToClipboard(context: Context, text: String) {

161186 clipboard.setPrimaryClip(ClipData.newPlainText("message", text))

162187}

163188

189+private val urlRegex = Regex("""https?://[^\s]+""")

190+

191+/**

192+ * Render [text] as an AnnotatedString. Triple-backtick fences split the text into

193+ * prose and code segments: code segments are rendered monospace on a tinted

194+ * [codeBackground] (fences dropped), while prose has each http(s) URL turned into a

195+ * clickable link. The streaming cursor (" ▌") is appended outside any annotation.

196+ */

197+private fun buildLinkedText(

198+ text: String,

199+ streaming: Boolean,

200+ linkColor: Color,

201+ codeBackground: Color,

202+ context: Context,

203+): AnnotatedString = buildAnnotatedString {

204+ // Odd-indexed segments sit between a pair of ``` fences, so they're code. An

205+ // unclosed fence leaves the trailing segment styled as code, mirroring markdown.

206+ val segments = text.split("```")

207+ segments.forEachIndexed { index, segment ->

208+ if (index % 2 == 1) {

209+ withStyle(SpanStyle(fontFamily = FontFamily.Monospace, background = codeBackground)) {

210+ append(segment)

211+ }

212+ } else {

213+ appendLinkedText(segment, linkColor, codeBackground, context)

214+ }

215+ }

216+ if (streaming) append(" ▌")

217+}

218+

219+/**

220+ * Append [text] to the builder. Double-asterisk pairs are rendered bold; within each

221+ * segment, single-backtick pairs are rendered as inline code (monospace, backticks

222+ * dropped), and the remaining prose has each http(s) URL turned into a clickable link.

223+ * Triple-backtick fences are already stripped upstream in [buildLinkedText], so only

224+ * inline spans reach here.

225+ */

226+private fun AnnotatedString.Builder.appendLinkedText(

227+ text: String,

228+ linkColor: Color,

229+ codeBackground: Color,

230+ context: Context,

231+) {

232+ // Bold is the outermost inline layer: split on ** first so a bold span can wrap

233+ // inline code and links inside it. Odd-indexed segments sit between a pair of **

234+ // markers, so they're bold (markers dropped); even segments are ordinary prose.

235+ // Only the non-bold (even) segments get single-* italic handling — splitting a bold

236+ // segment on "*" would misfire on the leftover asterisks from the ** markers.

237+ val segments = text.split("**")

238+ // An even segment count means an odd number of ** markers, so the final ** is unclosed:

239+ // its trailing segment isn't bold. Restore the literal ** and render it as ordinary prose.

240+ val unclosed = segments.size % 2 == 0

241+ segments.forEachIndexed { index, segment ->

242+ val isUnclosedTail = unclosed && index == segments.size - 1

243+ if (index % 2 == 1 && !isUnclosedTail) {

244+ withStyle(SpanStyle(fontWeight = FontWeight.Bold)) {

245+ appendInlineCode(segment, linkColor, codeBackground, context)

246+ }

247+ } else {

248+ if (isUnclosedTail) append("**")

249+ appendItalicText(segment, linkColor, codeBackground, context)

250+ }

251+ }

252+}

253+

254+/**

255+ * Append [text] to the builder, rendering single-asterisk pairs as italic. Double

256+ * asterisks are already consumed as bold upstream in [appendLinkedText], so only lone

257+ * `*` markers reach here. Each segment then flows through inline-code and URL handling.

258+ */

259+private fun AnnotatedString.Builder.appendItalicText(

260+ text: String,

261+ linkColor: Color,

262+ codeBackground: Color,

263+ context: Context,

264+) {

265+ // Odd-indexed segments sit between a pair of single asterisks, so they're italic

266+ // (markers dropped); even segments are ordinary prose.

267+ val segments = text.split("*")

268+ // An even segment count means an odd number of * markers, so the final * is unclosed:

269+ // its trailing segment isn't italic. Restore the literal * and render it as prose.

270+ val unclosed = segments.size % 2 == 0

271+ segments.forEachIndexed { index, segment ->

272+ val isUnclosedTail = unclosed && index == segments.size - 1

273+ if (index % 2 == 1 && !isUnclosedTail) {

274+ withStyle(SpanStyle(fontStyle = FontStyle.Italic)) {

275+ appendInlineCode(segment, linkColor, codeBackground, context)

276+ }

277+ } else {

278+ if (isUnclosedTail) append("*")

279+ appendInlineCode(segment, linkColor, codeBackground, context)

280+ }

281+ }

282+}

283+

284+/**

285+ * Append [text] to the builder, rendering single-backtick pairs as inline code

286+ * (monospace, backticks dropped) and turning each http(s) URL in the remaining prose

287+ * into a clickable link.

288+ */

289+private fun AnnotatedString.Builder.appendInlineCode(

290+ text: String,

291+ linkColor: Color,

292+ codeBackground: Color,

293+ context: Context,

294+) {

295+ // Odd-indexed segments sit between a pair of single backticks, so they're inline

296+ // code. Even segments are ordinary prose and get URL linking applied.

297+ val segments = text.split("`")

298+ // An even segment count means an odd number of backtick markers, so the final backtick

299+ // is unclosed: its trailing segment isn't code. Restore the literal ` and treat as prose.

300+ val unclosed = segments.size % 2 == 0

301+ segments.forEachIndexed { index, segment ->

302+ val isUnclosedTail = unclosed && index == segments.size - 1

303+ if (index % 2 == 1 && !isUnclosedTail) {

304+ withStyle(SpanStyle(fontFamily = FontFamily.Monospace, background = codeBackground)) {

305+ append(segment)

306+ }

307+ } else {

308+ if (isUnclosedTail) append("`")

309+ appendUrls(segment, linkColor, context)

310+ }

311+ }

312+}

313+

314+/** Append [text] to the builder, turning each http(s) URL into a clickable link. */

315+private fun AnnotatedString.Builder.appendUrls(

316+ text: String,

317+ linkColor: Color,

318+ context: Context,

319+) {

320+ val matches = urlRegex.findAll(text).toList()

321+ var cursor = 0

322+ for (match in matches) {

323+ append(text.substring(cursor, match.range.first))

324+ val url = match.value

325+ withLink(

326+ LinkAnnotation.Clickable(

327+ tag = url,

328+ styles = TextLinkStyles(

329+ SpanStyle(color = linkColor, textDecoration = TextDecoration.Underline),

330+ ),

331+ linkInteractionListener = {

332+ runCatching {

333+ context.startActivity(Intent(Intent.ACTION_VIEW, Uri.parse(url)))

334+ }

335+ },

336+ ),

337+ ) {

338+ append(url)

339+ }

340+ cursor = match.range.last + 1

341+ }

342+ append(text.substring(cursor))

343+}

344+

164345private fun shareText(context: Context, text: String) {

165346 val intent = Intent(Intent.ACTION_SEND).apply {

166347 type = "text/plain"

app/src/main/java/soy/iko/opencode/ui/screens/ChatScreen.kt+141−10

@@ -1,5 +1,9 @@

11package soy.iko.opencode.ui.screens

3+import android.content.ClipData

4+import android.content.ClipboardManager

5+import android.content.Context

6+import android.widget.Toast

37import androidx.compose.animation.AnimatedVisibility

48import androidx.compose.animation.core.RepeatMode

59import androidx.compose.animation.core.animateFloat

@@ -10,8 +14,10 @@ import androidx.compose.animation.fadeIn

1014import androidx.compose.animation.fadeOut

1115import androidx.compose.animation.scaleIn

1216import androidx.compose.animation.scaleOut

17+import androidx.compose.foundation.ExperimentalFoundationApi

1318import androidx.compose.foundation.background

1419import androidx.compose.foundation.clickable

20+import androidx.compose.foundation.combinedClickable

1521import androidx.compose.foundation.layout.Arrangement

1622import androidx.compose.foundation.layout.Box

1723import androidx.compose.foundation.layout.BoxScope

@@ -20,6 +26,7 @@ import androidx.compose.foundation.layout.Row

2026import androidx.compose.foundation.layout.Spacer

2127import androidx.compose.foundation.layout.fillMaxSize

2228import androidx.compose.foundation.layout.fillMaxWidth

29+import androidx.compose.foundation.layout.heightIn

2330import androidx.compose.foundation.layout.PaddingValues

2431import androidx.compose.foundation.layout.WindowInsets

2532import androidx.compose.foundation.layout.ime

@@ -36,8 +43,10 @@ import androidx.compose.foundation.text.KeyboardOptions

3643import androidx.compose.material.icons.Icons

3744import androidx.compose.material.icons.automirrored.filled.ArrowBack

3845import androidx.compose.material.icons.automirrored.filled.Send

46+import androidx.compose.material.icons.filled.ChatBubbleOutline

3947import androidx.compose.material.icons.filled.Close

4048import androidx.compose.material.icons.filled.KeyboardArrowDown

49+import androidx.compose.material.icons.filled.KeyboardArrowUp

4150import androidx.compose.material.icons.filled.Stop

4251import androidx.compose.material3.CircularProgressIndicator

4352import androidx.compose.material3.ExperimentalMaterial3Api

@@ -52,6 +61,7 @@ import androidx.compose.material3.OutlinedTextField

5261import androidx.compose.material3.Scaffold

5362import androidx.compose.material3.Surface

5463import androidx.compose.material3.Text

64+import androidx.compose.material3.TextButton

5565import androidx.compose.material3.TopAppBar

5666import androidx.compose.runtime.Composable

5767import androidx.compose.runtime.LaunchedEffect

@@ -65,6 +75,8 @@ import androidx.compose.ui.Alignment

6575import androidx.compose.ui.Modifier

6676import androidx.compose.ui.draw.clip

6777import androidx.compose.ui.hapticfeedback.HapticFeedbackType

78+import androidx.compose.ui.platform.LocalClipboardManager

79+import androidx.compose.ui.platform.LocalContext

6880import androidx.compose.ui.platform.LocalDensity

6981import androidx.compose.ui.platform.LocalHapticFeedback

7082import androidx.compose.ui.text.font.FontStyle

@@ -77,11 +89,12 @@ import soy.iko.opencode.core.Event

7789import soy.iko.opencode.core.UiState

7890import soy.iko.opencode.ui.components.MessageBubble

7991

80−@OptIn(ExperimentalMaterial3Api::class)

92+@OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)

8193@Composable

8294fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {

8395 val listState = rememberLazyListState()

8496 val coroutineScope = rememberCoroutineScope()

97+ val context = LocalContext.current

8598

8699 // Hide the jump-to-bottom FAB while the keyboard is up: it would otherwise

87100 // sit over the top of the IME. Reading the ime inset bottom during composition

@@ -100,6 +113,12 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {

100113 }

101114 }

102115

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+

103122 // Track how many messages the user has "seen" (i.e. was at the bottom for). While

104123 // they're scrolled up, any messages beyond that count are unseen — flag the FAB.

105124 var lastSeenCount by remember { mutableStateOf(0) }

@@ -134,7 +153,15 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {

134153 text = if (state.messages.isNotEmpty()) "$title (${state.messages.size})" else title,

135154 maxLines = 1,

136155 overflow = TextOverflow.Ellipsis,

137− modifier = Modifier.clickable { dispatch(Event.NavigateToSessions) },

156+ modifier = Modifier.combinedClickable(

157+ onClick = { dispatch(Event.NavigateToSessions) },

158+ onLongClick = {

159+ state.currentSessionId?.let { id ->

160+ copyToClipboard(context, id)

161+ Toast.makeText(context, "Session ID copied", Toast.LENGTH_SHORT).show()

162+ }

163+ },

164+ ),

138165 )

139166 },

140167 navigationIcon = {

@@ -178,12 +205,24 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {

178205 }

179206 Box(Modifier.fillMaxWidth().weight(1f)) {

180207 if (state.messages.isEmpty() && !state.loading) {

181− Text(

182− text = "Send a message to start the conversation.",

183− style = MaterialTheme.typography.bodyMedium,

184− color = MaterialTheme.colorScheme.onSurfaceVariant,

208+ Column(

185209 modifier = Modifier.align(Alignment.Center).padding(32.dp),

186− )

210+ horizontalAlignment = Alignment.CenterHorizontally,

211+ ) {

212+ Icon(

213+ Icons.Filled.ChatBubbleOutline,

214+ contentDescription = null,

215+ modifier = Modifier.size(48.dp),

216+ tint = MaterialTheme.colorScheme.primary.copy(alpha = 0.5f),

217+ )

218+ Spacer(Modifier.size(16.dp))

219+ Text(

220+ text = "Send a message to start the conversation.",

221+ style = MaterialTheme.typography.bodyMedium,

222+ color = MaterialTheme.colorScheme.onSurfaceVariant,

223+ textAlign = TextAlign.Center,

224+ )

225+ }

187226 }

188227 LazyColumn(

189228 state = listState,

@@ -219,11 +258,25 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {

219258 onClick = {

220259 coroutineScope.launch {

221260 if (state.messages.isNotEmpty()) {

222− listState.animateScrollToItem(state.messages.size - 1)

261+ // When the typing indicator is showing it occupies the item

262+ // just past the last message, so scroll one further to reach it.

263+ val target = if (state.generating && state.messages.none { it.streaming })

264+ state.messages.size

265+ else

266+ state.messages.size - 1

267+ listState.animateScrollToItem(target)

223268 }

224269 }

225270 },

226271 )

272+ ScrollToTopButton(

273+ visible = showScrollTop,

274+ onClick = {

275+ coroutineScope.launch {

276+ listState.animateScrollToItem(0)

277+ }

278+ },

279+ )

227280 }

228281 }

229282 }

@@ -263,6 +316,35 @@ private fun BoxScope.ScrollToBottomButton(visible: Boolean, showBadge: Boolean,

263316 }

264317}

265318

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+

343+private fun copyToClipboard(context: Context, text: String) {

344+ val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager

345+ clipboard.setPrimaryClip(ClipData.newPlainText("session", text))

346+}

347+

266348private val dateSeparatorFormat = java.time.format.DateTimeFormatter.ofPattern("MMM d")

267349

268350/** Convert an epoch-millis timestamp to the local calendar day it falls on. */

@@ -415,19 +497,56 @@ private fun ChatInputBar(

415497 onStop: () -> Unit,

416498) {

417499 val haptic = LocalHapticFeedback.current

500+ val clipboardManager = LocalClipboardManager.current

418501 Surface(tonalElevation = 3.dp) {

419− Row(

502+ Column(

420503 modifier = Modifier.fillMaxWidth().imePadding().padding(horizontal = 12.dp, vertical = 8.dp),

504+ ) {

505+ Row(

506+ modifier = Modifier.fillMaxWidth(),

421507 verticalAlignment = Alignment.Bottom,

422508 horizontalArrangement = Arrangement.spacedBy(8.dp),

423509 ) {

424510 OutlinedTextField(

425511 value = draft,

426512 onValueChange = onDraftChange,

427− modifier = Modifier.weight(1f),

513+ modifier = Modifier.weight(1f).heightIn(min = 48.dp),

428514 enabled = !loading,

429515 placeholder = { Text("Message opencode…") },

430516 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+ },

535+ // Surface a running count once the draft gets long, so the user has a

536+ // sense of scale before sending a wall of text.

537+ supportingText = if (draft.length > 500) {

538+ {

539+ Text(

540+ text = "${draft.length} characters",

541+ style = MaterialTheme.typography.labelSmall,

542+ color = MaterialTheme.colorScheme.onSurfaceVariant,

543+ textAlign = TextAlign.End,

544+ modifier = Modifier.fillMaxWidth(),

545+ )

546+ }

547+ } else {

548+ null

549+ },

431550 keyboardOptions = KeyboardOptions(imeAction = ImeAction.Send),

432551 keyboardActions = KeyboardActions(onSend = {

433552 if (!generating && !loading && draft.isNotBlank()) onSend()

@@ -455,5 +574,17 @@ private fun ChatInputBar(

455574 }

456575 }

457576 }

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+ }

458589 }

459590}

app/src/main/java/soy/iko/opencode/ui/screens/ConnectScreen.kt+25−2

@@ -155,7 +155,15 @@ fun ConnectScreen(state: UiState, dispatch: (Event) -> Unit) {

155155 },

156156 modifier = Modifier.fillMaxWidth(),

157157 keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password, imeAction = ImeAction.Go),

158− keyboardActions = KeyboardActions(onGo = { dispatch(Event.Connect) }),

158+ keyboardActions = KeyboardActions(onGo = {

159+ // Mirror the connect button's enabled condition so the keyboard's

160+ // Go action can't fire a request the form isn't ready for.

161+ if (!state.loading && state.serverUrl.isNotBlank() &&

162+ (!state.authRequired || state.username.isNotBlank() || state.password.isNotBlank())

163+ ) {

164+ dispatch(Event.Connect)

165+ }

166+ }),

159167 enabled = !state.loading,

160168 )

161169 Spacer(Modifier.height(4.dp))

@@ -170,7 +178,10 @@ fun ConnectScreen(state: UiState, dispatch: (Event) -> Unit) {

170178

171179 Button(

172180 onClick = { dispatch(Event.Connect) },

173− enabled = !state.loading && state.serverUrl.isNotBlank(),

181+ // When auth is required, keep the button disabled until at least one

182+ // credential is entered — otherwise it just triggers a validation error.

183+ enabled = !state.loading && state.serverUrl.isNotBlank() &&

184+ (!state.authRequired || state.username.isNotBlank() || state.password.isNotBlank()),

174185 modifier = Modifier.fillMaxWidth(),

175186 ) {

176187 if (state.loading) {

@@ -184,6 +195,18 @@ fun ConnectScreen(state: UiState, dispatch: (Event) -> Unit) {

184195 }

185196 }

186197

198+ // While connecting (including auto-connect on launch), echo the target URL

199+ // so the user knows what the spinner is waiting on.

200+ if (state.loading) {

201+ Spacer(Modifier.height(8.dp))

202+ Text(

203+ text = "Connecting to ${state.serverUrl}...",

204+ style = MaterialTheme.typography.bodySmall,

205+ color = MaterialTheme.colorScheme.onSurfaceVariant,

206+ textAlign = TextAlign.Center,

207+ )

208+ }

209+

187210 // Surface the error inline as well, so it stays visible while the user

188211 // corrects the form (the snackbar is transient).

189212 if (state.error != null && !state.loading) {

app/src/main/java/soy/iko/opencode/ui/screens/SessionsScreen.kt+61−3

@@ -1,7 +1,13 @@

11package soy.iko.opencode.ui.screens

3+import android.content.ClipData

4+import android.content.ClipboardManager

5+import android.content.Context

6+import android.widget.Toast

7+import androidx.compose.foundation.ExperimentalFoundationApi

38import androidx.compose.foundation.background

49import androidx.compose.foundation.clickable

10+import androidx.compose.foundation.combinedClickable

511import androidx.compose.foundation.layout.Arrangement

612import androidx.compose.foundation.layout.Box

713import androidx.compose.foundation.layout.Column

@@ -15,6 +21,8 @@ import androidx.compose.foundation.layout.padding

1521import androidx.compose.foundation.layout.size

1622import androidx.compose.foundation.lazy.LazyColumn

1723import androidx.compose.foundation.lazy.items

24+import androidx.compose.foundation.lazy.rememberLazyListState

25+import androidx.compose.foundation.shape.CircleShape

1826import androidx.compose.material.icons.Icons

1927import androidx.compose.material.icons.automirrored.filled.ArrowBack

2028import androidx.compose.material.icons.filled.Add

@@ -50,8 +58,12 @@ import androidx.compose.runtime.remember

5058import androidx.compose.runtime.setValue

5159import androidx.compose.ui.Alignment

5260import androidx.compose.ui.Modifier

61+import androidx.compose.ui.draw.clip

62+import androidx.compose.ui.graphics.Color

5363import androidx.compose.ui.hapticfeedback.HapticFeedbackType

64+import androidx.compose.ui.platform.LocalContext

5465import androidx.compose.ui.platform.LocalHapticFeedback

66+import androidx.compose.ui.text.style.TextAlign

5567import androidx.compose.ui.text.style.TextOverflow

5668import androidx.compose.ui.unit.dp

5769import soy.iko.opencode.core.Event

@@ -65,6 +77,15 @@ fun SessionsScreen(state: UiState, dispatch: (Event) -> Unit) {

6577 var pendingDeleteId by remember { mutableStateOf<String?>(null) }

6678 var isPullRefreshing by remember { mutableStateOf(false) }

6779 var searchQuery by remember { mutableStateOf("") }

80+ val sessionsListState = rememberLazyListState()

81+

82+ // Bring a newly created session (which lands at the top of the list) into view.

83+ // Only scroll when the list actually grows, not on every reload of the same sessions.

84+ var prevSize by remember { mutableStateOf(state.sessions.size) }

85+ LaunchedEffect(state.sessions.size) {

86+ if (state.sessions.size > prevSize) sessionsListState.animateScrollToItem(0)

87+ prevSize = state.sessions.size

88+ }

6889

6990 // The pull-to-refresh spinner should only reflect a user-initiated pull, not

7091 // every loading operation. Clear it once the underlying load completes.

@@ -98,7 +119,23 @@ fun SessionsScreen(state: UiState, dispatch: (Event) -> Unit) {

98119 Scaffold(

99120 topBar = {

100121 TopAppBar(

101− title = { Text(if (state.sessions.isNotEmpty()) "Sessions (${state.sessions.size})" else "Sessions") },

122+ title = {

123+ Row(verticalAlignment = Alignment.CenterVertically) {

124+ // A quick at-a-glance health dot for the SSE stream: green when

125+ // connected, error-tinted when the stream is down (updates stall).

126+ Box(

127+ modifier = Modifier

128+ .size(8.dp)

129+ .clip(CircleShape)

130+ .background(

131+ if (state.sseConnected) Color(0xFF4CAF50)

132+ else MaterialTheme.colorScheme.error,

133+ ),

134+ )

135+ Spacer(Modifier.size(8.dp))

136+ Text(if (state.sessions.isNotEmpty()) "Sessions (${state.sessions.size})" else "Sessions")

137+ }

138+ },

102139 navigationIcon = {

103140 IconButton(onClick = { dispatch(Event.NavigateToConnect) }) {

104141 Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Disconnect")

@@ -162,6 +199,7 @@ fun SessionsScreen(state: UiState, dispatch: (Event) -> Unit) {

162199 state = rememberPullToRefreshState(),

163200 ) {

164201 LazyColumn(

202+ state = sessionsListState,

165203 modifier = Modifier.fillMaxSize(),

166204 contentPadding = PaddingValues(bottom = 88.dp),

167205 ) {

@@ -200,13 +238,21 @@ fun SessionsScreen(state: UiState, dispatch: (Event) -> Unit) {

200238 }

201239}

202240

241+@OptIn(ExperimentalFoundationApi::class)

203242@Composable

204243private fun SessionRow(session: SessionView, onOpen: () -> Unit, onDelete: () -> Unit) {

244+ val context = LocalContext.current

205245 Row(

206246 modifier = Modifier

207247 .fillMaxWidth()

208248 .background(MaterialTheme.colorScheme.surface)

209− .clickable(onClick = onOpen)

249+ .combinedClickable(

250+ onClick = onOpen,

251+ onLongClick = {

252+ copyToClipboard(context, session.id)

253+ Toast.makeText(context, "Session ID copied", Toast.LENGTH_SHORT).show()

254+ },

255+ )

210256 .padding(start = 20.dp, end = 8.dp, top = 14.dp, bottom = 14.dp),

211257 verticalAlignment = Alignment.CenterVertically,

212258 ) {

@@ -241,7 +287,7 @@ private fun SessionRow(session: SessionView, onOpen: () -> Unit, onDelete: () ->

241287 Icon(

242288 Icons.Filled.DeleteOutline,

243289 contentDescription = "Delete session",

244− tint = MaterialTheme.colorScheme.onSurfaceVariant,

290+ tint = MaterialTheme.colorScheme.error,

245291 )

246292 }

247293 }

@@ -299,6 +345,11 @@ private fun ReconnectingBanner() {

299345 }

300346}

301347

348+private fun copyToClipboard(context: Context, text: String) {

349+ val clipboard = context.getSystemService(Context.CLIPBOARD_SERVICE) as ClipboardManager

350+ clipboard.setPrimaryClip(ClipData.newPlainText("session", text))

351+}

352+

302353/** Shorten a session ID for display: "abc12345…" instead of the full UUID. */

303354private fun shortSessionId(id: String): String =

304355 if (id.length > 12) id.take(8) + "…" else id

@@ -340,5 +391,12 @@ private fun EmptySessions() {

340391 style = MaterialTheme.typography.bodyMedium,

341392 color = MaterialTheme.colorScheme.onSurfaceVariant,

342393 )

394+ Spacer(Modifier.height(8.dp))

395+ Text(

396+ text = "Sessions you create on this server will appear here.",

397+ style = MaterialTheme.typography.bodySmall,

398+ color = MaterialTheme.colorScheme.onSurfaceVariant,

399+ textAlign = TextAlign.Center,

400+ )

343401 }

344402}

app/src/main/java/soy/iko/opencode/ui/theme/Theme.kt+10

@@ -17,6 +17,11 @@ private val DarkColors = darkColorScheme(

1717 primaryContainer = Color(0xFF1A3D2A),

1818 onPrimaryContainer = Color(0xFFA8E6C1),

1919 secondary = EmeraldDark,

20+ onSecondary = Color(0xFFE6E9EF),

21+ secondaryContainer = Color(0xFF1A2A3D),

22+ onSecondaryContainer = Color(0xFFA8C5E6),

23+ tertiary = Color(0xFF6B7280),

24+ onTertiary = Color(0xFFE6E9EF),

2025 tertiaryContainer = Color(0xFF2A2A3D),

2126 onTertiaryContainer = Color(0xFFC5C5E6),

2227 errorContainer = Color(0xFF4D2626),

@@ -33,6 +38,11 @@ private val LightColors = lightColorScheme(

3338 primaryContainer = Color(0xFFD7F5E3),

3439 onPrimaryContainer = Color(0xFF0A3D22),

3540 secondary = Emerald,

41+ onSecondary = Color(0xFF1A1C1F),

42+ secondaryContainer = Color(0xFFD7E8F5),

43+ onSecondaryContainer = Color(0xFF0A2A4D),

44+ tertiary = Color(0xFF6B7280),

45+ onTertiary = Color(0xFFFFFFFF),

3646 tertiaryContainer = Color(0xFFE8E8F5),

3747 onTertiaryContainer = Color(0xFF2A2A4D),

3848 errorContainer = Color(0xFFFFE0E0),