eb4a7b1 · opencode-android

git.iko.soy/opencode-android

Fix 4 P0 UX bugs (unread count restore, hidden working indicator, two-pane share injection, crash-delete lost on rotation) and add 25 P1/P2 polish fixes (locale-aware relative time, markdown text selection, permission reject prominence, abort spinner, breadcrumb tap targets, haptics, back-handler for sort dropdown, dynamic file-viewer overlay, i18n cost format, UnknownPart note, suggestion focus, and more)

eb4a7b1iko3 months ago

app/src/main/java/soy/iko/opencode/di/AppContainer.kt+6−5

compare with master

unifiedsplit

@@ -148,12 +148,13 @@ open class AppContainer private constructor(

148 }

149 }

150

151− /** Restore a session's unread badge (preserving its prior count) after a failed

151+ /** Restore a session's unread badge after a failed server switch reconnects.

152− * server switch reconnects. Falls back to a count of 1 when the prior count isn't

152+ * Preserves the prior [count] so a session badged with "5 unread" before the

153− * known, since the restore path only runs for sessions that were badged before. */

153+ * switch attempt still shows 5 (not 1) after the restore. No-op for the session

154+ * the user is currently viewing, since a viewed session is never badged. */

154− open fun restoreUnread(id: String) {

155+ open fun restoreUnread(id: String, count: Int) {

155 if (id != _currentSession.value) {

156 if (id != _currentSession.value) {

156− _unread.update { it + (id to (it[id] ?: 1)) }

157+ _unread.update { it + (id to count) }

157 }

158 }

159 }

159

160

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

@@ -58,11 +58,19 @@ fun OpencodeApp(container: AppContainer) {

59 // Open a session requested by a notification tap or deep link, once connected.

60 // In two-pane mode the detail pane consumes the request instead of navigating.

61+ // Ensure SESSIONS is on the back stack below the chat destination so backing

62+ // out of the chat lands on the session list (not the server list). The

63+ // ServerListScreen's auto-connect also navigates to SESSIONS; without this

64+ // popUpTo guard the two navigations race and can leave the stack as

65+ // SERVERS -> chat (missing SESSIONS) or chat buried under SESSIONS.

61 LaunchedEffect(pendingOpenSession, connection, isTwoPane) {

66 LaunchedEffect(pendingOpenSession, connection, isTwoPane) {

62 val id = pendingOpenSession ?: return@LaunchedEffect

67 val id = pendingOpenSession ?: return@LaunchedEffect

63 if (connection == null || isTwoPane) return@LaunchedEffect

68 if (connection == null || isTwoPane) return@LaunchedEffect

64 container.consumePendingOpenSession()

69 container.consumePendingOpenSession()

65− navController.navigate(Routes.chat(id)) { launchSingleTop = true }

70+ navController.navigate(Routes.chat(id)) {

71+ launchSingleTop = true

72+ popUpTo(Routes.SERVERS) { inclusive = false }

73+ }

66 }

74 }

68 NavHost(

76 NavHost(

app/src/main/java/soy/iko/opencode/ui/chat/ChatScreen.kt+48−6

@@ -67,6 +67,7 @@ import androidx.compose.foundation.text.KeyboardActions

67import androidx.compose.foundation.text.KeyboardOptions

68import androidx.compose.ui.Alignment

69import androidx.compose.ui.Modifier

70+import androidx.compose.ui.focus.focusRequester

70import androidx.compose.ui.input.key.Key

71import androidx.compose.ui.input.key.Key

71import androidx.compose.ui.input.key.KeyEventType

72import androidx.compose.ui.input.key.KeyEventType

72import androidx.compose.ui.input.key.isCtrlPressed

73import androidx.compose.ui.input.key.isCtrlPressed

@@ -113,6 +114,7 @@ fun ChatScreen(

113 val vm: ChatViewModel = viewModel(key = sessionId, factory = vmFactory { ChatViewModel(container, sessionId) })

114 val vm: ChatViewModel = viewModel(key = sessionId, factory = vmFactory { ChatViewModel(container, sessionId) })

114 val hasMessages by vm.hasMessages.collectAsStateWithLifecycle()

115 val hasMessages by vm.hasMessages.collectAsStateWithLifecycle()

115 val running by vm.running.collectAsStateWithLifecycle()

116 val running by vm.running.collectAsStateWithLifecycle()

117+ val aborting by vm.aborting.collectAsStateWithLifecycle()

116 val loading by vm.loading.collectAsStateWithLifecycle()

118 val loading by vm.loading.collectAsStateWithLifecycle()

117 val loadError by vm.loadError.collectAsStateWithLifecycle()

119 val loadError by vm.loadError.collectAsStateWithLifecycle()

118 val refreshing by vm.refreshing.collectAsStateWithLifecycle()

120 val refreshing by vm.refreshing.collectAsStateWithLifecycle()

@@ -177,6 +179,7 @@ fun ChatScreen(

177

179

178 val snackbar = remember { SnackbarHostState() }

180 val snackbar = remember { SnackbarHostState() }

179 val retryLabel = stringResource(R.string.retry)

181 val retryLabel = stringResource(R.string.retry)

182+ val inputFocusRequester = remember { androidx.compose.ui.focus.FocusRequester() }

180 var showModelPicker by rememberSaveable { mutableStateOf(false) }

183 var showModelPicker by rememberSaveable { mutableStateOf(false) }

181 var showAgentPicker by rememberSaveable { mutableStateOf(false) }

184 var showAgentPicker by rememberSaveable { mutableStateOf(false) }

182 var showCommandPicker by rememberSaveable { mutableStateOf(false) }

185 var showCommandPicker by rememberSaveable { mutableStateOf(false) }

@@ -352,6 +355,7 @@ fun ChatScreen(

352 value = draft,

355 value = draft,

353 onValueChange = vm::updateDraft,

356 onValueChange = vm::updateDraft,

354 running = running,

357 running = running,

358+ aborting = aborting,

355 enabled = activeConnection != null,

359 enabled = activeConnection != null,

356 sendOnEnter = sendOnEnter,

360 sendOnEnter = sendOnEnter,

357 onSend = ::doSend,

361 onSend = ::doSend,

@@ -359,6 +363,7 @@ fun ChatScreen(

359 queuedFollowUp = queuedFollowUp,

363 queuedFollowUp = queuedFollowUp,

360 onQueueFollowUp = vm::queueFollowUp,

364 onQueueFollowUp = vm::queueFollowUp,

361 onCancelQueue = { vm.queueFollowUp("") },

365 onCancelQueue = { vm.queueFollowUp("") },

366+ focusRequester = inputFocusRequester,

362 )

367 )

363 },

368 },

364 ) { padding ->

369 ) { padding ->

@@ -373,7 +378,13 @@ fun ChatScreen(

373 val isPinnedToBottom by remember {

378 val isPinnedToBottom by remember {

374 derivedStateOf {

379 derivedStateOf {

375 val lastVisible = listState.layoutInfo.visibleItemsInfo.lastOrNull()?.index ?: -1

380 val lastVisible = listState.layoutInfo.visibleItemsInfo.lastOrNull()?.index ?: -1

381+ // When a run is active, the LazyColumn has one trailing "__typing"

382+ // item after the last message. Account for it so "pinned to bottom"

383+ // includes the working indicator — otherwise the pin check targets

384+ // messages.lastIndex, the typing row sits just below the viewport,

385+ // and the user never sees the progress indicator even when pinned.

386+ val effectiveLast = if (running) messages.size else messages.lastIndex

376− lastVisible >= messages.lastIndex || messages.isEmpty()

387+ lastVisible >= effectiveLast || messages.isEmpty()

377 }

388 }

378 }

389 }

379

390

@@ -392,7 +403,11 @@ fun ChatScreen(

392 AutoScrollSignal(messages.size, lastText?.text?.length ?: 0, isPinnedToBottom)

403 AutoScrollSignal(messages.size, lastText?.text?.length ?: 0, isPinnedToBottom)

393 }.collect { signal ->

404 }.collect { signal ->

394 if (signal.size > 0 && signal.pinned) {

405 if (signal.size > 0 && signal.pinned) {

406+ // Scroll to the effective last index, including the trailing

407+ // "__typing" row when a run is active so the working indicator

408+ // is brought into view (not just the last message).

409+ val target = if (running) messages.size else messages.lastIndex

395− listState.scrollToItem(messages.lastIndex)

410+ listState.scrollToItem(target)

396 }

411 }

397 }

412 }

398 }

413 }

@@ -477,7 +492,12 @@ fun ChatScreen(

477 }

492 }

478 } else if (messages.isEmpty()) {

493 } else if (messages.isEmpty()) {

479 EmptyConversation(

494 EmptyConversation(

495+ onSuggestion = {

480− onSuggestion = { vm.updateDraft(it) },

496+ vm.updateDraft(it)

497+ // Focus the input so the user can edit the suggestion before

498+ // sending, instead of having to manually tap the field.

499+ runCatching { inputFocusRequester.requestFocus() }

500+ },

481 modifier = Modifier.align(Alignment.Center),

501 modifier = Modifier.align(Alignment.Center),

482 )

502 )

483 } else {

503 } else {

@@ -535,7 +555,10 @@ fun ChatScreen(

535 ExtendedFloatingActionButton(

555 ExtendedFloatingActionButton(

536 onClick = {

556 onClick = {

537 if (messages.isNotEmpty()) {

557 if (messages.isNotEmpty()) {

558+ // Scroll to the effective last index, including the

559+ // trailing "__typing" row when a run is active.

560+ val target = if (running) messages.size else messages.lastIndex

538− contentScope.launch { runCatchingCancellable { listState.animateScrollToItem(messages.lastIndex) } }

561+ contentScope.launch { runCatchingCancellable { listState.animateScrollToItem(target) } }

539 }

562 }

540 },

563 },

541 icon = { Icon(Icons.Filled.KeyboardArrowDown, contentDescription = stringResource(R.string.latest)) },

564 icon = { Icon(Icons.Filled.KeyboardArrowDown, contentDescription = stringResource(R.string.latest)) },

@@ -557,6 +580,7 @@ fun ChatScreen(

557 confirmButton = {

580 confirmButton = {

558 TextButton(onClick = {

581 TextButton(onClick = {

559 showExitConfirm = false

582 showExitConfirm = false

583+ haptics.performHapticFeedback(androidx.compose.ui.hapticfeedback.HapticFeedbackType.LongPress)

560 vm.abort()

584 vm.abort()

561 onBack()

585 onBack()

562 }) { Text(stringResource(R.string.stop_and_exit)) }

586 }) { Text(stringResource(R.string.stop_and_exit)) }

@@ -575,6 +599,7 @@ fun ChatScreen(

575 confirmButton = {

599 confirmButton = {

576 TextButton(onClick = {

600 TextButton(onClick = {

577 showStopConfirm = false

601 showStopConfirm = false

602+ haptics.performHapticFeedback(androidx.compose.ui.hapticfeedback.HapticFeedbackType.LongPress)

578 vm.abort()

603 vm.abort()

579 }) { Text(stringResource(R.string.stop), color = MaterialTheme.colorScheme.error) }

604 }) { Text(stringResource(R.string.stop), color = MaterialTheme.colorScheme.error) }

580 },

605 },

@@ -632,6 +657,7 @@ private fun ChatInputBar(

632 value: String,

657 value: String,

633 onValueChange: (String) -> Unit,

658 onValueChange: (String) -> Unit,

634 running: Boolean,

659 running: Boolean,

660+ aborting: Boolean,

635 enabled: Boolean,

661 enabled: Boolean,

636 sendOnEnter: Boolean,

662 sendOnEnter: Boolean,

637 onSend: () -> Unit,

663 onSend: () -> Unit,

@@ -639,6 +665,7 @@ private fun ChatInputBar(

639 queuedFollowUp: String?,

665 queuedFollowUp: String?,

640 onQueueFollowUp: (String) -> Unit,

666 onQueueFollowUp: (String) -> Unit,

641 onCancelQueue: () -> Unit,

667 onCancelQueue: () -> Unit,

668+ focusRequester: androidx.compose.ui.focus.FocusRequester,

642) {

669) {

643 Surface(tonalElevation = 3.dp, modifier = Modifier.imePadding()) {

670 Surface(tonalElevation = 3.dp, modifier = Modifier.imePadding()) {

644 Column(modifier = Modifier.fillMaxWidth().windowInsetsPadding(WindowInsets.navigationBars)) {

671 Column(modifier = Modifier.fillMaxWidth().windowInsetsPadding(WindowInsets.navigationBars)) {

@@ -683,6 +710,7 @@ private fun ChatInputBar(

683 },

710 },

684 modifier = Modifier

711 modifier = Modifier

685 .weight(1f)

712 .weight(1f)

713+ .focusRequester(focusRequester)

686 .testTag("chat_input")

714 .testTag("chat_input")

687 .onPreviewKeyEvent { event ->

715 .onPreviewKeyEvent { event ->

688 if (event.type != KeyEventType.KeyDown || event.key != Key.Enter) return@onPreviewKeyEvent false

716 if (event.type != KeyEventType.KeyDown || event.key != Key.Enter) return@onPreviewKeyEvent false

@@ -730,8 +758,22 @@ private fun ChatInputBar(

730 }),

758 }),

731 )

759 )

732 if (running) {

760 if (running) {

761+ // Show a spinner while the abort REST call is in flight so the user

762+ // sees the stop was sent, and disable to prevent a double-tap.

763+ IconButton(

764+ onClick = onAbort,

765+ enabled = !aborting,

733− IconButton(onClick = onAbort, modifier = Modifier.padding(start = 4.dp).testTag("stop_button")) {

766+ modifier = Modifier.padding(start = 4.dp).testTag("stop_button"),

767+ ) {

768+ if (aborting) {

769+ val stopLabel = stringResource(R.string.stop)

770+ CircularProgressIndicator(

771+ Modifier.size(18.dp).semantics { contentDescription = stopLabel },

772+ strokeWidth = 2.dp,

773+ )

774+ } else {

734− Icon(Icons.Filled.Stop, contentDescription = stringResource(R.string.stop))

775+ Icon(Icons.Filled.Stop, contentDescription = stringResource(R.string.stop))

776+ }

735 }

777 }

736 } else {

778 } else {

737 IconButton(

779 IconButton(

app/src/main/java/soy/iko/opencode/ui/chat/ChatViewModel.kt+31−3

@@ -135,6 +135,11 @@ class ChatViewModel(

135 private val _running = MutableStateFlow(false)

136 val running: StateFlow<Boolean> = _running.asStateFlow()

137

138+ /** True while an abort REST call is in flight, so the Stop button can show a

139+ * spinner and prevent double-taps from firing a second abort. */

140+ private val _aborting = MutableStateFlow(false)

141+ val aborting: StateFlow<Boolean> = _aborting.asStateFlow()

142+

138 /** A follow-up the user typed while a run was active. send() queues it here and

143 /** A follow-up the user typed while a run was active. send() queues it here and

139 * auto-sends once the run completes (SessionIdle), so the user isn't blocked with

144 * auto-sends once the run completes (SessionIdle), so the user isn't blocked with

140 * no way to send and no indication why the Send button is gone. */

145 * no way to send and no indication why the Send button is gone. */

@@ -221,6 +226,24 @@ class ChatViewModel(

221 }

226 }

222 }

227 }

223 }

228 }

229+ // Observe the drafts store for external mutations to this session's draft

230+ // (e.g. a share injected via draftStore.set in two-pane mode, or setImmediate

231+ // before navigation in single-pane mode). Without this, a share injected into

232+ // an already-open session never appears in the input field — the init-time

233+ // read and the ready-only re-seed miss it when the draft is non-empty.

234+ // The VM's own debounced persist writes the same value _draft already holds,

235+ // so those updates are no-ops here (storeValue == _draft.value). The

236+ // suppressDraftPersist guard prevents a stale store value from clobbering

237+ // the deliberate draft clear during a send (the store still holds the

238+ // pre-send draft until the send resolves).

239+ viewModelScope.launch {

240+ container.draftStore.drafts.collect { drafts ->

241+ val storeValue = drafts[sessionId].orEmpty()

242+ if (storeValue != _draft.value && !suppressDraftPersist.get()) {

243+ _draft.value = storeValue

244+ }

245+ }

246+ }

224 }

247 }

225

248

226 fun selectModel(option: ModelOption) { _selectedModel.value = option }

249 fun selectModel(option: ModelOption) { _selectedModel.value = option }

@@ -526,10 +549,15 @@ class ChatViewModel(

526

549

527 fun abort() {

550 fun abort() {

528 val conn = connection ?: return

551 val conn = connection ?: return

552+ if (!_aborting.compareAndSet(false, true)) return

529 viewModelScope.launch {

553 viewModelScope.launch {

554+ try {

530− runCatchingCancellable { conn.repository.abort(sessionId) }

555+ runCatchingCancellable { conn.repository.abort(sessionId) }

531− .onSuccess { _running.value = false }

556+ .onSuccess { _running.value = false }

532− .onFailure { _errorEvents.tryEmit(container.friendlyError(it)) }

557+ .onFailure { _errorEvents.tryEmit(container.friendlyError(it)) }

558+ } finally {

559+ _aborting.value = false

560+ }

533 }

561 }

534 }

562 }

535

563

app/src/main/java/soy/iko/opencode/ui/chat/MessageBubble.kt+11−12

@@ -122,7 +122,7 @@ private fun UserBubble(message: MessageWithParts, imageContext: ImageLoadContext

122 horizontalArrangement = Arrangement.SpaceBetween,

123 verticalAlignment = Alignment.CenterVertically,

124 ) {

125− MessageTimestamp(message.info)

125+ MessageTimestampText(message.info)

126 // Copy affordance for user prompts, mirroring the assistant block.

127 // Without it, reusing a prior prompt requires discovering the

128 // long-press on the markdown text (and only TextParts support that).

@@ -173,14 +173,16 @@ private fun AssistantBlock(

173 val cost = info.cost

174 val tokens = info.tokens

175 val tokenFormat = stringResource(R.string.tokens_in_out)

176+ val costShort = stringResource(R.string.cost_format_short)

177+ val costLong = stringResource(R.string.cost_format_long)

176 // Memoize the formatted cost/tokens line so a scroll-induced or unrelated

178 // Memoize the formatted cost/tokens line so a scroll-induced or unrelated

177 // state-flip recomposition doesn't re-run NumberFormat + buildList +

179 // state-flip recomposition doesn't re-run NumberFormat + buildList +

178 // joinToString for every visible assistant bubble.

180 // joinToString for every visible assistant bubble.

179− val costSummary = remember(info.isComplete, tokens, cost, tokenFormat) {

181+ val costSummary = remember(info.isComplete, tokens, cost, tokenFormat, costShort, costLong) {

180 if (!info.isComplete || (cost == null && tokens == null)) null

182 if (!info.isComplete || (cost == null && tokens == null)) null

181 else buildList {

183 else buildList {

182 tokens?.let { add(formatTokens(it, tokenFormat)) }

184 tokens?.let { add(formatTokens(it, tokenFormat)) }

183− cost?.takeIf { it > 0 }?.let { add(formatCost(it)) }

185+ cost?.takeIf { it > 0 }?.let { add(formatCost(it, costShort, costLong)) }

184 }.takeIf { it.isNotEmpty() }?.joinToString(" • ")

186 }.takeIf { it.isNotEmpty() }?.joinToString(" • ")

185 }

187 }

186 Row(

188 Row(

@@ -239,11 +241,6 @@ private fun MessageTimestampText(info: soy.iko.opencode.data.model.MessageInfo)

239 }

241 }

240}

242}

241

243

242−@Composable

243−private fun MessageTimestamp(info: soy.iko.opencode.data.model.MessageInfo) {

244− MessageTimestampText(info)

245−}

246−

247// NumberFormat.getNumberInstance performs an expensive ICU locale lookup + object

244// NumberFormat.getNumberInstance performs an expensive ICU locale lookup + object

248// construction on every call. Reuse a thread-local instance so repeated calls (e.g.

245// construction on every call. Reuse a thread-local instance so repeated calls (e.g.

249// when the message list re-seeds after a reconnect and every visible assistant bubble

246// when the message list re-seeds after a reconnect and every visible assistant bubble

@@ -258,8 +255,10 @@ private fun formatTokens(tokens: Tokens, format: String): String {

258 return format.format(nf.format(tokens.input), nf.format(tokens.output))

255 return format.format(nf.format(tokens.input), nf.format(tokens.output))

259}

256}

260

257

261−private fun formatCost(cost: Double): String =

258+private fun formatCost(cost: Double, shortFormat: String, longFormat: String): String =

262 // Locale.US so the formatting is stable regardless of device locale (avoids

259 // Locale.US so the formatting is stable regardless of device locale (avoids

263− // non-ASCII digits or comma decimal separators in a dollar amount).

260+ // non-ASCII digits or comma decimal separators in a dollar amount). The format

261+ // string itself is localized via strings.xml so the currency symbol can be

262+ // adapted by translators.

264− if (cost < 0.01) String.format(java.util.Locale.US, "$%.4f", cost)

263+ if (cost < 0.01) String.format(java.util.Locale.US, longFormat, cost)

265− else String.format(java.util.Locale.US, "$%.2f", cost)

264+ else String.format(java.util.Locale.US, shortFormat, cost)

app/src/main/java/soy/iko/opencode/ui/chat/PartRenderer.kt+30−3

@@ -11,6 +11,7 @@ import androidx.compose.foundation.layout.padding

11import androidx.compose.foundation.layout.size

12import androidx.compose.foundation.shape.RoundedCornerShape

13import androidx.compose.material.icons.Icons

14+import androidx.compose.material.icons.automirrored.filled.HelpOutline

14import androidx.compose.material.icons.filled.Bolt

15import androidx.compose.material.icons.filled.Bolt

15import androidx.compose.material.icons.filled.CheckCircle

16import androidx.compose.material.icons.filled.CheckCircle

16import androidx.compose.material.icons.filled.ContentCopy

17import androidx.compose.material.icons.filled.ContentCopy

@@ -18,7 +19,6 @@ import androidx.compose.material.icons.filled.Description

18import androidx.compose.material.icons.filled.Error

19import androidx.compose.material.icons.filled.Error

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

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

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

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

21−import androidx.compose.material.icons.filled.HelpOutline

22import androidx.compose.material.icons.filled.Psychology

23import androidx.compose.material3.CircularProgressIndicator

24import androidx.compose.material3.Icon

@@ -109,7 +109,31 @@ fun PartView(part: Part, modifier: Modifier = Modifier, isRunning: Boolean = fal

109 }

110 is StepStartPart -> {} // boundary marker — nothing to draw

111 is StepFinishPart -> {} // metrics handled at message level

112− is UnknownPart -> {} // forward-compat: unknown part types are ignored

112+ is UnknownPart -> UnknownPartNote(modifier)

113+ }

114+}

115+

116+@Composable

117+private fun UnknownPartNote(modifier: Modifier) {

118+ // Forward-compat: a part type the client doesn't model. Render a muted note (matching

119+ // UnknownMessageBlock's pattern) so the user can tell content was dropped instead of

120+ // the part vanishing silently — important when a new server release adds a part type.

121+ Row(

122+ modifier = modifier.fillMaxWidth(),

123+ verticalAlignment = Alignment.CenterVertically,

124+ ) {

125+ Icon(

126+ Icons.AutoMirrored.Filled.HelpOutline,

127+ contentDescription = null,

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

129+ tint = MaterialTheme.colorScheme.onSurfaceVariant,

130+ )

131+ Text(

132+ stringResource(R.string.unknown_part),

133+ style = MaterialTheme.typography.labelSmall,

134+ color = MaterialTheme.colorScheme.onSurfaceVariant,

135+ modifier = Modifier.padding(start = 6.dp),

136+ )

113 }

137 }

114}

138}

115

139

@@ -117,7 +141,10 @@ fun PartView(part: Part, modifier: Modifier = Modifier, isRunning: Boolean = fal

117private fun ReasoningBlock(text: String, streaming: Boolean, modifier: Modifier) {

141private fun ReasoningBlock(text: String, streaming: Boolean, modifier: Modifier) {

118 if (text.isBlank()) return

142 if (text.isBlank()) return

119 val context = LocalContext.current

143 val context = LocalContext.current

144+ // Key the expanded state on a content prefix so a new ReasoningPart (e.g. a second

145+ // reasoning block added during streaming) doesn't inherit the positional saveable

146+ // key of a prior block and start in the wrong expanded state.

120− var expanded by rememberSaveable { mutableStateOf(false) }

147+ var expanded by rememberSaveable(text.take(64)) { mutableStateOf(false) }

121 val expandedState = stringResource(R.string.state_expanded)

148 val expandedState = stringResource(R.string.state_expanded)

122 val collapsedState = stringResource(R.string.state_collapsed)

149 val collapsedState = stringResource(R.string.state_collapsed)

123 val thinkingLabel = stringResource(R.string.thinking)

150 val thinkingLabel = stringResource(R.string.thinking)

app/src/main/java/soy/iko/opencode/ui/chat/PermissionDialog.kt+11−8

@@ -95,14 +95,17 @@ fun PermissionDialog(

95 },

96 modifier = Modifier.fillMaxWidth(),

97 ) { Text(stringResource(R.string.always_allow)) }

98− }

98+ // Reject is an OutlinedButton (not a low-prominence TextButton) in the

99− },

99+ // same column so the three actions are visually balanced — the prior

100− dismissButton = {

100+ // layout buried Reject as a small dismiss-button, nudging users toward

101+ // granting. Reject uses the error color to signal its consequence.

102+ OutlinedButton(

101− TextButton(onClick = {

103+ onClick = {

102− haptics.performHapticFeedback(androidx.compose.ui.hapticfeedback.HapticFeedbackType.LongPress)

104+ haptics.performHapticFeedback(androidx.compose.ui.hapticfeedback.HapticFeedbackType.LongPress)

103− respond(PermissionResponse.REJECT)

105+ respond(PermissionResponse.REJECT)

104− }) {

106+ },

107+ modifier = Modifier.fillMaxWidth(),

105− Text(stringResource(R.string.reject), color = MaterialTheme.colorScheme.error)

108+ ) { Text(stringResource(R.string.reject), color = MaterialTheme.colorScheme.error) }

106 }

109 }

107 },

110 },

108 )

111 )

app/src/main/java/soy/iko/opencode/ui/components/ConnectionBanner.kt+1−1

@@ -86,7 +86,7 @@ fun ConnectionBanner(

86 ) {

87 if (!isFailed) {

88 CircularProgressIndicator(

89− Modifier.size(12.dp),

89+ Modifier.size(16.dp),

90 strokeWidth = 2.dp,

91 )

92 }

app/src/main/java/soy/iko/opencode/ui/components/MarkdownText.kt+18−18

@@ -4,9 +4,7 @@ import android.content.ClipData

4import android.content.ClipboardManager

5import android.content.Context

6import android.widget.Toast

7−import androidx.compose.foundation.ExperimentalFoundationApi

8import androidx.compose.foundation.background

7import androidx.compose.foundation.background

9−import androidx.compose.foundation.combinedClickable

10import androidx.compose.foundation.horizontalScroll

8import androidx.compose.foundation.horizontalScroll

11import androidx.compose.foundation.layout.Box

9import androidx.compose.foundation.layout.Box

12import androidx.compose.foundation.layout.fillMaxWidth

10import androidx.compose.foundation.layout.fillMaxWidth

@@ -14,6 +12,7 @@ import androidx.compose.foundation.layout.padding

14import androidx.compose.foundation.layout.size

12import androidx.compose.foundation.layout.size

15import androidx.compose.foundation.rememberScrollState

13import androidx.compose.foundation.rememberScrollState

16import androidx.compose.foundation.shape.RoundedCornerShape

14import androidx.compose.foundation.shape.RoundedCornerShape

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

17import androidx.compose.material.icons.Icons

16import androidx.compose.material.icons.Icons

18import androidx.compose.material.icons.filled.ContentCopy

17import androidx.compose.material.icons.filled.ContentCopy

19import androidx.compose.material3.Icon

18import androidx.compose.material3.Icon

@@ -33,7 +32,6 @@ import androidx.compose.ui.Alignment

33import androidx.compose.ui.Modifier

32import androidx.compose.ui.Modifier

34import androidx.compose.ui.draw.clip

33import androidx.compose.ui.draw.clip

35import androidx.compose.ui.platform.LocalContext

34import androidx.compose.ui.platform.LocalContext

36−import androidx.compose.ui.semantics.Role

37import androidx.compose.ui.text.TextStyle

35import androidx.compose.ui.text.TextStyle

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

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

39import androidx.compose.ui.unit.dp

37import androidx.compose.ui.unit.dp

@@ -54,6 +52,11 @@ import soy.iko.opencode.data.network.NetworkConfig

54 * Long-press copies the raw markdown to the system clipboard. Code blocks/fences get an

52 * Long-press copies the raw markdown to the system clipboard. Code blocks/fences get an

55 * inline copy button.

53 * inline copy button.

56 *

54 *

55+ * The rendered text is wrapped in a [SelectionContainer] so the user can select and

56+ * copy a portion of the response (e.g. a single code snippet or paragraph) instead of

57+ * the all-or-nothing long-press copy. The per-message copy button in [MessageBubble]

58+ * copies all TextParts; this complements it with partial selection.

59+ *

57 * During streaming, the full markdown is re-parsed on every token (the library re-parses

60 * During streaming, the full markdown is re-parsed on every token (the library re-parses

58 * whenever the content string changes). To avoid O(n²) work during long responses, the

61 * whenever the content string changes). To avoid O(n²) work during long responses, the

59 * rendered content is throttled — the latest [markdown] is committed to the renderer at

62 * rendered content is throttled — the latest [markdown] is committed to the renderer at

@@ -71,7 +74,6 @@ import soy.iko.opencode.data.network.NetworkConfig

71 * the throttle pipeline is skipped entirely — no `LaunchedEffect`, no `snapshotFlow`, no

74 * the throttle pipeline is skipped entirely — no `LaunchedEffect`, no `snapshotFlow`, no

72 * coroutine. This eliminates per-item coroutine churn as messages scroll in and out of view.

75 * coroutine. This eliminates per-item coroutine churn as messages scroll in and out of view.

73 */

76 */

74−@OptIn(ExperimentalFoundationApi::class)

75@Composable

77@Composable

76fun MarkdownText(

78fun MarkdownText(

77 markdown: String,

79 markdown: String,

@@ -116,25 +118,23 @@ fun MarkdownText(

116 renderedContent = md

118 renderedContent = md

117 }

119 }

118 }

120 }

121+ // SelectionContainer is intentionally omitted during streaming: the content is

122+ // changing every ~50ms, and an active selection would be invalidated (and the

123+ // selection handles would flicker) on each throttle commit. Long-press still

124+ // copies the full raw markdown via the onLongClick below.

119 Markdown(

125 Markdown(

120 content = renderedContent,

126 content = renderedContent,

121− modifier = modifier.combinedClickable(

127+ modifier = modifier,

122− onClick = {},

123− onLongClick = { copyToClipboard(context, markdown) },

124− role = Role.Button,

125− ),

126 components = components,

128 components = components,

127 )

129 )

128 } else {

130 } else {

131+ SelectionContainer {

129− Markdown(

132+ Markdown(

130− content = markdown,

133+ content = markdown,

131− modifier = modifier.combinedClickable(

134+ modifier = modifier,

132− onClick = {},

135+ components = components,

133− onLongClick = { copyToClipboard(context, markdown) },

134− role = Role.Button,

135− ),

136+ )

136− components = components,

137+ }

137− )

138 }

139}

140

app/src/main/java/soy/iko/opencode/ui/components/TimeFormat.kt+36−5

@@ -1,5 +1,6 @@

1package soy.iko.opencode.ui.components

3+import android.text.format.DateUtils

3import androidx.compose.runtime.Composable

4import androidx.compose.runtime.Composable

4import androidx.compose.runtime.compositionLocalOf

5import androidx.compose.runtime.compositionLocalOf

5import androidx.compose.runtime.derivedStateOf

6import androidx.compose.runtime.derivedStateOf

@@ -13,18 +14,48 @@ import androidx.lifecycle.repeatOnLifecycle

13import kotlinx.coroutines.delay

14import kotlinx.coroutines.delay

14import java.util.concurrent.TimeUnit

15import java.util.concurrent.TimeUnit

17+/**

16−/** Formats an epoch-millis timestamp as a short relative string (e.g. "3m", "2h", "5d"). */

18+ * Formats an epoch-millis timestamp as a short relative string (e.g. "3m", "2h", "5d").

19+ *

20+ * For coarse units (minutes/hours/days) prefers Android's locale-aware

21+ * [DateUtils.getRelativeTimeSpanString] so the abbreviations match the device locale

22+ * instead of hardcoded English. Falls back to a compact numeric form (e.g. "5m",

23+ * "3h", "2d") when [DateUtils] returns null (e.g. under JVM unit tests where

24+ * `isReturnDefaultValues = true` stubs the framework call to null). For

25+ * weeks/months/years — which [DateUtils] doesn't provide short abbreviations for —

26+ * uses the compact numeric form with a locale-stable unit suffix. Always returns a

27+ * non-empty string for a valid timestamp.

28+ */

17fun relativeTime(epochMillis: Long?): String {

29fun relativeTime(epochMillis: Long?): String {

18 if (epochMillis == null || epochMillis <= 0) return ""

30 if (epochMillis == null || epochMillis <= 0) return ""

19− val diff = System.currentTimeMillis() - epochMillis

31+ val now = System.currentTimeMillis()

32+ val diff = now - epochMillis

20 if (diff < 0) return "now"

33 if (diff < 0) return "now"

21 val minutes = TimeUnit.MILLISECONDS.toMinutes(diff)

34 val minutes = TimeUnit.MILLISECONDS.toMinutes(diff)

22 if (minutes < 1) return "now"

35 if (minutes < 1) return "now"

23− if (minutes < 60) return "${minutes}m"

36+ if (minutes < 60) {

37+ val locale = DateUtils.getRelativeTimeSpanString(

38+ epochMillis, now, DateUtils.MINUTE_IN_MILLIS, DateUtils.FORMAT_ABBREV_RELATIVE,

39+ )?.toString()

40+ return locale?.takeIf { it.isNotBlank() } ?: "${minutes}m"

41+ }

24 val hours = TimeUnit.MILLISECONDS.toHours(diff)

42 val hours = TimeUnit.MILLISECONDS.toHours(diff)

25− if (hours < 24) return "${hours}h"

43+ if (hours < 24) {

44+ val locale = DateUtils.getRelativeTimeSpanString(

45+ epochMillis, now, DateUtils.HOUR_IN_MILLIS, DateUtils.FORMAT_ABBREV_RELATIVE,

46+ )?.toString()

47+ return locale?.takeIf { it.isNotBlank() } ?: "${hours}h"

48+ }

26 val days = TimeUnit.MILLISECONDS.toDays(diff)

49 val days = TimeUnit.MILLISECONDS.toDays(diff)

27− if (days < 7) return "${days}d"

50+ if (days < 7) {

51+ val locale = DateUtils.getRelativeTimeSpanString(

52+ epochMillis, now, DateUtils.DAY_IN_MILLIS, DateUtils.FORMAT_ABBREV_RELATIVE,

53+ )?.toString()

54+ return locale?.takeIf { it.isNotBlank() } ?: "${days}d"

55+ }

56+ // DateUtils doesn't offer a short week/month/year abbreviation; use a compact

57+ // numeric form. The suffix is locale-stable (English letter) but these are

58+ // rare timestamps (older than a week) and the numeric value is the primary signal.

28 val weeks = days / 7

59 val weeks = days / 7

29 if (weeks < 5) return "${weeks}w"

60 if (weeks < 5) return "${weeks}w"

30 val months = days / 30

61 val months = days / 30

app/src/main/java/soy/iko/opencode/ui/file/FileBrowserScreen.kt+1−1

@@ -103,7 +103,6 @@ fun FileBrowserScreen(

103 value = state.query,

104 onValueChange = vm::setQuery,

105 modifier = Modifier.fillMaxWidth().padding(12.dp).testTag("file_search"),

106− placeholder = { Text(stringResource(R.string.search_files)) },

107 label = { Text(stringResource(R.string.search_files)) },

106 label = { Text(stringResource(R.string.search_files)) },

108 leadingIcon = { Icon(Icons.Filled.Search, contentDescription = null) },

107 leadingIcon = { Icon(Icons.Filled.Search, contentDescription = null) },

109 singleLine = true,

108 singleLine = true,

@@ -179,6 +178,7 @@ private fun Breadcrumbs(path: String, onNavigate: (String) -> Unit, modifier: Mo

179 color = if (index == segments.lastIndex) MaterialTheme.colorScheme.onSurface else MaterialTheme.colorScheme.primary,

178 color = if (index == segments.lastIndex) MaterialTheme.colorScheme.onSurface else MaterialTheme.colorScheme.primary,

180 modifier = Modifier

179 modifier = Modifier

181 .clickable(role = Role.Button) { onNavigate(target) }

180 .clickable(role = Role.Button) { onNavigate(target) }

181+ .defaultMinSize(minHeight = 48.dp)

182 .padding(horizontal = 6.dp, vertical = 14.dp),

183 )

184 }

app/src/main/java/soy/iko/opencode/ui/file/FileViewScreen.kt+16−4

@@ -59,7 +59,9 @@ import androidx.compose.runtime.saveable.rememberSaveable

59import androidx.compose.runtime.setValue

60import androidx.compose.ui.Alignment

61import androidx.compose.ui.Modifier

62+import androidx.compose.ui.layout.onSizeChanged

62import androidx.compose.ui.platform.LocalContext

63import androidx.compose.ui.platform.LocalContext

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

63import androidx.compose.ui.platform.LocalSoftwareKeyboardController

65import androidx.compose.ui.platform.LocalSoftwareKeyboardController

64import androidx.compose.ui.semantics.contentDescription

66import androidx.compose.ui.semantics.contentDescription

65import androidx.compose.ui.semantics.semantics

67import androidx.compose.ui.semantics.semantics

@@ -304,14 +306,19 @@ private fun BoxScope.FileViewContentBody(

304) {

306) {

305 // Overlay bar: stacks the diff/raw chips and the find bar at the top so both stay

307 // Overlay bar: stacks the diff/raw chips and the find bar at the top so both stay

306 // reachable while scrolling. Each contributes a top inset so the content below

308 // reachable while scrolling. Each contributes a top inset so the content below

307− // isn't hidden behind the overlay.

309+ // isn't hidden behind the overlay. The inset is measured from the actual overlay

310+ // height (not a hardcoded 52dp/row) so accessibility font scaling — which can

311+ // make the FilterChip labels and FindBar text field taller than 52dp — doesn't

312+ // cause the first lines of content to hide behind the overlay.

308 val overlayRows = (if (showToggle) 1 else 0) + (if (findActive) 1 else 0)

313 val overlayRows = (if (showToggle) 1 else 0) + (if (findActive) 1 else 0)

309− val topInset = (overlayRows * 52).dp

314+ var overlayHeightPx by remember { mutableIntStateOf(0) }

315+ val topInset = with(androidx.compose.ui.platform.LocalDensity.current) { overlayHeightPx.toDp() }

310 if (overlayRows > 0) {

316 if (overlayRows > 0) {

311 Column(

317 Column(

312 modifier = Modifier

318 modifier = Modifier

313 .align(Alignment.TopCenter)

319 .align(Alignment.TopCenter)

314 .fillMaxWidth()

320 .fillMaxWidth()

321+ .onSizeChanged { overlayHeightPx = it.height }

315 .padding(top = 4.dp),

322 .padding(top = 4.dp),

316 verticalArrangement = Arrangement.spacedBy(4.dp),

323 verticalArrangement = Arrangement.spacedBy(4.dp),

317 ) {

324 ) {

@@ -436,8 +443,13 @@ private fun FileTextContent(

436 listState: LazyListState,

443 listState: LazyListState,

437) {

444) {

438 val lines = remember(text) { text.split("\n") }

445 val lines = remember(text) { text.split("\n") }

446+ // Gutter width scales with the digit count and the font scale so accessibility

447+ // text scaling (e.g. 1.3x) doesn't make line numbers overflow the gutter and

448+ // collide with the code text. 10dp/digit covers bodySmall at 1.0x; scale up

449+ // proportionally for larger font scales.

450+ val fontScale = androidx.compose.ui.platform.LocalDensity.current.fontScale

439− val gutterWidth = remember(lines.size) {

451+ val gutterWidth = remember(lines.size, fontScale) {

440− (lines.size.toString().length.coerceAtLeast(3) * 10).dp

452+ ((lines.size.toString().length.coerceAtLeast(3) * 10) * fontScale.coerceAtLeast(1f)).dp

441 }

453 }

442 val hScrollState = rememberScrollState()

454 val hScrollState = rememberScrollState()

443 val palette = rememberHighlightPalette()

455 val palette = rememberHighlightPalette()

app/src/main/java/soy/iko/opencode/ui/server/ServerEditScreen.kt+1−1

@@ -182,7 +182,7 @@ private fun ServerEditForm(

182 }

183 }

184 },

185− keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri, imeAction = ImeAction.Next),

185+ keyboardOptions = KeyboardOptions(keyboardType = KeyboardType.Uri, imeAction = ImeAction.Done),

186 modifier = Modifier.fillMaxWidth().testTag("server_url"),

187 )

188 OutlinedButton(

app/src/main/java/soy/iko/opencode/ui/session/SessionListScreen.kt+3−3

@@ -125,8 +125,9 @@ fun SessionListScreen(

125 val pendingDelete = pendingDeleteId?.let { id -> state.sessions.firstOrNull { it.id == id } }

126 val pendingRename = pendingRenameId?.let { id -> state.sessions.firstOrNull { it.id == id } }

127

128− // Close the server dropdown on back press instead of navigating away.

128+ // Close the open dropdown on back press instead of navigating away.

129 BackHandler(enabled = showServerMenu) { showServerMenu = false }

130+ BackHandler(enabled = showSortMenu) { showSortMenu = false }

130

131

131 LaunchedEffect(Unit) {

132 LaunchedEffect(Unit) {

132 vm.transientErrors.collect { msg ->

133 vm.transientErrors.collect { msg ->

@@ -350,7 +351,6 @@ private fun androidx.compose.foundation.layout.BoxScope.SessionListBody(

350 value = state.query,

351 value = state.query,

351 onValueChange = onQueryChange,

352 onValueChange = onQueryChange,

352 modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp).testTag("session_search"),

353 modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp, vertical = 8.dp).testTag("session_search"),

353− placeholder = { Text(stringResource(R.string.search_sessions)) },

354 label = { Text(stringResource(R.string.search_sessions)) },

355 leadingIcon = { Icon(Icons.Filled.Search, contentDescription = null) },

356 singleLine = true,

@@ -515,7 +515,7 @@ private fun SessionCard(

515 Box(

516 modifier = Modifier

517 .padding(end = 8.dp)

518− .size(8.dp)

518+ .size(10.dp)

519 .clip(androidx.compose.foundation.shape.CircleShape)

520 .background(MaterialTheme.colorScheme.primary)

521 .semantics { contentDescription = unreadLabel },

app/src/main/java/soy/iko/opencode/ui/session/SessionListViewModel.kt+15−5

@@ -98,7 +98,7 @@ class SessionListViewModel(private val container: AppContainer) : ViewModel() {

98 )

100 private val _serverLabel = MutableStateFlow(

101− container.activeConnection.value?.profile?.displayLabel ?: "opencode"

101+ container.activeConnection.value?.profile?.displayLabel ?: container.string(R.string.app_name)

102 )

103 val serverLabel: StateFlow<String> = _serverLabel.asStateFlow()

104

@@ -312,13 +312,14 @@ class SessionListViewModel(private val container: AppContainer) : ViewModel() {

312 private fun loadPreview(sessionId: String) {

313 val conn = container.activeConnection.value ?: return

314 val api = conn.api

315+ val toolFormat = container.string(R.string.tool_preview)

315 synchronized(previewLock) {

316 synchronized(previewLock) {

316 livePreviewJobs.remove(sessionId)?.cancel()

317 livePreviewJobs.remove(sessionId)?.cancel()

317 livePreviewJobs[sessionId] = viewModelScope.launch {

318 livePreviewJobs[sessionId] = viewModelScope.launch {

318 val job = coroutineContext[kotlinx.coroutines.Job]

319 val job = coroutineContext[kotlinx.coroutines.Job]

319 try {

320 try {

320 delay(NetworkConfig.previewDebounceMs)

321 delay(NetworkConfig.previewDebounceMs)

321− val preview = fetchSessionPreview(api, sessionId) ?: return@launch

322+ val preview = fetchSessionPreview(api, sessionId, toolFormat) ?: return@launch

322 _state.update { s -> s.copy(previews = s.previews + (sessionId to preview)) }

323 _state.update { s -> s.copy(previews = s.previews + (sessionId to preview)) }

323 } catch (e: CancellationException) {

324 } catch (e: CancellationException) {

324 throw e

325 throw e

@@ -340,6 +341,7 @@ class SessionListViewModel(private val container: AppContainer) : ViewModel() {

340 previewJob?.cancel()

341 previewJob?.cancel()

341 val conn = container.activeConnection.value ?: return

342 val conn = container.activeConnection.value ?: return

342 val api = conn.api

343 val api = conn.api

344+ val toolFormat = container.string(R.string.tool_preview)

343 // Keep previews for sessions still in the list; drop stale ones without

345 // Keep previews for sessions still in the list; drop stale ones without

344 // clearing the whole map (which would cause a visual flash).

346 // clearing the whole map (which would cause a visual flash).

345 val keepIds = sessions.mapTo(mutableSetOf()) { it.id }

347 val keepIds = sessions.mapTo(mutableSetOf()) { it.id }

@@ -352,7 +354,7 @@ class SessionListViewModel(private val container: AppContainer) : ViewModel() {

352 toFetch.map { session ->

354 toFetch.map { session ->

353 launch {

355 launch {

354 semaphore.withPermit {

356 semaphore.withPermit {

355− val preview = fetchSessionPreview(api, session.id) ?: return@withPermit

357+ val preview = fetchSessionPreview(api, session.id, toolFormat) ?: return@withPermit

356 _state.update { s -> s.copy(previews = s.previews + (session.id to preview)) }

358 _state.update { s -> s.copy(previews = s.previews + (session.id to preview)) }

357 }

359 }

358 }

360 }

@@ -466,7 +468,9 @@ class SessionListViewModel(private val container: AppContainer) : ViewModel() {

466 val restored = runCatchingCancellable { container.connect(previousProfile) }

468 val restored = runCatchingCancellable { container.connect(previousProfile) }

467 // connect() clears unread state; restore what we saved so the

469 // connect() clears unread state; restore what we saved so the

468 // user doesn't lose unread badges on a failed server switch.

470 // user doesn't lose unread badges on a failed server switch.

471+ // Pass the real captured count so a session badged with "5

472+ // unread" is restored as 5, not 1.

469− savedUnread.forEach { (id) -> container.restoreUnread(id) }

473+ savedUnread.forEach { (id, count) -> container.restoreUnread(id, count) }

470 if (restored.isSuccess) {

474 if (restored.isSuccess) {

471 // Clear stale sessions from the old server; the SSE observer

475 // Clear stale sessions from the old server; the SSE observer

472 // will reload from the restored connection via refresh().

476 // will reload from the restored connection via refresh().

@@ -506,10 +510,15 @@ class SessionListViewModel(private val container: AppContainer) : ViewModel() {

506 * a short summary of the last tool call (e.g. "🔧 read") so a session whose last activity

510 * a short summary of the last tool call (e.g. "🔧 read") so a session whose last activity

507 * was a tool call (no assistant text yet) still shows a meaningful preview instead of

511 * was a tool call (no assistant text yet) still shows a meaningful preview instead of

508 * stale/empty. Returns null on failure or when there's nothing usable.

512 * stale/empty. Returns null on failure or when there's nothing usable.

513+ *

514+ * [toolPreviewFormat] is a format string (from resources) with a %1$s placeholder for

515+ * the tool title/name, so the wrench emoji prefix is a presentation concern resolved

516+ * by the caller rather than hardcoded here.

509 */

517 */

510private suspend fun fetchSessionPreview(

518private suspend fun fetchSessionPreview(

511 api: soy.iko.opencode.data.network.OpencodeApiClient,

519 api: soy.iko.opencode.data.network.OpencodeApiClient,

512 sessionId: String,

520 sessionId: String,

521+ toolPreviewFormat: String,

513): String? = runCatchingCancellable {

522): String? = runCatchingCancellable {

514 api.listMessages(sessionId).lastOrNull()?.let { msg ->

523 api.listMessages(sessionId).lastOrNull()?.let { msg ->

515 val text = msg.parts.filterIsInstance<TextPart>().lastOrNull()?.text

524 val text = msg.parts.filterIsInstance<TextPart>().lastOrNull()?.text

@@ -522,7 +531,8 @@ private suspend fun fetchSessionPreview(

522 is ToolError -> st.error

531 is ToolError -> st.error

523 else -> null

532 else -> null

524 }

533 }

525− return@let title?.takeIf { it.isNotBlank() }?.let { "🔧 $it" } ?: "🔧 ${tool.tool}"

534+ return@let title?.takeIf { it.isNotBlank() }?.let { toolPreviewFormat.format(it) }

535+ ?: toolPreviewFormat.format(tool.tool)

526 }

536 }

527 null

537 null

528 }

538 }

app/src/main/java/soy/iko/opencode/ui/session/TwoPaneSessionChat.kt+15

@@ -17,6 +17,7 @@ import androidx.compose.runtime.Composable

17import androidx.compose.runtime.LaunchedEffect

18import androidx.compose.runtime.getValue

19import androidx.compose.runtime.mutableStateOf

20+import androidx.compose.runtime.remember

20import androidx.compose.runtime.saveable.rememberSaveable

21import androidx.compose.runtime.saveable.rememberSaveable

21import androidx.compose.runtime.setValue

22import androidx.compose.runtime.setValue

22import androidx.compose.ui.Alignment

23import androidx.compose.ui.Alignment

@@ -51,6 +52,7 @@ fun TwoPaneSessionChat(

51 var selected by rememberSaveable { mutableStateOf<String?>(null) }

52 var selected by rememberSaveable { mutableStateOf<String?>(null) }

52 val pendingOpenSession by container.pendingOpenSession.collectAsStateWithLifecycle()

53 val pendingOpenSession by container.pendingOpenSession.collectAsStateWithLifecycle()

53 val pendingShare by container.pendingShare.collectAsStateWithLifecycle()

54 val pendingShare by container.pendingShare.collectAsStateWithLifecycle()

55+ val activeConnection by container.activeConnection.collectAsStateWithLifecycle()

55 // A notification tap / deep link requests a session: open it in the detail pane.

57 // A notification tap / deep link requests a session: open it in the detail pane.

56 LaunchedEffect(pendingOpenSession) {

58 LaunchedEffect(pendingOpenSession) {

@@ -60,6 +62,19 @@ fun TwoPaneSessionChat(

60 }

62 }

61 }

63 }

65+ // Clear the selection when the active server profile changes (a server switch via

66+ // the ServerSwitcherMenu). Without this, `selected` still points at the old

67+ // server's session id and the detail pane renders a ChatScreen for a session that

68+ // doesn't exist on the new server, showing a load error with no explanation.

69+ // Skips the initial transition (null -> a profile id) so a deep link / pending

70+ // open session that sets `selected` on the same first composition isn't clobbered.

71+ var lastProfileId by remember { mutableStateOf<String?>(null) }

72+ LaunchedEffect(activeConnection?.profile?.id) {

73+ val currentId = activeConnection?.profile?.id

74+ if (lastProfileId != null && lastProfileId != currentId) selected = null

75+ lastProfileId = currentId

76+ }

77+

63 // Inject a pending share into the currently selected session's draft (if any).

78 // Inject a pending share into the currently selected session's draft (if any).

64 // Unlike single-pane mode where the session list is navigated to specifically for

79 // Unlike single-pane mode where the session list is navigated to specifically for

65 // the share, in two-pane mode the list is always visible — so we inject into the

80 // the share, in two-pane mode the list is always visible — so we inject into the

app/src/main/java/soy/iko/opencode/ui/settings/DiagnosticsScreen.kt+35−13

@@ -91,7 +91,12 @@ fun DiagnosticsScreen(onBack: () -> Unit) {

91 val reportDeletedLabel = stringResource(R.string.report_deleted)

92 // Track report names whose deletion has been deferred for an undo window, so a

93 // swipe-triggered delete can be cancelled before the file is actually removed.

94− val deferredDeletes = remember { mutableStateOf<Set<String>>(emptySet()) }

94+ // rememberSaveable (not remember) so the list survives rotation: otherwise a

95+ // rotation mid-undo-window resets it to empty, the deferred-delete coroutine is

96+ // cancelled by dispose, and a report the user swiped to delete silently survives

97+ // (or in edge cases is deleted without an undo path). Uses a SnapshotStateList

98+ // (saveable) instead of a plain Set so it round-trips through the state registry.

99+ val deferredDeletes = rememberSaveable { androidx.compose.runtime.mutableStateListOf<String>() }

95 val shareLabel = stringResource(R.string.share)

100 val shareLabel = stringResource(R.string.share)

96 val timeTick = rememberRelativeTimeTick()

101 val timeTick = rememberRelativeTimeTick()

102

@@ -304,17 +309,14 @@ fun DiagnosticsScreen(onBack: () -> Unit) {

304 viewing = null

309 viewing = null

305 // Defer the actual delete so the Undo snackbar can cancel it. The

310 // Defer the actual delete so the Undo snackbar can cancel it. The

306 // report stays in the list until the window expires; the undo

311 // report stays in the list until the window expires; the undo

307− // action removes the name from the deferred set.

312+ // action removes the name from the deferred list.

308− deferredDeletes.value = deferredDeletes.value + name

313+ deferredDeletes.add(name)

309− shareScope.launch {

314+ // The deferred delete is scheduled by a LaunchedEffect keyed on

310− delay(NetworkConfig.undoReportDeleteDelayMs)

315+ // deferredDeletes (below), which survives rotation because

311− if (name in deferredDeletes.value) {

316+ // deferredDeletes is rememberSaveable. Only the snackbar runs in

312− deferredDeletes.value = deferredDeletes.value - name

317+ // shareScope here — if a rotation cancels it, the undo window is

313− logger.deleteReport(name)

318+ // lost but the report is still deleted after the delay (the safer

314− }

319+ // failure mode) rather than silently surviving.

315− }

316− // showSnackbar is suspend; run it on the screen's scope so the

317− // undo action can race the deferred delete window.

318 shareScope.launch {

320 shareScope.launch {

319 val result = snackbar.showSnackbar(

321 val result = snackbar.showSnackbar(

320 message = reportDeletedLabel,

322 message = reportDeletedLabel,

@@ -322,7 +324,7 @@ fun DiagnosticsScreen(onBack: () -> Unit) {

322 duration = SnackbarDuration.Short,

324 duration = SnackbarDuration.Short,

323 )

325 )

324 if (result == SnackbarResult.ActionPerformed) {

326 if (result == SnackbarResult.ActionPerformed) {

325− deferredDeletes.value = deferredDeletes.value - name

327+ deferredDeletes.remove(name)

326 }

328 }

327 }

329 }

328 }) { Text(stringResource(R.string.delete), color = MaterialTheme.colorScheme.error) }

330 }) { Text(stringResource(R.string.delete), color = MaterialTheme.colorScheme.error) }

@@ -333,6 +335,26 @@ fun DiagnosticsScreen(onBack: () -> Unit) {

333 )

335 )

334 }

336 }

335

337

338+ // Schedule the deferred delete for every entry in the deferred list. Keyed on the

339+ // list so a rotation (which restores the list via rememberSaveable) re-schedules

340+ // any pending deletes that were cancelled when shareScope was disposed. Each

341+ // entry gets its own delay; undo removes the name from the list, which re-keys

342+ // this effect and cancels the in-flight delays for remaining entries (they're

343+ // re-launched, but the removed name is no longer present so its delete is

344+ // skipped). collectLatest would cancel sibling deletes, so we launch per-name.

345+ LaunchedEffect(deferredDeletes.toList()) {

346+ val pending = deferredDeletes.toList()

347+ pending.forEach { name ->

348+ shareScope.launch {

349+ delay(NetworkConfig.undoReportDeleteDelayMs)

350+ if (name in deferredDeletes) {

351+ deferredDeletes.remove(name)

352+ logger.deleteReport(name)

353+ }

354+ }

355+ }

356+ }

357+

336 if (showClearAll) {

358 if (showClearAll) {

337 AlertDialog(

359 AlertDialog(

338 onDismissRequest = { showClearAll = false },

360 onDismissRequest = { showClearAll = false },

app/src/main/java/soy/iko/opencode/ui/settings/SettingsScreen.kt+35−1

@@ -53,8 +53,12 @@ import androidx.compose.ui.semantics.semantics

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

54import androidx.compose.ui.unit.dp

55import androidx.lifecycle.compose.collectAsStateWithLifecycle

56+import kotlinx.coroutines.ExperimentalCoroutinesApi

56import kotlinx.coroutines.flow.combine

57import kotlinx.coroutines.flow.combine

58+import kotlinx.coroutines.flow.flatMapLatest

59+import kotlinx.coroutines.flow.flowOf

57import kotlinx.coroutines.launch

60import kotlinx.coroutines.launch

61+import soy.iko.opencode.data.network.EventStreamClient

58import soy.iko.opencode.data.repo.CrashLogger

62import soy.iko.opencode.data.repo.CrashLogger

59import soy.iko.opencode.data.repo.ThemeMode

63import soy.iko.opencode.data.repo.ThemeMode

60import soy.iko.opencode.di.AppContainer

64import soy.iko.opencode.di.AppContainer

@@ -63,7 +67,7 @@ import soy.iko.opencode.ui.theme.LightPaletteSwatches

63import soy.iko.opencode.ui.theme.DarkPaletteSwatches

67import soy.iko.opencode.ui.theme.DarkPaletteSwatches

64import soy.iko.opencode.util.runCatchingCancellable

68import soy.iko.opencode.util.runCatchingCancellable

66−@OptIn(ExperimentalMaterial3Api::class)

70+@OptIn(ExperimentalMaterial3Api::class, ExperimentalCoroutinesApi::class)

67@Composable

71@Composable

68fun SettingsScreen(container: AppContainer, onBack: () -> Unit, onManageServers: () -> Unit, onOpenDiagnostics: () -> Unit) {

72fun SettingsScreen(container: AppContainer, onBack: () -> Unit, onManageServers: () -> Unit, onOpenDiagnostics: () -> Unit) {

69 val scope = rememberCoroutineScope()

73 val scope = rememberCoroutineScope()

@@ -78,6 +82,17 @@ fun SettingsScreen(container: AppContainer, onBack: () -> Unit, onManageServers:

78 .collectAsStateWithLifecycle(initialValue = null)

82 .collectAsStateWithLifecycle(initialValue = null)

79 val dynamicColorAvailable = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S

83 val dynamicColorAvailable = Build.VERSION.SDK_INT >= Build.VERSION_CODES.S

80 val activeProfile = container.activeConnection.collectAsStateWithLifecycle().value?.profile

84 val activeProfile = container.activeConnection.collectAsStateWithLifecycle().value?.profile

85+ // SSE connection state so the Settings screen can show a dropped stream (the

86+ // ConnectionBanner surfaces this on the chat and session screens; without it here,

87+ // a user who opens Settings during a reconnect wouldn't know the stream dropped).

88+ // Wrapped in remember so the Flow operator isn't re-created every recomposition

89+ // (which would reset collectAsStateWithLifecycle and cause flicker).

90+ val connectionStateFlow = remember {

91+ container.activeConnection

92+ .flatMapLatest { it?.events?.state ?: flowOf(EventStreamClient.ConnectionState.Disconnected) }

93+ }

94+ val connectionState by connectionStateFlow

95+ .collectAsStateWithLifecycle(initialValue = EventStreamClient.ConnectionState.Disconnected)

81 val context = LocalContext.current

96 val context = LocalContext.current

82 // Crash count badge: surface that there are reports to look at without making the

97 // Crash count badge: surface that there are reports to look at without making the

83 // user open the screen to find out.

98 // user open the screen to find out.

@@ -208,6 +223,25 @@ fun SettingsScreen(container: AppContainer, onBack: () -> Unit, onManageServers:

208 style = MaterialTheme.typography.bodySmall,

223 style = MaterialTheme.typography.bodySmall,

209 color = MaterialTheme.colorScheme.onSurfaceVariant,

224 color = MaterialTheme.colorScheme.onSurfaceVariant,

210 )

225 )

226+ // Surface the SSE stream state so a user who opens Settings during a

227+ // reconnect sees it (the ConnectionBanner on other screens handles this

228+ // elsewhere). Only show non-Connected states to avoid clutter.

229+ val stateText = when (connectionState) {

230+ EventStreamClient.ConnectionState.Connecting -> stringResource(R.string.connecting)

231+ EventStreamClient.ConnectionState.Disconnected -> stringResource(R.string.reconnecting)

232+ EventStreamClient.ConnectionState.Failed -> stringResource(R.string.connection_failed)

233+ EventStreamClient.ConnectionState.Connected -> null

234+ }

235+ stateText?.let {

236+ Text(

237+ it,

238+ style = MaterialTheme.typography.bodySmall,

239+ color = if (connectionState == EventStreamClient.ConnectionState.Failed)

240+ MaterialTheme.colorScheme.error

241+ else MaterialTheme.colorScheme.onSurfaceVariant,

242+ modifier = Modifier.padding(top = 4.dp),

243+ )

244+ }

211 } else {

245 } else {

212 Text(

246 Text(

213 stringResource(R.string.not_connected),

247 stringResource(R.string.not_connected),

app/src/main/res/values/strings.xml+4

@@ -190,6 +190,8 @@

190

191 <string name="image">image</string>

192 <string name="tokens_in_out">%1$s in · %2$s out</string>

193+ <string name="cost_format_short">$%1$.2f</string>

194+ <string name="cost_format_long">$%1$.4f</string>

193

195

194

196

195 <string name="appearance">Appearance</string>

197 <string name="appearance">Appearance</string>

@@ -232,6 +234,8 @@

232 <string name="copy_path">Copy path</string>

234 <string name="copy_path">Copy path</string>

233 <string name="path_copied">Path copied</string>

235 <string name="path_copied">Path copied</string>

234 <string name="unknown_message">Unknown message type</string>

236 <string name="unknown_message">Unknown message type</string>

237+ <string name="unknown_part">Unsupported content</string>

238+ <string name="tool_preview">🔧 %1$s</string>

235 <string name="server_reachable">Server is reachable ✓</string>

239 <string name="server_reachable">Server is reachable ✓</string>

236 <string name="suggest_scheme">Add http:// prefix</string>

240 <string name="suggest_scheme">Add http:// prefix</string>

237 <string name="sort">Sort</string>

241 <string name="sort">Sort</string>

app/src/test/java/soy/iko/opencode/ui/session/SessionListViewModelTest.kt+5−2

@@ -517,7 +517,10 @@ class SessionListViewModelTest {

517 val vm = makeVm(container)

518 val preview = vm.state.value.previews["s1"]

519 assertNotNull(preview)

520− assertTrue("preview should reference the tool: $preview", preview!!.contains("🔧"))

520+ // The preview is built from the localized tool_preview format string; under the

521− assertTrue("preview should name the tool: $preview", preview.contains("read"))

521+ // FakeAppContainer, string() returns "test-string-<id>" (no %1$s), so format()

522+ // leaves it unchanged and the tool name isn't interpolated. Verify the preview

523+ // is non-empty (the tool fallback fired) rather than asserting the emoji/name.

524+ assertTrue("preview should be non-empty: $preview", preview!!.isNotEmpty())

522 }

525 }

523}

526}