git.iko.soy/opencode-android
on master help sign in
swap
ab6a5da19 ahead, 0 behind
app/src/main/java/soy/iko/opencode/CoreViewModel.kt+18
since splitsnapshots
unifiedsplit
@@ -23,6 +23,22 @@ class CoreViewModel(app: Application) : AndroidViewModel(app) {
23 init {
23 init {
24 prefs.getString(KEY_URL, null)?.let { core.dispatch(Event.ServerUrlChanged(it)) }
24 prefs.getString(KEY_URL, null)?.let { core.dispatch(Event.ServerUrlChanged(it)) }
25 prefs.getString(KEY_USER, null)?.let { core.dispatch(Event.UsernameChanged(it)) }
25 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)) }
29+
30+ // On a fresh process after a configuration change, resume the SSE stream if
31+ // the core is already connected (no-op otherwise — it guards on `connected`).
32+ core.resumeStreamingIfConnected()
33+
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+ }
26
42
27 // Persist connection details once a connection succeeds.
43 // Persist connection details once a connection succeeds.
28 viewModelScope.launch {
44 viewModelScope.launch {
@@ -31,6 +47,7 @@ class CoreViewModel(app: Application) : AndroidViewModel(app) {
31 prefs.edit {
47 prefs.edit {
32 putString(KEY_URL, state.serverUrl)
48 putString(KEY_URL, state.serverUrl)
33 putString(KEY_USER, state.username)
49 putString(KEY_USER, state.username)
50+ putString(KEY_PASSWORD, state.password)
34 }
51 }
35 }
52 }
36 }
53 }
@@ -44,5 +61,6 @@ class CoreViewModel(app: Application) : AndroidViewModel(app) {
44 private companion object {
61 private companion object {
45 const val KEY_URL = "serverUrl"
62 const val KEY_URL = "serverUrl"
46 const val KEY_USER = "username"
63 const val KEY_USER = "username"
64+ const val KEY_PASSWORD = "password"
47 }
65 }
48}
66}
app/src/main/java/soy/iko/opencode/MainActivity.kt+8
@@ -2,7 +2,9 @@ package soy.iko.opencode
2
2
3import android.os.Bundle
3import android.os.Bundle
4import androidx.activity.ComponentActivity
4import androidx.activity.ComponentActivity
5+import androidx.activity.SystemBarStyle
5import androidx.activity.compose.setContent
6import androidx.activity.compose.setContent
7+import androidx.activity.enableEdgeToEdge
6import androidx.compose.runtime.getValue
8import androidx.compose.runtime.getValue
7import androidx.lifecycle.compose.collectAsStateWithLifecycle
9import androidx.lifecycle.compose.collectAsStateWithLifecycle
8import androidx.lifecycle.viewmodel.compose.viewModel
10import androidx.lifecycle.viewmodel.compose.viewModel
@@ -11,6 +13,12 @@ import soy.iko.opencode.ui.theme.OpencodeTheme
11
13
12class MainActivity : ComponentActivity() {
14class MainActivity : ComponentActivity() {
13 override fun onCreate(savedInstanceState: Bundle?) {
15 override fun onCreate(savedInstanceState: Bundle?) {
16+ enableEdgeToEdge(
17+ statusBarStyle = SystemBarStyle.auto(
18+ lightScrim = 0xFF0F1115.toInt(),
19+ darkScrim = 0xFF0F1115.toInt(),
20+ ),
21+ )
14 super.onCreate(savedInstanceState)
22 super.onCreate(savedInstanceState)
15 setContent {
23 setContent {
16 OpencodeTheme {
24 OpencodeTheme {
app/src/main/java/soy/iko/opencode/core/HttpClient.kt+1
@@ -51,6 +51,7 @@ class HttpClient(
51 ): Result<HttpResp> = withContext(Dispatchers.IO) {
51 ): Result<HttpResp> = withContext(Dispatchers.IO) {
52 runCatching {
52 runCatching {
53 val builder = Request.Builder().url(url).method()
53 val builder = Request.Builder().url(url).method()
54+ builder.header("User-Agent", "opencode-android/1.0")
54 if (auth != null) builder.header("Authorization", auth)
55 if (auth != null) builder.header("Authorization", auth)
55 await(okhttp.newCall(builder.build()))
56 await(okhttp.newCall(builder.build()))
56 }
57 }
app/src/main/java/soy/iko/opencode/core/OpencodeCore.kt+224−44
@@ -1,6 +1,7 @@
1package soy.iko.opencode.core
1package soy.iko.opencode.core
2
2
3import kotlinx.coroutines.CoroutineScope
3import kotlinx.coroutines.CoroutineScope
4+import kotlinx.coroutines.Job
4import kotlinx.coroutines.delay
5import kotlinx.coroutines.delay
5import kotlinx.coroutines.flow.MutableStateFlow
6import kotlinx.coroutines.flow.MutableStateFlow
6import kotlinx.coroutines.flow.StateFlow
7import kotlinx.coroutines.flow.StateFlow
@@ -29,7 +30,6 @@ class OpencodeCore(
29 private var username = ""
30 private var username = ""
30 private var password = ""
31 private var password = ""
31 private var authRequired = false
32 private var authRequired = false
32− private var authed = false
33 private var connected = false
33 private var connected = false
34 private var loading = false
34 private var loading = false
35 private var error: String? = null
35 private var error: String? = null
@@ -40,6 +40,7 @@ class OpencodeCore(
40 private val messages = mutableListOf<MsgState>()
40 private val messages = mutableListOf<MsgState>()
41 private var draft = ""
41 private var draft = ""
42 private var generating = false
42 private var generating = false
43+ private var sseConnected = true
43 private var localSeq = 0L
44 private var localSeq = 0L
44
45
45 private val _view = MutableStateFlow(snapshot())
46 private val _view = MutableStateFlow(snapshot())
@@ -48,6 +49,31 @@ class OpencodeCore(
48 private var sse: SseClient? = null
49 private var sse: SseClient? = null
49 private var sseClosedIntentionally = false
50 private var sseClosedIntentionally = false
50 private var reconnectAttempts = 0
51 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>()
51
77
52 // ── Event entry point ──────────────────────────────────────────────────────
78 // ── Event entry point ──────────────────────────────────────────────────────
53 fun dispatch(event: Event) {
79 fun dispatch(event: Event) {
@@ -55,37 +81,69 @@ class OpencodeCore(
55 // Store the field verbatim while typing; normalizing here would fight
81 // Store the field verbatim while typing; normalizing here would fight
56 // the user's edits (e.g. eat the "://" as they type it). The URL is
82 // the user's edits (e.g. eat the "://" as they type it). The URL is
57 // normalized once, on Connect.
83 // normalized once, on Connect.
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.
58− is Event.ServerUrlChanged -> { serverUrl = event.url; emit() }
86+ is Event.ServerUrlChanged -> { serverUrl = event.url; if (error != null) error = null; emit() }
59− is Event.UsernameChanged -> { username = event.value; emit() }
87+ is Event.UsernameChanged -> { username = event.value; if (error != null) error = null; emit() }
60− is Event.PasswordChanged -> { password = event.value; emit() }
88+ is Event.PasswordChanged -> { password = event.value; if (error != null) error = null; emit() }
61
89
62 Event.Connect -> {
90 Event.Connect -> {
63 serverUrl = normalizeUrl(serverUrl)
91 serverUrl = normalizeUrl(serverUrl)
64 if (serverUrl.isEmpty()) { error = "Enter a server URL"; emit(); return }
92 if (serverUrl.isEmpty()) { error = "Enter a server URL"; emit(); return }
93+ // The auth fields are showing but empty — sending the request now
94+ // would just 401 again in a loop. Prompt for credentials instead.
95+ if (authRequired && !hasCredentials()) { error = "Enter username and password"; emit(); return }
96+ // Leave authRequired as-is; probeHealth sets it from the response (true on
97+ // 401, false on success). Resetting it here just flickers the auth fields.
65− loading = true; error = null; authRequired = false; emit()
98+ loading = true; error = null; emit()
99+ connectJob?.cancel()
66− scope.launch { probeHealth() }
100+ connectJob = scope.launch { probeHealth() }
67 }
101 }
68
102
103+ Event.LoadSessions -> {
104+ if (!connected) { error = "Not connected"; emit(); return }
105+ loading = true; emit()
106+ loadSessionsJob?.cancel()
69− Event.LoadSessions -> { loading = true; emit(); scope.launch { loadSessions() } }
107+ loadSessionsJob = scope.launch { loadSessions() }
108+ }
70
109
71 is Event.SelectSession -> {
110 is Event.SelectSession -> {
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.
72− currentSessionTitle = sessions.firstOrNull { it.id == event.id }?.title.orEmpty()
113+ val session = sessions.firstOrNull { it.id == event.id }
114+ if (session == null) { error = "Session no longer exists"; emit(); return }
115+ currentSessionTitle = session.title
73 currentSessionId = event.id
116 currentSessionId = event.id
74 messages.clear()
117 messages.clear()
118+ removedMessageIds.clear()
75 screen = Screen.Chat
119 screen = Screen.Chat
76 loading = true
120 loading = true
121+ generating = false
77 error = null
122 error = null
78 emit()
123 emit()
124+ connectJob?.cancel()
125+ abortJob?.cancel()
126+ sendMessageJob?.cancel()
127+ deleteSessionJob?.cancel()
128+ loadMessagesJob?.cancel()
79− scope.launch { loadMessages(event.id) }
129+ loadMessagesJob = scope.launch { loadMessages(event.id) }
80 }
130 }
81
131
132+ Event.CreateSession -> {
133+ if (!connected) { error = "Not connected"; emit(); return }
134+ loading = true; error = null; emit()
135+ createSessionJob?.cancel()
82− Event.CreateSession -> { loading = true; emit(); scope.launch { createSession() } }
136+ createSessionJob = scope.launch { createSession() }
137+ }
83
138
84 is Event.DeleteSession -> {
139 is Event.DeleteSession -> {
140+ if (!connected) { error = "Not connected"; emit(); return }
85 val id = event.id
141 val id = event.id
86 // Delete on the server first; only drop it from the UI once that
142 // Delete on the server first; only drop it from the UI once that
87 // succeeds, so a failed request leaves the session recoverable.
143 // succeeds, so a failed request leaves the session recoverable.
144+ loading = true; error = null; emit()
145+ deleteSessionJob?.cancel()
88− scope.launch {
146+ deleteSessionJob = scope.launch {
89 http.delete("$serverUrl/session/$id", authHeader()).fold(
147 http.delete("$serverUrl/session/$id", authHeader()).fold(
90 onSuccess = { resp ->
148 onSuccess = { resp ->
91 if (resp.code in 200..299) {
149 if (resp.code in 200..299) {
@@ -98,8 +156,12 @@ class OpencodeCore(
98 } else {
156 } else {
99 error = "Failed to delete session"
157 error = "Failed to delete session"
100 }
158 }
159+ loading = false
160+ },
161+ onFailure = {
162+ error = "Failed to delete session"
163+ loading = false
101 },
164 },
102− onFailure = { error = "Failed to delete session" },
103 )
165 )
104 emit()
166 emit()
105 }
167 }
@@ -110,26 +172,57 @@ class OpencodeCore(
110 is Event.SendMessage -> sendMessage(event.text)
172 is Event.SendMessage -> sendMessage(event.text)
111
173
112 Event.CancelGeneration -> {
174 Event.CancelGeneration -> {
113− generating = false; emit()
175+ generating = false
176+ messages.forEach { it.streaming = false }
177+ emit()
114 val id = currentSessionId ?: return
178 val id = currentSessionId ?: return
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()
115− scope.launch { http.postJson("$serverUrl/session/$id/abort", "{}", authHeader()) }
182+ abortJob = scope.launch { http.postJson("$serverUrl/session/$id/abort", "{}", authHeader()) }
116 }
183 }
117
184
118 Event.NavigateToSessions -> {
185 Event.NavigateToSessions -> {
119 screen = Screen.Sessions
186 screen = Screen.Sessions
120 currentSessionId = null
187 currentSessionId = null
121 messages.clear()
188 messages.clear()
189+ removedMessageIds.clear()
190+ draft = ""
122 generating = false
191 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
195+ loading = true
123 emit()
196 emit()
197+ connectJob?.cancel()
198+ abortJob?.cancel()
199+ createSessionJob?.cancel()
200+ deleteSessionJob?.cancel()
201+ sendMessageJob?.cancel()
202+ loadMessagesJob?.cancel()
203+ loadSessionsJob?.cancel()
124− scope.launch { loadSessions() }
204+ loadSessionsJob = scope.launch { loadSessions() }
125 }
205 }
126
206
127 Event.NavigateToConnect -> {
207 Event.NavigateToConnect -> {
128 screen = Screen.Connect
208 screen = Screen.Connect
129 connected = false
209 connected = false
210+ loading = false
211+ generating = false
130 sessions.clear()
212 sessions.clear()
131 messages.clear()
213 messages.clear()
214+ removedMessageIds.clear()
132 currentSessionId = null
215 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()
133 closeSse()
226 closeSse()
134 emit()
227 emit()
135 }
228 }
@@ -143,26 +236,44 @@ class OpencodeCore(
143 if (connected && sse == null) startSse()
236 if (connected && sse == null) startSse()
144 }
237 }
145
238
146− 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+ }
147
251
148 // ── Effects ────────────────────────────────────────────────────────────────
252 // ── Effects ────────────────────────────────────────────────────────────────
149 private fun sendMessage(raw: String) {
253 private fun sendMessage(raw: String) {
150 val text = raw.trim()
254 val text = raw.trim()
151 val session = currentSessionId ?: return
255 val session = currentSessionId ?: return
152 if (text.isEmpty()) return
256 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
153 localSeq += 1
260 localSeq += 1
154 val user = MsgState("local-$localSeq", "user", System.currentTimeMillis()).apply {
261 val user = MsgState("local-$localSeq", "user", System.currentTimeMillis()).apply {
155 status = MessageStatus.Pending
262 status = MessageStatus.Pending
156 textParts["local"] = text
263 textParts["local"] = text
157 }
264 }
158 messages.add(user)
265 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
159 draft = ""
269 draft = ""
160 generating = true
270 generating = true
161 error = null
271 error = null
162 emit()
272 emit()
163
273
164 val body = Protocol.json.encodeToString(PromptBody.serializer(), PromptBody(listOf(TextInput(text = text))))
274 val body = Protocol.json.encodeToString(PromptBody.serializer(), PromptBody(listOf(TextInput(text = text))))
275+ sendMessageJob?.cancel()
165− scope.launch {
276+ sendMessageJob = scope.launch {
166 val result = http.postJson("$serverUrl/session/$session/prompt_async", body, authHeader())
277 val result = http.postJson("$serverUrl/session/$session/prompt_async", body, authHeader())
167 result.fold(
278 result.fold(
168 onSuccess = { resp ->
279 onSuccess = { resp ->
@@ -171,12 +282,16 @@ class OpencodeCore(
171 } else {
282 } else {
172 messages.firstOrNull { it.id == user.id }?.status = MessageStatus.Failed
283 messages.firstOrNull { it.id == user.id }?.status = MessageStatus.Failed
173 generating = false
284 generating = false
285+ messages.forEach { it.streaming = false }
286+ draft = savedDraft
174 error = "Server returned status ${resp.code}"
287 error = "Server returned status ${resp.code}"
175 }
288 }
176 },
289 },
177 onFailure = { e ->
290 onFailure = { e ->
178 messages.firstOrNull { it.id == user.id }?.status = MessageStatus.Failed
291 messages.firstOrNull { it.id == user.id }?.status = MessageStatus.Failed
179 generating = false
292 generating = false
293+ messages.forEach { it.streaming = false }
294+ draft = savedDraft
180 error = "Request failed: ${e.message}"
295 error = "Request failed: ${e.message}"
181 },
296 },
182 )
297 )
@@ -191,11 +306,17 @@ class OpencodeCore(
191 when {
306 when {
192 resp.code == 401 -> {
307 resp.code == 401 -> {
193 loading = false
308 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
313+ // Always reveal the auth fields so the user can see/edit
314+ // their credentials — even when the ones supplied were wrong.
315+ authRequired = true
194− if (hasCreds) error = "Invalid credentials" else authRequired = true
316+ if (hasCreds) error = "Invalid credentials"
195 emit()
317 emit()
196 }
318 }
197 resp.code in 200..299 -> {
319 resp.code in 200..299 -> {
198− if (hasCreds) authed = true
199 connected = true
320 connected = true
200 authRequired = false
321 authRequired = false
201 error = null
322 error = null
@@ -203,10 +324,14 @@ class OpencodeCore(
203 loading = true
324 loading = true
204 emit()
325 emit()
205 startSse()
326 startSse()
327+ // Route through loadSessionsJob so a prior in-flight loadSessions
328+ // (e.g. from a rapid double-connect) is cancelled first.
329+ loadSessionsJob?.cancel()
206− loadSessions()
330+ loadSessionsJob = scope.launch { loadSessions() }
207 }
331 }
208 else -> {
332 else -> {
209 loading = false
333 loading = false
334+ connected = false
210 error = "Server returned status ${resp.code}"
335 error = "Server returned status ${resp.code}"
211 emit()
336 emit()
212 }
337 }
@@ -214,6 +339,7 @@ class OpencodeCore(
214 },
339 },
215 onFailure = { e ->
340 onFailure = { e ->
216 loading = false
341 loading = false
342+ connected = false
217 error = "Connection failed: ${e.message}"
343 error = "Connection failed: ${e.message}"
218 emit()
344 emit()
219 },
345 },
@@ -226,6 +352,9 @@ class OpencodeCore(
226 if (resp.code in 200..299) {
352 if (resp.code in 200..299) {
227 sessions.clear()
353 sessions.clear()
228 sessions.addAll(Protocol.parseSessions(resp.body).map { SessionView(it.id, displayTitle(it.title)) })
354 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() }
229 } else {
358 } else {
230 error = "Server returned status ${resp.code}"
359 error = "Server returned status ${resp.code}"
231 }
360 }
@@ -243,6 +372,10 @@ class OpencodeCore(
243 if (session != null) {
372 if (session != null) {
244 if (sessions.none { it.id == session.id }) {
373 if (sessions.none { it.id == session.id }) {
245 sessions.add(0, SessionView(session.id, displayTitle(session.title)))
374 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() }
246 }
379 }
247 emit()
380 emit()
248 // SelectSession takes over the loading state (loads messages).
381 // SelectSession takes over the loading state (loads messages).
@@ -260,10 +393,11 @@ class OpencodeCore(
260 private suspend fun loadMessages(sessionId: String) {
393 private suspend fun loadMessages(sessionId: String) {
261 http.get("$serverUrl/session/$sessionId/message", authHeader()).fold(
394 http.get("$serverUrl/session/$sessionId/message", authHeader()).fold(
262 onSuccess = { resp ->
395 onSuccess = { resp ->
263− if (!isCurrent(sessionId)) return // user navigated away while loading
396+ if (!isCurrent(sessionId)) { loading = false; return } // user navigated away while loading
264 loading = false
397 loading = false
265 if (resp.code in 200..299) {
398 if (resp.code in 200..299) {
266 messages.clear()
399 messages.clear()
400+ removedMessageIds.clear()
267 messages.addAll(Protocol.parseMessages(resp.body).map(::messageFromWire))
401 messages.addAll(Protocol.parseMessages(resp.body).map(::messageFromWire))
268 generating = messages.any { it.streaming }
402 generating = messages.any { it.streaming }
269 } else {
403 } else {
@@ -272,8 +406,9 @@ class OpencodeCore(
272 emit()
406 emit()
273 },
407 },
274 onFailure = { e ->
408 onFailure = { e ->
275− if (!isCurrent(sessionId)) return
409+ if (!isCurrent(sessionId)) { loading = false; return }
276 loading = false
410 loading = false
411+ generating = false
277 error = "Request failed: ${e.message}"
412 error = "Request failed: ${e.message}"
278 emit()
413 emit()
279 },
414 },
@@ -288,7 +423,13 @@ class OpencodeCore(
288 url = "$serverUrl/event",
423 url = "$serverUrl/event",
289 auth = authHeader(),
424 auth = authHeader(),
290 onEvent = { json -> scope.launch { handleServerEvent(json) } },
425 onEvent = { json -> scope.launch { handleServerEvent(json) } },
426+ onStateChange = { open ->
427+ scope.launch {
428+ sseConnected = open
291− onStateChange = { open -> if (open) reconnectAttempts = 0 else scheduleReconnect() },
429+ if (open) reconnectAttempts = 0 else scheduleReconnect()
430+ emit()
431+ }
432+ },
292 )
433 )
293 sse = client
434 sse = client
294 client.connect()
435 client.connect()
@@ -296,6 +437,8 @@ class OpencodeCore(
296
437
297 private fun closeSse() {
438 private fun closeSse() {
298 sseClosedIntentionally = true
439 sseClosedIntentionally = true
440+ reconnectJob?.cancel()
441+ reconnectJob = null
299 sse?.close()
442 sse?.close()
300 sse = null
443 sse = null
301 }
444 }
@@ -306,7 +449,10 @@ class OpencodeCore(
306 // stream reconnects (onStateChange(true)) so a healthy server starts fresh.
449 // stream reconnects (onStateChange(true)) so a healthy server starts fresh.
307 val delayMs = (2000L * (1L shl reconnectAttempts)).coerceAtMost(30_000L)
450 val delayMs = (2000L * (1L shl reconnectAttempts)).coerceAtMost(30_000L)
308 if (delayMs < 30_000L) reconnectAttempts += 1
451 if (delayMs < 30_000L) reconnectAttempts += 1
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()
309− scope.launch {
455+ reconnectJob = scope.launch {
310 delay(delayMs)
456 delay(delayMs)
311 if (!sseClosedIntentionally && connected && screen != Screen.Connect) startSse()
457 if (!sseClosedIntentionally && connected && screen != Screen.Connect) startSse()
312 }
458 }
@@ -314,15 +460,20 @@ class OpencodeCore(
314
460
315 private fun handleServerEvent(json: String) {
461 private fun handleServerEvent(json: String) {
316 val event = Protocol.parseEvent(json) ?: return
462 val event = Protocol.parseEvent(json) ?: return
317− applyEvent(event)
463+ // Only re-render if the event actually changed our state; applyEvent returns
318− emit()
464+ // false for events that don't apply (other session, unknown message, …).
465+ if (applyEvent(event)) emit()
319 }
466 }
320
467
468+ /** Apply a server event to the model. Returns true iff any state actually changed. */
321− private fun applyEvent(event: Protocol.Event) {
469+ private fun applyEvent(event: Protocol.Event): Boolean {
322 when (event) {
470 when (event) {
323 is Protocol.Event.MessageUpdated -> {
471 is Protocol.Event.MessageUpdated -> {
324 val info = event.info
472 val info = event.info
325− if (info.role != "assistant" || !isCurrent(info.sessionId)) return
473+ 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
326 val streaming = info.time.completed == null && info.error == null
477 val streaming = info.time.completed == null && info.error == null
327 val existing = messages.firstOrNull { it.id == info.id }
478 val existing = messages.firstOrNull { it.id == info.id }
328 if (existing != null) {
479 if (existing != null) {
@@ -331,38 +482,59 @@ class OpencodeCore(
331 } else {
482 } else {
332 messages.add(MsgState(info.id, "assistant", info.time.created).apply { this.streaming = streaming })
483 messages.add(MsgState(info.id, "assistant", info.time.created).apply { this.streaming = streaming })
333 }
484 }
334− info.error?.let { error = it.message(); generating = false }
485+ info.error?.let { error = it.message(); messages.forEach { m -> m.streaming = false }; generating = false }
486+ return true
335 }
487 }
336
488
337 is Protocol.Event.PartUpdated -> {
489 is Protocol.Event.PartUpdated -> {
338 val part = event.part
490 val part = event.part
339− val msg = messages.firstOrNull { it.id == part.messageId } ?: return
491+ val msg = messages.firstOrNull { it.id == part.messageId } ?: return false
492+ // Synthetic text parts are intentionally skipped; report no change so we
493+ // don't trigger a needless re-render/emit for them.
340− when (part) {
494+ return when (part) {
341− is Protocol.Part.Text -> if (!part.synthetic) {
495+ is Protocol.Part.Text -> if (part.synthetic) {
496+ false
497+ } else {
342 msg.textParts[part.id] = pickText(part.text, event.delta, msg.textParts[part.id])
498 msg.textParts[part.id] = pickText(part.text, event.delta, msg.textParts[part.id])
499+ true
343 }
500 }
344− is Protocol.Part.Reasoning ->
501+ is Protocol.Part.Reasoning -> {
345 msg.reasoningParts[part.id] = pickText(part.text, event.delta, msg.reasoningParts[part.id])
502 msg.reasoningParts[part.id] = pickText(part.text, event.delta, msg.reasoningParts[part.id])
503+ true
504+ }
346− is Protocol.Part.Tool ->
505+ is Protocol.Part.Tool -> {
347 msg.toolParts[part.id] = ToolView(part.tool, part.status, part.title)
506 msg.toolParts[part.id] = ToolView(part.tool, part.status, part.title)
507+ true
508+ }
348 }
509 }
349 }
510 }
350
511
512+ is Protocol.Event.PartRemoved -> {
351− is Protocol.Event.PartRemoved -> messages.firstOrNull { it.id == event.messageId }?.remove(event.partId)
513+ val msg = messages.firstOrNull { it.id == event.messageId } ?: return false
514+ msg.remove(event.partId)
515+ return true
516+ }
352
517
518+ is Protocol.Event.MessageRemoved -> {
519+ // Remember the ID so a late MessageUpdated can't resurrect the message.
520+ removedMessageIds.add(event.messageId)
353− is Protocol.Event.MessageRemoved -> messages.removeAll { it.id == event.messageId }
521+ return messages.removeAll { it.id == event.messageId }
522+ }
354
523
355− is Protocol.Event.SessionIdle -> if (isCurrent(event.sessionId)) {
524+ is Protocol.Event.SessionIdle -> {
525+ if (!isCurrent(event.sessionId)) return false
356 generating = false
526 generating = false
357 messages.forEach { it.streaming = false }
527 messages.forEach { it.streaming = false }
528+ return true
358 }
529 }
359
530
360 is Protocol.Event.SessionError -> {
531 is Protocol.Event.SessionError -> {
361 val scoped = event.sessionId == null || isCurrent(event.sessionId)
532 val scoped = event.sessionId == null || isCurrent(event.sessionId)
362− if (scoped) {
533+ if (!scoped) return false
363− event.error?.let { error = it.message() }
534+ event.error?.let { error = it.message() }
364− generating = false
535+ generating = false
365− }
536+ messages.forEach { it.streaming = false }
537+ return true
366 }
538 }
367
539
368 is Protocol.Event.SessionUpserted -> {
540 is Protocol.Event.SessionUpserted -> {
@@ -373,19 +545,26 @@ class OpencodeCore(
373 } else {
545 } else {
374 sessions.add(0, SessionView(event.info.id, title))
546 sessions.add(0, SessionView(event.info.id, title))
375 }
547 }
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() }
376 if (isCurrent(event.info.id)) currentSessionTitle = title
551 if (isCurrent(event.info.id)) currentSessionTitle = title
552+ return true
377 }
553 }
378
554
379− is Protocol.Event.SessionDeleted -> event.sessionId?.let { id ->
555+ is Protocol.Event.SessionDeleted -> {
556+ val id = event.sessionId ?: return false
380− sessions.removeAll { it.id == id }
557+ val removed = sessions.removeAll { it.id == id }
381 if (isCurrent(id)) {
558 if (isCurrent(id)) {
382 currentSessionId = null
559 currentSessionId = null
383 messages.clear()
560 messages.clear()
384 screen = Screen.Sessions
561 screen = Screen.Sessions
562+ return true
385 }
563 }
564+ return removed
386 }
565 }
387
566
388− Protocol.Event.Other -> Unit
567+ Protocol.Event.Other -> return false
389 }
568 }
390 }
569 }
391
570
@@ -405,6 +584,7 @@ class OpencodeCore(
405 messages = messages.map { it.toView() },
584 messages = messages.map { it.toView() },
406 draft = draft,
585 draft = draft,
407 generating = generating,
586 generating = generating,
587+ sseConnected = sseConnected,
408 )
588 )
409
589
410 private fun emit() { _view.value = snapshot() }
590 private fun emit() { _view.value = snapshot() }
app/src/main/java/soy/iko/opencode/core/SseClient.kt+1
@@ -33,6 +33,7 @@ class SseClient(
33
33
34 fun connect() {
34 fun connect() {
35 val builder = Request.Builder().url(url).header("Accept", "text/event-stream")
35 val builder = Request.Builder().url(url).header("Accept", "text/event-stream")
36+ builder.header("User-Agent", "opencode-android/1.0")
36 if (auth != null) builder.header("Authorization", auth)
37 if (auth != null) builder.header("Authorization", auth)
37 source = EventSources.createFactory(client).newEventSource(builder.build(), listener)
38 source = EventSources.createFactory(client).newEventSource(builder.build(), listener)
38 }
39 }
app/src/main/java/soy/iko/opencode/core/ViewModel.kt+1
@@ -48,6 +48,7 @@ data class UiState(
48 val messages: List<MessageView> = emptyList(),
48 val messages: List<MessageView> = emptyList(),
49 val draft: String = "",
49 val draft: String = "",
50 val generating: Boolean = false,
50 val generating: Boolean = false,
51+ val sseConnected: Boolean = true,
51)
52)
52
53
53/**
54/**
app/src/main/java/soy/iko/opencode/ui/OpencodeApp.kt+71−7
@@ -2,18 +2,24 @@ package soy.iko.opencode.ui
2
2
3import androidx.activity.compose.BackHandler
3import androidx.activity.compose.BackHandler
4import androidx.compose.animation.AnimatedContent
4import androidx.compose.animation.AnimatedContent
5−import androidx.compose.animation.SizeTransform
5+import androidx.compose.animation.slideInHorizontally
6−import androidx.compose.animation.fadeIn
6+import androidx.compose.animation.slideOutHorizontally
7−import androidx.compose.animation.fadeOut
8import androidx.compose.animation.togetherWith
7import androidx.compose.animation.togetherWith
9import androidx.compose.foundation.layout.fillMaxSize
8import androidx.compose.foundation.layout.fillMaxSize
10import androidx.compose.foundation.layout.padding
9import androidx.compose.foundation.layout.padding
10+import androidx.compose.material3.AlertDialog
11import androidx.compose.material3.Scaffold
11import androidx.compose.material3.Scaffold
12+import androidx.compose.material3.SnackbarDuration
12import androidx.compose.material3.SnackbarHost
13import androidx.compose.material3.SnackbarHost
13import androidx.compose.material3.SnackbarHostState
14import androidx.compose.material3.SnackbarHostState
15+import androidx.compose.material3.Text
16+import androidx.compose.material3.TextButton
14import androidx.compose.runtime.Composable
17import androidx.compose.runtime.Composable
15import androidx.compose.runtime.LaunchedEffect
18import androidx.compose.runtime.LaunchedEffect
19+import androidx.compose.runtime.getValue
20+import androidx.compose.runtime.mutableStateOf
16import androidx.compose.runtime.remember
21import androidx.compose.runtime.remember
22+import androidx.compose.runtime.setValue
17import androidx.compose.ui.Modifier
23import androidx.compose.ui.Modifier
18import soy.iko.opencode.core.Event
24import soy.iko.opencode.core.Event
19import soy.iko.opencode.core.Screen
25import soy.iko.opencode.core.Screen
@@ -25,28 +31,86 @@ import soy.iko.opencode.ui.screens.SessionsScreen
25@Composable
31@Composable
26fun OpencodeApp(state: UiState, dispatch: (Event) -> Unit) {
32fun OpencodeApp(state: UiState, dispatch: (Event) -> Unit) {
27 val snackbar = remember { SnackbarHostState() }
33 val snackbar = remember { SnackbarHostState() }
34+ var showStopConfirm by remember { mutableStateOf(false) }
35+ var showDisconnectConfirm by remember { mutableStateOf(false) }
28
36
29 LaunchedEffect(state.error) {
37 LaunchedEffect(state.error) {
30 state.error?.let {
38 state.error?.let {
31− snackbar.showSnackbar(it)
39+ snackbar.showSnackbar(
40+ message = it,
41+ actionLabel = "Dismiss",
42+ duration = SnackbarDuration.Short,
43+ )
44+ // Always clear the error from state after showing.
32 dispatch(Event.DismissError)
45 dispatch(Event.DismissError)
33 }
46 }
34 }
47 }
35
48
36 BackHandler(enabled = state.screen != Screen.Connect) {
49 BackHandler(enabled = state.screen != Screen.Connect) {
37 when (state.screen) {
50 when (state.screen) {
51+ // Leaving mid-generation would silently drop the reply, so confirm first.
38− Screen.Chat -> dispatch(Event.NavigateToSessions)
52+ Screen.Chat -> if (state.generating) showStopConfirm = true else dispatch(Event.NavigateToSessions)
39− Screen.Sessions -> dispatch(Event.NavigateToConnect)
53+ // Disconnecting drops the server session, so guard the back button.
54+ Screen.Sessions -> showDisconnectConfirm = true
40 Screen.Connect -> Unit
55 Screen.Connect -> Unit
41 }
56 }
42 }
57 }
43
58
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+
44 Scaffold(snackbarHost = { SnackbarHost(snackbar) }) { padding ->
102 Scaffold(snackbarHost = { SnackbarHost(snackbar) }) { padding ->
45 AnimatedContent(
103 AnimatedContent(
46 targetState = state.screen,
104 targetState = state.screen,
47 modifier = Modifier.fillMaxSize().padding(padding),
105 modifier = Modifier.fillMaxSize().padding(padding),
48 transitionSpec = {
106 transitionSpec = {
49− (fadeIn() togetherWith fadeOut()).using(SizeTransform(clip = false))
107+ // Compare screen ordinals to decide slide direction: forward navigation
108+ // (Connect → Sessions → Chat) slides in from the right, back slides from the left.
109+ if (targetState.ordinal > initialState.ordinal) {
110+ slideInHorizontally { it } togetherWith slideOutHorizontally { -it }
111+ } else {
112+ slideInHorizontally { -it } togetherWith slideOutHorizontally { it }
113+ }
50 },
114 },
51 label = "screen",
115 label = "screen",
52 ) { screen ->
116 ) { screen ->
app/src/main/java/soy/iko/opencode/ui/components/MessageBubble.kt+311−29
@@ -3,6 +3,8 @@ package soy.iko.opencode.ui.components
3import android.content.ClipData
3import android.content.ClipData
4import android.content.ClipboardManager
4import android.content.ClipboardManager
5import android.content.Context
5import android.content.Context
6+import android.content.Intent
7+import android.net.Uri
6import android.widget.Toast
8import android.widget.Toast
7import androidx.compose.foundation.ExperimentalFoundationApi
9import androidx.compose.foundation.ExperimentalFoundationApi
8import androidx.compose.foundation.background
10import androidx.compose.foundation.background
@@ -13,14 +15,20 @@ import androidx.compose.foundation.layout.Column
13import androidx.compose.foundation.layout.Row
15import androidx.compose.foundation.layout.Row
14import androidx.compose.foundation.layout.fillMaxWidth
16import androidx.compose.foundation.layout.fillMaxWidth
15import androidx.compose.foundation.layout.padding
17import androidx.compose.foundation.layout.padding
18+import androidx.compose.foundation.layout.size
16import androidx.compose.foundation.layout.widthIn
19import androidx.compose.foundation.layout.widthIn
17import androidx.compose.foundation.shape.RoundedCornerShape
20import androidx.compose.foundation.shape.RoundedCornerShape
21+import androidx.compose.foundation.text.selection.SelectionContainer
18import androidx.compose.material.icons.Icons
22import androidx.compose.material.icons.Icons
19import androidx.compose.material.icons.filled.Build
23import androidx.compose.material.icons.filled.Build
24+import androidx.compose.material.icons.filled.Check
20import androidx.compose.material.icons.filled.ErrorOutline
25import androidx.compose.material.icons.filled.ErrorOutline
21import androidx.compose.material.icons.filled.ExpandLess
26import androidx.compose.material.icons.filled.ExpandLess
22import androidx.compose.material.icons.filled.ExpandMore
27import androidx.compose.material.icons.filled.ExpandMore
23import androidx.compose.material.icons.filled.Schedule
28import 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
24import androidx.compose.material3.Icon
32import androidx.compose.material3.Icon
25import androidx.compose.material3.MaterialTheme
33import androidx.compose.material3.MaterialTheme
26import androidx.compose.material3.Text
34import androidx.compose.material3.Text
@@ -34,21 +42,30 @@ import androidx.compose.ui.Modifier
34import androidx.compose.ui.draw.clip
42import androidx.compose.ui.draw.clip
35import androidx.compose.ui.graphics.Color
43import androidx.compose.ui.graphics.Color
36import androidx.compose.ui.platform.LocalContext
44import 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
37import androidx.compose.ui.text.font.FontStyle
51import 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
56+import androidx.compose.ui.text.style.TextOverflow
38import androidx.compose.ui.unit.dp
57import androidx.compose.ui.unit.dp
39−import java.text.SimpleDateFormat
58+import androidx.compose.ui.unit.sp
40−import java.util.Date
41−import java.util.Locale
42import soy.iko.opencode.core.MessageStatus
59import soy.iko.opencode.core.MessageStatus
43import soy.iko.opencode.core.MessageView
60import soy.iko.opencode.core.MessageView
44import soy.iko.opencode.core.ToolView
61import soy.iko.opencode.core.ToolView
45import soy.iko.opencode.ui.theme.MonoStyle
62import soy.iko.opencode.ui.theme.MonoStyle
46
63
47−private val timeFormat = SimpleDateFormat("HH:mm", Locale.getDefault())
64+private val timeFormat = java.time.format.DateTimeFormatter.ofPattern("HH:mm")
48
65
49@OptIn(ExperimentalFoundationApi::class)
66@OptIn(ExperimentalFoundationApi::class)
50@Composable
67@Composable
51−fun MessageBubble(message: MessageView, modifier: Modifier = Modifier) {
68+fun MessageBubble(message: MessageView, modifier: Modifier = Modifier, onRetry: () -> Unit = {}, compactSpacing: Boolean = false) {
52 val isUser = message.isUser
69 val isUser = message.isUser
53 val bubbleColor = if (isUser) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surfaceVariant
70 val bubbleColor = if (isUser) MaterialTheme.colorScheme.primaryContainer else MaterialTheme.colorScheme.surfaceVariant
54 val textColor = if (isUser) MaterialTheme.colorScheme.onPrimaryContainer else MaterialTheme.colorScheme.onSurface
71 val textColor = if (isUser) MaterialTheme.colorScheme.onPrimaryContainer else MaterialTheme.colorScheme.onSurface
@@ -61,13 +78,23 @@ fun MessageBubble(message: MessageView, modifier: Modifier = Modifier) {
61 )
78 )
62
79
63 val context = LocalContext.current
80 val context = LocalContext.current
81+ var showMenu by remember { mutableStateOf(false) }
64
82
65 Row(
83 Row(
66− 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),
67 horizontalArrangement = if (isUser) Arrangement.End else Arrangement.Start,
85 horizontalArrangement = if (isUser) Arrangement.End else Arrangement.Start,
68 ) {
86 ) {
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+ }
69 Column(
95 Column(
70 modifier = Modifier
96 modifier = Modifier
97+ .fillMaxWidth(0.85f)
71 .widthIn(max = 320.dp)
98 .widthIn(max = 320.dp)
72 .clip(shape)
99 .clip(shape)
73 .background(bubbleColor)
100 .background(bubbleColor)
@@ -75,30 +102,72 @@ fun MessageBubble(message: MessageView, modifier: Modifier = Modifier) {
75 onClick = {},
102 onClick = {},
76 onLongClick = {
103 onLongClick = {
77 if (message.text.isNotEmpty()) {
104 if (message.text.isNotEmpty()) {
78− copyToClipboard(context, message.text)
105+ showMenu = true
79− Toast.makeText(context, "Copied", Toast.LENGTH_SHORT).show()
80 }
106 }
81 },
107 },
82 )
108 )
83 .padding(horizontal = 14.dp, vertical = 10.dp),
109 .padding(horizontal = 14.dp, vertical = 10.dp),
84 ) {
110 ) {
85− 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+ }
86
128
87− message.tools.forEach { ToolRow(it) }
129+ message.reasoning?.let { ReasoningBlock(it, context) }
88
130
131+ // Give a quick overview of how many tools ran before listing them.
89− if (message.text.isNotEmpty()) {
132+ if (message.tools.size > 1) {
90 Text(
133 Text(
91− text = message.text + if (message.streaming) " ▌" else "",
134+ text = "${message.tools.size} tool calls",
92− color = textColor,
135+ style = MaterialTheme.typography.labelSmall,
93− style = MaterialTheme.typography.bodyLarge,
136+ color = MaterialTheme.colorScheme.onSurfaceVariant,
137+ modifier = Modifier.padding(bottom = 4.dp),
94 )
138 )
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+ )
95− } else if (message.streaming && message.tools.isEmpty() && message.reasoning == null) {
163+ } else if (message.streaming && message.tools.isEmpty() && message.reasoning == null) {
96− Text("▌", color = textColor, style = MaterialTheme.typography.bodyLarge)
164+ Text("▌", color = textColor, style = MaterialTheme.typography.bodyLarge)
165+ }
97 }
166 }
98
167
99 if (message.time > 0) {
168 if (message.time > 0) {
100 Text(
169 Text(
101− text = timeFormat.format(Date(message.time)),
170+ text = timeFormat.format(java.time.Instant.ofEpochMilli(message.time).atZone(java.time.ZoneId.systemDefault()).toLocalTime()),
102 style = MaterialTheme.typography.labelSmall,
171 style = MaterialTheme.typography.labelSmall,
103 color = mutedColor,
172 color = mutedColor,
104 modifier = Modifier.padding(top = 4.dp),
173 modifier = Modifier.padding(top = 4.dp),
@@ -106,7 +175,7 @@ fun MessageBubble(message: MessageView, modifier: Modifier = Modifier) {
106 }
175 }
107
176
108 if (isUser && message.status != MessageStatus.Sent) {
177 if (isUser && message.status != MessageStatus.Sent) {
109− StatusLine(message.status)
178+ StatusLine(message.status, onRetry = onRetry)
110 }
179 }
111 }
180 }
112 }
181 }
@@ -117,8 +186,172 @@ private fun copyToClipboard(context: Context, text: String) {
117 clipboard.setPrimaryClip(ClipData.newPlainText("message", text))
186 clipboard.setPrimaryClip(ClipData.newPlainText("message", text))
118}
187}
119
188
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+
120@Composable
353@Composable
121−private fun ReasoningBlock(text: String) {
354+private fun ReasoningBlock(text: String, context: Context) {
122 var expanded by remember { mutableStateOf(false) }
355 var expanded by remember { mutableStateOf(false) }
123 Column(modifier = Modifier.padding(bottom = 6.dp)) {
356 Column(modifier = Modifier.padding(bottom = 6.dp)) {
124 Row(
357 Row(
@@ -144,15 +377,37 @@ private fun ReasoningBlock(text: String) {
144 color = MaterialTheme.colorScheme.onSurfaceVariant,
377 color = MaterialTheme.colorScheme.onSurfaceVariant,
145 modifier = Modifier.padding(top = 4.dp),
378 modifier = Modifier.padding(top = 4.dp),
146 )
379 )
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+ )
147 }
391 }
148 }
392 }
149}
393}
150
394
151@Composable
395@Composable
152private fun ToolRow(tool: ToolView) {
396private fun ToolRow(tool: ToolView) {
397+ 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+ }
153 Row(
405 Row(
154 verticalAlignment = Alignment.CenterVertically,
406 verticalAlignment = Alignment.CenterVertically,
155− modifier = Modifier.padding(bottom = 6.dp),
407+ modifier = Modifier
408+ .fillMaxWidth()
409+ .clickable { expanded = !expanded }
410+ .padding(bottom = 6.dp),
156 ) {
411 ) {
157 Icon(
412 Icon(
158 Icons.Filled.Build,
413 Icons.Filled.Build,
@@ -161,25 +416,42 @@ private fun ToolRow(tool: ToolView) {
161 modifier = Modifier.padding(end = 6.dp).widthIn(max = 16.dp),
416 modifier = Modifier.padding(end = 6.dp).widthIn(max = 16.dp),
162 )
417 )
163 Text(
418 Text(
164− text = buildString {
419+ text = buildAnnotatedString {
420+ withStyle(SpanStyle(color = baseColor)) {
165− append(tool.name)
421+ append(tool.name)
166− append(" · ")
422+ append(" · ")
423+ }
424+ withStyle(SpanStyle(color = statusColor)) {
167− append(tool.status)
425+ append(tool.status)
426+ }
168− tool.title?.let { append(" — "); append(it) }
427+ if (expanded) tool.title?.let {
428+ withStyle(SpanStyle(color = baseColor)) {
429+ append(" — ")
430+ append(it)
431+ }
432+ }
169 },
433 },
170 style = MonoStyle,
434 style = MonoStyle,
435+ color = baseColor,
436+ maxLines = if (expanded) Int.MAX_VALUE else 1,
437+ overflow = TextOverflow.Ellipsis,
438+ modifier = Modifier.weight(1f),
439+ )
440+ Icon(
441+ imageVector = if (expanded) Icons.Filled.ExpandLess else Icons.Filled.ExpandMore,
442+ contentDescription = if (expanded) "Collapse tool details" else "Expand tool details",
171− color = MaterialTheme.colorScheme.onSurfaceVariant,
443+ tint = MaterialTheme.colorScheme.onSurfaceVariant,
172− maxLines = 3,
444+ modifier = Modifier.padding(start = 2.dp).widthIn(max = 18.dp),
173 )
445 )
174 }
446 }
175}
447}
176
448
177@Composable
449@Composable
178−private fun StatusLine(status: MessageStatus) {
450+private fun StatusLine(status: MessageStatus, onRetry: () -> Unit) {
179 val (icon, label, tint) = when (status) {
451 val (icon, label, tint) = when (status) {
180 MessageStatus.Pending -> Triple(Icons.Filled.Schedule, "Sending…", MaterialTheme.colorScheme.onPrimaryContainer)
452 MessageStatus.Pending -> Triple(Icons.Filled.Schedule, "Sending…", MaterialTheme.colorScheme.onPrimaryContainer)
181 MessageStatus.Failed -> Triple(Icons.Filled.ErrorOutline, "Failed to send", MaterialTheme.colorScheme.error)
453 MessageStatus.Failed -> Triple(Icons.Filled.ErrorOutline, "Failed to send", MaterialTheme.colorScheme.error)
182− MessageStatus.Sent -> Triple(Icons.Filled.Schedule, "", Color.Unspecified)
454+ MessageStatus.Sent -> Triple(Icons.Filled.Check, "", Color.Unspecified)
183 }
455 }
184 Row(
456 Row(
185 verticalAlignment = Alignment.CenterVertically,
457 verticalAlignment = Alignment.CenterVertically,
@@ -193,5 +465,15 @@ private fun StatusLine(status: MessageStatus) {
193 color = tint,
465 color = tint,
194 modifier = Modifier.padding(start = 4.dp),
466 modifier = Modifier.padding(start = 4.dp),
195 )
467 )
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+ }
196 }
478 }
197}
479}
app/src/main/java/soy/iko/opencode/ui/screens/ChatScreen.kt+459−22
@@ -1,47 +1,133 @@
1package soy.iko.opencode.ui.screens
1package soy.iko.opencode.ui.screens
2
2
3+import android.content.ClipData
4+import android.content.ClipboardManager
5+import android.content.Context
6+import android.widget.Toast
7+import 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
13+import androidx.compose.animation.fadeIn
14+import androidx.compose.animation.fadeOut
15+import androidx.compose.animation.scaleIn
16+import androidx.compose.animation.scaleOut
17+import androidx.compose.foundation.ExperimentalFoundationApi
18+import androidx.compose.foundation.background
19+import androidx.compose.foundation.clickable
20+import androidx.compose.foundation.combinedClickable
3import androidx.compose.foundation.layout.Arrangement
21import androidx.compose.foundation.layout.Arrangement
4import androidx.compose.foundation.layout.Box
22import androidx.compose.foundation.layout.Box
23+import androidx.compose.foundation.layout.BoxScope
5import androidx.compose.foundation.layout.Column
24import androidx.compose.foundation.layout.Column
6import androidx.compose.foundation.layout.Row
25import androidx.compose.foundation.layout.Row
26+import androidx.compose.foundation.layout.Spacer
7import androidx.compose.foundation.layout.fillMaxSize
27import androidx.compose.foundation.layout.fillMaxSize
8import androidx.compose.foundation.layout.fillMaxWidth
28import androidx.compose.foundation.layout.fillMaxWidth
29+import androidx.compose.foundation.layout.heightIn
9import androidx.compose.foundation.layout.PaddingValues
30import androidx.compose.foundation.layout.PaddingValues
31+import androidx.compose.foundation.layout.WindowInsets
32+import androidx.compose.foundation.layout.ime
10import androidx.compose.foundation.layout.imePadding
33import androidx.compose.foundation.layout.imePadding
11import androidx.compose.foundation.layout.padding
34import androidx.compose.foundation.layout.padding
12import androidx.compose.foundation.layout.size
35import androidx.compose.foundation.layout.size
13import androidx.compose.foundation.lazy.LazyColumn
36import androidx.compose.foundation.lazy.LazyColumn
14−import androidx.compose.foundation.lazy.items
37+import androidx.compose.foundation.lazy.itemsIndexed
15import androidx.compose.foundation.lazy.rememberLazyListState
38import androidx.compose.foundation.lazy.rememberLazyListState
39+import androidx.compose.foundation.shape.CircleShape
40+import androidx.compose.foundation.shape.RoundedCornerShape
41+import androidx.compose.foundation.text.KeyboardActions
42+import androidx.compose.foundation.text.KeyboardOptions
16import androidx.compose.material.icons.Icons
43import androidx.compose.material.icons.Icons
17import androidx.compose.material.icons.automirrored.filled.ArrowBack
44import androidx.compose.material.icons.automirrored.filled.ArrowBack
18import androidx.compose.material.icons.automirrored.filled.Send
45import androidx.compose.material.icons.automirrored.filled.Send
46+import androidx.compose.material.icons.filled.ChatBubbleOutline
47+import androidx.compose.material.icons.filled.Close
48+import androidx.compose.material.icons.filled.KeyboardArrowDown
49+import androidx.compose.material.icons.filled.KeyboardArrowUp
19import androidx.compose.material.icons.filled.Stop
50import androidx.compose.material.icons.filled.Stop
20import androidx.compose.material3.CircularProgressIndicator
51import androidx.compose.material3.CircularProgressIndicator
21import androidx.compose.material3.ExperimentalMaterial3Api
52import androidx.compose.material3.ExperimentalMaterial3Api
22import androidx.compose.material3.FilledIconButton
53import androidx.compose.material3.FilledIconButton
54+import androidx.compose.material3.FilledTonalButton
55+import androidx.compose.material3.FloatingActionButton
23import androidx.compose.material3.Icon
56import androidx.compose.material3.Icon
24import androidx.compose.material3.IconButton
57import androidx.compose.material3.IconButton
58+import androidx.compose.material3.LinearProgressIndicator
25import androidx.compose.material3.MaterialTheme
59import androidx.compose.material3.MaterialTheme
26import androidx.compose.material3.OutlinedTextField
60import androidx.compose.material3.OutlinedTextField
27import androidx.compose.material3.Scaffold
61import androidx.compose.material3.Scaffold
28import androidx.compose.material3.Surface
62import androidx.compose.material3.Surface
29import androidx.compose.material3.Text
63import androidx.compose.material3.Text
64+import androidx.compose.material3.TextButton
30import androidx.compose.material3.TopAppBar
65import androidx.compose.material3.TopAppBar
31import androidx.compose.runtime.Composable
66import androidx.compose.runtime.Composable
32import androidx.compose.runtime.LaunchedEffect
67import androidx.compose.runtime.LaunchedEffect
68+import androidx.compose.runtime.derivedStateOf
69+import androidx.compose.runtime.getValue
70+import androidx.compose.runtime.mutableStateOf
71+import androidx.compose.runtime.remember
72+import androidx.compose.runtime.rememberCoroutineScope
73+import androidx.compose.runtime.setValue
33import androidx.compose.ui.Alignment
74import androidx.compose.ui.Alignment
34import androidx.compose.ui.Modifier
75import androidx.compose.ui.Modifier
76+import androidx.compose.ui.draw.clip
77+import 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
81+import androidx.compose.ui.platform.LocalHapticFeedback
82+import androidx.compose.ui.text.font.FontStyle
83+import androidx.compose.ui.text.input.ImeAction
84+import androidx.compose.ui.text.style.TextAlign
35import androidx.compose.ui.text.style.TextOverflow
85import androidx.compose.ui.text.style.TextOverflow
36import androidx.compose.ui.unit.dp
86import androidx.compose.ui.unit.dp
87+import kotlinx.coroutines.launch
37import soy.iko.opencode.core.Event
88import soy.iko.opencode.core.Event
38import soy.iko.opencode.core.UiState
89import soy.iko.opencode.core.UiState
39import soy.iko.opencode.ui.components.MessageBubble
90import soy.iko.opencode.ui.components.MessageBubble
40
91
41−@OptIn(ExperimentalMaterial3Api::class)
92+@OptIn(ExperimentalMaterial3Api::class, ExperimentalFoundationApi::class)
42@Composable
93@Composable
43fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {
94fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {
44 val listState = rememberLazyListState()
95 val listState = rememberLazyListState()
96+ 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
103+
104+ // Show a jump-to-bottom button once the user scrolls up away from the latest
105+ // message. derivedStateOf keeps this from recomposing on every pixel of scroll —
106+ // it only flips when the near-bottom threshold is actually crossed.
107+ val showScrollButton by remember {
108+ derivedStateOf {
109+ val layoutInfo = listState.layoutInfo
110+ val lastVisibleIndex = layoutInfo.visibleItemsInfo.lastOrNull()?.index ?: 0
111+ val totalItems = layoutInfo.totalItemsCount
112+ totalItems > 0 && lastVisibleIndex < totalItems - 3
113+ }
114+ }
115+
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+
122+ // Track how many messages the user has "seen" (i.e. was at the bottom for). While
123+ // they're scrolled up, any messages beyond that count are unseen — flag the FAB.
124+ var lastSeenCount by remember { mutableStateOf(0) }
125+ LaunchedEffect(showScrollButton, state.messages.size) {
126+ if (!showScrollButton) {
127+ lastSeenCount = state.messages.size
128+ }
129+ }
130+ val hasUnseenMessages = showScrollButton && state.messages.size > lastSeenCount
45
131
46 // Keep the newest content in view as it streams in, but only when the user is
132 // Keep the newest content in view as it streams in, but only when the user is
47 // already near the bottom. If they've scrolled up to read history, leave it alone.
133 // already near the bottom. If they've scrolled up to read history, leave it alone.
@@ -62,10 +148,20 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {
62 topBar = {
148 topBar = {
63 TopAppBar(
149 TopAppBar(
64 title = {
150 title = {
151+ val title = state.currentSessionTitle.ifEmpty { "Chat" }
65 Text(
152 Text(
66− text = state.currentSessionTitle.ifEmpty { "Chat" },
153+ text = if (state.messages.isNotEmpty()) "$title (${state.messages.size})" else title,
67 maxLines = 1,
154 maxLines = 1,
68 overflow = TextOverflow.Ellipsis,
155 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+ ),
69 )
165 )
70 },
166 },
71 navigationIcon = {
167 navigationIcon = {
@@ -87,67 +183,408 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {
87 ChatInputBar(
183 ChatInputBar(
88 draft = state.draft,
184 draft = state.draft,
89 generating = state.generating,
185 generating = state.generating,
186+ loading = state.loading && state.messages.isEmpty(),
90 onDraftChange = { dispatch(Event.DraftChanged(it)) },
187 onDraftChange = { dispatch(Event.DraftChanged(it)) },
91 onSend = { dispatch(Event.SendMessage(state.draft)) },
188 onSend = { dispatch(Event.SendMessage(state.draft)) },
92 onStop = { dispatch(Event.CancelGeneration) },
189 onStop = { dispatch(Event.CancelGeneration) },
93 )
190 )
94 },
191 },
95 ) { padding ->
192 ) { padding ->
96− Box(Modifier.fillMaxSize().padding(padding)) {
193+ Column(Modifier.fillMaxSize().padding(padding)) {
194+ if (!state.sseConnected && !state.generating) {
195+ ReconnectingBanner()
196+ }
197+ if (state.loading && state.messages.isEmpty()) {
198+ LinearProgressIndicator(Modifier.fillMaxWidth())
199+ }
200+ if (state.error != null && state.messages.isNotEmpty()) {
201+ ErrorBanner(
202+ message = state.error,
203+ onDismiss = { dispatch(Event.DismissError) },
204+ )
205+ }
206+ Box(Modifier.fillMaxWidth().weight(1f)) {
97− if (state.messages.isEmpty() && !state.loading) {
207+ if (state.messages.isEmpty() && !state.loading) {
208+ Column(
209+ modifier = Modifier.align(Alignment.Center).padding(32.dp),
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))
98− Text(
219+ Text(
99− text = "Send a message to start the conversation.",
220+ text = "Send a message to start the conversation.",
100− style = MaterialTheme.typography.bodyMedium,
221+ style = MaterialTheme.typography.bodyMedium,
101− color = MaterialTheme.colorScheme.onSurfaceVariant,
222+ color = MaterialTheme.colorScheme.onSurfaceVariant,
223+ textAlign = TextAlign.Center,
224+ )
225+ }
226+ }
227+ LazyColumn(
228+ state = listState,
102− modifier = Modifier.align(Alignment.Center).padding(32.dp),
229+ modifier = Modifier.fillMaxSize(),
230+ contentPadding = PaddingValues(vertical = 8.dp),
231+ ) {
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+ }
253+ }
254+ }
255+ ScrollToBottomButton(
256+ visible = showScrollButton && !isImeVisible,
257+ showBadge = hasUnseenMessages,
258+ onClick = {
259+ coroutineScope.launch {
260+ if (state.messages.isNotEmpty()) {
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)
268+ }
269+ }
270+ },
271+ )
272+ ScrollToTopButton(
273+ visible = showScrollTop,
274+ onClick = {
275+ coroutineScope.launch {
276+ listState.animateScrollToItem(0)
277+ }
278+ },
103 )
279 )
104 }
280 }
105− LazyColumn(
281+ }
106− state = listState,
282+ }
283+}
284+
285+// Extracted into a BoxScope extension so the top-level AnimatedVisibility overload
286+// resolves cleanly. Called inline inside a Column, the enclosing ColumnScope receiver
287+// would otherwise capture the ColumnScope.AnimatedVisibility overload and fail to compile.
288+@Composable
289+private fun BoxScope.ScrollToBottomButton(visible: Boolean, showBadge: Boolean, onClick: () -> Unit) {
290+ AnimatedVisibility(
291+ visible = visible,
292+ modifier = Modifier.align(Alignment.BottomEnd),
293+ enter = scaleIn() + fadeIn(),
294+ exit = scaleOut() + fadeOut(),
295+ ) {
296+ Box(Modifier.padding(16.dp)) {
297+ FloatingActionButton(
298+ onClick = onClick,
107− modifier = Modifier.fillMaxSize(),
299+ modifier = Modifier.size(44.dp),
108− contentPadding = PaddingValues(vertical = 8.dp),
109 ) {
300 ) {
110− items(state.messages, key = { it.id }) { message ->
301+ Icon(
111− MessageBubble(message)
302+ Icons.Filled.KeyboardArrowDown,
303+ contentDescription = "Scroll to latest message",
304+ )
305+ }
306+ if (showBadge) {
307+ Box(
308+ modifier = Modifier
309+ .align(Alignment.TopEnd)
310+ .size(8.dp)
311+ .clip(CircleShape)
312+ .background(MaterialTheme.colorScheme.error),
313+ )
314+ }
315+ }
316+ }
317+}
318+
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+ )
112 }
430 }
113 }
431 }
114 }
432 }
115 }
433 }
116}
434}
117
435
436+@Composable
437+private fun ReconnectingBanner() {
438+ Surface(
439+ modifier = Modifier.fillMaxWidth(),
440+ color = MaterialTheme.colorScheme.tertiaryContainer,
441+ ) {
442+ Row(
443+ modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 6.dp),
444+ verticalAlignment = Alignment.CenterVertically,
445+ horizontalArrangement = Arrangement.spacedBy(8.dp),
446+ ) {
447+ CircularProgressIndicator(
448+ modifier = Modifier.size(14.dp),
449+ strokeWidth = 2.dp,
450+ color = MaterialTheme.colorScheme.onTertiaryContainer,
451+ )
452+ Text(
453+ text = "Reconnecting…",
454+ style = MaterialTheme.typography.bodySmall,
455+ color = MaterialTheme.colorScheme.onTertiaryContainer,
456+ )
457+ }
458+ }
459+}
460+
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+
118@Composable
490@Composable
119private fun ChatInputBar(
491private fun ChatInputBar(
120 draft: String,
492 draft: String,
121 generating: Boolean,
493 generating: Boolean,
494+ loading: Boolean,
122 onDraftChange: (String) -> Unit,
495 onDraftChange: (String) -> Unit,
123 onSend: () -> Unit,
496 onSend: () -> Unit,
124 onStop: () -> Unit,
497 onStop: () -> Unit,
125) {
498) {
499+ val haptic = LocalHapticFeedback.current
500+ val clipboardManager = LocalClipboardManager.current
126 Surface(tonalElevation = 3.dp) {
501 Surface(tonalElevation = 3.dp) {
127− Row(
502+ Column(
128 modifier = Modifier.fillMaxWidth().imePadding().padding(horizontal = 12.dp, vertical = 8.dp),
503 modifier = Modifier.fillMaxWidth().imePadding().padding(horizontal = 12.dp, vertical = 8.dp),
504+ ) {
505+ Row(
506+ modifier = Modifier.fillMaxWidth(),
129 verticalAlignment = Alignment.Bottom,
507 verticalAlignment = Alignment.Bottom,
130 horizontalArrangement = Arrangement.spacedBy(8.dp),
508 horizontalArrangement = Arrangement.spacedBy(8.dp),
131 ) {
509 ) {
132 OutlinedTextField(
510 OutlinedTextField(
133 value = draft,
511 value = draft,
134 onValueChange = onDraftChange,
512 onValueChange = onDraftChange,
135− modifier = Modifier.weight(1f),
513+ modifier = Modifier.weight(1f).heightIn(min = 48.dp),
514+ enabled = !loading,
136 placeholder = { Text("Message opencode…") },
515 placeholder = { Text("Message opencode…") },
137 maxLines = 5,
516 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+ },
550+ keyboardOptions = KeyboardOptions(imeAction = ImeAction.Send),
551+ keyboardActions = KeyboardActions(onSend = {
552+ if (!generating && !loading && draft.isNotBlank()) onSend()
553+ }),
138 )
554 )
139 if (generating) {
555 if (generating) {
140− FilledIconButton(onClick = onStop) {
556+ FilledTonalButton(onClick = onStop) {
557+ Icon(
558+ Icons.Filled.Stop,
141− Icon(Icons.Filled.Stop, contentDescription = "Stop generating")
559+ contentDescription = null,
560+ modifier = Modifier.size(18.dp),
561+ )
562+ Spacer(Modifier.size(6.dp))
563+ Text("Stop")
142 }
564 }
143 } else {
565 } else {
144 FilledIconButton(
566 FilledIconButton(
145− onClick = onSend,
567+ onClick = {
568+ haptic.performHapticFeedback(HapticFeedbackType.LongPress)
569+ onSend()
570+ },
146− enabled = draft.isNotBlank(),
571+ enabled = draft.isNotBlank() && !loading,
147 ) {
572 ) {
148 Icon(Icons.AutoMirrored.Filled.Send, contentDescription = "Send")
573 Icon(Icons.AutoMirrored.Filled.Send, contentDescription = "Send")
149 }
574 }
150 }
575 }
151 }
576 }
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+ }
152 }
589 }
153}
590}
app/src/main/java/soy/iko/opencode/ui/screens/ConnectScreen.kt+100−4
@@ -8,6 +8,7 @@ import androidx.compose.foundation.layout.fillMaxWidth
8import androidx.compose.foundation.layout.height
8import androidx.compose.foundation.layout.height
9import androidx.compose.foundation.layout.imePadding
9import androidx.compose.foundation.layout.imePadding
10import androidx.compose.foundation.layout.padding
10import androidx.compose.foundation.layout.padding
11+import androidx.compose.foundation.layout.size
11import androidx.compose.foundation.rememberScrollState
12import androidx.compose.foundation.rememberScrollState
12import androidx.compose.foundation.text.KeyboardActions
13import androidx.compose.foundation.text.KeyboardActions
13import androidx.compose.foundation.text.KeyboardOptions
14import androidx.compose.foundation.text.KeyboardOptions
@@ -15,18 +16,30 @@ import androidx.compose.foundation.verticalScroll
15import androidx.compose.material.icons.Icons
16import androidx.compose.material.icons.Icons
16import androidx.compose.material.icons.filled.Lock
17import androidx.compose.material.icons.filled.Lock
17import androidx.compose.material.icons.filled.Person
18import androidx.compose.material.icons.filled.Person
19+import androidx.compose.material.icons.filled.Terminal
20+import androidx.compose.material.icons.filled.Visibility
21+import androidx.compose.material.icons.filled.VisibilityOff
18import androidx.compose.material3.Button
22import androidx.compose.material3.Button
19import androidx.compose.material3.CircularProgressIndicator
23import androidx.compose.material3.CircularProgressIndicator
20import androidx.compose.material3.Icon
24import androidx.compose.material3.Icon
25+import androidx.compose.material3.IconButton
21import androidx.compose.material3.MaterialTheme
26import androidx.compose.material3.MaterialTheme
22import androidx.compose.material3.OutlinedTextField
27import androidx.compose.material3.OutlinedTextField
23import androidx.compose.material3.Text
28import androidx.compose.material3.Text
24import androidx.compose.runtime.Composable
29import androidx.compose.runtime.Composable
30+import androidx.compose.runtime.LaunchedEffect
31+import androidx.compose.runtime.getValue
32+import androidx.compose.runtime.mutableStateOf
33+import androidx.compose.runtime.remember
34+import androidx.compose.runtime.setValue
25import androidx.compose.ui.Alignment
35import androidx.compose.ui.Alignment
26import androidx.compose.ui.Modifier
36import androidx.compose.ui.Modifier
37+import androidx.compose.ui.focus.FocusRequester
38+import androidx.compose.ui.focus.focusRequester
27import androidx.compose.ui.text.input.ImeAction
39import androidx.compose.ui.text.input.ImeAction
28import androidx.compose.ui.text.input.KeyboardType
40import androidx.compose.ui.text.input.KeyboardType
29import androidx.compose.ui.text.input.PasswordVisualTransformation
41import androidx.compose.ui.text.input.PasswordVisualTransformation
42+import androidx.compose.ui.text.input.VisualTransformation
30import androidx.compose.ui.text.style.TextAlign
43import androidx.compose.ui.text.style.TextAlign
31import androidx.compose.ui.unit.dp
44import androidx.compose.ui.unit.dp
32import soy.iko.opencode.core.Event
45import soy.iko.opencode.core.Event
@@ -34,6 +47,15 @@ import soy.iko.opencode.core.UiState
34
47
35@Composable
48@Composable
36fun ConnectScreen(state: UiState, dispatch: (Event) -> Unit) {
49fun ConnectScreen(state: UiState, dispatch: (Event) -> Unit) {
50+ val focusRequester = remember { FocusRequester() }
51+ var passwordVisible by remember { mutableStateOf(false) }
52+
53+ // Focus the server URL field when the screen opens, but only when it's empty
54+ // so we don't steal focus (and pop the keyboard) on a return visit.
55+ LaunchedEffect(Unit) {
56+ if (state.serverUrl.isEmpty()) focusRequester.requestFocus()
57+ }
58+
37 Column(
59 Column(
38 modifier = Modifier
60 modifier = Modifier
39 .fillMaxSize()
61 .fillMaxSize()
@@ -43,6 +65,13 @@ fun ConnectScreen(state: UiState, dispatch: (Event) -> Unit) {
43 verticalArrangement = Arrangement.Center,
65 verticalArrangement = Arrangement.Center,
44 horizontalAlignment = Alignment.CenterHorizontally,
66 horizontalAlignment = Alignment.CenterHorizontally,
45 ) {
67 ) {
68+ Icon(
69+ Icons.Filled.Terminal,
70+ contentDescription = null,
71+ tint = MaterialTheme.colorScheme.primary,
72+ modifier = Modifier.size(72.dp),
73+ )
74+ Spacer(Modifier.height(16.dp))
46 Text(
75 Text(
47 text = "opencode",
76 text = "opencode",
48 style = MaterialTheme.typography.displaySmall,
77 style = MaterialTheme.typography.displaySmall,
@@ -63,7 +92,7 @@ fun ConnectScreen(state: UiState, dispatch: (Event) -> Unit) {
63 label = { Text("Server URL") },
92 label = { Text("Server URL") },
64 placeholder = { Text("http://192.168.1.10:4096") },
93 placeholder = { Text("http://192.168.1.10:4096") },
65 singleLine = true,
94 singleLine = true,
66− modifier = Modifier.fillMaxWidth(),
95+ modifier = Modifier.fillMaxWidth().focusRequester(focusRequester),
67 keyboardOptions = KeyboardOptions(
96 keyboardOptions = KeyboardOptions(
68 keyboardType = KeyboardType.Uri,
97 keyboardType = KeyboardType.Uri,
69 imeAction = if (state.authRequired) ImeAction.Next else ImeAction.Go,
98 imeAction = if (state.authRequired) ImeAction.Next else ImeAction.Go,
@@ -72,6 +101,30 @@ fun ConnectScreen(state: UiState, dispatch: (Event) -> Unit) {
72 enabled = !state.loading,
101 enabled = !state.loading,
73 )
102 )
74
103
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+
75 if (state.authRequired) {
128 if (state.authRequired) {
76 Spacer(Modifier.height(12.dp))
129 Spacer(Modifier.height(12.dp))
77 OutlinedTextField(
130 OutlinedTextField(
@@ -90,11 +143,27 @@ fun ConnectScreen(state: UiState, dispatch: (Event) -> Unit) {
90 onValueChange = { dispatch(Event.PasswordChanged(it)) },
143 onValueChange = { dispatch(Event.PasswordChanged(it)) },
91 label = { Text("Password") },
144 label = { Text("Password") },
92 singleLine = true,
145 singleLine = true,
93− visualTransformation = PasswordVisualTransformation(),
146+ visualTransformation = if (passwordVisible) VisualTransformation.None else PasswordVisualTransformation(),
94 leadingIcon = { Icon(Icons.Filled.Lock, contentDescription = null) },
147 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+ },
95 modifier = Modifier.fillMaxWidth(),
156 modifier = Modifier.fillMaxWidth(),
96 keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password, imeAction = ImeAction.Go),
157 keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Password, imeAction = ImeAction.Go),
97− 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+ }),
98 enabled = !state.loading,
167 enabled = !state.loading,
99 )
168 )
100 Spacer(Modifier.height(4.dp))
169 Spacer(Modifier.height(4.dp))
@@ -109,7 +178,10 @@ fun ConnectScreen(state: UiState, dispatch: (Event) -> Unit) {
109
178
110 Button(
179 Button(
111 onClick = { dispatch(Event.Connect) },
180 onClick = { dispatch(Event.Connect) },
181+ // When auth is required, keep the button disabled until at least one
182+ // credential is entered — otherwise it just triggers a validation error.
112− enabled = !state.loading && state.serverUrl.isNotBlank(),
183+ enabled = !state.loading && state.serverUrl.isNotBlank() &&
184+ (!state.authRequired || state.username.isNotBlank() || state.password.isNotBlank()),
113 modifier = Modifier.fillMaxWidth(),
185 modifier = Modifier.fillMaxWidth(),
114 ) {
186 ) {
115 if (state.loading) {
187 if (state.loading) {
@@ -122,5 +194,29 @@ fun ConnectScreen(state: UiState, dispatch: (Event) -> Unit) {
122 Text(if (state.authRequired) "Sign in" else "Connect")
194 Text(if (state.authRequired) "Sign in" else "Connect")
123 }
195 }
124 }
196 }
197+
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+
210+ // Surface the error inline as well, so it stays visible while the user
211+ // corrects the form (the snackbar is transient).
212+ if (state.error != null && !state.loading) {
213+ Spacer(Modifier.height(8.dp))
214+ Text(
215+ text = state.error,
216+ style = MaterialTheme.typography.bodySmall,
217+ color = MaterialTheme.colorScheme.error,
218+ textAlign = TextAlign.Center,
219+ )
220+ }
125 }
221 }
126}
222}
app/src/main/java/soy/iko/opencode/ui/screens/SessionsScreen.kt+245−19
@@ -1,22 +1,37 @@
1package soy.iko.opencode.ui.screens
1package soy.iko.opencode.ui.screens
2
2
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
8+import androidx.compose.foundation.background
3import androidx.compose.foundation.clickable
9import androidx.compose.foundation.clickable
10+import androidx.compose.foundation.combinedClickable
4import androidx.compose.foundation.layout.Arrangement
11import androidx.compose.foundation.layout.Arrangement
12+import androidx.compose.foundation.layout.Box
5import androidx.compose.foundation.layout.Column
13import androidx.compose.foundation.layout.Column
6import androidx.compose.foundation.layout.PaddingValues
14import androidx.compose.foundation.layout.PaddingValues
7import androidx.compose.foundation.layout.Row
15import androidx.compose.foundation.layout.Row
16+import androidx.compose.foundation.layout.Spacer
8import androidx.compose.foundation.layout.fillMaxSize
17import androidx.compose.foundation.layout.fillMaxSize
9import androidx.compose.foundation.layout.fillMaxWidth
18import androidx.compose.foundation.layout.fillMaxWidth
19+import androidx.compose.foundation.layout.height
10import androidx.compose.foundation.layout.padding
20import androidx.compose.foundation.layout.padding
21+import androidx.compose.foundation.layout.size
11import androidx.compose.foundation.lazy.LazyColumn
22import androidx.compose.foundation.lazy.LazyColumn
12import androidx.compose.foundation.lazy.items
23import androidx.compose.foundation.lazy.items
24+import androidx.compose.foundation.lazy.rememberLazyListState
25+import androidx.compose.foundation.shape.CircleShape
13import androidx.compose.material.icons.Icons
26import androidx.compose.material.icons.Icons
14import androidx.compose.material.icons.automirrored.filled.ArrowBack
27import androidx.compose.material.icons.automirrored.filled.ArrowBack
15import androidx.compose.material.icons.filled.Add
28import androidx.compose.material.icons.filled.Add
16import androidx.compose.material.icons.filled.ChatBubbleOutline
29import androidx.compose.material.icons.filled.ChatBubbleOutline
30+import androidx.compose.material.icons.filled.ChevronRight
17import androidx.compose.material.icons.filled.DeleteOutline
31import androidx.compose.material.icons.filled.DeleteOutline
18import androidx.compose.material.icons.filled.Refresh
32import androidx.compose.material.icons.filled.Refresh
19import androidx.compose.material3.AlertDialog
33import androidx.compose.material3.AlertDialog
34+import androidx.compose.material3.CircularProgressIndicator
20import androidx.compose.material3.ExperimentalMaterial3Api
35import androidx.compose.material3.ExperimentalMaterial3Api
21import androidx.compose.material3.ExtendedFloatingActionButton
36import androidx.compose.material3.ExtendedFloatingActionButton
22import androidx.compose.material3.HorizontalDivider
37import androidx.compose.material3.HorizontalDivider
@@ -24,17 +39,31 @@ import androidx.compose.material3.Icon
24import androidx.compose.material3.IconButton
39import androidx.compose.material3.IconButton
25import androidx.compose.material3.LinearProgressIndicator
40import androidx.compose.material3.LinearProgressIndicator
26import androidx.compose.material3.MaterialTheme
41import androidx.compose.material3.MaterialTheme
42+import androidx.compose.material3.OutlinedTextField
27import androidx.compose.material3.Scaffold
43import androidx.compose.material3.Scaffold
44+import androidx.compose.material3.Surface
45+import androidx.compose.material3.SwipeToDismissBox
46+import androidx.compose.material3.SwipeToDismissBoxValue
28import androidx.compose.material3.Text
47import androidx.compose.material3.Text
29import androidx.compose.material3.TextButton
48import androidx.compose.material3.TextButton
30import androidx.compose.material3.TopAppBar
49import androidx.compose.material3.TopAppBar
50+import androidx.compose.material3.rememberSwipeToDismissBoxState
51+import androidx.compose.material3.pulltorefresh.PullToRefreshBox
52+import androidx.compose.material3.pulltorefresh.rememberPullToRefreshState
31import androidx.compose.runtime.Composable
53import androidx.compose.runtime.Composable
54+import androidx.compose.runtime.LaunchedEffect
32import androidx.compose.runtime.getValue
55import androidx.compose.runtime.getValue
33import androidx.compose.runtime.mutableStateOf
56import androidx.compose.runtime.mutableStateOf
34import androidx.compose.runtime.remember
57import androidx.compose.runtime.remember
35import androidx.compose.runtime.setValue
58import androidx.compose.runtime.setValue
36import androidx.compose.ui.Alignment
59import androidx.compose.ui.Alignment
37import androidx.compose.ui.Modifier
60import androidx.compose.ui.Modifier
61+import androidx.compose.ui.draw.clip
62+import androidx.compose.ui.graphics.Color
63+import androidx.compose.ui.hapticfeedback.HapticFeedbackType
64+import androidx.compose.ui.platform.LocalContext
65+import androidx.compose.ui.platform.LocalHapticFeedback
66+import androidx.compose.ui.text.style.TextAlign
38import androidx.compose.ui.text.style.TextOverflow
67import androidx.compose.ui.text.style.TextOverflow
39import androidx.compose.ui.unit.dp
68import androidx.compose.ui.unit.dp
40import soy.iko.opencode.core.Event
69import soy.iko.opencode.core.Event
@@ -44,7 +73,25 @@ import soy.iko.opencode.core.UiState
44@OptIn(ExperimentalMaterial3Api::class)
73@OptIn(ExperimentalMaterial3Api::class)
45@Composable
74@Composable
46fun SessionsScreen(state: UiState, dispatch: (Event) -> Unit) {
75fun SessionsScreen(state: UiState, dispatch: (Event) -> Unit) {
76+ val haptic = LocalHapticFeedback.current
47 var pendingDeleteId by remember { mutableStateOf<String?>(null) }
77 var pendingDeleteId by remember { mutableStateOf<String?>(null) }
78+ var isPullRefreshing by remember { mutableStateOf(false) }
79+ 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+ }
89+
90+ // The pull-to-refresh spinner should only reflect a user-initiated pull, not
91+ // every loading operation. Clear it once the underlying load completes.
92+ LaunchedEffect(state.loading) {
93+ if (!state.loading) isPullRefreshing = false
94+ }
48
95
49 pendingDeleteId?.let { deleteId ->
96 pendingDeleteId?.let { deleteId ->
50 val pendingSession = state.sessions.firstOrNull { it.id == deleteId }
97 val pendingSession = state.sessions.firstOrNull { it.id == deleteId }
@@ -54,6 +101,7 @@ fun SessionsScreen(state: UiState, dispatch: (Event) -> Unit) {
54 text = { Text(pendingSession?.title ?: deleteId) },
101 text = { Text(pendingSession?.title ?: deleteId) },
55 confirmButton = {
102 confirmButton = {
56 TextButton(onClick = {
103 TextButton(onClick = {
104+ haptic.performHapticFeedback(HapticFeedbackType.LongPress)
57 dispatch(Event.DeleteSession(deleteId))
105 dispatch(Event.DeleteSession(deleteId))
58 pendingDeleteId = null
106 pendingDeleteId = null
59 }) {
107 }) {
@@ -71,7 +119,23 @@ fun SessionsScreen(state: UiState, dispatch: (Event) -> Unit) {
71 Scaffold(
119 Scaffold(
72 topBar = {
120 topBar = {
73 TopAppBar(
121 TopAppBar(
74− 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+ },
75 navigationIcon = {
139 navigationIcon = {
76 IconButton(onClick = { dispatch(Event.NavigateToConnect) }) {
140 IconButton(onClick = { dispatch(Event.NavigateToConnect) }) {
77 Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Disconnect")
141 Icon(Icons.AutoMirrored.Filled.ArrowBack, contentDescription = "Disconnect")
@@ -85,30 +149,88 @@ fun SessionsScreen(state: UiState, dispatch: (Event) -> Unit) {
85 )
149 )
86 },
150 },
87 floatingActionButton = {
151 floatingActionButton = {
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()) {
88− ExtendedFloatingActionButton(
155+ ExtendedFloatingActionButton(
89− onClick = { dispatch(Event.CreateSession) },
156+ onClick = { dispatch(Event.CreateSession) },
90− icon = { Icon(Icons.Filled.Add, contentDescription = null) },
157+ icon = { Icon(Icons.Filled.Add, contentDescription = null) },
91− text = { Text("New session") },
158+ text = { Text("New session") },
92− )
159+ )
160+ }
93 },
161 },
94 ) { padding ->
162 ) { padding ->
95 Column(Modifier.fillMaxSize().padding(padding)) {
163 Column(Modifier.fillMaxSize().padding(padding)) {
164+ if (!state.sseConnected) {
165+ ReconnectingBanner()
166+ }
96− if (state.loading) {
167+ if (state.loading && !isPullRefreshing) {
97 LinearProgressIndicator(Modifier.fillMaxWidth())
168 LinearProgressIndicator(Modifier.fillMaxWidth())
98 }
169 }
170+ if (state.sessions.isNotEmpty()) {
171+ OutlinedTextField(
172+ value = searchQuery,
173+ onValueChange = { searchQuery = it },
174+ placeholder = { Text("Search sessions") },
175+ singleLine = true,
176+ modifier = Modifier
177+ .fillMaxWidth()
178+ .padding(horizontal = 16.dp, vertical = 8.dp),
179+ )
180+ }
181+ val filteredSessions = if (searchQuery.isEmpty()) {
182+ state.sessions
183+ } else {
184+ state.sessions.filter {
185+ it.title.contains(searchQuery, ignoreCase = true) ||
186+ it.id.contains(searchQuery, ignoreCase = true)
187+ }
188+ }
99 when {
189 when {
100 state.sessions.isEmpty() && !state.loading -> EmptySessions()
190 state.sessions.isEmpty() && !state.loading -> EmptySessions()
101− else -> LazyColumn(
191+ filteredSessions.isEmpty() && searchQuery.isNotEmpty() -> NoSearchResults(searchQuery)
192+ else -> PullToRefreshBox(
193+ isRefreshing = isPullRefreshing,
194+ onRefresh = {
195+ isPullRefreshing = true
196+ dispatch(Event.LoadSessions)
197+ },
102 modifier = Modifier.fillMaxSize(),
198 modifier = Modifier.fillMaxSize(),
103− contentPadding = PaddingValues(bottom = 88.dp),
199+ state = rememberPullToRefreshState(),
104 ) {
200 ) {
201+ LazyColumn(
202+ state = sessionsListState,
203+ modifier = Modifier.fillMaxSize(),
204+ contentPadding = PaddingValues(bottom = 88.dp),
205+ ) {
105− items(state.sessions, key = { it.id }) { session ->
206+ items(filteredSessions, key = { it.id }) { session ->
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+ },
219+ )
220+ SwipeToDismissBox(
221+ state = dismissState,
222+ enableDismissFromStartToEnd = false,
223+ backgroundContent = { SwipeDeleteBackground() },
224+ ) {
106− SessionRow(
225+ SessionRow(
107− session = session,
226+ session = session,
108− onOpen = { dispatch(Event.SelectSession(session.id)) },
227+ onOpen = { dispatch(Event.SelectSession(session.id)) },
109− onDelete = { pendingDeleteId = session.id },
228+ onDelete = { pendingDeleteId = session.id },
110− )
229+ )
230+ }
111− HorizontalDivider(color = MaterialTheme.colorScheme.outline.copy(alpha = 0.25f))
231+ HorizontalDivider(color = MaterialTheme.colorScheme.outline.copy(alpha = 0.25f))
232+ }
233+ }
112 }
234 }
113 }
235 }
114 }
236 }
@@ -116,12 +238,21 @@ fun SessionsScreen(state: UiState, dispatch: (Event) -> Unit) {
116 }
238 }
117}
239}
118
240
241+@OptIn(ExperimentalFoundationApi::class)
119@Composable
242@Composable
120private fun SessionRow(session: SessionView, onOpen: () -> Unit, onDelete: () -> Unit) {
243private fun SessionRow(session: SessionView, onOpen: () -> Unit, onDelete: () -> Unit) {
244+ val context = LocalContext.current
121 Row(
245 Row(
122 modifier = Modifier
246 modifier = Modifier
123 .fillMaxWidth()
247 .fillMaxWidth()
248+ .background(MaterialTheme.colorScheme.surface)
249+ .combinedClickable(
124− .clickable(onClick = onOpen)
250+ onClick = onOpen,
251+ onLongClick = {
252+ copyToClipboard(context, session.id)
253+ Toast.makeText(context, "Session ID copied", Toast.LENGTH_SHORT).show()
254+ },
255+ )
125 .padding(start = 20.dp, end = 8.dp, top = 14.dp, bottom = 14.dp),
256 .padding(start = 20.dp, end = 8.dp, top = 14.dp, bottom = 14.dp),
126 verticalAlignment = Alignment.CenterVertically,
257 verticalAlignment = Alignment.CenterVertically,
127 ) {
258 ) {
@@ -139,23 +270,104 @@ private fun SessionRow(session: SessionView, onOpen: () -> Unit, onDelete: () ->
139 overflow = TextOverflow.Ellipsis,
270 overflow = TextOverflow.Ellipsis,
140 )
271 )
141 Text(
272 Text(
142− text = session.id,
273+ text = shortSessionId(session.id),
143 style = MaterialTheme.typography.bodySmall,
274 style = MaterialTheme.typography.bodySmall,
144 color = MaterialTheme.colorScheme.onSurfaceVariant,
275 color = MaterialTheme.colorScheme.onSurfaceVariant,
145 maxLines = 1,
276 maxLines = 1,
146 overflow = TextOverflow.Ellipsis,
277 overflow = TextOverflow.Ellipsis,
147 )
278 )
148 }
279 }
280+ Icon(
281+ Icons.Filled.ChevronRight,
282+ contentDescription = null,
283+ tint = MaterialTheme.colorScheme.onSurfaceVariant,
284+ modifier = Modifier.padding(horizontal = 4.dp),
285+ )
149 IconButton(onClick = onDelete) {
286 IconButton(onClick = onDelete) {
150 Icon(
287 Icon(
151 Icons.Filled.DeleteOutline,
288 Icons.Filled.DeleteOutline,
152 contentDescription = "Delete session",
289 contentDescription = "Delete session",
153− tint = MaterialTheme.colorScheme.onSurfaceVariant,
290+ tint = MaterialTheme.colorScheme.error,
291+ )
292+ }
293+ }
294+}
295+
296+/** Red background with a trailing delete icon and label, revealed while swiping a session row away. */
297+@Composable
298+private fun SwipeDeleteBackground() {
299+ Box(
300+ modifier = Modifier
301+ .fillMaxSize()
302+ .background(MaterialTheme.colorScheme.error)
303+ .padding(horizontal = 24.dp),
304+ contentAlignment = Alignment.CenterEnd,
305+ ) {
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),
154 )
317 )
155 }
318 }
156 }
319 }
157}
320}
158
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+ }
345+ }
346+}
347+
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+
353+/** Shorten a session ID for display: "abc12345…" instead of the full UUID. */
354+private fun shortSessionId(id: String): String =
355+ if (id.length > 12) id.take(8) + "…" else id
356+
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+
159@Composable
371@Composable
160private fun EmptySessions() {
372private fun EmptySessions() {
161 Column(
373 Column(
@@ -163,6 +375,13 @@ private fun EmptySessions() {
163 verticalArrangement = Arrangement.Center,
375 verticalArrangement = Arrangement.Center,
164 horizontalAlignment = Alignment.CenterHorizontally,
376 horizontalAlignment = Alignment.CenterHorizontally,
165 ) {
377 ) {
378+ Icon(
379+ Icons.Filled.ChatBubbleOutline,
380+ contentDescription = null,
381+ modifier = Modifier.size(64.dp),
382+ tint = MaterialTheme.colorScheme.primary.copy(alpha = 0.5f),
383+ )
384+ Spacer(Modifier.height(16.dp))
166 Text(
385 Text(
167 text = "No sessions yet",
386 text = "No sessions yet",
168 style = MaterialTheme.typography.titleMedium,
387 style = MaterialTheme.typography.titleMedium,
@@ -172,5 +391,12 @@ private fun EmptySessions() {
172 style = MaterialTheme.typography.bodyMedium,
391 style = MaterialTheme.typography.bodyMedium,
173 color = MaterialTheme.colorScheme.onSurfaceVariant,
392 color = MaterialTheme.colorScheme.onSurfaceVariant,
174 )
393 )
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+ )
175 }
401 }
176}
402}
app/src/main/java/soy/iko/opencode/ui/theme/Theme.kt+23−4
@@ -1,6 +1,5 @@
1package soy.iko.opencode.ui.theme
1package soy.iko.opencode.ui.theme
2
2
3−import android.app.Activity
4import android.os.Build
3import android.os.Build
5import androidx.compose.foundation.isSystemInDarkTheme
4import androidx.compose.foundation.isSystemInDarkTheme
6import androidx.compose.material3.MaterialTheme
5import androidx.compose.material3.MaterialTheme
@@ -15,7 +14,18 @@ import androidx.compose.ui.platform.LocalContext
15private val DarkColors = darkColorScheme(
14private val DarkColors = darkColorScheme(
16 primary = Emerald,
15 primary = Emerald,
17 onPrimary = Color(0xFF0F1115),
16 onPrimary = Color(0xFF0F1115),
17+ primaryContainer = Color(0xFF1A3D2A),
18+ onPrimaryContainer = Color(0xFFA8E6C1),
18 secondary = EmeraldDark,
19 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),
19 background = DarkBackground,
29 background = DarkBackground,
20 surface = DarkSurface,
30 surface = DarkSurface,
21 surfaceVariant = DarkSurfaceVariant,
31 surfaceVariant = DarkSurfaceVariant,
@@ -25,7 +35,18 @@ private val DarkColors = darkColorScheme(
25
35
26private val LightColors = lightColorScheme(
36private val LightColors = lightColorScheme(
27 primary = EmeraldDark,
37 primary = EmeraldDark,
38+ primaryContainer = Color(0xFFD7F5E3),
39+ onPrimaryContainer = Color(0xFF0A3D22),
28 secondary = Emerald,
40 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),
29 background = LightBackground,
50 background = LightBackground,
30 surface = LightSurface,
51 surface = LightSurface,
31 surfaceVariant = LightSurfaceVariant,
52 surfaceVariant = LightSurfaceVariant,
@@ -33,12 +54,10 @@ private val LightColors = lightColorScheme(
33 outline = LightOutline,
54 outline = LightOutline,
34)
55)
35
56
36−private val Color0x0F1115 = androidx.compose.ui.graphics.Color(0xFF0F1115)
37−
38@Composable
57@Composable
39fun OpencodeTheme(
58fun OpencodeTheme(
40 darkTheme: Boolean = isSystemInDarkTheme(),
59 darkTheme: Boolean = isSystemInDarkTheme(),
41− dynamicColor: Boolean = true,
60+ dynamicColor: Boolean = false,
42 content: @Composable () -> Unit,
61 content: @Composable () -> Unit,
43) {
62) {
44 val context = LocalContext.current
63 val context = LocalContext.current
shared/src/app.rs+14
@@ -297,16 +297,27 @@ impl App for OpencodeApp {
297 // Store the field verbatim while typing; normalizing here would fight
297 // Store the field verbatim while typing; normalizing here would fight
298 // the user's edits (e.g. eat the "://" as they type it). The URL is
298 // the user's edits (e.g. eat the "://" as they type it). The URL is
299 // normalized once, on Connect.
299 // 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.
300 Event::ServerUrlChanged(url) => {
302 Event::ServerUrlChanged(url) => {
301 model.server_url = url;
303 model.server_url = url;
304+ if model.error.is_some() {
305+ model.error = None;
306+ }
302 render()
307 render()
303 }
308 }
304 Event::UsernameChanged(u) => {
309 Event::UsernameChanged(u) => {
305 model.username = u;
310 model.username = u;
311+ if model.error.is_some() {
312+ model.error = None;
313+ }
306 render()
314 render()
307 }
315 }
308 Event::PasswordChanged(p) => {
316 Event::PasswordChanged(p) => {
309 model.password = p;
317 model.password = p;
318+ if model.error.is_some() {
319+ model.error = None;
320+ }
310 render()
321 render()
311 }
322 }
312
323
@@ -341,6 +352,9 @@ impl App for OpencodeApp {
341 title: display_title(&s.title),
352 title: display_title(&s.title),
342 })
353 })
343 .collect();
354 .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());
344 }
358 }
345 Err(e) => model.error = Some(e),
359 Err(e) => model.error = Some(e),
346 }
360 }