bc10148 · opencode-android

git.iko.soy/opencode-android

on master help sign in

Reduce recomposition and hot-path allocations across chat, session list, and file viewer

bc10148iko3 months ago

app/src/main/java/soy/iko/opencode/data/model/Provider.kt+6−1

compare with master

unifiedsplit

@@ -61,7 +61,12 @@ fun ProvidersResponse.toOptions(): List<ModelOption> =

61 modelLabel = info.displayName(modelKey),

62 )

63 }

64− }.sortedWith(compareBy({ it.providerLabel.lowercase() }, { it.modelLabel.lowercase() }))

64+ }.sortedWith(

65+ // CASE_INSENSITIVE_ORDER compares in place; compareBy { it.x.lowercase() } would

66+ // allocate a fresh lowercased string on every comparison (O(N log N) allocations).

67+ compareBy<ModelOption, String>(String.CASE_INSENSITIVE_ORDER) { it.providerLabel }

68+ .thenBy(String.CASE_INSENSITIVE_ORDER) { it.modelLabel },

69+ )

66/** The default option to preselect: the server's default for some provider, else the first model. */

71/** The default option to preselect: the server's default for some provider, else the first model. */

67fun ProvidersResponse.defaultOption(options: List<ModelOption> = toOptions()): ModelOption? {

72fun ProvidersResponse.defaultOption(options: List<ModelOption> = toOptions()): ModelOption? {

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

@@ -302,13 +302,17 @@ open class AppContainer private constructor(

302 // Track sessions actively streaming so we know which idle events

303 // represent a finished run worth notifying about.

304 if (isLiveRunActivity(event)) {

305+ // The add-under-lock is required both for thread-safety and for the

306+ // LRU access-order refresh (keeps a continuously-streaming session

307+ // from being evicted), so it runs per event. Only the flag write is

308+ // skippable once it's already set.

305 synchronized(activeRuns) {

309 synchronized(activeRuns) {

306 if (activeRuns.size >= activeRunsLimit) {

310 if (activeRuns.size >= activeRunsLimit) {

307 activeRuns.remove(activeRuns.iterator().next())

311 activeRuns.remove(activeRuns.iterator().next())

308 }

312 }

309 activeRuns.add(sid)

313 activeRuns.add(sid)

310 }

314 }

311− _anyRunActive.value = true

315+ if (!_anyRunActive.value) _anyRunActive.value = true

312 }

316 }

313 } }.onFailure { Log.w("AppContainer", "Message activity observer failed, will retry: ${safeExceptionSummary(it)}") }

317 } }.onFailure { Log.w("AppContainer", "Message activity observer failed, will retry: ${safeExceptionSummary(it)}") }

314 if (!isActive) break

318 if (!isActive) break

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

@@ -1100,7 +1100,7 @@ private fun buildMessageListItems(

1100): List<MessageListItem> {

1101 if (messages.isEmpty()) return emptyList()

1102 val today = java.time.LocalDate.now(java.time.ZoneId.systemDefault())

1103− val dateFmt = java.text.DateFormat.getDateInstance(java.text.DateFormat.MEDIUM)

1103+ val dateFmt = mediumDateFormat()

1104 val result = ArrayList<MessageListItem>(messages.size + 4)

1105 var lastDayKey: String? = null

1106 var sepOrdinal = 0

@@ -1116,11 +1116,42 @@ private fun buildMessageListItems(

1116 return result

1117}

1118

1119+/**

1119−/** A stable bucket key for a timestamp's calendar day (epoch-days as a string). */

1120+ * A stable bucket key for a timestamp's calendar day (epoch-days as a string).

1121+ *

1122+ * [buildMessageListItems] re-runs on every streaming snapshot (the memo is keyed on the

1123+ * whole `messages` list, which must stay so the live message's fresh parts render), so a

1124+ * naive implementation would re-allocate an `Instant`/`ZonedDateTime`/`LocalDate` for

1125+ * every message on every token. Message timestamps are immutable once assigned, so we

1126+ * memoize the parse per epoch-millis: after the first snapshot, each unchanged message is

1127+ * a cheap hash lookup. Bounded LRU (access-order) caps memory; only touched on the main

1128+ * thread during composition, so the coarse lock is uncontended.

1129+ */

1130+private val dayKeyCache = object : LinkedHashMap<Long, String>(128, 0.75f, true) {

1131+ override fun removeEldestEntry(eldest: MutableMap.MutableEntry<Long, String>): Boolean = size > 1024

1132+}

1133+

1120−private fun dayKey(epochMillis: Long): String {

1134+private fun dayKey(epochMillis: Long): String = synchronized(dayKeyCache) {

1135+ dayKeyCache.getOrPut(epochMillis) {

1121− val instant = java.time.Instant.ofEpochMilli(epochMillis)

1136+ java.time.Instant.ofEpochMilli(epochMillis)

1122− val date = instant.atZone(java.time.ZoneId.systemDefault()).toLocalDate()

1137+ .atZone(java.time.ZoneId.systemDefault()).toLocalDate().toEpochDay().toString()

1123− return date.toEpochDay().toString()

1138+ }

1139+}

1140+

1141+// The medium-date formatter is an ICU locale lookup; cache one instance instead of

1142+// allocating a fresh one per buildMessageListItems call, rebuilding only if the default

1143+// locale changes at runtime. Main-thread-only, so no synchronization is needed.

1144+private var cachedDateFmt: java.text.DateFormat? = null

1145+private var cachedDateFmtLocale: java.util.Locale? = null

1146+

1147+private fun mediumDateFormat(): java.text.DateFormat {

1148+ val locale = java.util.Locale.getDefault()

1149+ val existing = cachedDateFmt

1150+ if (existing != null && cachedDateFmtLocale == locale) return existing

1151+ return java.text.DateFormat.getDateInstance(java.text.DateFormat.MEDIUM).also {

1152+ cachedDateFmt = it

1153+ cachedDateFmtLocale = locale

1154+ }

1124}

1155}

1125

1156

1126/**

1157/**

app/src/main/java/soy/iko/opencode/ui/chat/PartRenderer.kt+9−7

@@ -284,6 +284,14 @@ private fun ToolCallView(part: ToolPart, modifier: Modifier) {

284 // looksLikeDiff scans the whole string; memoize so a recomposition that doesn't

285 // change `display` (e.g. an unrelated state flip) doesn't re-scan on every pass.

286 val isDiff = remember(display) { looksLikeDiff(display) }

287+ // How many lines are hidden while collapsed. detail.lines() splits the whole

288+ // (potentially multi-KB) output, so memoize it — otherwise it re-splits on

289+ // every recomposition, including each streaming update of a running tool.

290+ // `collapsed` is a prefix of `detail`, so its line count never exceeds it;

291+ // 0 (a single long line cut mid-way) falls back to the generic label.

292+ val moreLines = remember(detail, collapsed) {

293+ if (detail.length > COLLAPSED_LIMIT) detail.lines().size - collapsed.lines().size else 0

294+ }

287 CollapsibleDetail(

295 CollapsibleDetail(

288 label = null,

296 label = null,

289 detail = display,

297 detail = display,

@@ -293,13 +301,7 @@ private fun ToolCallView(part: ToolPart, modifier: Modifier) {

293 onToggleExpand = if (detail.length > COLLAPSED_LIMIT) {

301 onToggleExpand = if (detail.length > COLLAPSED_LIMIT) {

294 { expanded = !expanded }

302 { expanded = !expanded }

295 } else null,

303 } else null,

296− // How many lines are hidden while collapsed, so the expand affordance can

304+ moreLines = moreLines,

297− // tell the user the scale of what's truncated instead of a bare "Show more".

298− // `collapsed` is a prefix of `detail`, so its line count never exceeds it;

299− // 0 (a single long line cut mid-way) falls back to the generic label.

300− moreLines = if (detail.length > COLLAPSED_LIMIT) {

301− detail.lines().size - collapsed.lines().size

302− } else 0,

303 expandedState = expandedState,

305 expandedState = expandedState,

304 collapsedState = collapsedState,

306 collapsedState = collapsedState,

305 onCopy = { copyToClipboard(context, "output", detail) },

307 onCopy = { copyToClipboard(context, "output", detail) },

app/src/main/java/soy/iko/opencode/ui/components/CodeHighlighter.kt+23−3

@@ -28,7 +28,7 @@ import androidx.compose.ui.text.withStyle

28/** Language families recognized by [highlightLine]. The set of keywords is shared

29 * across C-family languages (kotlin, java, js, ts, swift, rust, go, c, cpp) since the

30 * common keywords overlap heavily; python has its own set; shell has its own. */

31−private enum class Language {

31+internal enum class Language {

32 C_FAMILY, // kotlin, java, js, ts, swift, rust, go, c, cpp, csharp, scala

33 PYTHON,

34 SHELL, // sh, bash, zsh

@@ -117,10 +117,30 @@ fun rememberHighlightPalette(): HighlightPalette {

117 * which matters because the file viewer renders lazily but can scroll through

118 * thousands of lines — a heavy highlighter would jank on fast scrolls.

119 */

120−fun highlightLine(line: String, filename: String, palette: HighlightPalette): AnnotatedString {

120+fun highlightLine(line: String, filename: String, palette: HighlightPalette): AnnotatedString =

121+ highlightLine(line, syntaxFor(filename), palette)

122+

123+/**

124+ * A file's language classification, resolved once from its name. Resolving this per file

125+ * (instead of re-parsing the extension inside [highlightLine] for every line) keeps the

126+ * hot per-line highlight path free of the `substringAfterLast`/`lowercase` work.

127+ */

128+class FileSyntax internal constructor(

129+ internal val lang: Language,

130+ internal val keywords: Set<String>,

131+)

132+

133+/** Resolve the [FileSyntax] for a filename. Cheap; call once per file and reuse. */

134+fun syntaxFor(filename: String): FileSyntax {

121 val lang = languageFor(filename)

135 val lang = languageFor(filename)

136+ return FileSyntax(lang, keywordsFor(lang))

137+}

138+

139+/** Highlight a single line using a pre-resolved [FileSyntax]. See [FileSyntax]. */

140+fun highlightLine(line: String, syntax: FileSyntax, palette: HighlightPalette): AnnotatedString {

141+ val lang = syntax.lang

122 if (lang == Language.NONE) return AnnotatedString(line)

142 if (lang == Language.NONE) return AnnotatedString(line)

123− val keywords = keywordsFor(lang)

143+ val keywords = syntax.keywords

124 val builder = AnnotatedString.Builder(line.length + 8)

144 val builder = AnnotatedString.Builder(line.length + 8)

125 val baseStyle = SpanStyle(color = palette.base, fontFamily = FontFamily.Monospace)

145 val baseStyle = SpanStyle(color = palette.base, fontFamily = FontFamily.Monospace)

126 val mono = FontFamily.Monospace

146 val mono = FontFamily.Monospace

app/src/main/java/soy/iko/opencode/ui/components/DiffView.kt+8−4

@@ -125,10 +125,14 @@ private const val COLLAPSED_DIFF_LINES = 200

125@Composable

126fun DiffView(diff: String, modifier: Modifier = Modifier) {

127 val lines = remember(diff) { parseDiff(diff) }

128+ // Derive the four row colors once per color scheme instead of allocating fresh Color

129+ // objects (the .copy() calls) on every recomposition — a diff re-parses/recomposes

130+ // per token while its output streams under the collapse limit.

131+ val scheme = MaterialTheme.colorScheme

128− val addColor = MaterialTheme.colorScheme.primary.copy(alpha = 0.15f)

132+ val addColor = remember(scheme) { scheme.primary.copy(alpha = 0.15f) }

129− val removeColor = MaterialTheme.colorScheme.error.copy(alpha = 0.15f)

133+ val removeColor = remember(scheme) { scheme.error.copy(alpha = 0.15f) }

130− val addText = MaterialTheme.colorScheme.primary

134+ val addText = scheme.primary

131− val removeText = MaterialTheme.colorScheme.error

135+ val removeText = scheme.error

132 val context = LocalContext.current

136 val context = LocalContext.current

133 val hScrollState = rememberScrollState()

137 val hScrollState = rememberScrollState()

134 var expanded by rememberSaveable(diff) { mutableStateOf(false) }

138 var expanded by rememberSaveable(diff) { mutableStateOf(false) }

app/src/main/java/soy/iko/opencode/ui/file/FileViewScreen.kt+30−10

@@ -54,6 +54,7 @@ import androidx.compose.runtime.LaunchedEffect

54import androidx.compose.runtime.getValue

55import androidx.compose.runtime.mutableIntStateOf

56import androidx.compose.runtime.mutableStateOf

57+import androidx.compose.runtime.produceState

57import androidx.compose.runtime.remember

58import androidx.compose.runtime.remember

58import androidx.compose.runtime.saveable.rememberSaveable

59import androidx.compose.runtime.saveable.rememberSaveable

59import androidx.compose.runtime.setValue

60import androidx.compose.runtime.setValue

@@ -77,9 +78,13 @@ import soy.iko.opencode.R

77import soy.iko.opencode.ui.components.DiffView

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

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

79import soy.iko.opencode.ui.components.copyToClipboard

79import soy.iko.opencode.ui.components.highlightLine

80import soy.iko.opencode.ui.components.highlightLine

81+import soy.iko.opencode.ui.components.syntaxFor

80import soy.iko.opencode.ui.components.rememberHighlightPalette

82import soy.iko.opencode.ui.components.rememberHighlightPalette

81import soy.iko.opencode.ui.vmFactory

83import soy.iko.opencode.ui.vmFactory

82import soy.iko.opencode.util.runCatchingCancellable

84import soy.iko.opencode.util.runCatchingCancellable

85+import kotlinx.coroutines.Dispatchers

86+import kotlinx.coroutines.delay

87+import kotlinx.coroutines.withContext

84@OptIn(ExperimentalMaterial3Api::class)

89@OptIn(ExperimentalMaterial3Api::class)

85@Composable

90@Composable

@@ -110,11 +115,19 @@ fun FileViewScreen(

110 val listState = rememberLazyListState()

115 val listState = rememberLazyListState()

111 val rawText = state.content?.content.orEmpty()

116 val rawText = state.content?.content.orEmpty()

112 val lines = remember(rawText) { rawText.split("\n") }

117 val lines = remember(rawText) { rawText.split("\n") }

113− val matchIndices = remember(lines, findQuery) {

118+ // Debounce the query so each keystroke doesn't trigger a full-file scan, and run the

119+ // scan on Dispatchers.Default so a large file doesn't jank the keyboard while typing.

120+ var debouncedFind by remember { mutableStateOf("") }

121+ LaunchedEffect(findQuery) {

114 val q = findQuery.trim()

122 val q = findQuery.trim()

115− if (q.isEmpty()) emptyList()

123+ if (q.isEmpty()) debouncedFind = "" else { delay(150); debouncedFind = q }

124+ }

125+ val matchIndices by produceState(emptyList<Int>(), lines, debouncedFind) {

126+ val q = debouncedFind

127+ value = if (q.isEmpty()) emptyList()

128+ else withContext(Dispatchers.Default) {

116− else lines.mapIndexed { index, line -> if (line.contains(q, ignoreCase = true)) index else -1 }

129+ lines.mapIndexedNotNull { index, line -> index.takeIf { line.contains(q, ignoreCase = true) } }

117− .filter { it >= 0 }

130+ }

118 }

131 }

119 // Keep the current match index in range when the match set shrinks (e.g. the file

132 // Keep the current match index in range when the match set shrinks (e.g. the file

120 // reloaded with fewer matches), so the counter never shows a stale "10 / 3".

133 // reloaded with fewer matches), so the counter never shows a stale "10 / 3".

@@ -163,12 +176,17 @@ fun FileViewScreen(

163 // state. During the crossfade the exiting layer still renders the old

176 // state. During the crossfade the exiting layer still renders the old

164 // content; passing the outer matchIndices (computed from the new content)

177 // content; passing the outer matchIndices (computed from the new content)

165 // would highlight and scroll the wrong lines until the animation settles.

178 // would highlight and scroll the wrong lines until the animation settles.

166− val sMatchIndices = remember(s.content?.content, findQuery) {

179+ val sMatchIndices = remember(s.content?.content, debouncedFind, lines, rawText) {

167− val q = findQuery.trim()

180+ val q = debouncedFind

168 if (q.isEmpty()) emptyList()

181 if (q.isEmpty()) emptyList()

182+ else {

183+ // Reuse the already-split `lines` when this layer shows the current

184+ // content (the common case); only re-split for the exiting layer's

185+ // stale content during the crossfade.

169− else (s.content?.content.orEmpty()).split("\n")

186+ val sContent = s.content?.content

187+ val sLines = if (sContent == rawText) lines else sContent.orEmpty().split("\n")

170− .mapIndexed { index, line -> if (line.contains(q, ignoreCase = true)) index else -1 }

188+ sLines.mapIndexedNotNull { index, line -> index.takeIf { line.contains(q, ignoreCase = true) } }

171− .filter { it >= 0 }

189+ }

172 }

190 }

173 FileViewStateContent(

191 FileViewStateContent(

174 state = s,

192 state = s,

@@ -498,6 +516,8 @@ private fun FileTextContent(

498 }

516 }

499 val hScrollState = rememberScrollState()

517 val hScrollState = rememberScrollState()

500 val palette = rememberHighlightPalette()

518 val palette = rememberHighlightPalette()

519+ // Resolve the file's language once instead of re-parsing the extension for every line.

520+ val syntax = remember(filename) { syntaxFor(filename) }

501 val q = findQuery.trim()

521 val q = findQuery.trim()

502 val matchSet = remember(matchIndices) { matchIndices.toHashSet() }

522 val matchSet = remember(matchIndices) { matchIndices.toHashSet() }

503 LazyColumn(

523 LazyColumn(

@@ -527,7 +547,7 @@ private fun FileTextContent(

527 // O(n) tokenizer + AnnotatedString allocation runs only when the line text,

547 // O(n) tokenizer + AnnotatedString allocation runs only when the line text,

528 // file, or palette actually changes — not on every recomposition (e.g. every

548 // file, or palette actually changes — not on every recomposition (e.g. every

529 // keystroke into find-in-file, which would otherwise re-highlight all visible lines).

549 // keystroke into find-in-file, which would otherwise re-highlight all visible lines).

530− val highlighted = remember(line, filename, palette) { highlightLine(line, filename, palette) }

550+ val highlighted = remember(line, syntax, palette) { highlightLine(line, syntax, palette) }

531 Text(

551 Text(

532 highlighted,

552 highlighted,

533 modifier = Modifier.padding(start = 8.dp),

553 modifier = Modifier.padding(start = 8.dp),

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

@@ -442,6 +442,14 @@ private fun androidx.compose.foundation.layout.BoxScope.SessionListBody(

442 false

443 },

444 )

445+ // Per-item callbacks memoized on the session id so SessionCard

446+ // stays skippable: the list emits a fresh SessionListState on

447+ // every background preview/unread update, and freshly-allocated

448+ // lambdas would otherwise force every visible card to recompose

449+ // on each of those emissions even when its own data is unchanged.

450+ val onCardClick = remember(session.id) { { onOpenSession(session.id) } }

451+ val onCardRename = remember(session.id) { { onRename(session.id) } }

452+ val onCardDelete = remember(session.id) { { onDelete(session.id) } }

445 SwipeToDismissBox(

453 SwipeToDismissBox(

446 state = swipeState,

454 state = swipeState,

447 enableDismissFromStartToEnd = false,

455 enableDismissFromStartToEnd = false,

@@ -468,9 +476,9 @@ private fun androidx.compose.foundation.layout.BoxScope.SessionListBody(

468 preview = state.previews[session.id],

476 preview = state.previews[session.id],

469 unreadCount = unread[session.id] ?: 0,

477 unreadCount = unread[session.id] ?: 0,

470 isSelected = session.id == selectedSessionId,

478 isSelected = session.id == selectedSessionId,

471− onClick = { onOpenSession(session.id) },

479+ onClick = onCardClick,

472− onRename = { onRename(session.id) },

480+ onRename = onCardRename,

473− onDelete = { onDelete(session.id) },

481+ onDelete = onCardDelete,

474 modifier = Modifier.testTag("session_card"),

482 modifier = Modifier.testTag("session_card"),

475 )

483 )

476 }

484 }

app/src/main/java/soy/iko/opencode/ui/session/SessionListViewModel.kt+6−1

@@ -70,7 +70,12 @@ private fun Iterable<Session>.sortedByMode(mode: SessionSortMode): List<Session>

70 SessionSortMode.RECENT ->

71 sortedByDescending { it.time?.updated ?: it.time?.created ?: 0L }

72 SessionSortMode.TITLE ->

73+ // CASE_INSENSITIVE_ORDER avoids allocating a lowercased title per comparison; this

74+ // sort re-runs on every debounced list flush during streaming.

75+ sortedWith(

76+ compareBy<Session, String>(String.CASE_INSENSITIVE_ORDER) { it.displayTitle }

73− sortedWith(compareBy<Session> { it.displayTitle.lowercase() }.thenByDescending { it.time?.updated ?: it.time?.created ?: 0L })

77+ .thenByDescending { it.time?.updated ?: it.time?.created ?: 0L },

78+ )

74}

79}

76class SessionListViewModel(private val container: AppContainer) : ViewModel() {

81class SessionListViewModel(private val container: AppContainer) : ViewModel() {