29df003..master · opencode-android

git.iko.soy/opencode-android

on master help sign in

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

since splitsnapshots

unifiedsplit

@@ -23,6 +23,9 @@ 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)) }

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

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

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

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

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

44 prefs.edit {

47 prefs.edit {

45 putString(KEY_URL, state.serverUrl)

48 putString(KEY_URL, state.serverUrl)

46 putString(KEY_USER, state.username)

49 putString(KEY_USER, state.username)

50+ putString(KEY_PASSWORD, state.password)

47 }

51 }

48 }

52 }

49 }

53 }

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

57 private companion object {

61 private companion object {

58 const val KEY_URL = "serverUrl"

62 const val KEY_URL = "serverUrl"

59 const val KEY_USER = "username"

63 const val KEY_USER = "username"

64+ const val KEY_PASSWORD = "password"

60 }

65 }

61}

66}

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

@@ -51,6 +51,7 @@ 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")

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

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

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

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

56 }

57 }

app/src/main/java/soy/iko/opencode/core/OpencodeCore.kt+19−1

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

189 removedMessageIds.clear()

190 draft = ""

191 generating = false

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

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

194+ error = null

192 loading = true

195 loading = true

193 emit()

196 emit()

194 connectJob?.cancel()

197 connectJob?.cancel()

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

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

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

234 }

237 }

235

238

236− fun shutdown() = closeSse()

239+ fun shutdown() {

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

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

242+ connectJob?.cancel()

243+ loadSessionsJob?.cancel()

244+ createSessionJob?.cancel()

245+ loadMessagesJob?.cancel()

246+ deleteSessionJob?.cancel()

247+ sendMessageJob?.cancel()

248+ abortJob?.cancel()

249+ closeSse()

250+ }

237

251

238 // ── Effects ────────────────────────────────────────────────────────────────

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

239 private fun sendMessage(raw: String) {

253 private fun sendMessage(raw: String) {

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

358 if (session != null) {

372 if (session != null) {

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

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

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

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

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

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

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

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

361 }

379 }

362 emit()

380 emit()

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

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

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

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

34 fun connect() {

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

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

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

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

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

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

38 }

39 }

app/src/main/java/soy/iko/opencode/ui/OpencodeApp.kt+24−1

@@ -32,6 +32,7 @@ import soy.iko.opencode.ui.screens.SessionsScreen

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

33 val snackbar = remember { SnackbarHostState() }

34 var showStopConfirm by remember { mutableStateOf(false) }

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

36 LaunchedEffect(state.error) {

37 LaunchedEffect(state.error) {

37 state.error?.let {

38 state.error?.let {

@@ -49,7 +50,8 @@ fun OpencodeApp(state: UiState, dispatch: (Event) -> Unit) {

49 when (state.screen) {

50 when (state.screen) {

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

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

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

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

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

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

54+ Screen.Sessions -> showDisconnectConfirm = true

53 Screen.Connect -> Unit

55 Screen.Connect -> Unit

54 }

56 }

55 }

57 }

@@ -76,6 +78,27 @@ fun OpencodeApp(state: UiState, dispatch: (Event) -> Unit) {

76 )

78 )

77 }

79 }

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+

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

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

80 AnimatedContent(

103 AnimatedContent(

81 targetState = state.screen,

104 targetState = state.screen,

app/src/main/java/soy/iko/opencode/ui/components/MessageBubble.kt+111−3

@@ -49,6 +49,7 @@ import androidx.compose.ui.text.TextLinkStyles

49import androidx.compose.ui.text.buildAnnotatedString

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

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

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

52import androidx.compose.ui.text.withLink

53import androidx.compose.ui.text.withLink

53import androidx.compose.ui.text.withStyle

54import androidx.compose.ui.text.withStyle

54import androidx.compose.ui.text.style.TextDecoration

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

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

127

128

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

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

129

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+

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

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

131

142

132 SelectionContainer {

143 SelectionContainer {

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

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

134 val linkColor = MaterialTheme.colorScheme.primary

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

135− val codeBackground = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.08f)

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

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

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

137 buildLinkedText(message.text, message.streaming, linkColor, codeBackground, context)

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

138 }

151 }

@@ -197,14 +210,109 @@ private fun buildLinkedText(

197 append(segment)

210 append(segment)

198 }

211 }

199 } else {

212 } else {

200− appendLinkedText(segment, linkColor, context)

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

201 }

214 }

202 }

215 }

203 if (streaming) append(" ▌")

216 if (streaming) append(" ▌")

204}

217}

205

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

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

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

207private fun AnnotatedString.Builder.appendLinkedText(

226private 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(

208 text: String,

316 text: String,

209 linkColor: Color,

317 linkColor: Color,

210 context: Context,

318 context: Context,

app/src/main/java/soy/iko/opencode/ui/screens/ChatScreen.kt+96−7

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

26import androidx.compose.foundation.layout.Spacer

27import androidx.compose.foundation.layout.fillMaxSize

28import androidx.compose.foundation.layout.fillMaxWidth

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

29import androidx.compose.foundation.layout.PaddingValues

30import androidx.compose.foundation.layout.PaddingValues

30import androidx.compose.foundation.layout.WindowInsets

31import androidx.compose.foundation.layout.WindowInsets

31import androidx.compose.foundation.layout.ime

32import androidx.compose.foundation.layout.ime

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

42import androidx.compose.material.icons.Icons

43import androidx.compose.material.icons.Icons

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

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

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

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

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

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

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

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

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

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

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

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

48import androidx.compose.material3.CircularProgressIndicator

51import androidx.compose.material3.CircularProgressIndicator

49import androidx.compose.material3.ExperimentalMaterial3Api

52import androidx.compose.material3.ExperimentalMaterial3Api

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

58import androidx.compose.material3.Scaffold

61import androidx.compose.material3.Scaffold

59import androidx.compose.material3.Surface

62import androidx.compose.material3.Surface

60import androidx.compose.material3.Text

63import androidx.compose.material3.Text

64+import androidx.compose.material3.TextButton

61import androidx.compose.material3.TopAppBar

65import androidx.compose.material3.TopAppBar

62import androidx.compose.runtime.Composable

66import androidx.compose.runtime.Composable

63import androidx.compose.runtime.LaunchedEffect

67import androidx.compose.runtime.LaunchedEffect

@@ -71,6 +75,7 @@ import androidx.compose.ui.Alignment

71import androidx.compose.ui.Modifier

75import androidx.compose.ui.Modifier

72import androidx.compose.ui.draw.clip

76import androidx.compose.ui.draw.clip

73import androidx.compose.ui.hapticfeedback.HapticFeedbackType

77import androidx.compose.ui.hapticfeedback.HapticFeedbackType

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

74import androidx.compose.ui.platform.LocalContext

79import androidx.compose.ui.platform.LocalContext

75import androidx.compose.ui.platform.LocalDensity

80import androidx.compose.ui.platform.LocalDensity

76import androidx.compose.ui.platform.LocalHapticFeedback

81import androidx.compose.ui.platform.LocalHapticFeedback

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

108 }

113 }

109 }

114 }

110

115

116+ // Offer a jump-to-top shortcut once the conversation is long and the user has

117+ // scrolled a few messages down — saves flick-scrolling back through history.

118+ val showScrollTop by remember {

119+ derivedStateOf { state.messages.size > 10 && listState.firstVisibleItemIndex > 3 }

120+ }

121+

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

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

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

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

113 var lastSeenCount by remember { mutableStateOf(0) }

124 var lastSeenCount by remember { mutableStateOf(0) }

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

194 }

205 }

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

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

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

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

197− Text(

208+ Column(

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

199− style = MaterialTheme.typography.bodyMedium,

200− color = MaterialTheme.colorScheme.onSurfaceVariant,

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

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

210+ horizontalAlignment = Alignment.CenterHorizontally,

202− )

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

203 }

226 }

204 LazyColumn(

227 LazyColumn(

205 state = listState,

228 state = listState,

@@ -246,6 +269,14 @@ fun ChatScreen(state: UiState, dispatch: (Event) -> Unit) {

246 }

269 }

247 },

270 },

248 )

271 )

272+ ScrollToTopButton(

273+ visible = showScrollTop,

274+ onClick = {

275+ coroutineScope.launch {

276+ listState.animateScrollToItem(0)

277+ }

278+ },

279+ )

249 }

280 }

250 }

281 }

251 }

282 }

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

285 }

316 }

286}

317}

287

318

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

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

321+@Composable

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

323+ AnimatedVisibility(

324+ visible = visible,

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

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

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

328+ ) {

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

330+ FloatingActionButton(

331+ onClick = onClick,

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

333+ ) {

334+ Icon(

335+ Icons.Filled.KeyboardArrowUp,

336+ contentDescription = "Scroll to top",

337+ )

338+ }

339+ }

340+ }

341+}

342+

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

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

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

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

290 clipboard.setPrimaryClip(ClipData.newPlainText("session", text))

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

@@ -442,19 +497,41 @@ private fun ChatInputBar(

442 onStop: () -> Unit,

497 onStop: () -> Unit,

443) {

498) {

444 val haptic = LocalHapticFeedback.current

499 val haptic = LocalHapticFeedback.current

500+ val clipboardManager = LocalClipboardManager.current

445 Surface(tonalElevation = 3.dp) {

501 Surface(tonalElevation = 3.dp) {

446− Row(

502+ Column(

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

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

504+ ) {

505+ Row(

506+ modifier = Modifier.fillMaxWidth(),

448 verticalAlignment = Alignment.Bottom,

507 verticalAlignment = Alignment.Bottom,

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

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

450 ) {

509 ) {

451 OutlinedTextField(

510 OutlinedTextField(

452 value = draft,

511 value = draft,

453 onValueChange = onDraftChange,

512 onValueChange = onDraftChange,

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

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

455 enabled = !loading,

514 enabled = !loading,

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

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

457 maxLines = 5,

516 maxLines = 5,

517+ // Offer a quick way to wipe the draft once there's something to clear

518+ // and we're not mid-generation (where the field is a poor place to fuss).

519+ trailingIcon = if (draft.isNotEmpty() && !generating) {

520+ {

521+ IconButton(

522+ onClick = { onDraftChange("") },

523+ modifier = Modifier.size(20.dp),

524+ ) {

525+ Icon(

526+ Icons.Filled.Close,

527+ contentDescription = "Clear draft",

528+ modifier = Modifier.size(16.dp),

529+ )

530+ }

531+ }

532+ } else {

533+ null

534+ },

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

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

459 // sense of scale before sending a wall of text.

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

460 supportingText = if (draft.length > 500) {

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

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

497 }

574 }

498 }

575 }

499 }

576 }

577+ // With nothing typed yet, offer a one-tap way to drop in clipboard contents.

578+ if (draft.isEmpty() && !generating && !loading) {

579+ TextButton(

580+ onClick = {

581+ clipboardManager.getText()?.text?.let { onDraftChange(it) }

582+ },

583+ contentPadding = PaddingValues(0.dp),

584+ ) {

585+ Text("Paste")

586+ }

587+ }

588+ }

500 }

589 }

501}

590}

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

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

155 },

156 modifier = Modifier.fillMaxWidth(),

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

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

158+ keyboardActions = KeyboardActions(onGo = {

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

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

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

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

163+ ) {

164+ dispatch(Event.Connect)

165+ }

166+ }),

159 enabled = !state.loading,

167 enabled = !state.loading,

160 )

168 )

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

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

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

170

178

171 Button(

179 Button(

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

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

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

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

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

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

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

174 modifier = Modifier.fillMaxWidth(),

185 modifier = Modifier.fillMaxWidth(),

175 ) {

186 ) {

176 if (state.loading) {

187 if (state.loading) {

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

184 }

195 }

185 }

196 }

186

197

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

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

200+ if (state.loading) {

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

202+ Text(

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

204+ style = MaterialTheme.typography.bodySmall,

205+ color = MaterialTheme.colorScheme.onSurfaceVariant,

206+ textAlign = TextAlign.Center,

207+ )

208+ }

209+

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

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

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

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

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

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

app/src/main/java/soy/iko/opencode/ui/screens/SessionsScreen.kt+29−2

@@ -22,6 +22,7 @@ import androidx.compose.foundation.layout.size

22import androidx.compose.foundation.lazy.LazyColumn

23import androidx.compose.foundation.lazy.items

24import androidx.compose.foundation.lazy.rememberLazyListState

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

25import androidx.compose.material.icons.Icons

26import androidx.compose.material.icons.Icons

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

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

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

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

@@ -57,9 +58,12 @@ import androidx.compose.runtime.remember

57import androidx.compose.runtime.setValue

58import androidx.compose.runtime.setValue

58import androidx.compose.ui.Alignment

59import androidx.compose.ui.Alignment

59import androidx.compose.ui.Modifier

60import androidx.compose.ui.Modifier

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

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

60import androidx.compose.ui.hapticfeedback.HapticFeedbackType

63import androidx.compose.ui.hapticfeedback.HapticFeedbackType

61import androidx.compose.ui.platform.LocalContext

64import androidx.compose.ui.platform.LocalContext

62import androidx.compose.ui.platform.LocalHapticFeedback

65import androidx.compose.ui.platform.LocalHapticFeedback

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

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

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

64import androidx.compose.ui.unit.dp

68import androidx.compose.ui.unit.dp

65import soy.iko.opencode.core.Event

69import soy.iko.opencode.core.Event

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

115 Scaffold(

119 Scaffold(

116 topBar = {

120 topBar = {

117 TopAppBar(

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

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

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

137+ }

138+ },

119 navigationIcon = {

139 navigationIcon = {

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

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

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

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

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

267 Icon(

287 Icon(

268 Icons.Filled.DeleteOutline,

288 Icons.Filled.DeleteOutline,

269 contentDescription = "Delete session",

289 contentDescription = "Delete session",

270− tint = MaterialTheme.colorScheme.onSurfaceVariant,

290+ tint = MaterialTheme.colorScheme.error,

271 )

291 )

272 }

292 }

273 }

293 }

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

371 style = MaterialTheme.typography.bodyMedium,

391 style = MaterialTheme.typography.bodyMedium,

372 color = MaterialTheme.colorScheme.onSurfaceVariant,

392 color = MaterialTheme.colorScheme.onSurfaceVariant,

373 )

393 )

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

395+ Text(

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

397+ style = MaterialTheme.typography.bodySmall,

398+ color = MaterialTheme.colorScheme.onSurfaceVariant,

399+ textAlign = TextAlign.Center,

400+ )

374 }

401 }

375}

402}

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

@@ -17,6 +17,11 @@ 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),

20 tertiaryContainer = Color(0xFF2A2A3D),

25 tertiaryContainer = Color(0xFF2A2A3D),

21 onTertiaryContainer = Color(0xFFC5C5E6),

26 onTertiaryContainer = Color(0xFFC5C5E6),

22 errorContainer = Color(0xFF4D2626),

27 errorContainer = Color(0xFF4D2626),

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

33 primaryContainer = Color(0xFFD7F5E3),

38 primaryContainer = Color(0xFFD7F5E3),

34 onPrimaryContainer = Color(0xFF0A3D22),

39 onPrimaryContainer = Color(0xFF0A3D22),

35 secondary = Emerald,

40 secondary = Emerald,

41+ onSecondary = Color(0xFF1A1C1F),

42+ secondaryContainer = Color(0xFFD7E8F5),

43+ onSecondaryContainer = Color(0xFF0A2A4D),

44+ tertiary = Color(0xFF6B7280),

45+ onTertiary = Color(0xFFFFFFFF),

36 tertiaryContainer = Color(0xFFE8E8F5),

46 tertiaryContainer = Color(0xFFE8E8F5),

37 onTertiaryContainer = Color(0xFF2A2A4D),

47 onTertiaryContainer = Color(0xFF2A2A4D),

38 errorContainer = Color(0xFFFFE0E0),

48 errorContainer = Color(0xFFFFE0E0),