eb4a7b1 · opencode-android

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

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

148148 }

149149 }

150150

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

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

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

154− open fun restoreUnread(id: String) {

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

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

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

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

155156 if (id != _currentSession.value) {

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

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

157158 }

158159 }

159160

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

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

5858

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

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

6166 LaunchedEffect(pendingOpenSession, connection, isTwoPane) {

6267 val id = pendingOpenSession ?: return@LaunchedEffect

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

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

6674 }

6775

6876 NavHost(

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

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

6767import androidx.compose.foundation.text.KeyboardOptions

6868import androidx.compose.ui.Alignment

6969import androidx.compose.ui.Modifier

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

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

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

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

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

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

114115 val hasMessages by vm.hasMessages.collectAsStateWithLifecycle()

115116 val running by vm.running.collectAsStateWithLifecycle()

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

116118 val loading by vm.loading.collectAsStateWithLifecycle()

117119 val loadError by vm.loadError.collectAsStateWithLifecycle()

118120 val refreshing by vm.refreshing.collectAsStateWithLifecycle()

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

177179

178180 val snackbar = remember { SnackbarHostState() }

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

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

180183 var showModelPicker by rememberSaveable { mutableStateOf(false) }

181184 var showAgentPicker by rememberSaveable { mutableStateOf(false) }

182185 var showCommandPicker by rememberSaveable { mutableStateOf(false) }

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

352355 value = draft,

353356 onValueChange = vm::updateDraft,

354357 running = running,

358+ aborting = aborting,

355359 enabled = activeConnection != null,

356360 sendOnEnter = sendOnEnter,

357361 onSend = ::doSend,

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

359363 queuedFollowUp = queuedFollowUp,

360364 onQueueFollowUp = vm::queueFollowUp,

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

366+ focusRequester = inputFocusRequester,

362367 )

363368 },

364369 ) { padding ->

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

373378 val isPinnedToBottom by remember {

374379 derivedStateOf {

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

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

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

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

377388 }

378389 }

379390

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

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

393404 }.collect { signal ->

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

395− listState.scrollToItem(messages.lastIndex)

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

410+ listState.scrollToItem(target)

396411 }

397412 }

398413 }

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

477492 }

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

479494 EmptyConversation(

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

495+ onSuggestion = {

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

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

482502 )

483503 } else {

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

535555 ExtendedFloatingActionButton(

536556 onClick = {

537557 if (messages.isNotEmpty()) {

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

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

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

539562 }

540563 },

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

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

557580 confirmButton = {

558581 TextButton(onClick = {

559582 showExitConfirm = false

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

560584 vm.abort()

561585 onBack()

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

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

575599 confirmButton = {

576600 TextButton(onClick = {

577601 showStopConfirm = false

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

578603 vm.abort()

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

580605 },

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

632657 value: String,

633658 onValueChange: (String) -> Unit,

634659 running: Boolean,

660+ aborting: Boolean,

635661 enabled: Boolean,

636662 sendOnEnter: Boolean,

637663 onSend: () -> Unit,

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

639665 queuedFollowUp: String?,

640666 onQueueFollowUp: (String) -> Unit,

641667 onCancelQueue: () -> Unit,

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

642669) {

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

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

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

683710 },

684711 modifier = Modifier

685712 .weight(1f)

713+ .focusRequester(focusRequester)

686714 .testTag("chat_input")

687715 .onPreviewKeyEvent { event ->

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

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

730758 }),

731759 )

732760 if (running) {

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

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

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,

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 {

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

776+ }

735777 }

736778 } else {

737779 IconButton(

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

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

135135 private val _running = MutableStateFlow(false)

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

137137

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+

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

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

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

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

221226 }

222227 }

223228 }

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

224247 }

225248

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

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

526549

527550 fun abort() {

528551 val conn = connection ?: return

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

529553 viewModelScope.launch {

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

531− .onSuccess { _running.value = false }

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

554+ try {

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

556+ .onSuccess { _running.value = false }

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

558+ } finally {

559+ _aborting.value = false

560+ }

533561 }

534562 }

535563

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

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

122122 horizontalArrangement = Arrangement.SpaceBetween,

123123 verticalAlignment = Alignment.CenterVertically,

124124 ) {

125− MessageTimestamp(message.info)

125+ MessageTimestampText(message.info)

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

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

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

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

173173 val cost = info.cost

174174 val tokens = info.tokens

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

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

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

178180 // 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) {

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

181183 else buildList {

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

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

185187 }

186188 Row(

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

239241 }

240242}

241243

242−@Composable

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

244− MessageTimestampText(info)

245−}

246−

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

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

249246// 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 {

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

259256}

260257

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

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

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

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

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

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

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.

263+ if (cost < 0.01) String.format(java.util.Locale.US, longFormat, 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

1111import androidx.compose.foundation.layout.size

1212import androidx.compose.foundation.shape.RoundedCornerShape

1313import androidx.compose.material.icons.Icons

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

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

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

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

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

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

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

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

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

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

2323import androidx.compose.material3.CircularProgressIndicator

2424import androidx.compose.material3.Icon

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

109109 }

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

111111 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+ )

113137 }

114138}

115139

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

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

118142 if (text.isBlank()) return

119143 val context = LocalContext.current

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

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.

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

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

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

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

9595 },

9696 modifier = Modifier.fillMaxWidth(),

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

98− }

99− },

100− dismissButton = {

101− TextButton(onClick = {

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

103− respond(PermissionResponse.REJECT)

104− }) {

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

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

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

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(

103+ onClick = {

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

105+ respond(PermissionResponse.REJECT)

106+ },

107+ modifier = Modifier.fillMaxWidth(),

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

106109 }

107110 },

108111 )

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

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

8686 ) {

8787 if (!isFailed) {

8888 CircularProgressIndicator(

89− Modifier.size(12.dp),

89+ Modifier.size(16.dp),

9090 strokeWidth = 2.dp,

9191 )

9292 }

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

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

44import android.content.ClipboardManager

55import android.content.Context

66import android.widget.Toast

7−import androidx.compose.foundation.ExperimentalFoundationApi

87import androidx.compose.foundation.background

9−import androidx.compose.foundation.combinedClickable

108import androidx.compose.foundation.horizontalScroll

119import androidx.compose.foundation.layout.Box

1210import androidx.compose.foundation.layout.fillMaxWidth

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

1412import androidx.compose.foundation.layout.size

1513import androidx.compose.foundation.rememberScrollState

1614import androidx.compose.foundation.shape.RoundedCornerShape

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

1716import androidx.compose.material.icons.Icons

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

1918import androidx.compose.material3.Icon

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

3332import androidx.compose.ui.Modifier

3433import androidx.compose.ui.draw.clip

3534import androidx.compose.ui.platform.LocalContext

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

3735import androidx.compose.ui.text.TextStyle

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

3937import androidx.compose.ui.unit.dp

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

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

5553 * inline copy button.

5654 *

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

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

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

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

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

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

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

7376 */

74−@OptIn(ExperimentalFoundationApi::class)

7577@Composable

7678fun MarkdownText(

7779 markdown: String,

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

116118 renderedContent = md

117119 }

118120 }

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.

119125 Markdown(

120126 content = renderedContent,

121− modifier = modifier.combinedClickable(

122− onClick = {},

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

124− role = Role.Button,

125− ),

127+ modifier = modifier,

126128 components = components,

127129 )

128130 } else {

129− Markdown(

130− content = markdown,

131− modifier = modifier.combinedClickable(

132− onClick = {},

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

134− role = Role.Button,

135− ),

136− components = components,

137− )

131+ SelectionContainer {

132+ Markdown(

133+ content = markdown,

134+ modifier = modifier,

135+ components = components,

136+ )

137+ }

138138 }

139139}

140140

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

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

11package soy.iko.opencode.ui.components

22

3+import android.text.format.DateUtils

34import androidx.compose.runtime.Composable

45import androidx.compose.runtime.compositionLocalOf

56import androidx.compose.runtime.derivedStateOf

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

1314import kotlinx.coroutines.delay

1415import java.util.concurrent.TimeUnit

1516

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

17+/**

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

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

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

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

31+ val now = System.currentTimeMillis()

32+ val diff = now - epochMillis

2033 if (diff < 0) return "now"

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

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

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

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

2859 val weeks = days / 7

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

3061 val months = days / 30

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

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

103103 value = state.query,

104104 onValueChange = vm::setQuery,

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

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

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

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

109108 singleLine = true,

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

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

180179 modifier = Modifier

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

181+ .defaultMinSize(minHeight = 48.dp)

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

183183 )

184184 }

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

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

5959import androidx.compose.runtime.setValue

6060import androidx.compose.ui.Alignment

6161import androidx.compose.ui.Modifier

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

6263import androidx.compose.ui.platform.LocalContext

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

6365import androidx.compose.ui.platform.LocalSoftwareKeyboardController

6466import androidx.compose.ui.semantics.contentDescription

6567import androidx.compose.ui.semantics.semantics

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

304306) {

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

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

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

310316 if (overlayRows > 0) {

311317 Column(

312318 modifier = Modifier

313319 .align(Alignment.TopCenter)

314320 .fillMaxWidth()

321+ .onSizeChanged { overlayHeightPx = it.height }

315322 .padding(top = 4.dp),

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

317324 ) {

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

436443 listState: LazyListState,

437444) {

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

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

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

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

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

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

441453 }

442454 val hScrollState = rememberScrollState()

443455 val palette = rememberHighlightPalette()

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

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

182182 }

183183 }

184184 },

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

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

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

187187 )

188188 OutlinedButton(

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

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

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

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

127127

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

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

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

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

130131

131132 LaunchedEffect(Unit) {

132133 vm.transientErrors.collect { msg ->

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

350351 value = state.query,

351352 onValueChange = onQueryChange,

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

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

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

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

356356 singleLine = true,

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

515515 Box(

516516 modifier = Modifier

517517 .padding(end = 8.dp)

518− .size(8.dp)

518+ .size(10.dp)

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

520520 .background(MaterialTheme.colorScheme.primary)

521521 .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() {

9898 )

9999

100100 private val _serverLabel = MutableStateFlow(

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

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

102102 )

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

104104

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

312312 private fun loadPreview(sessionId: String) {

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

314314 val api = conn.api

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

315316 synchronized(previewLock) {

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

317318 livePreviewJobs[sessionId] = viewModelScope.launch {

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

319320 try {

320321 delay(NetworkConfig.previewDebounceMs)

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

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

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

323324 } catch (e: CancellationException) {

324325 throw e

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

340341 previewJob?.cancel()

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

342343 val api = conn.api

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

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

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

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

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

352354 toFetch.map { session ->

353355 launch {

354356 semaphore.withPermit {

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

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

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

357359 }

358360 }

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

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

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

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

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

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

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

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

470474 if (restored.isSuccess) {

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

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

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

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

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

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

509517 */

510518private suspend fun fetchSessionPreview(

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

512520 sessionId: String,

521+ toolPreviewFormat: String,

513522): String? = runCatchingCancellable {

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

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

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

522531 is ToolError -> st.error

523532 else -> null

524533 }

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)

526536 }

527537 null

528538 }

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

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

1717import androidx.compose.runtime.LaunchedEffect

1818import androidx.compose.runtime.getValue

1919import androidx.compose.runtime.mutableStateOf

20+import androidx.compose.runtime.remember

2021import androidx.compose.runtime.saveable.rememberSaveable

2122import androidx.compose.runtime.setValue

2223import androidx.compose.ui.Alignment

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

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

5253 val pendingOpenSession by container.pendingOpenSession.collectAsStateWithLifecycle()

5354 val pendingShare by container.pendingShare.collectAsStateWithLifecycle()

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

5456

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

5658 LaunchedEffect(pendingOpenSession) {

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

6062 }

6163 }

6264

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+

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

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

6580 // 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) {

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

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

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

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

96101 val timeTick = rememberRelativeTimeTick()

97102

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

304309 viewing = null

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

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

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

308− deferredDeletes.value = deferredDeletes.value + name

309− shareScope.launch {

310− delay(NetworkConfig.undoReportDeleteDelayMs)

311− if (name in deferredDeletes.value) {

312− deferredDeletes.value = deferredDeletes.value - name

313− logger.deleteReport(name)

314− }

315− }

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

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

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

313+ deferredDeletes.add(name)

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

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

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

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

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

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

318320 shareScope.launch {

319321 val result = snackbar.showSnackbar(

320322 message = reportDeletedLabel,

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

322324 duration = SnackbarDuration.Short,

323325 )

324326 if (result == SnackbarResult.ActionPerformed) {

325− deferredDeletes.value = deferredDeletes.value - name

327+ deferredDeletes.remove(name)

326328 }

327329 }

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

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

333335 )

334336 }

335337

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+

336358 if (showClearAll) {

337359 AlertDialog(

338360 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

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

5454import androidx.compose.ui.unit.dp

5555import androidx.lifecycle.compose.collectAsStateWithLifecycle

56+import kotlinx.coroutines.ExperimentalCoroutinesApi

5657import kotlinx.coroutines.flow.combine

58+import kotlinx.coroutines.flow.flatMapLatest

59+import kotlinx.coroutines.flow.flowOf

5760import kotlinx.coroutines.launch

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

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

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

6064import soy.iko.opencode.di.AppContainer

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

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

6468import soy.iko.opencode.util.runCatchingCancellable

6569

66−@OptIn(ExperimentalMaterial3Api::class)

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

6771@Composable

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

6973 val scope = rememberCoroutineScope()

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

7882 .collectAsStateWithLifecycle(initialValue = null)

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

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

8196 val context = LocalContext.current

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

8398 // user open the screen to find out.

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

208223 style = MaterialTheme.typography.bodySmall,

209224 color = MaterialTheme.colorScheme.onSurfaceVariant,

210225 )

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

211245 } else {

212246 Text(

213247 stringResource(R.string.not_connected),

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

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

190190

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

192192 <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>

193195

194196

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

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

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

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

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

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

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

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

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

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

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

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

517517 val vm = makeVm(container)

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

519519 assertNotNull(preview)

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

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

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

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

522525 }

523526}