From 56e705708fa9a6a8d951042db7e8d677d779959b Mon Sep 17 00:00:00 2001 From: Cole Leavitt Date: Thu, 26 Feb 2026 18:23:28 -0700 Subject: [PATCH 1/4] perf(tui): replace reconcile() with path-syntax setStore for streaming updates MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Replace all reconcile() calls with direct assignment and path-syntax setStore() to eliminate O(n) deep-diff overhead during streaming. - Hot path: reconcile(info) → direct assignment for message/part/session updates - Hot path: produce() delta flush → setStore path-syntax (O(depth) vs O(n)) - Bootstrap: remove reconcile() from all one-shot API response stores - Remove unused reconcile import from solid-js/store Proven from Solid.js source: reconcile() recursively traverses the entire object tree (applyState in modifiers.ts), while path-syntax navigates directly to the leaf node via updatePath (store.ts). --- .../opencode/src/cli/cmd/tui/context/sync.tsx | 53 +++++++++---------- 1 file changed, 25 insertions(+), 28 deletions(-) diff --git a/packages/opencode/src/cli/cmd/tui/context/sync.tsx b/packages/opencode/src/cli/cmd/tui/context/sync.tsx index 269ed7ae0bd1..9e6910ba67fd 100644 --- a/packages/opencode/src/cli/cmd/tui/context/sync.tsx +++ b/packages/opencode/src/cli/cmd/tui/context/sync.tsx @@ -18,7 +18,7 @@ import type { ProviderAuthMethod, VcsInfo, } from "@opencode-ai/sdk/v2" -import { createStore, produce, reconcile } from "solid-js/store" +import { createStore, produce } from "solid-js/store" import { useSDK } from "@tui/context/sdk" import { Binary } from "@opencode-ai/util/binary" import { createSimpleContext } from "./helper" @@ -134,7 +134,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ } const match = Binary.search(requests, request.id, (r) => r.id) if (match.found) { - setStore("permission", request.sessionID, match.index, reconcile(request)) + setStore("permission", request.sessionID, match.index, request) break } setStore( @@ -172,7 +172,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ } const match = Binary.search(requests, request.id, (r) => r.id) if (match.found) { - setStore("question", request.sessionID, match.index, reconcile(request)) + setStore("question", request.sessionID, match.index, request) break } setStore( @@ -208,7 +208,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ case "session.updated": { const result = Binary.search(store.session, event.properties.info.id, (s) => s.id) if (result.found) { - setStore("session", result.index, reconcile(event.properties.info)) + setStore("session", result.index, event.properties.info) break } setStore( @@ -233,7 +233,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ } const result = Binary.search(messages, event.properties.info.id, (m) => m.id) if (result.found) { - setStore("message", event.properties.info.sessionID, result.index, reconcile(event.properties.info)) + setStore("message", event.properties.info.sessionID, result.index, event.properties.info) break } setStore( @@ -286,7 +286,7 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ } const result = Binary.search(parts, event.properties.part.id, (p) => p.id) if (result.found) { - setStore("part", event.properties.part.messageID, result.index, reconcile(event.properties.part)) + setStore("part", event.properties.part.messageID, result.index, event.properties.part) break } setStore( @@ -307,12 +307,9 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ setStore( "part", event.properties.messageID, - produce((draft) => { - const part = draft[result.index] - const field = event.properties.field as keyof typeof part - const existing = part[field] as string | undefined - ;(part[field] as string) = (existing ?? "") + event.properties.delta - }), + result.index, + event.properties.field as any, + (prev: string) => (prev ?? "") + event.properties.delta, ) break } @@ -388,12 +385,12 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ const sessions = responses[4] batch(() => { - setStore("provider", reconcile(providers.providers)) - setStore("provider_default", reconcile(providers.default)) - setStore("provider_next", reconcile(providerList)) - setStore("agent", reconcile(agents)) - setStore("config", reconcile(config)) - if (sessions !== undefined) setStore("session", reconcile(sessions)) + setStore("provider", providers.providers) + setStore("provider_default", providers.default) + setStore("provider_next", providerList) + setStore("agent", agents) + setStore("config", config) + if (sessions !== undefined) setStore("session", sessions) }) }) }) @@ -401,18 +398,18 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ if (store.status !== "complete") setStore("status", "partial") // non-blocking Promise.all([ - ...(args.continue ? [] : [sessionListPromise.then((sessions) => setStore("session", reconcile(sessions)))]), - sdk.client.command.list().then((x) => setStore("command", reconcile(x.data ?? []))), - sdk.client.lsp.status().then((x) => setStore("lsp", reconcile(x.data!))), - sdk.client.mcp.status().then((x) => setStore("mcp", reconcile(x.data!))), - sdk.client.experimental.resource.list().then((x) => setStore("mcp_resource", reconcile(x.data ?? {}))), - sdk.client.formatter.status().then((x) => setStore("formatter", reconcile(x.data!))), + ...(args.continue ? [] : [sessionListPromise.then((sessions) => setStore("session", sessions))]), + sdk.client.command.list().then((x) => setStore("command", x.data ?? [])), + sdk.client.lsp.status().then((x) => setStore("lsp", x.data!)), + sdk.client.mcp.status().then((x) => setStore("mcp", x.data!)), + sdk.client.experimental.resource.list().then((x) => setStore("mcp_resource", x.data ?? {})), + sdk.client.formatter.status().then((x) => setStore("formatter", x.data!)), sdk.client.session.status().then((x) => { - setStore("session_status", reconcile(x.data!)) + setStore("session_status", x.data!) }), - sdk.client.provider.auth().then((x) => setStore("provider_auth", reconcile(x.data ?? {}))), - sdk.client.vcs.get().then((x) => setStore("vcs", reconcile(x.data))), - sdk.client.path.get().then((x) => setStore("path", reconcile(x.data!))), + sdk.client.provider.auth().then((x) => setStore("provider_auth", x.data ?? {})), + sdk.client.vcs.get().then((x) => setStore("vcs", x.data)), + sdk.client.path.get().then((x) => setStore("path", x.data!)), ]).then(() => { setStore("status", "complete") }) From 6ba24a4f9a3e9dc6f87b997ec1dd734f8b5b2c8b Mon Sep 17 00:00:00 2001 From: Cole Leavitt Date: Thu, 26 Feb 2026 18:51:59 -0700 Subject: [PATCH 2/4] =?UTF-8?q?fix(tui):=20address=20PR=20review=20?= =?UTF-8?q?=E2=80=94=20restore=20reconcile=20for=20dict=20stores,=20fix=20?= =?UTF-8?q?type=20safety?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Restore reconcile() for 6 dictionary/object stores (provider_default, config, mcp, mcp_resource, session_status, provider_auth) to properly remove stale keys on re-bootstrap — setStore shallow-merges objects - Replace 'as any' with 'as keyof Part' and add runtime type guard for delta handler to satisfy type safety requirements - Keep path-syntax setStore for streaming hot path and array stores --- .../opencode/src/cli/cmd/tui/context/sync.tsx | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/packages/opencode/src/cli/cmd/tui/context/sync.tsx b/packages/opencode/src/cli/cmd/tui/context/sync.tsx index 9e6910ba67fd..44bc72ce4789 100644 --- a/packages/opencode/src/cli/cmd/tui/context/sync.tsx +++ b/packages/opencode/src/cli/cmd/tui/context/sync.tsx @@ -18,7 +18,7 @@ import type { ProviderAuthMethod, VcsInfo, } from "@opencode-ai/sdk/v2" -import { createStore, produce } from "solid-js/store" +import { createStore, produce, reconcile } from "solid-js/store" import { useSDK } from "@tui/context/sdk" import { Binary } from "@opencode-ai/util/binary" import { createSimpleContext } from "./helper" @@ -308,8 +308,8 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ "part", event.properties.messageID, result.index, - event.properties.field as any, - (prev: string) => (prev ?? "") + event.properties.delta, + event.properties.field as keyof Part, + (prev: unknown) => (typeof prev === "string" ? prev : "") + event.properties.delta, ) break } @@ -386,10 +386,10 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ batch(() => { setStore("provider", providers.providers) - setStore("provider_default", providers.default) + setStore("provider_default", reconcile(providers.default)) setStore("provider_next", providerList) setStore("agent", agents) - setStore("config", config) + setStore("config", reconcile(config)) if (sessions !== undefined) setStore("session", sessions) }) }) @@ -401,13 +401,13 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ ...(args.continue ? [] : [sessionListPromise.then((sessions) => setStore("session", sessions))]), sdk.client.command.list().then((x) => setStore("command", x.data ?? [])), sdk.client.lsp.status().then((x) => setStore("lsp", x.data!)), - sdk.client.mcp.status().then((x) => setStore("mcp", x.data!)), - sdk.client.experimental.resource.list().then((x) => setStore("mcp_resource", x.data ?? {})), + sdk.client.mcp.status().then((x) => setStore("mcp", reconcile(x.data!))), + sdk.client.experimental.resource.list().then((x) => setStore("mcp_resource", reconcile(x.data ?? {}))), sdk.client.formatter.status().then((x) => setStore("formatter", x.data!)), sdk.client.session.status().then((x) => { - setStore("session_status", x.data!) + setStore("session_status", reconcile(x.data!)) }), - sdk.client.provider.auth().then((x) => setStore("provider_auth", x.data ?? {})), + sdk.client.provider.auth().then((x) => setStore("provider_auth", reconcile(x.data ?? {}))), sdk.client.vcs.get().then((x) => setStore("vcs", x.data)), sdk.client.path.get().then((x) => setStore("path", x.data!)), ]).then(() => { From 7371b81fc963926115e6603e2b3592336f542d92 Mon Sep 17 00:00:00 2001 From: Cole Leavitt Date: Thu, 26 Feb 2026 19:17:40 -0700 Subject: [PATCH 3/4] perf(tui): coalesce streaming deltas via queueMicrotask to eliminate per-token setStore calls Accumulate message.part.delta events in a plain Record buffer (zero reactive overhead), then flush to the store via a single batched setStore() call per queueMicrotask. This collapses N deltas per part per SDK flush into 1 setStore() call, reducing proxy trap invocations from 5N to 5 per flush cycle. - Add pending delta accumulator (plain Record, no proxies) - Schedule flushDeltas() via queueMicrotask after sdk.tsx batch completes - Clear stale pending deltas on message.part.updated/removed - No store shape changes, no hook changes, no new timers --- .../opencode/src/cli/cmd/tui/context/sync.tsx | 60 +++++++++++++++---- 1 file changed, 49 insertions(+), 11 deletions(-) diff --git a/packages/opencode/src/cli/cmd/tui/context/sync.tsx b/packages/opencode/src/cli/cmd/tui/context/sync.tsx index 44bc72ce4789..44a66e778f76 100644 --- a/packages/opencode/src/cli/cmd/tui/context/sync.tsx +++ b/packages/opencode/src/cli/cmd/tui/context/sync.tsx @@ -104,6 +104,41 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ const sdk = useSDK() + // Delta coalescing: accumulate deltas in a plain record (zero reactive overhead), + // flush to store via queueMicrotask after sdk.tsx's batch() completes. + // Collapses N deltas per part per flush into 1 setStore() call. + const pending: Record>> = {} + let scheduled = false + + function flushDeltas() { + for (const messageID in pending) { + const parts = store.part[messageID] + if (!parts) { + delete pending[messageID] + continue + } + for (const partID in pending[messageID]) { + const result = Binary.search(parts, partID, (p) => p.id) + if (!result.found) { + delete pending[messageID][partID] + continue + } + for (const field in pending[messageID][partID]) { + const delta = pending[messageID][partID][field] + setStore( + "part", + messageID, + result.index, + field as keyof Part, + (prev: unknown) => (typeof prev === "string" ? prev : "") + delta, + ) + } + delete pending[messageID][partID] + } + delete pending[messageID] + } + } + sdk.event.listen((e) => { const event = e.details switch (event.type) { @@ -279,6 +314,8 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ break } case "message.part.updated": { + // Clear pending deltas — full update supersedes them + delete pending[event.properties.part.messageID]?.[event.properties.part.id] const parts = store.part[event.properties.part.messageID] if (!parts) { setStore("part", event.properties.part.messageID, [event.properties.part]) @@ -300,21 +337,22 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ } case "message.part.delta": { - const parts = store.part[event.properties.messageID] - if (!parts) break - const result = Binary.search(parts, event.properties.partID, (p) => p.id) - if (!result.found) break - setStore( - "part", - event.properties.messageID, - result.index, - event.properties.field as keyof Part, - (prev: unknown) => (typeof prev === "string" ? prev : "") + event.properties.delta, - ) + const p = event.properties + const msg = (pending[p.messageID] ??= {}) + const part = (msg[p.partID] ??= {}) + part[p.field] = (part[p.field] ?? "") + p.delta + if (!scheduled) { + scheduled = true + queueMicrotask(() => { + scheduled = false + batch(() => flushDeltas()) + }) + } break } case "message.part.removed": { + delete pending[event.properties.messageID]?.[event.properties.partID] const parts = store.part[event.properties.messageID] const result = Binary.search(parts, event.properties.partID, (p) => p.id) if (result.found) From f2a3e238efd1d47206a56f070aa96c009ff385c4 Mon Sep 17 00:00:00 2001 From: Cole Leavitt Date: Fri, 27 Feb 2026 02:43:56 -0700 Subject: [PATCH 4/4] fix(tui): guard flushDeltas against post-unmount execution to prevent segfault on Ctrl+C --- packages/opencode/src/cli/cmd/tui/context/sync.tsx | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/opencode/src/cli/cmd/tui/context/sync.tsx b/packages/opencode/src/cli/cmd/tui/context/sync.tsx index 44a66e778f76..9ffd001abb52 100644 --- a/packages/opencode/src/cli/cmd/tui/context/sync.tsx +++ b/packages/opencode/src/cli/cmd/tui/context/sync.tsx @@ -25,7 +25,7 @@ import { createSimpleContext } from "./helper" import type { Snapshot } from "@/snapshot" import { useExit } from "./exit" import { useArgs } from "./args" -import { batch, onMount } from "solid-js" +import { batch, onCleanup, onMount } from "solid-js" import { Log } from "@/util/log" import type { Path } from "@opencode-ai/sdk" @@ -109,8 +109,10 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ // Collapses N deltas per part per flush into 1 setStore() call. const pending: Record>> = {} let scheduled = false + let disposed = false function flushDeltas() { + if (disposed) return for (const messageID in pending) { const parts = store.part[messageID] if (!parts) { @@ -139,6 +141,11 @@ export const { use: useSync, provider: SyncProvider } = createSimpleContext({ } } + onCleanup(() => { + disposed = true + for (const key in pending) delete pending[key] + }) + sdk.event.listen((e) => { const event = e.details switch (event.type) {