stabilize TUI theme persistence and KV writes (#23188)

Author: kommander

bun.lock

@@ -122,8 +122,8 @@
 "@opentelemetry/exporter-trace-otlp-http": "0.214.0",
 "@opentelemetry/sdk-trace-base": "2.6.1",
 "@opentelemetry/sdk-trace-node": "2.6.1",
-"@opentui/core": "catalog:",
-"@opentui/solid": "catalog:",
+"@opentui/core": "0.1.101",
+"@opentui/solid": "0.1.101",
 "@parcel/watcher": "2.5.1",
 "@pierre/diffs": "catalog:",
 "@solid-primitives/event-bus": "1.1.2",

packages/opencode/package.json

@@ -1,7 +1,6 @@
 import{render,TimeToFirstDraw,useKeyboard,useRenderer,useTerminalDimensions}from"@opentui/solid"
 import*asClipboardfrom"@tui/util/clipboard"
 import*asSelectionfrom"@tui/util/selection"
-import*asTerminalfrom"@tui/util/terminal"
 import{createCliRenderer,MouseButton,typeCliRendererConfig}from"@opentui/core"
 import{RouteProvider,useRoute}from"@tui/context/route"
 import{
@@ -120,12 +119,6 @@ export function tui(input: {
 constunguard=win32InstallCtrlCGuard()
 win32DisableProcessedInput()
 
-constmode=awaitTerminal.getTerminalBackgroundColor()
-
-// Re-clear after getTerminalBackgroundColor() — setRawMode(false) restores
-// the original console mode which re-enables ENABLE_PROCESSED_INPUT.
-win32DisableProcessedInput()
-
 constonExit=async()=>{
 unguard?.()
 resolve()
@@ -136,6 +129,7 @@ export function tui(input: {
 }
 
 constrenderer=awaitcreateCliRenderer(rendererConfig(input.config))
+constmode=(awaitrenderer.waitForThemeMode(1000))??"dark"
 
 awaitrender(()=>{
 return(

packages/opencode/src/cli/cmd/tui/app.tsx

@@ -1,7 +1,9 @@
 import{Global}from"@/global"
 import{Filesystem}from"@/util"
+import{Flock}from"@opencode-ai/shared/util/flock"
+import{rename,rm}from"fs/promises"
 import{createSignal,typeSetter}from"solid-js"
-import{createStore}from"solid-js/store"
+import{createStore,unwrap}from"solid-js/store"
 import{createSimpleContext}from"./helper"
 importpathfrom"path"
 
@@ -11,12 +13,29 @@ export const { use: useKV, provider: KVProvider } = createSimpleContext({
 const[ready,setReady]=createSignal(false)
 const[store,setStore]=createStore<Record<string,any>>()
 constfilePath=path.join(Global.Path.state,"kv.json")
+constlock=`tui-kv:${filePath}`
+// Queue same-process writes so rapid updates persist in order.
+letwrite=Promise.resolve()
 
-Filesystem.readJson<Record<string,any>>(filePath)
+// Write to a temp file first so kv.json is only replaced once the JSON is complete, avoiding partial writes if shutdown interrupts persistence.
+functionwriteSnapshot(snapshot: Record<string,any>){
+consttempPath=`${filePath}.${process.pid}.${Date.now()}.tmp`
+returnFilesystem.writeJson(tempPath,snapshot)
+.then(()=>rename(tempPath,filePath))
+.catch(async(error)=>{
+awaitrm(tempPath,{force: true}).catch(()=>undefined)
+throwerror
+})
+}
+
+// Read under the same lock used for writes because kv.json is shared across processes.
+Flock.withLock(lock,()=>Filesystem.readJson<Record<string,any>>(filePath))
 .then((x)=>{
 setStore(x)
 })
-.catch(()=>{})
+.catch((error)=>{
+console.error("Failed to read KV state",{ filePath, error })
+})
 .finally(()=>{
 setReady(true)
 })
@@ -44,7 +63,12 @@ export const { use: useKV, provider: KVProvider } = createSimpleContext({
 },
 set(key: string,value: any){
 setStore(key,value)
-voidFilesystem.writeJson(filePath,store)
+constsnapshot=structuredClone(unwrap(store))
+write=write
+.then(()=>Flock.withLock(lock,()=>writeSnapshot(snapshot)))
+.catch((error)=>{
+console.error("Failed to write KV state",{ filePath, error })
+})
 },
 }
 returnresult

packages/opencode/src/cli/cmd/tui/context/kv.tsx

@@ -314,8 +314,11 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
 setStore(
 produce((draft)=>{
 constlock=pick(kv.get("theme_mode_lock"))
-constmode=pick(kv.get("theme_mode",props.mode))
-draft.mode=lock??mode??props.mode
+constmode=lock??props.mode
+if(!lock&&pick(kv.get("theme_mode"))!==undefined){
+kv.set("theme_mode",undefined)
+}
+draft.mode=mode
 draft.lock=lock
 constactive=config.theme??kv.get("theme","opencode")
 draft.active=typeofactive==="string" ? active : "opencode"
@@ -373,7 +376,7 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
 }
 
 functionapply(mode: "dark"|"light"){
-kv.set("theme_mode",mode)
+if(store.lock!==undefined)kv.set("theme_mode",mode)
 if(store.mode===mode)return
 setStore("mode",mode)
 renderer.clearPaletteCache()
@@ -389,6 +392,7 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
 functionfree(){
 setStore("lock",undefined)
 kv.set("theme_mode_lock",undefined)
+kv.set("theme_mode",undefined)
 constmode=renderer.themeMode
 if(mode)apply(mode)
 }
@@ -397,7 +401,7 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
 if(store.lock)return
 apply(mode)
 }
-// renderer.on(CliRenderEvents.THEME_MODE, handle)
+renderer.on(CliRenderEvents.THEME_MODE,handle)
 
 constrefresh=()=>{
 renderer.clearPaletteCache()

packages/opencode/src/cli/cmd/tui/context/theme.tsx

@@ -17,12 +17,6 @@ function parse(color: string): RGBA | null {
 returnnull
 }
 
-functionmode(bg: RGBA|null): "dark"|"light"{
-if(!bg)return"dark"
-constluminance=(0.299*bg.r+0.587*bg.g+0.114*bg.b)/255
-returnluminance>0.5 ? "light" : "dark"
-}
-
 /**
  * Query terminal colors including background, foreground, and palette (0-15).
  * Uses OSC escape sequences to retrieve actual terminal color values.
@@ -100,36 +94,3 @@ export async function colors(): Promise<{
 },1000)
 })
 }
-
-// Keep startup mode detection separate from `colors()`: the TUI boot path only
-// needs OSC 11 and should resolve on the first background response instead of
-// waiting on the full palette query used by system theme generation.
-exportasyncfunctiongetTerminalBackgroundColor(): Promise<"dark"|"light">{
-if(!process.stdin.isTTY)return"dark"
-
-returnnewPromise((resolve)=>{
-lettimeout: NodeJS.Timeout
-
-constcleanup=()=>{
-process.stdin.setRawMode(false)
-process.stdin.removeListener("data",handler)
-clearTimeout(timeout)
-}
-
-consthandler=(data: Buffer)=>{
-constmatch=data.toString().match(/\x1b]11;([^\x07\x1b]+)/)
-if(!match)return
-cleanup()
-resolve(mode(parse(match[1])))
-}
-
-process.stdin.setRawMode(true)
-process.stdin.on("data",handler)
-process.stdout.write("\x1b]11;?\x07")
-
-timeout=setTimeout(()=>{
-cleanup()
-resolve("dark")
-},1000)
-})
-}

packages/opencode/src/cli/cmd/tui/util/terminal.ts

@@ -22,8 +22,8 @@
 "zod": "catalog:"
  },
 "peerDependencies": {
-"@opentui/core": ">=0.1.100",
-"@opentui/solid": ">=0.1.100"
+"@opentui/core": ">=0.1.101",
+"@opentui/solid": ">=0.1.101"
  },
 "peerDependenciesMeta": {
 "@opentui/core": {
@@ -34,8 +34,8 @@
  }
  },
 "devDependencies": {
-"@opentui/core": "catalog:",
-"@opentui/solid": "catalog:",
+"@opentui/core": "0.1.101",
+"@opentui/solid": "0.1.101",
 "@tsconfig/node22": "catalog:",
 "@types/node": "catalog:",
 "typescript": "catalog:",