master..7571397 · opencode-android

git.iko.soy/opencode-android

on 7571397 help sign in

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

since splitsnapshots

unifiedsplit

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

23 init {

24 prefs.getString(KEY_URL, null)?.let { core.dispatch(Event.ServerUrlChanged(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)) }

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

27 // 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`).

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

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

47 prefs.edit {

44 prefs.edit {

48 putString(KEY_URL, state.serverUrl)

45 putString(KEY_URL, state.serverUrl)

49 putString(KEY_USER, state.username)

46 putString(KEY_USER, state.username)

50− putString(KEY_PASSWORD, state.password)

51 }

47 }

52 }

48 }

53 }

49 }

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

61 private companion object {

57 private companion object {

62 const val KEY_URL = "serverUrl"

58 const val KEY_URL = "serverUrl"

63 const val KEY_USER = "username"

59 const val KEY_USER = "username"

64− const val KEY_PASSWORD = "password"

65 }

60 }

66}

61}

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

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

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

52 runCatching {

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

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

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

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

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

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

57 }

56 }

app/src/main/java/soy/iko/opencode/core/OpencodeCore.kt+6−69

@@ -60,18 +60,6 @@ class OpencodeCore(

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.

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

76 private val removedMessageIds = mutableSetOf<String>()

64 private val removedMessageIds = mutableSetOf<String>()

@@ -96,12 +84,10 @@ class OpencodeCore(

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

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

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

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

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

99− connectJob?.cancel()

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

87+ scope.launch { probeHealth() }

101 }

88 }

102

103 Event.LoadSessions -> {

90 Event.LoadSessions -> {

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

105 loading = true; emit()

91 loading = true; emit()

106 loadSessionsJob?.cancel()

92 loadSessionsJob?.cancel()

107 loadSessionsJob = scope.launch { loadSessions() }

93 loadSessionsJob = scope.launch { loadSessions() }

@@ -121,29 +107,22 @@ class OpencodeCore(

121 generating = false

107 generating = false

122 error = null

108 error = null

123 emit()

109 emit()

124− connectJob?.cancel()

125− abortJob?.cancel()

126− sendMessageJob?.cancel()

127− deleteSessionJob?.cancel()

128 loadMessagesJob?.cancel()

110 loadMessagesJob?.cancel()

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

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

130 }

112 }

131

113

132 Event.CreateSession -> {

114 Event.CreateSession -> {

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

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

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

135 createSessionJob?.cancel()

116 createSessionJob?.cancel()

136 createSessionJob = scope.launch { createSession() }

117 createSessionJob = scope.launch { createSession() }

137 }

118 }

138

119

139 is Event.DeleteSession -> {

120 is Event.DeleteSession -> {

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

141 val id = event.id

121 val id = event.id

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

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

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

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

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

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

145− deleteSessionJob?.cancel()

146− deleteSessionJob = scope.launch {

125+ scope.launch {

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

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

148 onSuccess = { resp ->

127 onSuccess = { resp ->

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

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

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

176 messages.forEach { it.streaming = false }

155 messages.forEach { it.streaming = false }

177 emit()

156 emit()

178 val id = currentSessionId ?: return

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

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

183 }

159 }

184

160

185 Event.NavigateToSessions -> {

161 Event.NavigateToSessions -> {

@@ -189,16 +165,9 @@ class OpencodeCore(

189 removedMessageIds.clear()

165 removedMessageIds.clear()

190 draft = ""

166 draft = ""

191 generating = false

167 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

168 loading = true

196 emit()

169 emit()

197− connectJob?.cancel()

198− abortJob?.cancel()

199 createSessionJob?.cancel()

170 createSessionJob?.cancel()

200− deleteSessionJob?.cancel()

201− sendMessageJob?.cancel()

202 loadMessagesJob?.cancel()

171 loadMessagesJob?.cancel()

203 loadSessionsJob?.cancel()

172 loadSessionsJob?.cancel()

204 loadSessionsJob = scope.launch { loadSessions() }

173 loadSessionsJob = scope.launch { loadSessions() }

@@ -217,11 +186,7 @@ class OpencodeCore(

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

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

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

219 sseConnected = true

188 sseConnected = true

220− connectJob?.cancel()

221− abortJob?.cancel()

222 createSessionJob?.cancel()

189 createSessionJob?.cancel()

223− deleteSessionJob?.cancel()

224− sendMessageJob?.cancel()

225 loadMessagesJob?.cancel()

190 loadMessagesJob?.cancel()

226 closeSse()

191 closeSse()

227 emit()

192 emit()

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

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

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

237 }

202 }

238

203

239− fun shutdown() {

204+ fun shutdown() = closeSse()

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

251

205

252 // ── Effects ────────────────────────────────────────────────────────────────

206 // ── Effects ────────────────────────────────────────────────────────────────

253 private fun sendMessage(raw: String) {

207 private fun sendMessage(raw: String) {

254 val text = raw.trim()

208 val text = raw.trim()

255 val session = currentSessionId ?: return

209 val session = currentSessionId ?: return

256 if (text.isEmpty()) return

210 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

260 localSeq += 1

211 localSeq += 1

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

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

262 status = MessageStatus.Pending

213 status = MessageStatus.Pending

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

272 emit()

223 emit()

273

224

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

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

275− sendMessageJob?.cancel()

276− sendMessageJob = scope.launch {

226+ scope.launch {

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

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

278 result.fold(

228 result.fold(

279 onSuccess = { resp ->

229 onSuccess = { resp ->

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

306 when {

256 when {

307 resp.code == 401 -> {

257 resp.code == 401 -> {

308 loading = false

258 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

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

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

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

315 authRequired = true

261 authRequired = true

@@ -331,7 +277,6 @@ class OpencodeCore(

331 }

277 }

332 else -> {

278 else -> {

333 loading = false

279 loading = false

334− connected = false

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

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

336 emit()

281 emit()

337 }

282 }

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

339 },

284 },

340 onFailure = { e ->

285 onFailure = { e ->

341 loading = false

286 loading = false

342− connected = false

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

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

344 emit()

288 emit()

345 },

289 },

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

372 if (session != null) {

316 if (session != null) {

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

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

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

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

379 }

319 }

380 emit()

320 emit()

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

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

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

482 } else {

422 } else {

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

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

484 }

424 }

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

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

486 return true

426 return true

487 }

427 }

488

428

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

545 } else {

485 } else {

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

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

547 }

487 }

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

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

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

552 return true

489 return true

553 }

490 }

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

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

34 fun connect() {

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

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

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

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

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

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

39 }

38 }

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

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

7import androidx.compose.animation.togetherWith

8import androidx.compose.foundation.layout.fillMaxSize

9import androidx.compose.foundation.layout.padding

10−import androidx.compose.material3.AlertDialog

11import androidx.compose.material3.Scaffold

10import androidx.compose.material3.Scaffold

12import androidx.compose.material3.SnackbarDuration

11import androidx.compose.material3.SnackbarDuration

13import androidx.compose.material3.SnackbarHost

12import androidx.compose.material3.SnackbarHost

14import androidx.compose.material3.SnackbarHostState

13import androidx.compose.material3.SnackbarHostState

15−import androidx.compose.material3.Text

16−import androidx.compose.material3.TextButton

17import androidx.compose.runtime.Composable

14import androidx.compose.runtime.Composable

18import androidx.compose.runtime.LaunchedEffect

15import androidx.compose.runtime.LaunchedEffect

19−import androidx.compose.runtime.getValue

20−import androidx.compose.runtime.mutableStateOf

21import androidx.compose.runtime.remember

16import androidx.compose.runtime.remember

22−import androidx.compose.runtime.setValue

23import androidx.compose.ui.Modifier

17import androidx.compose.ui.Modifier

24import soy.iko.opencode.core.Event

18import soy.iko.opencode.core.Event

25import soy.iko.opencode.core.Screen

19import soy.iko.opencode.core.Screen

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

31@Composable

25@Composable

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

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

33 val snackbar = remember { SnackbarHostState() }

27 val snackbar = remember { SnackbarHostState() }

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

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

37 LaunchedEffect(state.error) {

29 LaunchedEffect(state.error) {

38 state.error?.let {

30 state.error?.let {

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

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

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

50 when (state.screen) {

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

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

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

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

54− Screen.Sessions -> showDisconnectConfirm = true

55 Screen.Connect -> Unit

45 Screen.Connect -> Unit

56 }

46 }

57 }

47 }

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−

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

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

103 AnimatedContent(

50 AnimatedContent(

104 targetState = state.screen,

51 targetState = state.screen,

app/src/main/java/soy/iko/opencode/ui/components/MessageBubble.kt+5−225

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

3import android.content.ClipData

4import android.content.ClipboardManager

5import android.content.Context

6−import android.content.Intent

7−import android.net.Uri

8import android.widget.Toast

6import android.widget.Toast

9import androidx.compose.foundation.ExperimentalFoundationApi

7import androidx.compose.foundation.ExperimentalFoundationApi

10import androidx.compose.foundation.background

8import androidx.compose.foundation.background

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

15import androidx.compose.foundation.layout.Row

13import androidx.compose.foundation.layout.Row

16import androidx.compose.foundation.layout.fillMaxWidth

14import androidx.compose.foundation.layout.fillMaxWidth

17import androidx.compose.foundation.layout.padding

15import androidx.compose.foundation.layout.padding

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

19import androidx.compose.foundation.layout.widthIn

16import androidx.compose.foundation.layout.widthIn

20import androidx.compose.foundation.shape.RoundedCornerShape

17import androidx.compose.foundation.shape.RoundedCornerShape

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

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

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

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

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

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

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

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

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

32import androidx.compose.material3.Icon

26import androidx.compose.material3.Icon

33import androidx.compose.material3.MaterialTheme

27import androidx.compose.material3.MaterialTheme

34import androidx.compose.material3.Text

28import androidx.compose.material3.Text

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

42import androidx.compose.ui.draw.clip

36import androidx.compose.ui.draw.clip

43import androidx.compose.ui.graphics.Color

37import androidx.compose.ui.graphics.Color

44import androidx.compose.ui.platform.LocalContext

38import androidx.compose.ui.platform.LocalContext

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

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

47import androidx.compose.ui.text.SpanStyle

39import androidx.compose.ui.text.SpanStyle

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

49import androidx.compose.ui.text.buildAnnotatedString

40import androidx.compose.ui.text.buildAnnotatedString

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

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

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

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

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

54import androidx.compose.ui.text.withStyle

42import androidx.compose.ui.text.withStyle

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

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

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

57import androidx.compose.ui.unit.dp

44import androidx.compose.ui.unit.dp

58import androidx.compose.ui.unit.sp

45import androidx.compose.ui.unit.sp

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

66@OptIn(ExperimentalFoundationApi::class)

53@OptIn(ExperimentalFoundationApi::class)

67@Composable

54@Composable

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

55+fun MessageBubble(message: MessageView, modifier: Modifier = Modifier, onRetry: () -> Unit = {}) {

69 val isUser = message.isUser

56 val isUser = message.isUser

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

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

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

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

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

78 )

65 )

80 val context = LocalContext.current

67 val context = LocalContext.current

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

83 Row(

69 Row(

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

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

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

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

86 ) {

72 ) {

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

95 Column(

73 Column(

96 modifier = Modifier

74 modifier = Modifier

97 .fillMaxWidth(0.85f)

75 .fillMaxWidth(0.85f)

@@ -102,55 +80,21 @@ fun MessageBubble(message: MessageView, modifier: Modifier = Modifier, onRetry:

102 onClick = {},

80 onClick = {},

103 onLongClick = {

81 onLongClick = {

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

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

105− showMenu = true

83+ copyToClipboard(context, message.text)

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

106 }

85 }

107 },

86 },

108 )

87 )

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

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

110 ) {

89 ) {

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−

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

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

130

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−

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

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

142

143 SelectionContainer {

94 SelectionContainer {

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

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

96 Text(

153− text = annotatedText,

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

154 color = textColor,

98 color = textColor,

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

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

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

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

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

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

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

187}

131}

188

132

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−

353@Composable

133@Composable

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

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

355 var expanded by remember { mutableStateOf(false) }

135 var expanded by remember { mutableStateOf(false) }

app/src/main/java/soy/iko/opencode/ui/screens/ChatScreen.kt+11−145

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

1package 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

7import androidx.compose.animation.AnimatedVisibility

3import androidx.compose.animation.AnimatedVisibility

8import androidx.compose.animation.core.RepeatMode

4import androidx.compose.animation.core.RepeatMode

9import androidx.compose.animation.core.animateFloat

5import androidx.compose.animation.core.animateFloat

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

14import androidx.compose.animation.fadeOut

10import androidx.compose.animation.fadeOut

15import androidx.compose.animation.scaleIn

11import androidx.compose.animation.scaleIn

16import androidx.compose.animation.scaleOut

12import androidx.compose.animation.scaleOut

17−import androidx.compose.foundation.ExperimentalFoundationApi

18import androidx.compose.foundation.background

13import androidx.compose.foundation.background

19import androidx.compose.foundation.clickable

14import androidx.compose.foundation.clickable

20−import androidx.compose.foundation.combinedClickable

21import androidx.compose.foundation.layout.Arrangement

15import androidx.compose.foundation.layout.Arrangement

22import androidx.compose.foundation.layout.Box

16import androidx.compose.foundation.layout.Box

23import androidx.compose.foundation.layout.BoxScope

17import androidx.compose.foundation.layout.BoxScope

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

26import androidx.compose.foundation.layout.Spacer

20import androidx.compose.foundation.layout.Spacer

27import androidx.compose.foundation.layout.fillMaxSize

21import androidx.compose.foundation.layout.fillMaxSize

28import androidx.compose.foundation.layout.fillMaxWidth

22import androidx.compose.foundation.layout.fillMaxWidth

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

30import androidx.compose.foundation.layout.PaddingValues

23import androidx.compose.foundation.layout.PaddingValues

31import androidx.compose.foundation.layout.WindowInsets

24import androidx.compose.foundation.layout.WindowInsets

32import androidx.compose.foundation.layout.ime

25import androidx.compose.foundation.layout.ime

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

43import androidx.compose.material.icons.Icons

36import androidx.compose.material.icons.Icons

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

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

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

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

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

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

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

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

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

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

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

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

51import androidx.compose.material3.CircularProgressIndicator

42import androidx.compose.material3.CircularProgressIndicator

52import androidx.compose.material3.ExperimentalMaterial3Api

43import androidx.compose.material3.ExperimentalMaterial3Api

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

61import androidx.compose.material3.Scaffold

52import androidx.compose.material3.Scaffold

62import androidx.compose.material3.Surface

53import androidx.compose.material3.Surface

63import androidx.compose.material3.Text

54import androidx.compose.material3.Text

64−import androidx.compose.material3.TextButton

65import androidx.compose.material3.TopAppBar

55import androidx.compose.material3.TopAppBar

66import androidx.compose.runtime.Composable

56import androidx.compose.runtime.Composable

67import androidx.compose.runtime.LaunchedEffect

57import androidx.compose.runtime.LaunchedEffect

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

75import androidx.compose.ui.Modifier

65import androidx.compose.ui.Modifier

76import androidx.compose.ui.draw.clip

66import androidx.compose.ui.draw.clip

77import androidx.compose.ui.hapticfeedback.HapticFeedbackType

67import androidx.compose.ui.hapticfeedback.HapticFeedbackType

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

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

80import androidx.compose.ui.platform.LocalDensity

68import androidx.compose.ui.platform.LocalDensity

81import androidx.compose.ui.platform.LocalHapticFeedback

69import androidx.compose.ui.platform.LocalHapticFeedback

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

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

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

89import soy.iko.opencode.core.UiState

77import soy.iko.opencode.core.UiState

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

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

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

80+@OptIn(ExperimentalMaterial3Api::class)

93@Composable

81@Composable

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

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

95 val listState = rememberLazyListState()

83 val listState = rememberLazyListState()

96 val coroutineScope = rememberCoroutineScope()

84 val coroutineScope = rememberCoroutineScope()

97− val context = LocalContext.current

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

86 // 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

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

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

113 }

100 }

114 }

101 }

115

102

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

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

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

124 var lastSeenCount by remember { mutableStateOf(0) }

105 var lastSeenCount by remember { mutableStateOf(0) }

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

148 topBar = {

129 topBar = {

149 TopAppBar(

130 TopAppBar(

150 title = {

131 title = {

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

152 Text(

132 Text(

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

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

154 maxLines = 1,

134 maxLines = 1,

155 overflow = TextOverflow.Ellipsis,

135 overflow = TextOverflow.Ellipsis,

156− modifier = Modifier.combinedClickable(

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

136+ modifier = Modifier.clickable { 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− ),

165 )

137 )

166 },

138 },

167 navigationIcon = {

139 navigationIcon = {

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

205 }

177 }

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

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

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

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

208− Column(

180+ Text(

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

182+ style = MaterialTheme.typography.bodyMedium,

183+ color = MaterialTheme.colorScheme.onSurfaceVariant,

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

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

210− horizontalAlignment = Alignment.CenterHorizontally,

211− ) {

185+ )

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

226 }

186 }

227 LazyColumn(

187 LazyColumn(

228 state = listState,

188 state = listState,

@@ -236,11 +196,9 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {

236 if (shouldShowDateSeparator(previous, message)) {

196 if (shouldShowDateSeparator(previous, message)) {

237 DateSeparator(message.time)

197 DateSeparator(message.time)

238 }

198 }

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

240 MessageBubble(

199 MessageBubble(

241 message,

200 message,

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

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

243− compactSpacing = sameSenderAsPrevious,

244 )

202 )

245 }

203 }

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

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

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

258 onClick = {

216 onClick = {

259 coroutineScope.launch {

217 coroutineScope.launch {

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

218 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

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

267− listState.animateScrollToItem(target)

268 }

220 }

269 }

221 }

270 },

222 },

271 )

223 )

272− ScrollToTopButton(

273− visible = showScrollTop,

274− onClick = {

275− coroutineScope.launch {

276− listState.animateScrollToItem(0)

277− }

278− },

279− )

280 }

224 }

281 }

225 }

282 }

226 }

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

316 }

260 }

317}

261}

318

262

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−

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

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

349

264

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

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

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

497 onStop: () -> Unit,

412 onStop: () -> Unit,

498) {

413) {

499 val haptic = LocalHapticFeedback.current

414 val haptic = LocalHapticFeedback.current

500− val clipboardManager = LocalClipboardManager.current

501 Surface(tonalElevation = 3.dp) {

415 Surface(tonalElevation = 3.dp) {

502− Column(

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

504− ) {

505 Row(

416 Row(

506− modifier = Modifier.fillMaxWidth(),

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

507 verticalAlignment = Alignment.Bottom,

418 verticalAlignment = Alignment.Bottom,

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

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

509 ) {

420 ) {

510 OutlinedTextField(

421 OutlinedTextField(

511 value = draft,

422 value = draft,

512 onValueChange = onDraftChange,

423 onValueChange = onDraftChange,

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

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

514 enabled = !loading,

425 enabled = !loading,

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

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

516 maxLines = 5,

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

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

551 keyboardActions = KeyboardActions(onSend = {

429 keyboardActions = KeyboardActions(onSend = {

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

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

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

574 }

452 }

575 }

453 }

576 }

454 }

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

589 }

455 }

590}

456}

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

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

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−

128 if (state.authRequired) {

116 if (state.authRequired) {

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

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

130 OutlinedTextField(

118 OutlinedTextField(

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

155 },

143 },

156 modifier = Modifier.fillMaxWidth(),

144 modifier = Modifier.fillMaxWidth(),

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

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

158− keyboardActions = KeyboardActions(onGo = {

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

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

167 enabled = !state.loading,

147 enabled = !state.loading,

168 )

148 )

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

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

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

178

158

179 Button(

159 Button(

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

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

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

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

185 modifier = Modifier.fillMaxWidth(),

162 modifier = Modifier.fillMaxWidth(),

186 ) {

163 ) {

187 if (state.loading) {

164 if (state.loading) {

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

195 }

172 }

196 }

173 }

197

174

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

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

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

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

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

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

app/src/main/java/soy/iko/opencode/ui/screens/SessionsScreen.kt+9−75

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

1package 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

8import androidx.compose.foundation.background

3import androidx.compose.foundation.background

9import androidx.compose.foundation.clickable

4import androidx.compose.foundation.clickable

10−import androidx.compose.foundation.combinedClickable

11import androidx.compose.foundation.layout.Arrangement

5import androidx.compose.foundation.layout.Arrangement

12import androidx.compose.foundation.layout.Box

6import androidx.compose.foundation.layout.Box

13import androidx.compose.foundation.layout.Column

7import androidx.compose.foundation.layout.Column

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

21import androidx.compose.foundation.layout.size

15import androidx.compose.foundation.layout.size

22import androidx.compose.foundation.lazy.LazyColumn

16import androidx.compose.foundation.lazy.LazyColumn

23import androidx.compose.foundation.lazy.items

17import androidx.compose.foundation.lazy.items

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

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

26import androidx.compose.material.icons.Icons

18import androidx.compose.material.icons.Icons

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

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

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

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

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

58import androidx.compose.runtime.setValue

50import androidx.compose.runtime.setValue

59import androidx.compose.ui.Alignment

51import androidx.compose.ui.Alignment

60import androidx.compose.ui.Modifier

52import androidx.compose.ui.Modifier

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

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

63import androidx.compose.ui.hapticfeedback.HapticFeedbackType

53import androidx.compose.ui.hapticfeedback.HapticFeedbackType

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

65import androidx.compose.ui.platform.LocalHapticFeedback

54import androidx.compose.ui.platform.LocalHapticFeedback

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

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

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

68import androidx.compose.ui.unit.dp

56import androidx.compose.ui.unit.dp

69import soy.iko.opencode.core.Event

57import soy.iko.opencode.core.Event

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

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

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

78 var isPullRefreshing by remember { mutableStateOf(false) }

66 var isPullRefreshing by remember { mutableStateOf(false) }

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

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

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

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

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

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

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

119 Scaffold(

98 Scaffold(

120 topBar = {

99 topBar = {

121 TopAppBar(

100 TopAppBar(

122− title = {

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

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

139 navigationIcon = {

102 navigationIcon = {

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

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

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

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

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

199 state = rememberPullToRefreshState(),

162 state = rememberPullToRefreshState(),

200 ) {

163 ) {

201 LazyColumn(

164 LazyColumn(

202− state = sessionsListState,

203 modifier = Modifier.fillMaxSize(),

165 modifier = Modifier.fillMaxSize(),

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

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

205 ) {

167 ) {

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

238 }

200 }

239}

201}

240

202

241−@OptIn(ExperimentalFoundationApi::class)

242@Composable

203@Composable

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

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

244− val context = LocalContext.current

245 Row(

205 Row(

246 modifier = Modifier

206 modifier = Modifier

247 .fillMaxWidth()

207 .fillMaxWidth()

248 .background(MaterialTheme.colorScheme.surface)

208 .background(MaterialTheme.colorScheme.surface)

249− .combinedClickable(

250− onClick = onOpen,

209+ .clickable(onClick = onOpen)

251− onLongClick = {

252− copyToClipboard(context, session.id)

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

254− },

255− )

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

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

257 verticalAlignment = Alignment.CenterVertically,

211 verticalAlignment = Alignment.CenterVertically,

258 ) {

212 ) {

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

287 Icon(

241 Icon(

288 Icons.Filled.DeleteOutline,

242 Icons.Filled.DeleteOutline,

289 contentDescription = "Delete session",

243 contentDescription = "Delete session",

290− tint = MaterialTheme.colorScheme.error,

244+ tint = MaterialTheme.colorScheme.onSurfaceVariant,

291 )

245 )

292 }

246 }

293 }

247 }

294}

248}

295

249

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

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

297@Composable

251@Composable

298private fun SwipeDeleteBackground() {

252private fun SwipeDeleteBackground() {

299 Box(

253 Box(

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

303 .padding(horizontal = 24.dp),

257 .padding(horizontal = 24.dp),

304 contentAlignment = Alignment.CenterEnd,

258 contentAlignment = Alignment.CenterEnd,

305 ) {

259 ) {

306− Row(verticalAlignment = Alignment.CenterVertically) {

307− Icon(

260+ Icon(

308− Icons.Filled.DeleteOutline,

261+ Icons.Filled.DeleteOutline,

309− contentDescription = null,

262+ contentDescription = null,

310− tint = MaterialTheme.colorScheme.onError,

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

264+ )

318− }

319 }

265 }

320}

266}

321

267

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

345 }

291 }

346}

292}

347

293

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

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

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

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

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

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

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

391 style = MaterialTheme.typography.bodyMedium,

332 style = MaterialTheme.typography.bodyMedium,

392 color = MaterialTheme.colorScheme.onSurfaceVariant,

333 color = MaterialTheme.colorScheme.onSurfaceVariant,

393 )

334 )

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

401 }

335 }

402}

336}

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

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

17 primaryContainer = Color(0xFF1A3D2A),

18 onPrimaryContainer = Color(0xFFA8E6C1),

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

20 tertiaryContainer = Color(0xFF2A2A3D),

26 onTertiaryContainer = Color(0xFFC5C5E6),

21 onTertiaryContainer = Color(0xFFC5C5E6),

27 errorContainer = Color(0xFF4D2626),

22 errorContainer = Color(0xFF4D2626),

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

38 primaryContainer = Color(0xFFD7F5E3),

33 primaryContainer = Color(0xFFD7F5E3),

39 onPrimaryContainer = Color(0xFF0A3D22),

34 onPrimaryContainer = Color(0xFF0A3D22),

40 secondary = Emerald,

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

36 tertiaryContainer = Color(0xFFE8E8F5),

47 onTertiaryContainer = Color(0xFF2A2A4D),

37 onTertiaryContainer = Color(0xFF2A2A4D),

48 errorContainer = Color(0xFFFFE0E0),

38 errorContainer = Color(0xFFFFE0E0),