git.iko.soy/opencode-android
on master help sign in
Reduce markdown re-parse work, wasted preview fetches during streaming, and diff allocation
34c5c50iko
app/src/main/java/soy/iko/opencode/data/network/NetworkConfig.kt+9−2
compare with master
unifiedsplit
@@ -53,6 +53,10 @@ object NetworkConfig {
53 const val maxConcurrentPreviews = 8
53 const val maxConcurrentPreviews = 8
54 /** Max characters of a session's last message to keep as a list preview. */
54 /** Max characters of a session's last message to keep as a list preview. */
55 const val previewTextMaxLength = 200
55 const val previewTextMaxLength = 200
56+ /** Debounce delay before fetching a session preview after an SSE update, so a burst
57+ * of SessionUpdated events (e.g. during active streaming) coalesces into one fetch
58+ * instead of launching one per event (each downloading the full message history). */
59+ const val previewDebounceMs = 500L
56
60
57 // --- In-memory message store (SessionRepository.MessageStore) ---
61 // --- In-memory message store (SessionRepository.MessageStore) ---
58
62
@@ -88,8 +92,11 @@ object NetworkConfig {
88
92
89 // --- Markdown rendering (MarkdownText) ---
93 // --- Markdown rendering (MarkdownText) ---
90
94
91− /** Throttle delay (~60fps frame) to coalesce streaming tokens into one re-parse. */
95+ /** Throttle delay to coalesce streaming tokens into one re-parse. The markdown
96+ * library re-parses the full AST on every content change, so during a long streaming
97+ * response this is O(n²) work. 50ms (~20fps) is smooth for progressively appearing
98+ * text while cutting parse work ~3x versus a per-frame (16ms) throttle. */
92− const val streamingThrottleMs = 16L
99+ const val streamingThrottleMs = 50L
93
100
94 // --- Snackbar one-shot events (ViewModels) ---
101 // --- Snackbar one-shot events (ViewModels) ---
95
102
app/src/main/java/soy/iko/opencode/ui/components/DiffView.kt+1−1
@@ -57,7 +57,7 @@ private val gitMetaPrefixes = listOf(
57/** Parse a unified diff string into typed [DiffLine]s. */
57/** Parse a unified diff string into typed [DiffLine]s. */
58fun parseDiff(diff: String): List<DiffLine> {
58fun parseDiff(diff: String): List<DiffLine> {
59 val result = mutableListOf<DiffLine>()
59 val result = mutableListOf<DiffLine>()
60− for (raw in diff.split("\n")) {
60+ for (raw in diff.lineSequence()) {
61 when {
61 when {
62 raw.startsWith("@@") -> result.add(DiffLine.Hunk(raw))
62 raw.startsWith("@@") -> result.add(DiffLine.Hunk(raw))
63 raw.startsWith("---") || raw.startsWith("+++") -> result.add(DiffLine.FileHeader(raw))
63 raw.startsWith("---") || raw.startsWith("+++") -> result.add(DiffLine.FileHeader(raw))
app/src/main/java/soy/iko/opencode/ui/components/MarkdownText.kt+1−1
@@ -57,7 +57,7 @@ import soy.iko.opencode.data.network.NetworkConfig
57 * During streaming, the full markdown is re-parsed on every token (the library re-parses
57 * 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
58 * 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
59 * rendered content is throttled — the latest [markdown] is committed to the renderer at
60− * most once per frame (~16ms), so a burst of tokens coalesces into a single re-parse.
60+ * most once every ~50ms, so a burst of tokens coalesces into a single re-parse.
61 *
61 *
62 * The throttle uses a single long-lived `LaunchedEffect(Unit)` that observes the markdown
62 * The throttle uses a single long-lived `LaunchedEffect(Unit)` that observes the markdown
63 * parameter via `rememberUpdatedState` + `snapshotFlow` + `conflate` + `collect`. A keyed
63 * parameter via `rememberUpdatedState` + `snapshotFlow` + `conflate` + `collect`. A keyed
app/src/main/java/soy/iko/opencode/ui/session/SessionListViewModel.kt+5−1
@@ -18,6 +18,7 @@ import kotlinx.coroutines.CancellationException
18import kotlinx.coroutines.ExperimentalCoroutinesApi
18import kotlinx.coroutines.ExperimentalCoroutinesApi
19import kotlinx.coroutines.Job
19import kotlinx.coroutines.Job
20import kotlinx.coroutines.channels.BufferOverflow
20import kotlinx.coroutines.channels.BufferOverflow
21+import kotlinx.coroutines.delay
21import kotlinx.coroutines.flow.MutableSharedFlow
22import kotlinx.coroutines.flow.MutableSharedFlow
22import kotlinx.coroutines.flow.MutableStateFlow
23import kotlinx.coroutines.flow.MutableStateFlow
23import kotlinx.coroutines.flow.SharedFlow
24import kotlinx.coroutines.flow.SharedFlow
@@ -228,7 +229,9 @@ class SessionListViewModel(private val container: AppContainer) : ViewModel() {
228 /**
229 /**
229 * Reload the preview for a single session (used by the live SSE handler).
230 * Reload the preview for a single session (used by the live SSE handler).
230 * Cancels any prior in-flight load for the same session so a burst of
231 * Cancels any prior in-flight load for the same session so a burst of
231− * [SessionUpdated] events coalesces into a single request.
232+ * [SessionUpdated] events coalesces into a single request. A short debounce
233+ * delay before the fetch avoids launching one full-history download per event
234+ * during active streaming — the fetch runs only after events quiet down.
232 */
235 */
233 private fun loadPreview(sessionId: String) {
236 private fun loadPreview(sessionId: String) {
234 val conn = container.activeConnection.value ?: return
237 val conn = container.activeConnection.value ?: return
@@ -238,6 +241,7 @@ class SessionListViewModel(private val container: AppContainer) : ViewModel() {
238 livePreviewJobs[sessionId] = viewModelScope.launch {
241 livePreviewJobs[sessionId] = viewModelScope.launch {
239 val job = coroutineContext[kotlinx.coroutines.Job]
242 val job = coroutineContext[kotlinx.coroutines.Job]
240 try {
243 try {
244+ delay(NetworkConfig.previewDebounceMs)
241 val preview = fetchSessionPreview(api, sessionId) ?: return@launch
245 val preview = fetchSessionPreview(api, sessionId) ?: return@launch
242 _state.update { s -> s.copy(previews = s.previews + (sessionId to preview)) }
246 _state.update { s -> s.copy(previews = s.previews + (sessionId to preview)) }
243 } catch (e: CancellationException) {
247 } catch (e: CancellationException) {