24b51d2...master · opencode-android

git.iko.soy/opencode-android

12 files changed+1121−104

since splitsnapshots

unifiedsplit

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

@@ -23,11 +23,23 @@ 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`).

2932 core.resumeStreamingIfConnected()

3033

34+ // Returning users shouldn't have to tap Connect: if a URL was restored and we

35+ // aren't already connected, kick off the connection attempt on launch. The core

36+ // handles an empty/invalid URL, so this only fires when there's something to try.

37+ core.view.value.let { restored ->

38+ if (restored.serverUrl.isNotEmpty() && !restored.connected) {

39+ core.dispatch(Event.Connect)

40+ }

41+ }

42+

3143 // Persist connection details once a connection succeeds.

3244 viewModelScope.launch {

3345 core.view.distinctUntilChangedBy { it.connected to it.serverUrl }.collect { state ->

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

3547 prefs.edit {

3648 putString(KEY_URL, state.serverUrl)

3749 putString(KEY_USER, state.username)

50+ putString(KEY_PASSWORD, state.password)

3851 }

3952 }

4053 }

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

4861 private companion object {

4962 const val KEY_URL = "serverUrl"

5063 const val KEY_USER = "username"

64+ const val KEY_PASSWORD = "password"

5165 }

5266}

app/src/main/java/soy/iko/opencode/MainActivity.kt+7−1

@@ -2,6 +2,7 @@ package soy.iko.opencode

33import android.os.Bundle

44import androidx.activity.ComponentActivity

5+import androidx.activity.SystemBarStyle

56import androidx.activity.compose.setContent

67import androidx.activity.enableEdgeToEdge

78import androidx.compose.runtime.getValue

@@ -12,7 +13,12 @@ import soy.iko.opencode.ui.theme.OpencodeTheme

1213

1314class MainActivity : ComponentActivity() {

1415 override fun onCreate(savedInstanceState: Bundle?) {

15− enableEdgeToEdge()

16+ enableEdgeToEdge(

17+ statusBarStyle = SystemBarStyle.auto(

18+ lightScrim = 0xFF0F1115.toInt(),

19+ darkScrim = 0xFF0F1115.toInt(),

20+ ),

21+ )

1622 super.onCreate(savedInstanceState)

1723 setContent {

1824 OpencodeTheme {

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+164−23

@@ -1,6 +1,7 @@

11package soy.iko.opencode.core

33import kotlinx.coroutines.CoroutineScope

4+import kotlinx.coroutines.Job

45import kotlinx.coroutines.delay

56import kotlinx.coroutines.flow.MutableStateFlow

67import kotlinx.coroutines.flow.StateFlow

@@ -48,6 +49,31 @@ class OpencodeCore(

4849 private var sse: SseClient? = null

4950 private var sseClosedIntentionally = false

5051 private var reconnectAttempts = 0

52+ private var reconnectJob: Job? = null

53+

54+ // Guards against overlapping session refreshes: rapid taps launch multiple

55+ // loadSessions coroutines and the slowest-to-return would otherwise win.

56+ private var loadSessionsJob: Job? = null

57+ // Tracks the in-flight createSession coroutine so navigating away can cancel it

58+ // before it dispatches SelectSession into a screen the user already left.

59+ private var createSessionJob: Job? = null

60+ // Tracks the in-flight loadMessages coroutine. Rapidly switching sessions launches

61+ // several; cancel the prior one so only the newest fetch runs (saves needless requests).

62+ private var loadMessagesJob: Job? = null

63+ // Tracks the in-flight probeHealth coroutine. Rapid double-taps on Connect would

64+ // otherwise launch two concurrent health probes; cancel the prior one first.

65+ private var connectJob: Job? = null

66+ // Tracks the in-flight DeleteSession coroutine so navigating away can cancel it

67+ // before its response handler mutates the sessions list / screen the user already left.

68+ private var deleteSessionJob: Job? = null

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

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

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

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

76+ private val removedMessageIds = mutableSetOf<String>()

5177

5278 // ── Event entry point ──────────────────────────────────────────────────────

5379 fun dispatch(event: Event) {

@@ -55,9 +81,11 @@ class OpencodeCore(

5581 // Store the field verbatim while typing; normalizing here would fight

5682 // the user's edits (e.g. eat the "://" as they type it). The URL is

5783 // normalized once, on Connect.

58− is Event.ServerUrlChanged -> { serverUrl = event.url; emit() }

59− is Event.UsernameChanged -> { username = event.value; emit() }

60− is Event.PasswordChanged -> { password = event.value; emit() }

84+ // Clear any prior error as soon as the user edits a field, so a stale

85+ // message (e.g. "Invalid credentials") doesn't linger while they correct it.

86+ is Event.ServerUrlChanged -> { serverUrl = event.url; if (error != null) error = null; emit() }

87+ is Event.UsernameChanged -> { username = event.value; if (error != null) error = null; emit() }

88+ is Event.PasswordChanged -> { password = event.value; if (error != null) error = null; emit() }

6189

6290 Event.Connect -> {

6391 serverUrl = normalizeUrl(serverUrl)

@@ -68,30 +96,54 @@ class OpencodeCore(

6896 // Leave authRequired as-is; probeHealth sets it from the response (true on

6997 // 401, false on success). Resetting it here just flickers the auth fields.

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

71− scope.launch { probeHealth() }

99+ connectJob?.cancel()

100+ connectJob = scope.launch { probeHealth() }

72101 }

73102

74− Event.LoadSessions -> { loading = true; emit(); scope.launch { loadSessions() } }

103+ Event.LoadSessions -> {

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

105+ loading = true; emit()

106+ loadSessionsJob?.cancel()

107+ loadSessionsJob = scope.launch { loadSessions() }

108+ }

75109

76110 is Event.SelectSession -> {

77− currentSessionTitle = sessions.firstOrNull { it.id == event.id }?.title.orEmpty()

111+ // The session may have been deleted (e.g. via SSE) while the list was on

112+ // screen; opening it would only 404 on loadMessages. Bail with an error.

113+ val session = sessions.firstOrNull { it.id == event.id }

114+ if (session == null) { error = "Session no longer exists"; emit(); return }

115+ currentSessionTitle = session.title

78116 currentSessionId = event.id

79117 messages.clear()

118+ removedMessageIds.clear()

80119 screen = Screen.Chat

81120 loading = true

121+ generating = false

82122 error = null

83123 emit()

84− scope.launch { loadMessages(event.id) }

124+ connectJob?.cancel()

125+ abortJob?.cancel()

126+ sendMessageJob?.cancel()

127+ deleteSessionJob?.cancel()

128+ loadMessagesJob?.cancel()

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

85130 }

86131

87− Event.CreateSession -> { loading = true; emit(); scope.launch { createSession() } }

132+ Event.CreateSession -> {

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

134+ loading = true; error = null; emit()

135+ createSessionJob?.cancel()

136+ createSessionJob = scope.launch { createSession() }

137+ }

88138

89139 is Event.DeleteSession -> {

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

90141 val id = event.id

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

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

93− loading = true; emit()

94− scope.launch {

144+ loading = true; error = null; emit()

145+ deleteSessionJob?.cancel()

146+ deleteSessionJob = scope.launch {

95147 http.delete("$serverUrl/session/$id", authHeader()).fold(

96148 onSuccess = { resp ->

97149 if (resp.code in 200..299) {

@@ -124,17 +176,32 @@ class OpencodeCore(

124176 messages.forEach { it.streaming = false }

125177 emit()

126178 val id = currentSessionId ?: return

127− 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()) }

128183 }

129184

130185 Event.NavigateToSessions -> {

131186 screen = Screen.Sessions

132187 currentSessionId = null

133188 messages.clear()

189+ removedMessageIds.clear()

190+ draft = ""

134191 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

135195 loading = true

136196 emit()

137− scope.launch { loadSessions() }

197+ connectJob?.cancel()

198+ abortJob?.cancel()

199+ createSessionJob?.cancel()

200+ deleteSessionJob?.cancel()

201+ sendMessageJob?.cancel()

202+ loadMessagesJob?.cancel()

203+ loadSessionsJob?.cancel()

204+ loadSessionsJob = scope.launch { loadSessions() }

138205 }

139206

140207 Event.NavigateToConnect -> {

@@ -144,7 +211,18 @@ class OpencodeCore(

144211 generating = false

145212 sessions.clear()

146213 messages.clear()

214+ removedMessageIds.clear()

147215 currentSessionId = null

216+ draft = ""

217+ // Reset to the default so a late-firing close callback from the old

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

219+ sseConnected = true

220+ connectJob?.cancel()

221+ abortJob?.cancel()

222+ createSessionJob?.cancel()

223+ deleteSessionJob?.cancel()

224+ sendMessageJob?.cancel()

225+ loadMessagesJob?.cancel()

148226 closeSse()

149227 emit()

150228 }

@@ -158,26 +236,44 @@ class OpencodeCore(

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

159237 }

160238

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

162251

163252 // ── Effects ────────────────────────────────────────────────────────────────

164253 private fun sendMessage(raw: String) {

165254 val text = raw.trim()

166255 val session = currentSessionId ?: return

167256 if (text.isEmpty()) return

257+ // Debounce rapid double-taps on send: a send is already in flight, so a second

258+ // tap would create a duplicate user message and fire a duplicate request.

259+ if (generating) return

168260 localSeq += 1

169261 val user = MsgState("local-$localSeq", "user", System.currentTimeMillis()).apply {

170262 status = MessageStatus.Pending

171263 textParts["local"] = text

172264 }

173265 messages.add(user)

266+ // Keep the draft text so we can restore it if the send fails; otherwise the

267+ // user's message is lost and they'd have to retype it.

268+ val savedDraft = draft

174269 draft = ""

175270 generating = true

176271 error = null

177272 emit()

178273

179274 val body = Protocol.json.encodeToString(PromptBody.serializer(), PromptBody(listOf(TextInput(text = text))))

180− scope.launch {

275+ sendMessageJob?.cancel()

276+ sendMessageJob = scope.launch {

181277 val result = http.postJson("$serverUrl/session/$session/prompt_async", body, authHeader())

182278 result.fold(

183279 onSuccess = { resp ->

@@ -186,12 +282,16 @@ class OpencodeCore(

186282 } else {

187283 messages.firstOrNull { it.id == user.id }?.status = MessageStatus.Failed

188284 generating = false

285+ messages.forEach { it.streaming = false }

286+ draft = savedDraft

189287 error = "Server returned status ${resp.code}"

190288 }

191289 },

192290 onFailure = { e ->

193291 messages.firstOrNull { it.id == user.id }?.status = MessageStatus.Failed

194292 generating = false

293+ messages.forEach { it.streaming = false }

294+ draft = savedDraft

195295 error = "Request failed: ${e.message}"

196296 },

197297 )

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

206306 when {

207307 resp.code == 401 -> {

208308 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

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

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

211315 authRequired = true

@@ -220,10 +324,14 @@ class OpencodeCore(

220324 loading = true

221325 emit()

222326 startSse()

223− loadSessions()

327+ // Route through loadSessionsJob so a prior in-flight loadSessions

328+ // (e.g. from a rapid double-connect) is cancelled first.

329+ loadSessionsJob?.cancel()

330+ loadSessionsJob = scope.launch { loadSessions() }

224331 }

225332 else -> {

226333 loading = false

334+ connected = false

227335 error = "Server returned status ${resp.code}"

228336 emit()

229337 }

@@ -231,6 +339,7 @@ class OpencodeCore(

231339 },

232340 onFailure = { e ->

233341 loading = false

342+ connected = false

234343 error = "Connection failed: ${e.message}"

235344 emit()

236345 },

@@ -243,6 +352,9 @@ class OpencodeCore(

243352 if (resp.code in 200..299) {

244353 sessions.clear()

245354 sessions.addAll(Protocol.parseSessions(resp.body).map { SessionView(it.id, displayTitle(it.title)) })

355+ // Impose a stable alphabetical order so the list doesn't shuffle with

356+ // whatever order the server happens to return sessions in.

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

246358 } else {

247359 error = "Server returned status ${resp.code}"

248360 }

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

260372 if (session != null) {

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

262374 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() }

263379 }

264380 emit()

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

@@ -281,6 +397,7 @@ class OpencodeCore(

281397 loading = false

282398 if (resp.code in 200..299) {

283399 messages.clear()

400+ removedMessageIds.clear()

284401 messages.addAll(Protocol.parseMessages(resp.body).map(::messageFromWire))

285402 generating = messages.any { it.streaming }

286403 } else {

@@ -291,6 +408,7 @@ class OpencodeCore(

291408 onFailure = { e ->

292409 if (!isCurrent(sessionId)) { loading = false; return }

293410 loading = false

411+ generating = false

294412 error = "Request failed: ${e.message}"

295413 emit()

296414 },

@@ -319,6 +437,8 @@ class OpencodeCore(

319437

320438 private fun closeSse() {

321439 sseClosedIntentionally = true

440+ reconnectJob?.cancel()

441+ reconnectJob = null

322442 sse?.close()

323443 sse = null

324444 }

@@ -329,7 +449,10 @@ class OpencodeCore(

329449 // stream reconnects (onStateChange(true)) so a healthy server starts fresh.

330450 val delayMs = (2000L * (1L shl reconnectAttempts)).coerceAtMost(30_000L)

331451 if (delayMs < 30_000L) reconnectAttempts += 1

332− scope.launch {

452+ // Cancel any pending reconnect so rapid network flapping can't stack multiple

453+ // coroutines that each open a new SSE connection.

454+ reconnectJob?.cancel()

455+ reconnectJob = scope.launch {

333456 delay(delayMs)

334457 if (!sseClosedIntentionally && connected && screen != Screen.Connect) startSse()

335458 }

@@ -348,6 +471,9 @@ class OpencodeCore(

348471 is Protocol.Event.MessageUpdated -> {

349472 val info = event.info

350473 if (info.role != "assistant" || !isCurrent(info.sessionId)) return false

474+ // A MessageRemoved may have arrived before this (late/out-of-order) update;

475+ // don't re-create a message the server has already deleted.

476+ if (info.id in removedMessageIds) return false

351477 val streaming = info.time.completed == null && info.error == null

352478 val existing = messages.firstOrNull { it.id == info.id }

353479 if (existing != null) {

@@ -356,23 +482,31 @@ class OpencodeCore(

356482 } else {

357483 messages.add(MsgState(info.id, "assistant", info.time.created).apply { this.streaming = streaming })

358484 }

359− info.error?.let { error = it.message(); generating = false }

485+ info.error?.let { error = it.message(); messages.forEach { m -> m.streaming = false }; generating = false }

360486 return true

361487 }

362488

363489 is Protocol.Event.PartUpdated -> {

364490 val part = event.part

365491 val msg = messages.firstOrNull { it.id == part.messageId } ?: return false

366− when (part) {

367− is Protocol.Part.Text -> if (!part.synthetic) {

492+ // Synthetic text parts are intentionally skipped; report no change so we

493+ // don't trigger a needless re-render/emit for them.

494+ return when (part) {

495+ is Protocol.Part.Text -> if (part.synthetic) {

496+ false

497+ } else {

368498 msg.textParts[part.id] = pickText(part.text, event.delta, msg.textParts[part.id])

499+ true

369500 }

370− is Protocol.Part.Reasoning ->

501+ is Protocol.Part.Reasoning -> {

371502 msg.reasoningParts[part.id] = pickText(part.text, event.delta, msg.reasoningParts[part.id])

372− is Protocol.Part.Tool ->

503+ true

504+ }

505+ is Protocol.Part.Tool -> {

373506 msg.toolParts[part.id] = ToolView(part.tool, part.status, part.title)

507+ true

508+ }

374509 }

375− return true

376510 }

377511

378512 is Protocol.Event.PartRemoved -> {

@@ -381,7 +515,11 @@ class OpencodeCore(

381515 return true

382516 }

383517

384− is Protocol.Event.MessageRemoved -> return messages.removeAll { it.id == event.messageId }

518+ is Protocol.Event.MessageRemoved -> {

519+ // Remember the ID so a late MessageUpdated can't resurrect the message.

520+ removedMessageIds.add(event.messageId)

521+ return messages.removeAll { it.id == event.messageId }

522+ }

385523

386524 is Protocol.Event.SessionIdle -> {

387525 if (!isCurrent(event.sessionId)) return false

@@ -407,6 +545,9 @@ class OpencodeCore(

407545 } else {

408546 sessions.add(0, SessionView(event.info.id, title))

409547 }

548+ // Keep the list alphabetically sorted (matching loadSessions) so an

549+ // upserted session doesn't jump to the top and break the ordering.

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

410551 if (isCurrent(event.info.id)) currentSessionTitle = title

411552 return true

412553 }

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+293−22

@@ -3,6 +3,8 @@ package soy.iko.opencode.ui.components

33import android.content.ClipData

44import android.content.ClipboardManager

55import android.content.Context

6+import android.content.Intent

7+import android.net.Uri

68import android.widget.Toast

79import androidx.compose.foundation.ExperimentalFoundationApi

810import androidx.compose.foundation.background

@@ -13,14 +15,20 @@ import androidx.compose.foundation.layout.Column

1315import androidx.compose.foundation.layout.Row

1416import androidx.compose.foundation.layout.fillMaxWidth

1517import androidx.compose.foundation.layout.padding

18+import androidx.compose.foundation.layout.size

1619import androidx.compose.foundation.layout.widthIn

1720import androidx.compose.foundation.shape.RoundedCornerShape

21+import androidx.compose.foundation.text.selection.SelectionContainer

1822import androidx.compose.material.icons.Icons

1923import androidx.compose.material.icons.filled.Build

24+import androidx.compose.material.icons.filled.Check

2025import androidx.compose.material.icons.filled.ErrorOutline

2126import androidx.compose.material.icons.filled.ExpandLess

2227import androidx.compose.material.icons.filled.ExpandMore

2328import androidx.compose.material.icons.filled.Schedule

29+import androidx.compose.material.icons.filled.SmartToy

30+import androidx.compose.material3.DropdownMenu

31+import androidx.compose.material3.DropdownMenuItem

2432import androidx.compose.material3.Icon

2533import androidx.compose.material3.MaterialTheme

2634import androidx.compose.material3.Text

@@ -34,9 +42,20 @@ import androidx.compose.ui.Modifier

3442import androidx.compose.ui.draw.clip

3543import androidx.compose.ui.graphics.Color

3644import androidx.compose.ui.platform.LocalContext

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

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

47+import androidx.compose.ui.text.SpanStyle

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

49+import androidx.compose.ui.text.buildAnnotatedString

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

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

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

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

54+import androidx.compose.ui.text.withStyle

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

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

3957import androidx.compose.ui.unit.dp

58+import androidx.compose.ui.unit.sp

4059import soy.iko.opencode.core.MessageStatus

4160import soy.iko.opencode.core.MessageView

4261import soy.iko.opencode.core.ToolView

@@ -46,7 +65,7 @@ private val timeFormat = java.time.format.DateTimeFormatter.ofPattern("HH:mm")

4665

4766@OptIn(ExperimentalFoundationApi::class)

4867@Composable

49−fun MessageBubble(message: MessageView, modifier: Modifier = Modifier) {

68+fun MessageBubble(message: MessageView, modifier: Modifier = Modifier, onRetry: () -> Unit = {}, compactSpacing: Boolean = false) {

5069 val isUser = message.isUser

5170 val bubbleColor = if (isUser) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surfaceVariant

5271 val textColor = if (isUser) MaterialTheme.colorScheme.onPrimaryContainer else MaterialTheme.colorScheme.onSurface

@@ -59,11 +78,20 @@ fun MessageBubble(message: MessageView, modifier: Modifier = Modifier) {

5978 )

6079

6180 val context = LocalContext.current

81+ var showMenu by remember { mutableStateOf(false) }

6282

6383 Row(

64− modifier = modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 4.dp),

84+ modifier = modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = if (compactSpacing) 1.dp else 4.dp),

6585 horizontalArrangement = if (isUser) Arrangement.End else Arrangement.Start,

6686 ) {

87+ if (!isUser) {

88+ Icon(

89+ Icons.Filled.SmartToy,

90+ contentDescription = null,

91+ tint = MaterialTheme.colorScheme.primary,

92+ modifier = Modifier.align(Alignment.Top).padding(end = 6.dp, top = 2.dp).size(28.dp),

93+ )

94+ }

6795 Column(

6896 modifier = Modifier

6997 .fillMaxWidth(0.85f)

@@ -74,25 +102,67 @@ fun MessageBubble(message: MessageView, modifier: Modifier = Modifier) {

74102 onClick = {},

75103 onLongClick = {

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

77− copyToClipboard(context, message.text)

78− Toast.makeText(context, "Copied", Toast.LENGTH_SHORT).show()

105+ showMenu = true

79106 }

80107 },

81108 )

82109 .padding(horizontal = 14.dp, vertical = 10.dp),

83110 ) {

84− message.reasoning?.let { ReasoningBlock(it) }

111+ DropdownMenu(expanded = showMenu, onDismissRequest = { showMenu = false }) {

112+ DropdownMenuItem(

113+ text = { Text("Copy") },

114+ onClick = {

115+ copyToClipboard(context, message.text)

116+ Toast.makeText(context, "Copied", Toast.LENGTH_SHORT).show()

117+ showMenu = false

118+ },

119+ )

120+ DropdownMenuItem(

121+ text = { Text("Share") },

122+ onClick = {

123+ shareText(context, message.text)

124+ showMenu = false

125+ },

126+ )

127+ }

85128

86− message.tools.forEach { ToolRow(it) }

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

87130

88− if (message.text.isNotEmpty()) {

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

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

89133 Text(

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

91− color = textColor,

92− style = MaterialTheme.typography.bodyLarge,

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

135+ style = MaterialTheme.typography.labelSmall,

136+ color = MaterialTheme.colorScheme.onSurfaceVariant,

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

93138 )

94− } else if (message.streaming && message.tools.isEmpty() && message.reasoning == null) {

95− Text("▌", color = textColor, style = MaterialTheme.typography.bodyLarge)

139+ }

140+

141+ message.tools.forEach { ToolRow(it) }

142+

143+ SelectionContainer {

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

152+ Text(

153+ text = annotatedText,

154+ color = textColor,

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

156+ // spacing for readability; user bubbles keep the default.

157+ style = if (isUser) {

158+ MaterialTheme.typography.bodyLarge

159+ } else {

160+ MaterialTheme.typography.bodyLarge.copy(lineHeight = 22.sp)

161+ },

162+ )

163+ } else if (message.streaming && message.tools.isEmpty() && message.reasoning == null) {

164+ Text("▌", color = textColor, style = MaterialTheme.typography.bodyLarge)

165+ }

96166 }

97167

98168 if (message.time > 0) {

@@ -105,7 +175,7 @@ fun MessageBubble(message: MessageView, modifier: Modifier = Modifier) {

105175 }

106176

107177 if (isUser && message.status != MessageStatus.Sent) {

108− StatusLine(message.status)

178+ StatusLine(message.status, onRetry = onRetry)

109179 }

110180 }

111181 }

@@ -116,8 +186,172 @@ private fun copyToClipboard(context: Context, text: String) {

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

117187}

118188

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+

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

346+ val intent = Intent(Intent.ACTION_SEND).apply {

347+ type = "text/plain"

348+ putExtra(Intent.EXTRA_TEXT, text)

349+ }

350+ context.startActivity(Intent.createChooser(intent, null))

351+}

352+

119353@Composable

120−private fun ReasoningBlock(text: String) {

354+private fun ReasoningBlock(text: String, context: Context) {

121355 var expanded by remember { mutableStateOf(false) }

122356 Column(modifier = Modifier.padding(bottom = 6.dp)) {

123357 Row(

@@ -143,6 +377,17 @@ private fun ReasoningBlock(text: String) {

143377 color = MaterialTheme.colorScheme.onSurfaceVariant,

144378 modifier = Modifier.padding(top = 4.dp),

145379 )

380+ Text(

381+ text = "Copy",

382+ style = MaterialTheme.typography.labelSmall,

383+ color = MaterialTheme.colorScheme.primary,

384+ modifier = Modifier

385+ .padding(top = 4.dp)

386+ .clickable {

387+ copyToClipboard(context, text)

388+ Toast.makeText(context, "Copied", Toast.LENGTH_SHORT).show()

389+ },

390+ )

146391 }

147392 }

148393}

@@ -150,6 +395,13 @@ private fun ReasoningBlock(text: String) {

150395@Composable

151396private fun ToolRow(tool: ToolView) {

152397 var expanded by remember { mutableStateOf(false) }

398+ val baseColor = MaterialTheme.colorScheme.onSurfaceVariant

399+ val statusColor = when (tool.status) {

400+ "completed", "success" -> MaterialTheme.colorScheme.primary

401+ "error", "failed" -> MaterialTheme.colorScheme.error

402+ "pending", "running", "in_progress" -> MaterialTheme.colorScheme.onSurfaceVariant

403+ else -> MaterialTheme.colorScheme.onSurfaceVariant

404+ }

153405 Row(

154406 verticalAlignment = Alignment.CenterVertically,

155407 modifier = Modifier

@@ -164,14 +416,23 @@ private fun ToolRow(tool: ToolView) {

164416 modifier = Modifier.padding(end = 6.dp).widthIn(max = 16.dp),

165417 )

166418 Text(

167− text = buildString {

168− append(tool.name)

169− append(" · ")

170− append(tool.status)

171− if (expanded) tool.title?.let { append(" — "); append(it) }

419+ text = buildAnnotatedString {

420+ withStyle(SpanStyle(color = baseColor)) {

421+ append(tool.name)

422+ append(" · ")

423+ }

424+ withStyle(SpanStyle(color = statusColor)) {

425+ append(tool.status)

426+ }

427+ if (expanded) tool.title?.let {

428+ withStyle(SpanStyle(color = baseColor)) {

429+ append(" — ")

430+ append(it)

431+ }

432+ }

172433 },

173434 style = MonoStyle,

174− color = MaterialTheme.colorScheme.onSurfaceVariant,

435+ color = baseColor,

175436 maxLines = if (expanded) Int.MAX_VALUE else 1,

176437 overflow = TextOverflow.Ellipsis,

177438 modifier = Modifier.weight(1f),

@@ -186,11 +447,11 @@ private fun ToolRow(tool: ToolView) {

186447}

187448

188449@Composable

189−private fun StatusLine(status: MessageStatus) {

450+private fun StatusLine(status: MessageStatus, onRetry: () -> Unit) {

190451 val (icon, label, tint) = when (status) {

191452 MessageStatus.Pending -> Triple(Icons.Filled.Schedule, "Sending…", MaterialTheme.colorScheme.onPrimaryContainer)

192453 MessageStatus.Failed -> Triple(Icons.Filled.ErrorOutline, "Failed to send", MaterialTheme.colorScheme.error)

193− MessageStatus.Sent -> Triple(Icons.Filled.Schedule, "", Color.Unspecified)

454+ MessageStatus.Sent -> Triple(Icons.Filled.Check, "", Color.Unspecified)

194455 }

195456 Row(

196457 verticalAlignment = Alignment.CenterVertically,

@@ -204,5 +465,15 @@ private fun StatusLine(status: MessageStatus) {

204465 color = tint,

205466 modifier = Modifier.padding(start = 4.dp),

206467 )

468+ if (status == MessageStatus.Failed) {

469+ Text(

470+ text = "Retry",

471+ style = MaterialTheme.typography.labelSmall,

472+ color = MaterialTheme.colorScheme.primary,

473+ modifier = Modifier

474+ .padding(start = 12.dp)

475+ .clickable { onRetry() },

476+ )

477+ }

207478 }

208479}

app/src/main/java/soy/iko/opencode/ui/screens/ChatScreen.kt+322−18

@@ -1,36 +1,57 @@

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

8+import androidx.compose.animation.core.RepeatMode

9+import androidx.compose.animation.core.animateFloat

10+import androidx.compose.animation.core.infiniteRepeatable

11+import androidx.compose.animation.core.rememberInfiniteTransition

12+import androidx.compose.animation.core.tween

413import androidx.compose.animation.fadeIn

514import androidx.compose.animation.fadeOut

615import androidx.compose.animation.scaleIn

716import androidx.compose.animation.scaleOut

17+import androidx.compose.foundation.ExperimentalFoundationApi

818import androidx.compose.foundation.background

19+import androidx.compose.foundation.clickable

20+import androidx.compose.foundation.combinedClickable

921import androidx.compose.foundation.layout.Arrangement

1022import androidx.compose.foundation.layout.Box

1123import androidx.compose.foundation.layout.BoxScope

1224import androidx.compose.foundation.layout.Column

1325import androidx.compose.foundation.layout.Row

26+import androidx.compose.foundation.layout.Spacer

1427import androidx.compose.foundation.layout.fillMaxSize

1528import androidx.compose.foundation.layout.fillMaxWidth

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

1630import androidx.compose.foundation.layout.PaddingValues

31+import androidx.compose.foundation.layout.WindowInsets

32+import androidx.compose.foundation.layout.ime

1733import androidx.compose.foundation.layout.imePadding

1834import androidx.compose.foundation.layout.padding

1935import androidx.compose.foundation.layout.size

2036import androidx.compose.foundation.lazy.LazyColumn

21−import androidx.compose.foundation.lazy.items

37+import androidx.compose.foundation.lazy.itemsIndexed

2238import androidx.compose.foundation.lazy.rememberLazyListState

2339import androidx.compose.foundation.shape.CircleShape

40+import androidx.compose.foundation.shape.RoundedCornerShape

2441import androidx.compose.foundation.text.KeyboardActions

2542import androidx.compose.foundation.text.KeyboardOptions

2643import androidx.compose.material.icons.Icons

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

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

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

47+import androidx.compose.material.icons.filled.Close

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

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

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

3151import androidx.compose.material3.CircularProgressIndicator

3252import androidx.compose.material3.ExperimentalMaterial3Api

3353import androidx.compose.material3.FilledIconButton

54+import androidx.compose.material3.FilledTonalButton

3455import androidx.compose.material3.FloatingActionButton

3556import androidx.compose.material3.Icon

3657import androidx.compose.material3.IconButton

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

4061import androidx.compose.material3.Scaffold

4162import androidx.compose.material3.Surface

4263import androidx.compose.material3.Text

64+import androidx.compose.material3.TextButton

4365import androidx.compose.material3.TopAppBar

4466import androidx.compose.runtime.Composable

4567import androidx.compose.runtime.LaunchedEffect

@@ -53,8 +75,13 @@ import androidx.compose.ui.Alignment

5375import androidx.compose.ui.Modifier

5476import androidx.compose.ui.draw.clip

5577import androidx.compose.ui.hapticfeedback.HapticFeedbackType

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

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

80+import androidx.compose.ui.platform.LocalDensity

5681import androidx.compose.ui.platform.LocalHapticFeedback

82+import androidx.compose.ui.text.font.FontStyle

5783import androidx.compose.ui.text.input.ImeAction

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

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

5986import androidx.compose.ui.unit.dp

6087import kotlinx.coroutines.launch

@@ -62,11 +89,17 @@ import soy.iko.opencode.core.Event

6289import soy.iko.opencode.core.UiState

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

6491

65−@OptIn(ExperimentalMaterial3Api::class)

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

6693@Composable

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

6895 val listState = rememberLazyListState()

6996 val coroutineScope = rememberCoroutineScope()

97+ val context = LocalContext.current

98+

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

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

101+ // observes snapshot state, so this flips as the keyboard opens/closes.

102+ val isImeVisible = WindowInsets.ime.getBottom(LocalDensity.current) > 0

70103

71104 // Show a jump-to-bottom button once the user scrolls up away from the latest

72105 // message. derivedStateOf keeps this from recomposing on every pixel of scroll —

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

80113 }

81114 }

82115

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+

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

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

85124 var lastSeenCount by remember { mutableStateOf(0) }

@@ -109,10 +148,20 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {

109148 topBar = {

110149 TopAppBar(

111150 title = {

151+ val title = state.currentSessionTitle.ifEmpty { "Chat" }

112152 Text(

113− text = state.currentSessionTitle.ifEmpty { "Chat" },

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

114154 maxLines = 1,

115155 overflow = TextOverflow.Ellipsis,

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+ ),

116165 )

117166 },

118167 navigationIcon = {

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

134183 ChatInputBar(

135184 draft = state.draft,

136185 generating = state.generating,

186+ loading = state.loading && state.messages.isEmpty(),

137187 onDraftChange = { dispatch(Event.DraftChanged(it)) },

138188 onSend = { dispatch(Event.SendMessage(state.draft)) },

139189 onStop = { dispatch(Event.CancelGeneration) },

@@ -147,35 +197,86 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {

147197 if (state.loading && state.messages.isEmpty()) {

148198 LinearProgressIndicator(Modifier.fillMaxWidth())

149199 }

200+ if (state.error != null && state.messages.isNotEmpty()) {

201+ ErrorBanner(

202+ message = state.error,

203+ onDismiss = { dispatch(Event.DismissError) },

204+ )

205+ }

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

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

152− Text(

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

154− style = MaterialTheme.typography.bodyMedium,

155− color = MaterialTheme.colorScheme.onSurfaceVariant,

208+ Column(

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

157− )

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

158226 }

159227 LazyColumn(

160228 state = listState,

161229 modifier = Modifier.fillMaxSize(),

162230 contentPadding = PaddingValues(vertical = 8.dp),

163231 ) {

164− items(state.messages, key = { it.id }) { message ->

165− MessageBubble(message)

232+ itemsIndexed(state.messages, key = { _, message -> message.id }) { index, message ->

233+ // Insert a date separator whenever a message falls on a different

234+ // calendar day than the one before it (and above the first message).

235+ val previous = state.messages.getOrNull(index - 1)

236+ if (shouldShowDateSeparator(previous, message)) {

237+ DateSeparator(message.time)

238+ }

239+ val sameSenderAsPrevious = index > 0 && state.messages[index - 1].isUser == message.isUser

240+ MessageBubble(

241+ message,

242+ onRetry = { dispatch(Event.SendMessage(message.text)) },

243+ compactSpacing = sameSenderAsPrevious,

244+ )

245+ }

246+ // While the assistant is spinning up but hasn't emitted a streaming

247+ // message yet (only the user's message is present), show a typing

248+ // indicator so the wait doesn't look like a stall.

249+ if (state.generating && state.messages.none { it.streaming }) {

250+ item(key = "typing-indicator") {

251+ TypingIndicator()

252+ }

166253 }

167254 }

168255 ScrollToBottomButton(

169− visible = showScrollButton,

256+ visible = showScrollButton && !isImeVisible,

170257 showBadge = hasUnseenMessages,

171258 onClick = {

172259 coroutineScope.launch {

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

174− 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)

175268 }

176269 }

177270 },

178271 )

272+ ScrollToTopButton(

273+ visible = showScrollTop,

274+ onClick = {

275+ coroutineScope.launch {

276+ listState.animateScrollToItem(0)

277+ }

278+ },

279+ )

179280 }

180281 }

181282 }

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

215316 }

216317}

217318

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+

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

349+

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

351+private fun localDayOf(epochMillis: Long): java.time.LocalDate =

352+ java.time.Instant.ofEpochMilli(epochMillis)

353+ .atZone(java.time.ZoneId.systemDefault())

354+ .toLocalDate()

355+

356+/**

357+ * A separator is shown above a message when it starts a new calendar day — i.e. the

358+ * first timestamped message, or one whose day differs from the previous message's.

359+ * Messages without a valid time (time <= 0) never get one.

360+ */

361+private fun shouldShowDateSeparator(previous: soy.iko.opencode.core.MessageView?, current: soy.iko.opencode.core.MessageView): Boolean {

362+ if (current.time <= 0) return false

363+ if (previous == null || previous.time <= 0) return true

364+ return localDayOf(previous.time) != localDayOf(current.time)

365+}

366+

367+/** Human-friendly day label: "Today", "Yesterday", or "MMM d" (e.g. "Jul 8"). */

368+private fun dateSeparatorLabel(day: java.time.LocalDate): String {

369+ val today = java.time.LocalDate.now()

370+ return when (day) {

371+ today -> "Today"

372+ today.minusDays(1) -> "Yesterday"

373+ else -> day.format(dateSeparatorFormat)

374+ }

375+}

376+

377+@Composable

378+private fun DateSeparator(epochMillis: Long) {

379+ Text(

380+ text = dateSeparatorLabel(localDayOf(epochMillis)),

381+ style = MaterialTheme.typography.labelSmall,

382+ color = MaterialTheme.colorScheme.onSurfaceVariant,

383+ textAlign = TextAlign.Center,

384+ modifier = Modifier.fillMaxWidth().padding(vertical = 8.dp),

385+ )

386+}

387+

388+// Assistant-style bubble with three sequentially-pulsing dots, shown as a stand-in

389+// until the real streaming reply starts. Mirrors MessageBubble's left-aligned,

390+// surfaceVariant look so it reads as an incoming message.

391+@Composable

392+private fun TypingIndicator() {

393+ val shape = RoundedCornerShape(topStart = 16.dp, topEnd = 16.dp, bottomStart = 4.dp, bottomEnd = 16.dp)

394+ val transition = rememberInfiniteTransition(label = "typing")

395+ Row(

396+ modifier = Modifier.fillMaxWidth().padding(horizontal = 12.dp, vertical = 4.dp),

397+ horizontalArrangement = Arrangement.Start,

398+ ) {

399+ Row(

400+ modifier = Modifier

401+ .clip(shape)

402+ .background(MaterialTheme.colorScheme.surfaceVariant)

403+ .padding(horizontal = 14.dp, vertical = 12.dp),

404+ verticalAlignment = Alignment.CenterVertically,

405+ horizontalArrangement = Arrangement.spacedBy(6.dp),

406+ ) {

407+ Text(

408+ text = "Thinking",

409+ style = MaterialTheme.typography.bodyMedium.copy(fontStyle = FontStyle.Italic),

410+ color = MaterialTheme.colorScheme.onSurfaceVariant,

411+ )

412+ Row(horizontalArrangement = Arrangement.spacedBy(4.dp)) {

413+ // Stagger the three dots so they fade in and out in sequence.

414+ listOf(0, 150, 300).forEach { staggerMs ->

415+ val alpha by transition.animateFloat(

416+ initialValue = 0.2f,

417+ targetValue = 1f,

418+ animationSpec = infiniteRepeatable(

419+ animation = tween(durationMillis = 600, delayMillis = staggerMs),

420+ repeatMode = RepeatMode.Reverse,

421+ ),

422+ label = "dot",

423+ )

424+ Box(

425+ modifier = Modifier

426+ .size(6.dp)

427+ .clip(CircleShape)

428+ .background(MaterialTheme.colorScheme.onSurfaceVariant.copy(alpha = alpha)),

429+ )

430+ }

431+ }

432+ }

433+ }

434+}

435+

218436@Composable

219437private fun ReconnectingBanner() {

220438 Surface(

@@ -240,35 +458,109 @@ private fun ReconnectingBanner() {

240458 }

241459}

242460

461+@Composable

462+private fun ErrorBanner(message: String, onDismiss: () -> Unit) {

463+ Surface(

464+ modifier = Modifier.fillMaxWidth(),

465+ color = MaterialTheme.colorScheme.errorContainer,

466+ ) {

467+ Row(

468+ modifier = Modifier.fillMaxWidth().padding(start = 16.dp, top = 6.dp, bottom = 6.dp, end = 4.dp),

469+ verticalAlignment = Alignment.CenterVertically,

470+ horizontalArrangement = Arrangement.spacedBy(8.dp),

471+ ) {

472+ Text(

473+ text = message,

474+ style = MaterialTheme.typography.bodySmall,

475+ color = MaterialTheme.colorScheme.onErrorContainer,

476+ modifier = Modifier.weight(1f),

477+ )

478+ IconButton(onClick = onDismiss, modifier = Modifier.size(32.dp)) {

479+ Icon(

480+ Icons.Filled.Close,

481+ contentDescription = "Dismiss error",

482+ tint = MaterialTheme.colorScheme.onErrorContainer,

483+ modifier = Modifier.size(18.dp),

484+ )

485+ }

486+ }

487+ }

488+}

489+

243490@Composable

244491private fun ChatInputBar(

245492 draft: String,

246493 generating: Boolean,

494+ loading: Boolean,

247495 onDraftChange: (String) -> Unit,

248496 onSend: () -> Unit,

249497 onStop: () -> Unit,

250498) {

251499 val haptic = LocalHapticFeedback.current

500+ val clipboardManager = LocalClipboardManager.current

252501 Surface(tonalElevation = 3.dp) {

253− Row(

502+ Column(

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

504+ ) {

505+ Row(

506+ modifier = Modifier.fillMaxWidth(),

255507 verticalAlignment = Alignment.Bottom,

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

257509 ) {

258510 OutlinedTextField(

259511 value = draft,

260512 onValueChange = onDraftChange,

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

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

514+ enabled = !loading,

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

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

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

265551 keyboardActions = KeyboardActions(onSend = {

266− if (!generating && draft.isNotBlank()) onSend()

552+ if (!generating && !loading && draft.isNotBlank()) onSend()

267553 }),

268554 )

269555 if (generating) {

270− FilledIconButton(onClick = onStop) {

271− Icon(Icons.Filled.Stop, contentDescription = "Stop generating")

556+ FilledTonalButton(onClick = onStop) {

557+ Icon(

558+ Icons.Filled.Stop,

559+ contentDescription = null,

560+ modifier = Modifier.size(18.dp),

561+ )

562+ Spacer(Modifier.size(6.dp))

563+ Text("Stop")

272564 }

273565 } else {

274566 FilledIconButton(

@@ -276,11 +568,23 @@ private fun ChatInputBar(

276568 haptic.performHapticFeedback(HapticFeedbackType.LongPress)

277569 onSend()

278570 },

279− enabled = draft.isNotBlank(),

571+ enabled = draft.isNotBlank() && !loading,

280572 ) {

281573 Icon(Icons.AutoMirrored.Filled.Send, contentDescription = "Send")

282574 }

283575 }

284576 }

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

285589 }

286590}

app/src/main/java/soy/iko/opencode/ui/screens/ConnectScreen.kt+66−3

@@ -17,15 +17,21 @@ import androidx.compose.material.icons.Icons

1717import androidx.compose.material.icons.filled.Lock

1818import androidx.compose.material.icons.filled.Person

1919import androidx.compose.material.icons.filled.Terminal

20+import androidx.compose.material.icons.filled.Visibility

21+import androidx.compose.material.icons.filled.VisibilityOff

2022import androidx.compose.material3.Button

2123import androidx.compose.material3.CircularProgressIndicator

2224import androidx.compose.material3.Icon

25+import androidx.compose.material3.IconButton

2326import androidx.compose.material3.MaterialTheme

2427import androidx.compose.material3.OutlinedTextField

2528import androidx.compose.material3.Text

2629import androidx.compose.runtime.Composable

2730import androidx.compose.runtime.LaunchedEffect

31+import androidx.compose.runtime.getValue

32+import androidx.compose.runtime.mutableStateOf

2833import androidx.compose.runtime.remember

34+import androidx.compose.runtime.setValue

2935import androidx.compose.ui.Alignment

3036import androidx.compose.ui.Modifier

3137import androidx.compose.ui.focus.FocusRequester

@@ -33,6 +39,7 @@ import androidx.compose.ui.focus.focusRequester

3339import androidx.compose.ui.text.input.ImeAction

3440import androidx.compose.ui.text.input.KeyboardType

3541import androidx.compose.ui.text.input.PasswordVisualTransformation

42+import androidx.compose.ui.text.input.VisualTransformation

3643import androidx.compose.ui.text.style.TextAlign

3744import androidx.compose.ui.unit.dp

3845import soy.iko.opencode.core.Event

@@ -41,6 +48,7 @@ import soy.iko.opencode.core.UiState

4148@Composable

4249fun ConnectScreen(state: UiState, dispatch: (Event) -> Unit) {

4350 val focusRequester = remember { FocusRequester() }

51+ var passwordVisible by remember { mutableStateOf(false) }

4452

4553 // Focus the server URL field when the screen opens, but only when it's empty

4654 // so we don't steal focus (and pop the keyboard) on a return visit.

@@ -93,6 +101,30 @@ fun ConnectScreen(state: UiState, dispatch: (Event) -> Unit) {

93101 enabled = !state.loading,

94102 )

95103

104+ // Point first-time users at the expected address format. Hidden once they

105+ // start typing so it doesn't compete with the field's own contents.

106+ if (state.serverUrl.isEmpty()) {

107+ Spacer(Modifier.height(6.dp))

108+ Text(

109+ text = "Enter the URL of your opencode server (e.g. http://192.168.1.10:4096)",

110+ style = MaterialTheme.typography.bodySmall,

111+ color = MaterialTheme.colorScheme.onSurfaceVariant,

112+ textAlign = TextAlign.Center,

113+ )

114+ }

115+

116+ // Nudge the user if the URL looks like it's missing a scheme — a bare host:port

117+ // won't connect. Informational (tertiary), not an error, since it's a heuristic.

118+ if (state.serverUrl.isNotBlank() && "://" !in state.serverUrl && !state.serverUrl.startsWith("http")) {

119+ Spacer(Modifier.height(6.dp))

120+ Text(

121+ text = "Tip: Add http:// if connecting to a local server",

122+ style = MaterialTheme.typography.bodySmall,

123+ color = MaterialTheme.colorScheme.tertiary,

124+ textAlign = TextAlign.Center,

125+ )

126+ }

127+

96128 if (state.authRequired) {

97129 Spacer(Modifier.height(12.dp))

98130 OutlinedTextField(

@@ -111,11 +143,27 @@ fun ConnectScreen(state: UiState, dispatch: (Event) -> Unit) {

111143 onValueChange = { dispatch(Event.PasswordChanged(it)) },

112144 label = { Text("Password") },

113145 singleLine = true,

114− visualTransformation = PasswordVisualTransformation(),

146+ visualTransformation = if (passwordVisible) VisualTransformation.None else PasswordVisualTransformation(),

115147 leadingIcon = { Icon(Icons.Filled.Lock, contentDescription = null) },

148+ trailingIcon = {

149+ IconButton(onClick = { passwordVisible = !passwordVisible }) {

150+ Icon(

151+ imageVector = if (passwordVisible) Icons.Filled.VisibilityOff else Icons.Filled.Visibility,

152+ contentDescription = if (passwordVisible) "Hide password" else "Show password",

153+ )

154+ }

155+ },

116156 modifier = Modifier.fillMaxWidth(),

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

118− 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+ }),

119167 enabled = !state.loading,

120168 )

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

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

130178

131179 Button(

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

133− 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()),

134185 modifier = Modifier.fillMaxWidth(),

135186 ) {

136187 if (state.loading) {

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

144195 }

145196 }

146197

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+

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

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

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

app/src/main/java/soy/iko/opencode/ui/screens/SessionsScreen.kt+161−34

@@ -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,13 +21,17 @@ 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

2129import androidx.compose.material.icons.filled.ChatBubbleOutline

30+import androidx.compose.material.icons.filled.ChevronRight

2231import androidx.compose.material.icons.filled.DeleteOutline

2332import androidx.compose.material.icons.filled.Refresh

2433import androidx.compose.material3.AlertDialog

34+import androidx.compose.material3.CircularProgressIndicator

2535import androidx.compose.material3.ExperimentalMaterial3Api

2636import androidx.compose.material3.ExtendedFloatingActionButton

2737import androidx.compose.material3.HorizontalDivider

@@ -31,6 +41,7 @@ import androidx.compose.material3.LinearProgressIndicator

3141import androidx.compose.material3.MaterialTheme

3242import androidx.compose.material3.OutlinedTextField

3343import androidx.compose.material3.Scaffold

44+import androidx.compose.material3.Surface

3445import androidx.compose.material3.SwipeToDismissBox

3546import androidx.compose.material3.SwipeToDismissBoxValue

3647import androidx.compose.material3.Text

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

4758import androidx.compose.runtime.setValue

4859import androidx.compose.ui.Alignment

4960import androidx.compose.ui.Modifier

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

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

5063import androidx.compose.ui.hapticfeedback.HapticFeedbackType

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

5165import androidx.compose.ui.platform.LocalHapticFeedback

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

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

5368import androidx.compose.ui.unit.dp

5469import soy.iko.opencode.core.Event

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

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

6378 var isPullRefreshing by remember { mutableStateOf(false) }

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

6589

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

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

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

95119 Scaffold(

96120 topBar = {

97121 TopAppBar(

98− title = { Text("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+ },

99139 navigationIcon = {

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

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

@@ -109,14 +149,21 @@ fun SessionsScreen(state: UiState, dispatch: (Event) -> Unit) {

109149 )

110150 },

111151 floatingActionButton = {

112− ExtendedFloatingActionButton(

113− onClick = { dispatch(Event.CreateSession) },

114− icon = { Icon(Icons.Filled.Add, contentDescription = null) },

115− text = { Text("New session") },

116− )

152+ // Give the search results the full width while searching — the FAB would

153+ // otherwise cover the bottom rows and isn't relevant mid-search anyway.

154+ if (searchQuery.isEmpty()) {

155+ ExtendedFloatingActionButton(

156+ onClick = { dispatch(Event.CreateSession) },

157+ icon = { Icon(Icons.Filled.Add, contentDescription = null) },

158+ text = { Text("New session") },

159+ )

160+ }

117161 },

118162 ) { padding ->

119163 Column(Modifier.fillMaxSize().padding(padding)) {

164+ if (!state.sseConnected) {

165+ ReconnectingBanner()

166+ }

120167 if (state.loading && !isPullRefreshing) {

121168 LinearProgressIndicator(Modifier.fillMaxWidth())

122169 }

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

141188 }

142189 when {

143190 state.sessions.isEmpty() && !state.loading -> EmptySessions()

191+ filteredSessions.isEmpty() && searchQuery.isNotEmpty() -> NoSearchResults(searchQuery)

144192 else -> PullToRefreshBox(

145193 isRefreshing = isPullRefreshing,

146194 onRefresh = {

@@ -151,32 +199,37 @@ fun SessionsScreen(state: UiState, dispatch: (Event) -> Unit) {

151199 state = rememberPullToRefreshState(),

152200 ) {

153201 LazyColumn(

202+ state = sessionsListState,

154203 modifier = Modifier.fillMaxSize(),

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

156205 ) {

157206 items(filteredSessions, key = { it.id }) { session ->

158− val dismissState = rememberSwipeToDismissBoxState(

159− // Only a swipe from the end (right-to-left) triggers deletion;

160− // return false so the row snaps back and the confirm dialog decides.

161− confirmValueChange = { value ->

162− if (value == SwipeToDismissBoxValue.EndToStart) {

163− pendingDeleteId = session.id

164− }

165− false

166− },

167− )

168− SwipeToDismissBox(

169− state = dismissState,

170− enableDismissFromStartToEnd = false,

171− backgroundContent = { SwipeDeleteBackground() },

172− ) {

173− SessionRow(

174− session = session,

175− onOpen = { dispatch(Event.SelectSession(session.id)) },

176− onDelete = { pendingDeleteId = session.id },

207+ // animateItem() slides the remaining rows into place when one is

208+ // deleted (and fades new rows in) instead of snapping instantly.

209+ Column(modifier = Modifier.animateItem()) {

210+ val dismissState = rememberSwipeToDismissBoxState(

211+ // Only a swipe from the end (right-to-left) triggers deletion;

212+ // return false so the row snaps back and the confirm dialog decides.

213+ confirmValueChange = { value ->

214+ if (value == SwipeToDismissBoxValue.EndToStart) {

215+ pendingDeleteId = session.id

216+ }

217+ false

218+ },

177219 )

220+ SwipeToDismissBox(

221+ state = dismissState,

222+ enableDismissFromStartToEnd = false,

223+ backgroundContent = { SwipeDeleteBackground() },

224+ ) {

225+ SessionRow(

226+ session = session,

227+ onOpen = { dispatch(Event.SelectSession(session.id)) },

228+ onDelete = { pendingDeleteId = session.id },

229+ )

230+ }

231+ HorizontalDivider(color = MaterialTheme.colorScheme.outline.copy(alpha = 0.25f))

178232 }

179− HorizontalDivider(color = MaterialTheme.colorScheme.outline.copy(alpha = 0.25f))

180233 }

181234 }

182235 }

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

185238 }

186239}

187240

241+@OptIn(ExperimentalFoundationApi::class)

188242@Composable

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

244+ val context = LocalContext.current

190245 Row(

191246 modifier = Modifier

192247 .fillMaxWidth()

193248 .background(MaterialTheme.colorScheme.surface)

194− .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+ )

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

196257 verticalAlignment = Alignment.CenterVertically,

197258 ) {

@@ -216,17 +277,23 @@ private fun SessionRow(session: SessionView, onOpen: () -> Unit, onDelete: () ->

216277 overflow = TextOverflow.Ellipsis,

217278 )

218279 }

280+ Icon(

281+ Icons.Filled.ChevronRight,

282+ contentDescription = null,

283+ tint = MaterialTheme.colorScheme.onSurfaceVariant,

284+ modifier = Modifier.padding(horizontal = 4.dp),

285+ )

219286 IconButton(onClick = onDelete) {

220287 Icon(

221288 Icons.Filled.DeleteOutline,

222289 contentDescription = "Delete session",

223− tint = MaterialTheme.colorScheme.onSurfaceVariant,

290+ tint = MaterialTheme.colorScheme.error,

224291 )

225292 }

226293 }

227294}

228295

229−/** Red background with a trailing delete icon, revealed while swiping a session row away. */

296+/** Red background with a trailing delete icon and label, revealed while swiping a session row away. */

230297@Composable

231298private fun SwipeDeleteBackground() {

232299 Box(

@@ -236,18 +303,71 @@ private fun SwipeDeleteBackground() {

236303 .padding(horizontal = 24.dp),

237304 contentAlignment = Alignment.CenterEnd,

238305 ) {

239− Icon(

240− Icons.Filled.DeleteOutline,

241− contentDescription = null,

242− tint = MaterialTheme.colorScheme.onError,

243− )

306+ Row(verticalAlignment = Alignment.CenterVertically) {

307+ Icon(

308+ Icons.Filled.DeleteOutline,

309+ contentDescription = null,

310+ tint = MaterialTheme.colorScheme.onError,

311+ )

312+ Text(

313+ text = "Delete",

314+ style = MaterialTheme.typography.labelLarge,

315+ color = MaterialTheme.colorScheme.onError,

316+ modifier = Modifier.padding(start = 4.dp),

317+ )

318+ }

319+ }

320+}

321+

322+/** Shown at the top of the list while the SSE stream is down, since session updates stall too. */

323+@Composable

324+private fun ReconnectingBanner() {

325+ Surface(

326+ modifier = Modifier.fillMaxWidth(),

327+ color = MaterialTheme.colorScheme.tertiaryContainer,

328+ ) {

329+ Row(

330+ modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 6.dp),

331+ verticalAlignment = Alignment.CenterVertically,

332+ horizontalArrangement = Arrangement.spacedBy(8.dp),

333+ ) {

334+ CircularProgressIndicator(

335+ modifier = Modifier.size(14.dp),

336+ strokeWidth = 2.dp,

337+ color = MaterialTheme.colorScheme.onTertiaryContainer,

338+ )

339+ Text(

340+ text = "Reconnecting…",

341+ style = MaterialTheme.typography.bodySmall,

342+ color = MaterialTheme.colorScheme.onTertiaryContainer,

343+ )

344+ }

244345 }

245346}

246347

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+

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

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

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

250356

357+@Composable

358+private fun NoSearchResults(query: String) {

359+ Box(

360+ modifier = Modifier.fillMaxSize().padding(32.dp),

361+ contentAlignment = Alignment.Center,

362+ ) {

363+ Text(

364+ text = "No results for “$query”",

365+ style = MaterialTheme.typography.bodyMedium,

366+ color = MaterialTheme.colorScheme.onSurfaceVariant,

367+ )

368+ }

369+}

370+

251371@Composable

252372private fun EmptySessions() {

253373 Column(

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

271391 style = MaterialTheme.typography.bodyMedium,

272392 color = MaterialTheme.colorScheme.onSurfaceVariant,

273393 )

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

274401 }

275402}

app/src/main/java/soy/iko/opencode/ui/theme/Theme.kt+23−1

@@ -14,7 +14,18 @@ import androidx.compose.ui.platform.LocalContext

1414private val DarkColors = darkColorScheme(

1515 primary = Emerald,

1616 onPrimary = Color(0xFF0F1115),

17+ primaryContainer = Color(0xFF1A3D2A),

18+ onPrimaryContainer = Color(0xFFA8E6C1),

1719 secondary = EmeraldDark,

20+ onSecondary = Color(0xFFE6E9EF),

21+ secondaryContainer = Color(0xFF1A2A3D),

22+ onSecondaryContainer = Color(0xFFA8C5E6),

23+ tertiary = Color(0xFF6B7280),

24+ onTertiary = Color(0xFFE6E9EF),

25+ tertiaryContainer = Color(0xFF2A2A3D),

26+ onTertiaryContainer = Color(0xFFC5C5E6),

27+ errorContainer = Color(0xFF4D2626),

28+ onErrorContainer = Color(0xFFFFB4B4),

1829 background = DarkBackground,

1930 surface = DarkSurface,

2031 surfaceVariant = DarkSurfaceVariant,

@@ -24,7 +35,18 @@ private val DarkColors = darkColorScheme(

2435

2536private val LightColors = lightColorScheme(

2637 primary = EmeraldDark,

38+ primaryContainer = Color(0xFFD7F5E3),

39+ onPrimaryContainer = Color(0xFF0A3D22),

2740 secondary = Emerald,

41+ onSecondary = Color(0xFF1A1C1F),

42+ secondaryContainer = Color(0xFFD7E8F5),

43+ onSecondaryContainer = Color(0xFF0A2A4D),

44+ tertiary = Color(0xFF6B7280),

45+ onTertiary = Color(0xFFFFFFFF),

46+ tertiaryContainer = Color(0xFFE8E8F5),

47+ onTertiaryContainer = Color(0xFF2A2A4D),

48+ errorContainer = Color(0xFFFFE0E0),

49+ onErrorContainer = Color(0xFF660000),

2850 background = LightBackground,

2951 surface = LightSurface,

3052 surfaceVariant = LightSurfaceVariant,

@@ -35,7 +57,7 @@ private val LightColors = lightColorScheme(

3557@Composable

3658fun OpencodeTheme(

3759 darkTheme: Boolean = isSystemInDarkTheme(),

38− dynamicColor: Boolean = true,

60+ dynamicColor: Boolean = false,

3961 content: @Composable () -> Unit,

4062) {

4163 val context = LocalContext.current

shared/src/app.rs+14

@@ -297,16 +297,27 @@ impl App for OpencodeApp {

297297 // Store the field verbatim while typing; normalizing here would fight

298298 // the user's edits (e.g. eat the "://" as they type it). The URL is

299299 // normalized once, on Connect.

300+ // Clear any prior error as soon as the user edits a field, so a stale

301+ // message (e.g. "Invalid credentials") doesn't linger while they correct it.

300302 Event::ServerUrlChanged(url) => {

301303 model.server_url = url;

304+ if model.error.is_some() {

305+ model.error = None;

306+ }

302307 render()

303308 }

304309 Event::UsernameChanged(u) => {

305310 model.username = u;

311+ if model.error.is_some() {

312+ model.error = None;

313+ }

306314 render()

307315 }

308316 Event::PasswordChanged(p) => {

309317 model.password = p;

318+ if model.error.is_some() {

319+ model.error = None;

320+ }

310321 render()

311322 }

312323

@@ -341,6 +352,9 @@ impl App for OpencodeApp {

341352 title: display_title(&s.title),

342353 })

343354 .collect();

355+ // Impose a stable alphabetical order so the list doesn't shuffle

356+ // with whatever order the server happens to return sessions in.

357+ model.sessions.sort_by_key(|s| s.title.to_lowercase());

344358 }

345359 Err(e) => model.error = Some(e),

346360 }