master..b9f3596 · opencode-android

git.iko.soy/opencode-android

11 files changed+80−920

unifiedsplit

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

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

2323 init {

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

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

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

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

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

2926

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

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

3229 core.resumeStreamingIfConnected()

3330

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

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

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

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

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

39− core.dispatch(Event.Connect)

40− }

41− }

42−

4331 // Persist connection details once a connection succeeds.

4432 viewModelScope.launch {

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

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

4735 prefs.edit {

4836 putString(KEY_URL, state.serverUrl)

4937 putString(KEY_USER, state.username)

50− putString(KEY_PASSWORD, state.password)

5138 }

5239 }

5340 }

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

6148 private companion object {

6249 const val KEY_URL = "serverUrl"

6350 const val KEY_USER = "username"

64− const val KEY_PASSWORD = "password"

6551 }

6652}

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

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

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

5252 runCatching {

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

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

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

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

5756 }

app/src/main/java/soy/iko/opencode/core/OpencodeCore.kt+16−130

@@ -51,41 +51,15 @@ class OpencodeCore(

5151 private var reconnectAttempts = 0

5252 private var reconnectJob: Job? = null

5353

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

77−

7854 // ── Event entry point ──────────────────────────────────────────────────────

7955 fun dispatch(event: Event) {

8056 when (event) {

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

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

8359 // 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.

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

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

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

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

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

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

8963

9064 Event.Connect -> {

9165 serverUrl = normalizeUrl(serverUrl)

@@ -96,54 +70,31 @@ class OpencodeCore(

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

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

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

99− connectJob?.cancel()

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

73+ scope.launch { probeHealth() }

10174 }

10275

103− Event.LoadSessions -> {

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

105− loading = true; emit()

106− loadSessionsJob?.cancel()

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

108− }

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

10977

11078 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.

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

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

115− currentSessionTitle = session.title

79+ currentSessionTitle = sessions.firstOrNull { it.id == event.id }?.title.orEmpty()

11680 currentSessionId = event.id

11781 messages.clear()

118− removedMessageIds.clear()

11982 screen = Screen.Chat

12083 loading = true

12184 generating = false

12285 error = null

12386 emit()

124− connectJob?.cancel()

125− abortJob?.cancel()

126− sendMessageJob?.cancel()

127− deleteSessionJob?.cancel()

128− loadMessagesJob?.cancel()

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

87+ scope.launch { loadMessages(event.id) }

13088 }

13189

132− Event.CreateSession -> {

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

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

135− createSessionJob?.cancel()

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

137− }

90+ Event.CreateSession -> { loading = true; error = null; emit(); scope.launch { createSession() } }

13891

13992 is Event.DeleteSession -> {

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

14193 val id = event.id

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

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

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

145− deleteSessionJob?.cancel()

146− deleteSessionJob = scope.launch {

97+ scope.launch {

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

14899 onSuccess = { resp ->

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

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

176127 messages.forEach { it.streaming = false }

177128 emit()

178129 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()

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

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

183131 }

184132

185133 Event.NavigateToSessions -> {

186134 screen = Screen.Sessions

187135 currentSessionId = null

188136 messages.clear()

189− removedMessageIds.clear()

190− draft = ""

191137 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

195138 loading = true

196139 emit()

197− connectJob?.cancel()

198− abortJob?.cancel()

199− createSessionJob?.cancel()

200− deleteSessionJob?.cancel()

201− sendMessageJob?.cancel()

202− loadMessagesJob?.cancel()

203− loadSessionsJob?.cancel()

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

140+ scope.launch { loadSessions() }

205141 }

206142

207143 Event.NavigateToConnect -> {

@@ -211,18 +147,10 @@ class OpencodeCore(

211147 generating = false

212148 sessions.clear()

213149 messages.clear()

214− removedMessageIds.clear()

215150 currentSessionId = null

216− draft = ""

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

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

219153 sseConnected = true

220− connectJob?.cancel()

221− abortJob?.cancel()

222− createSessionJob?.cancel()

223− deleteSessionJob?.cancel()

224− sendMessageJob?.cancel()

225− loadMessagesJob?.cancel()

226154 closeSse()

227155 emit()

228156 }

@@ -236,27 +164,13 @@ class OpencodeCore(

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

237165 }

238166

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

167+ fun shutdown() = closeSse()

251168

252169 // ── Effects ────────────────────────────────────────────────────────────────

253170 private fun sendMessage(raw: String) {

254171 val text = raw.trim()

255172 val session = currentSessionId ?: return

256173 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

260174 localSeq += 1

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

262176 status = MessageStatus.Pending

@@ -272,8 +186,7 @@ class OpencodeCore(

272186 emit()

273187

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

275− sendMessageJob?.cancel()

276− sendMessageJob = scope.launch {

189+ scope.launch {

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

278191 result.fold(

279192 onSuccess = { resp ->

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

306219 when {

307220 resp.code == 401 -> {

308221 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

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

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

315224 authRequired = true

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

324233 loading = true

325234 emit()

326235 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()

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

236+ loadSessions()

331237 }

332238 else -> {

333239 loading = false

334− connected = false

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

336241 emit()

337242 }

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

339244 },

340245 onFailure = { e ->

341246 loading = false

342− connected = false

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

344248 emit()

345249 },

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

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

353257 sessions.clear()

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

358259 } else {

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

360261 }

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

372273 if (session != null) {

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

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

379276 }

380277 emit()

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

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

397294 loading = false

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

399296 messages.clear()

400− removedMessageIds.clear()

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

402298 generating = messages.any { it.streaming }

403299 } else {

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

471367 is Protocol.Event.MessageUpdated -> {

472368 val info = event.info

473369 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

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

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

479372 if (existing != null) {

@@ -482,7 +375,7 @@ class OpencodeCore(

482375 } else {

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

484377 }

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

378+ info.error?.let { error = it.message(); generating = false }

486379 return true

487380 }

488381

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

515408 return true

516409 }

517410

518− is Protocol.Event.MessageRemoved -> {

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

520− removedMessageIds.add(event.messageId)

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

522− }

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

523412

524413 is Protocol.Event.SessionIdle -> {

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

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

545434 } else {

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

547436 }

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

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

552438 return true

553439 }

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

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

3333

3434 fun connect() {

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

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

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

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

3938 }

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

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

77import androidx.compose.animation.togetherWith

88import androidx.compose.foundation.layout.fillMaxSize

99import androidx.compose.foundation.layout.padding

10−import androidx.compose.material3.AlertDialog

1110import androidx.compose.material3.Scaffold

1211import androidx.compose.material3.SnackbarDuration

1312import androidx.compose.material3.SnackbarHost

1413import androidx.compose.material3.SnackbarHostState

15−import androidx.compose.material3.Text

16−import androidx.compose.material3.TextButton

1714import androidx.compose.runtime.Composable

1815import androidx.compose.runtime.LaunchedEffect

19−import androidx.compose.runtime.getValue

20−import androidx.compose.runtime.mutableStateOf

2116import androidx.compose.runtime.remember

22−import androidx.compose.runtime.setValue

2317import androidx.compose.ui.Modifier

2418import soy.iko.opencode.core.Event

2519import soy.iko.opencode.core.Screen

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

3125@Composable

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

3327 val snackbar = remember { SnackbarHostState() }

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

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

3628

3729 LaunchedEffect(state.error) {

3830 state.error?.let {

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

4840

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

5042 when (state.screen) {

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

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

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

54− Screen.Sessions -> showDisconnectConfirm = true

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

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

5545 Screen.Connect -> Unit

5646 }

5747 }

5848

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−

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

10350 AnimatedContent(

10451 targetState = state.screen,

app/src/main/java/soy/iko/opencode/ui/components/MessageBubble.kt+8−245

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

33import android.content.ClipData

44import android.content.ClipboardManager

55import android.content.Context

6−import android.content.Intent

7−import android.net.Uri

86import android.widget.Toast

97import androidx.compose.foundation.ExperimentalFoundationApi

108import androidx.compose.foundation.background

@@ -15,7 +13,6 @@ import androidx.compose.foundation.layout.Column

1513import androidx.compose.foundation.layout.Row

1614import androidx.compose.foundation.layout.fillMaxWidth

1715import androidx.compose.foundation.layout.padding

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

1916import androidx.compose.foundation.layout.widthIn

2017import androidx.compose.foundation.shape.RoundedCornerShape

2118import androidx.compose.foundation.text.selection.SelectionContainer

@@ -26,9 +23,6 @@ import androidx.compose.material.icons.filled.ErrorOutline

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

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

2825import 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

3226import androidx.compose.material3.Icon

3327import androidx.compose.material3.MaterialTheme

3428import androidx.compose.material3.Text

@@ -42,20 +36,12 @@ import androidx.compose.ui.Modifier

4236import androidx.compose.ui.draw.clip

4337import androidx.compose.ui.graphics.Color

4438import androidx.compose.ui.platform.LocalContext

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

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

4739import androidx.compose.ui.text.SpanStyle

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

4940import androidx.compose.ui.text.buildAnnotatedString

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

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

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

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

5442import androidx.compose.ui.text.withStyle

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

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

5744import androidx.compose.ui.unit.dp

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

5945import soy.iko.opencode.core.MessageStatus

6046import soy.iko.opencode.core.MessageView

6147import soy.iko.opencode.core.ToolView

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

6551

6652@OptIn(ExperimentalFoundationApi::class)

6753@Composable

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

54+fun MessageBubble(message: MessageView, modifier: Modifier = Modifier) {

6955 val isUser = message.isUser

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

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

@@ -78,20 +64,11 @@ fun MessageBubble(message: MessageView, modifier: Modifier = Modifier, onRetry:

7864 )

7965

8066 val context = LocalContext.current

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

8267

8368 Row(

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

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

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

8671 ) {

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

9572 Column(

9673 modifier = Modifier

9774 .fillMaxWidth(0.85f)

@@ -102,63 +79,23 @@ fun MessageBubble(message: MessageView, modifier: Modifier = Modifier, onRetry:

10279 onClick = {},

10380 onLongClick = {

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

105− showMenu = true

82+ copyToClipboard(context, message.text)

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

10684 }

10785 },

10886 )

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

11088 ) {

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

128−

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

13090

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

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

133− Text(

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

135− style = MaterialTheme.typography.labelSmall,

136− color = MaterialTheme.colorScheme.onSurfaceVariant,

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

138− )

139− }

140−

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

14292

14393 SelectionContainer {

14494 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− }

15295 Text(

153− text = annotatedText,

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

15497 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− },

98+ style = MaterialTheme.typography.bodyLarge,

16299 )

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

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

@@ -175,7 +112,7 @@ fun MessageBubble(message: MessageView, modifier: Modifier = Modifier, onRetry:

175112 }

176113

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

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

115+ StatusLine(message.status)

179116 }

180117 }

181118 }

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

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

187124}

188125

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−

353126@Composable

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

355128 var expanded by remember { mutableStateOf(false) }

@@ -447,7 +220,7 @@ private fun ToolRow(tool: ToolView) {

447220}

448221

449222@Composable

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

223+private fun StatusLine(status: MessageStatus) {

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

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

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

@@ -465,15 +238,5 @@ private fun StatusLine(status: MessageStatus, onRetry: () -> Unit) {

465238 color = tint,

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

467240 )

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

478241 }

479242}

app/src/main/java/soy/iko/opencode/ui/screens/ChatScreen.kt+17−280

@@ -1,57 +1,38 @@

11package soy.iko.opencode.ui.screens

3−import android.content.ClipData

4−import android.content.ClipboardManager

5−import android.content.Context

6−import android.widget.Toast

73import 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

134import androidx.compose.animation.fadeIn

145import androidx.compose.animation.fadeOut

156import androidx.compose.animation.scaleIn

167import androidx.compose.animation.scaleOut

17−import androidx.compose.foundation.ExperimentalFoundationApi

188import androidx.compose.foundation.background

199import androidx.compose.foundation.clickable

20−import androidx.compose.foundation.combinedClickable

2110import androidx.compose.foundation.layout.Arrangement

2211import androidx.compose.foundation.layout.Box

2312import androidx.compose.foundation.layout.BoxScope

2413import androidx.compose.foundation.layout.Column

2514import androidx.compose.foundation.layout.Row

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

2715import androidx.compose.foundation.layout.fillMaxSize

2816import androidx.compose.foundation.layout.fillMaxWidth

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

3017import androidx.compose.foundation.layout.PaddingValues

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

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

3318import androidx.compose.foundation.layout.imePadding

3419import androidx.compose.foundation.layout.padding

3520import androidx.compose.foundation.layout.size

3621import androidx.compose.foundation.lazy.LazyColumn

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

22+import androidx.compose.foundation.lazy.items

3823import androidx.compose.foundation.lazy.rememberLazyListState

3924import androidx.compose.foundation.shape.CircleShape

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

4125import androidx.compose.foundation.text.KeyboardActions

4226import androidx.compose.foundation.text.KeyboardOptions

4327import androidx.compose.material.icons.Icons

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

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

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

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

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

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

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

5133import androidx.compose.material3.CircularProgressIndicator

5234import androidx.compose.material3.ExperimentalMaterial3Api

5335import androidx.compose.material3.FilledIconButton

54−import androidx.compose.material3.FilledTonalButton

5536import androidx.compose.material3.FloatingActionButton

5637import androidx.compose.material3.Icon

5738import androidx.compose.material3.IconButton

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

6142import androidx.compose.material3.Scaffold

6243import androidx.compose.material3.Surface

6344import androidx.compose.material3.Text

64−import androidx.compose.material3.TextButton

6545import androidx.compose.material3.TopAppBar

6646import androidx.compose.runtime.Composable

6747import androidx.compose.runtime.LaunchedEffect

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

7555import androidx.compose.ui.Modifier

7656import androidx.compose.ui.draw.clip

7757import 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

8158import androidx.compose.ui.platform.LocalHapticFeedback

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

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

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

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

8661import androidx.compose.ui.unit.dp

8762import kotlinx.coroutines.launch

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

8964import soy.iko.opencode.core.UiState

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

9166

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

67+@OptIn(ExperimentalMaterial3Api::class)

9368@Composable

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

9570 val listState = rememberLazyListState()

9671 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

10372

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

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

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

11382 }

11483 }

11584

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−

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

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

12487 var lastSeenCount by remember { mutableStateOf(0) }

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

148111 topBar = {

149112 TopAppBar(

150113 title = {

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

152114 Text(

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

115+ text = state.currentSessionTitle.ifEmpty { "Chat" },

154116 maxLines = 1,

155117 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− ),

118+ modifier = Modifier.clickable { dispatch(Event.NavigateToSessions) },

165119 )

166120 },

167121 navigationIcon = {

@@ -205,78 +159,33 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {

205159 }

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

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

208− Column(

162+ Text(

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

164+ style = MaterialTheme.typography.bodyMedium,

165+ color = MaterialTheme.colorScheme.onSurfaceVariant,

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

219− Text(

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

221− style = MaterialTheme.typography.bodyMedium,

222− color = MaterialTheme.colorScheme.onSurfaceVariant,

223− textAlign = TextAlign.Center,

224− )

225− }

167+ )

226168 }

227169 LazyColumn(

228170 state = listState,

229171 modifier = Modifier.fillMaxSize(),

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

231173 ) {

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

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

175+ MessageBubble(message)

253176 }

254177 }

255178 ScrollToBottomButton(

256− visible = showScrollButton && !isImeVisible,

179+ visible = showScrollButton,

257180 showBadge = hasUnseenMessages,

258181 onClick = {

259182 coroutineScope.launch {

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

184+ listState.animateScrollToItem(state.messages.size - 1)

268185 }

269186 }

270187 },

271188 )

272− ScrollToTopButton(

273− visible = showScrollTop,

274− onClick = {

275− coroutineScope.launch {

276− listState.animateScrollToItem(0)

277− }

278− },

279− )

280189 }

281190 }

282191 }

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

316225 }

317226}

318227

319−// Mirror of ScrollToBottomButton, pinned to the top-start corner. Same BoxScope

320−// extension trick so the top-level AnimatedVisibility overload resolves cleanly.

321−@Composable

322−private fun BoxScope.ScrollToTopButton(visible: Boolean, onClick: () -> Unit) {

323− AnimatedVisibility(

324− visible = visible,

325− modifier = Modifier.align(Alignment.TopStart),

326− enter = scaleIn() + fadeIn(),

327− exit = scaleOut() + fadeOut(),

328− ) {

329− Box(Modifier.padding(16.dp)) {

330− FloatingActionButton(

331− onClick = onClick,

332− modifier = Modifier.size(44.dp),

333− ) {

334− Icon(

335− Icons.Filled.KeyboardArrowUp,

336− contentDescription = "Scroll to top",

337− )

338− }

339− }

340− }

341−}

342−

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

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

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

346−}

347−

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

349−

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

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

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

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

354− .toLocalDate()

355−

356−/**

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

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

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

360− */

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

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

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

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

365−}

366−

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

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

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

370− return when (day) {

371− today -> "Today"

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

373− else -> day.format(dateSeparatorFormat)

374− }

375−}

376−

377−@Composable

378−private fun DateSeparator(epochMillis: Long) {

379− Text(

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

381− style = MaterialTheme.typography.labelSmall,

382− color = MaterialTheme.colorScheme.onSurfaceVariant,

383− textAlign = TextAlign.Center,

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

385− )

386−}

387−

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

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

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

391−@Composable

392−private fun TypingIndicator() {

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

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

395− Row(

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

397− horizontalArrangement = Arrangement.Start,

398− ) {

399− Row(

400− modifier = Modifier

401− .clip(shape)

402− .background(MaterialTheme.colorScheme.surfaceVariant)

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

404− verticalAlignment = Alignment.CenterVertically,

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

406− ) {

407− Text(

408− text = "Thinking",

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

410− color = MaterialTheme.colorScheme.onSurfaceVariant,

411− )

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

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

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

415− val alpha by transition.animateFloat(

416− initialValue = 0.2f,

417− targetValue = 1f,

418− animationSpec = infiniteRepeatable(

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

420− repeatMode = RepeatMode.Reverse,

421− ),

422− label = "dot",

423− )

424− Box(

425− modifier = Modifier

426− .size(6.dp)

427− .clip(CircleShape)

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

429− )

430− }

431− }

432− }

433− }

434−}

435−

436228@Composable

437229private fun ReconnectingBanner() {

438230 Surface(

@@ -497,70 +289,27 @@ private fun ChatInputBar(

497289 onStop: () -> Unit,

498290) {

499291 val haptic = LocalHapticFeedback.current

500− val clipboardManager = LocalClipboardManager.current

501292 Surface(tonalElevation = 3.dp) {

502− Column(

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

504− ) {

505293 Row(

506− modifier = Modifier.fillMaxWidth(),

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

507295 verticalAlignment = Alignment.Bottom,

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

509297 ) {

510298 OutlinedTextField(

511299 value = draft,

512300 onValueChange = onDraftChange,

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

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

514302 enabled = !loading,

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

516304 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− },

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

551306 keyboardActions = KeyboardActions(onSend = {

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

553308 }),

554309 )

555310 if (generating) {

556− FilledTonalButton(onClick = onStop) {

557− Icon(

558− Icons.Filled.Stop,

559− contentDescription = null,

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

561− )

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

563− Text("Stop")

311+ FilledIconButton(onClick = onStop) {

312+ Icon(Icons.Filled.Stop, contentDescription = "Stop generating")

564313 }

565314 } else {

566315 FilledIconButton(

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

574323 }

575324 }

576325 }

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

589326 }

590327}

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

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

101101 enabled = !state.loading,

102102 )

103103

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−

128104 if (state.authRequired) {

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

130106 OutlinedTextField(

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

155131 },

156132 modifier = Modifier.fillMaxWidth(),

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

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

134+ keyboardActions = KeyboardActions(onGo = { dispatch(Event.Connect) }),

167135 enabled = !state.loading,

168136 )

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

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

178146

179147 Button(

180148 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.

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

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

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

185150 modifier = Modifier.fillMaxWidth(),

186151 ) {

187152 if (state.loading) {

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

195160 }

196161 }

197162

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−

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

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

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

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

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

11package soy.iko.opencode.ui.screens

3−import android.content.ClipData

4−import android.content.ClipboardManager

5−import android.content.Context

6−import android.widget.Toast

7−import androidx.compose.foundation.ExperimentalFoundationApi

83import androidx.compose.foundation.background

94import androidx.compose.foundation.clickable

10−import androidx.compose.foundation.combinedClickable

115import androidx.compose.foundation.layout.Arrangement

126import androidx.compose.foundation.layout.Box

137import androidx.compose.foundation.layout.Column

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

2115import androidx.compose.foundation.layout.size

2216import androidx.compose.foundation.lazy.LazyColumn

2317import androidx.compose.foundation.lazy.items

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

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

2618import androidx.compose.material.icons.Icons

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

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

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

5850import androidx.compose.runtime.setValue

5951import androidx.compose.ui.Alignment

6052import androidx.compose.ui.Modifier

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

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

6353import androidx.compose.ui.hapticfeedback.HapticFeedbackType

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

6554import androidx.compose.ui.platform.LocalHapticFeedback

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

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

6856import androidx.compose.ui.unit.dp

6957import soy.iko.opencode.core.Event

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

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

7866 var isPullRefreshing by remember { mutableStateOf(false) }

7967 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− }

8968

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

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

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

11998 Scaffold(

12099 topBar = {

121100 TopAppBar(

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− },

101+ title = { Text("Sessions") },

139102 navigationIcon = {

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

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

@@ -149,15 +112,11 @@ fun SessionsScreen(state: UiState, dispatch: (Event) -> Unit) {

149112 )

150113 },

151114 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()) {

155− ExtendedFloatingActionButton(

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

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

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

159− )

160− }

115+ ExtendedFloatingActionButton(

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

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

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

119+ )

161120 },

162121 ) { padding ->

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

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

199158 state = rememberPullToRefreshState(),

200159 ) {

201160 LazyColumn(

202− state = sessionsListState,

203161 modifier = Modifier.fillMaxSize(),

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

205163 ) {

206164 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− },

165+ val dismissState = rememberSwipeToDismissBoxState(

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

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

168+ confirmValueChange = { value ->

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

170+ pendingDeleteId = session.id

171+ }

172+ false

173+ },

174+ )

175+ SwipeToDismissBox(

176+ state = dismissState,

177+ enableDismissFromStartToEnd = false,

178+ backgroundContent = { SwipeDeleteBackground() },

179+ ) {

180+ SessionRow(

181+ session = session,

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

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

219184 )

220− SwipeToDismissBox(

221− state = dismissState,

222− enableDismissFromStartToEnd = false,

223− backgroundContent = { SwipeDeleteBackground() },

224− ) {

225− SessionRow(

226− session = session,

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

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

229− )

230− }

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

232185 }

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

233187 }

234188 }

235189 }

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

238192 }

239193}

240194

241−@OptIn(ExperimentalFoundationApi::class)

242195@Composable

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

244− val context = LocalContext.current

245197 Row(

246198 modifier = Modifier

247199 .fillMaxWidth()

248200 .background(MaterialTheme.colorScheme.surface)

249− .combinedClickable(

250− onClick = onOpen,

251− onLongClick = {

252− copyToClipboard(context, session.id)

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

254− },

255− )

201+ .clickable(onClick = onOpen)

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

257203 verticalAlignment = Alignment.CenterVertically,

258204 ) {

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

287233 Icon(

288234 Icons.Filled.DeleteOutline,

289235 contentDescription = "Delete session",

290− tint = MaterialTheme.colorScheme.error,

236+ tint = MaterialTheme.colorScheme.onSurfaceVariant,

291237 )

292238 }

293239 }

294240}

295241

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

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

297243@Composable

298244private fun SwipeDeleteBackground() {

299245 Box(

@@ -303,19 +249,11 @@ private fun SwipeDeleteBackground() {

303249 .padding(horizontal = 24.dp),

304250 contentAlignment = Alignment.CenterEnd,

305251 ) {

306− Row(verticalAlignment = Alignment.CenterVertically) {

307− Icon(

308− Icons.Filled.DeleteOutline,

309− contentDescription = null,

310− tint = MaterialTheme.colorScheme.onError,

311− )

312− Text(

313− text = "Delete",

314− style = MaterialTheme.typography.labelLarge,

315− color = MaterialTheme.colorScheme.onError,

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

317− )

318− }

252+ Icon(

253+ Icons.Filled.DeleteOutline,

254+ contentDescription = null,

255+ tint = MaterialTheme.colorScheme.onError,

256+ )

319257 }

320258}

321259

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

345283 }

346284}

347285

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−

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

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

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

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

391324 style = MaterialTheme.typography.bodyMedium,

392325 color = MaterialTheme.colorScheme.onSurfaceVariant,

393326 )

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

401327 }

402328}

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

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

1414private val DarkColors = darkColorScheme(

1515 primary = Emerald,

1616 onPrimary = Color(0xFF0F1115),

17− primaryContainer = Color(0xFF1A3D2A),

18− onPrimaryContainer = Color(0xFFA8E6C1),

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

2918 background = DarkBackground,

3019 surface = DarkSurface,

3120 surfaceVariant = DarkSurfaceVariant,

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

3524

3625private val LightColors = lightColorScheme(

3726 primary = EmeraldDark,

38− primaryContainer = Color(0xFFD7F5E3),

39− onPrimaryContainer = Color(0xFF0A3D22),

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

5028 background = LightBackground,

5129 surface = LightSurface,

5230 surfaceVariant = LightSurfaceVariant,

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

5735@Composable

5836fun OpencodeTheme(

5937 darkTheme: Boolean = isSystemInDarkTheme(),

60− dynamicColor: Boolean = false,

38+ dynamicColor: Boolean = true,

6139 content: @Composable () -> Unit,

6240) {

6341 val context = LocalContext.current

shared/src/app.rs−14

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

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

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

299299 // normalized once, on Connect.

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

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

302300 Event::ServerUrlChanged(url) => {

303301 model.server_url = url;

304− if model.error.is_some() {

305− model.error = None;

306− }

307302 render()

308303 }

309304 Event::UsernameChanged(u) => {

310305 model.username = u;

311− if model.error.is_some() {

312− model.error = None;

313− }

314306 render()

315307 }

316308 Event::PasswordChanged(p) => {

317309 model.password = p;

318− if model.error.is_some() {

319− model.error = None;

320− }

321310 render()

322311 }

323312

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

352341 title: display_title(&s.title),

353342 })

354343 .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());

358344 }

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

360346 }