fix: additional memory leak fixes across TUI, bus, PTY, and core

- Add onCleanup for all sdk.event.on() listeners in app.tsx, session route,
  and prompt component to prevent listener accumulation on re-render
- Add onCleanup for process SIGUSR2 handler in theme provider
- Add onCleanup for leader timeout in keybind provider
- Clear event queue on SDK context cleanup
- Remove empty subscription arrays in Bus and RPC listener maps
- Clear warning timeout in state disposal after completion
- Clear models refresh interval on process exit
- Add dispose() to ShareNext to clear pending sync timeouts
- Clear PTY session buffer on removal to free memory immediately

Co-Authored-By: Claude Opus 4.6 <[email protected]>

Author: 2 people

packages/opencode/src/bus/index.ts

@@ -100,6 +100,7 @@ export namespace Bus {
       const index = match.indexOf(callback)
       if (index === -1) return
       match.splice(index, 1)
+      if (match.length === 0) subscriptions.delete(type)
     }
   }
 

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

@@ -3,7 +3,7 @@ import { Clipboard } from "@tui/util/clipboard"
 import { Selection } from "@tui/util/selection"
 import { MouseButton, TextAttributes } from "@opentui/core"
 import { RouteProvider, useRoute } from "@tui/context/route"
-import { Switch, Match, createEffect, untrack, ErrorBoundary, createSignal, onMount, batch, Show, on } from "solid-js"
+import { Switch, Match, createEffect, untrack, ErrorBoundary, createSignal, onMount, onCleanup, batch, Show, on } from "solid-js"
 import { win32DisableProcessedInput, win32FlushInputBuffer, win32InstallCtrlCGuard } from "./win32"
 import { Installation } from "@/installation"
 import { Flag } from "@/flag/flag"
@@ -691,66 +691,69 @@ function App() {
     }
   })
 
-  sdk.event.on(TuiEvent.CommandExecute.type, (evt) => {
-    command.trigger(evt.properties.command)
-  })
-
-  sdk.event.on(TuiEvent.ToastShow.type, (evt) => {
-    toast.show({
-      title: evt.properties.title,
-      message: evt.properties.message,
-      variant: evt.properties.variant,
-      duration: evt.properties.duration,
-    })
-  })
-
-  sdk.event.on(TuiEvent.SessionSelect.type, (evt) => {
-    route.navigate({
-      type: "session",
-      sessionID: evt.properties.sessionID,
-    })
-  })
+  const unsubs = [
+    sdk.event.on(TuiEvent.CommandExecute.type, (evt) => {
+      command.trigger(evt.properties.command)
+    }),
 
-  sdk.event.on(SessionApi.Event.Deleted.type, (evt) => {
-    if (route.data.type === "session" && route.data.sessionID === evt.properties.info.id) {
-      route.navigate({ type: "home" })
+    sdk.event.on(TuiEvent.ToastShow.type, (evt) => {
       toast.show({
-        variant: "info",
-        message: "The current session was deleted",
+        title: evt.properties.title,
+        message: evt.properties.message,
+        variant: evt.properties.variant,
+        duration: evt.properties.duration,
       })
-    }
-  })
+    }),
 
-  sdk.event.on(SessionApi.Event.Error.type, (evt) => {
-    const error = evt.properties.error
-    if (error && typeof error === "object" && error.name === "MessageAbortedError") return
-    const message = (() => {
-      if (!error) return "An error occurred"
+    sdk.event.on(TuiEvent.SessionSelect.type, (evt) => {
+      route.navigate({
+        type: "session",
+        sessionID: evt.properties.sessionID,
+      })
+    }),
 
-      if (typeof error === "object") {
-        const data = error.data
-        if ("message" in data && typeof data.message === "string") {
-          return data.message
-        }
+    sdk.event.on(SessionApi.Event.Deleted.type, (evt) => {
+      if (route.data.type === "session" && route.data.sessionID === evt.properties.info.id) {
+        route.navigate({ type: "home" })
+        toast.show({
+          variant: "info",
+          message: "The current session was deleted",
+        })
       }
-      return String(error)
-    })()
+    }),
+
+    sdk.event.on(SessionApi.Event.Error.type, (evt) => {
+      const error = evt.properties.error
+      if (error && typeof error === "object" && error.name === "MessageAbortedError") return
+      const message = (() => {
+        if (!error) return "An error occurred"
+
+        if (typeof error === "object") {
+          const data = error.data
+          if ("message" in data && typeof data.message === "string") {
+            return data.message
+          }
+        }
+        return String(error)
+      })()
 
-    toast.show({
-      variant: "error",
-      message,
-      duration: 5000,
-    })
-  })
+      toast.show({
+        variant: "error",
+        message,
+        duration: 5000,
+      })
+    }),
 
-  sdk.event.on(Installation.Event.UpdateAvailable.type, (evt) => {
-    toast.show({
-      variant: "info",
-      title: "Update Available",
-      message: `OpenCode v${evt.properties.version} is available. Run 'opencode upgrade' to update manually.`,
-      duration: 10000,
-    })
-  })
+    sdk.event.on(Installation.Event.UpdateAvailable.type, (evt) => {
+      toast.show({
+        variant: "info",
+        title: "Update Available",
+        message: `OpenCode v${evt.properties.version} is available. Run 'opencode upgrade' to update manually.`,
+        duration: 10000,
+      })
+    }),
+  ]
+  onCleanup(() => unsubs.forEach((fn) => fn()))
 
   return (
     <box

packages/opencode/src/cli/cmd/tui/component/prompt/index.tsx

@@ -97,7 +97,7 @@ export function Prompt(props: PromptProps) {
   const pasteStyleId = syntax().getStyleId("extmark.paste")!
   let promptPartTypeId = 0
 
-  sdk.event.on(TuiEvent.PromptAppend.type, (evt) => {
+  const unsubPromptAppend = sdk.event.on(TuiEvent.PromptAppend.type, (evt) => {
     if (!input || input.isDestroyed) return
     input.insertText(evt.properties.text)
     setTimeout(() => {
@@ -108,6 +108,7 @@ export function Prompt(props: PromptProps) {
       renderer.requestRender()
     }, 0)
   })
+  onCleanup(unsubPromptAppend)
 
   createEffect(() => {
     if (props.disabled) input.cursorColor = theme.backgroundElement

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

@@ -1,4 +1,4 @@
-import { createMemo } from "solid-js"
+import { createMemo, onCleanup } from "solid-js"
 import { Keybind } from "@/util/keybind"
 import { pipe, mapValues } from "remeda"
 import type { TuiConfig } from "@/config/tui"
@@ -27,6 +27,7 @@ export const { use: useKeybind, provider: KeybindProvider } = createSimpleContex
 
     let focus: Renderable | null
     let timeout: NodeJS.Timeout
+    onCleanup(() => { if (timeout) clearTimeout(timeout) })
     function leader(active: boolean) {
       if (active) {
         setStore("leader", true)

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

@@ -108,6 +108,7 @@ export const { use: useSDK, provider: SDKProvider } = createSimpleContext({
       abort.abort()
       sse?.abort()
       if (timer) clearTimeout(timer)
+      queue.length = 0
     })
 
     return {

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

@@ -1,6 +1,6 @@
 import { SyntaxStyle, RGBA, type TerminalColors } from "@opentui/core"
 import path from "path"
-import { createEffect, createMemo, onMount } from "solid-js"
+import { createEffect, createMemo, onCleanup, onMount } from "solid-js"
 import { createSimpleContext } from "./helper"
 import { Glob } from "../../../../util/glob"
 import aura from "./theme/aura.json" with { type: "json" }
@@ -347,10 +347,12 @@ export const { use: useTheme, provider: ThemeProvider } = createSimpleContext({
     }
 
     const renderer = useRenderer()
-    process.on("SIGUSR2", async () => {
+    const sigusr2Handler = async () => {
       renderer.clearPaletteCache()
       init()
-    })
+    }
+    process.on("SIGUSR2", sigusr2Handler)
+    onCleanup(() => process.off("SIGUSR2", sigusr2Handler))
 
     const values = createMemo(() => {
       return resolveTheme(store.themes[store.active] ?? store.themes.opencode, store.mode)

packages/opencode/src/cli/cmd/tui/routes/session/index.tsx

@@ -7,6 +7,7 @@ import {
   For,
   Match,
   on,
+  onCleanup,
   onMount,
   Show,
   Switch,
@@ -215,7 +216,7 @@ export function Session() {
   })
 
   let lastSwitch: string | undefined = undefined
-  sdk.event.on("message.part.updated", (evt) => {
+  const unsubPartUpdated = sdk.event.on("message.part.updated", (evt) => {
     const part = evt.properties.part
     if (part.type !== "tool") return
     if (part.sessionID !== route.sessionID) return
@@ -230,6 +231,7 @@ export function Session() {
       lastSwitch = part.id
     }
   })
+  onCleanup(unsubPartUpdated)
 
   let scroll: ScrollBoxRenderable
   let prompt: PromptRef

packages/opencode/src/project/state.ts

@@ -36,14 +36,15 @@ export namespace State {
 
     let disposalFinished = false
 
-    setTimeout(() => {
+    const warnTimeout = setTimeout(() => {
       if (!disposalFinished) {
         log.warn(
           "state disposal is taking an unusually long time - if it does not complete in a reasonable time, please report this as a bug",
           { key },
         )
       }
-    }, 10000).unref()
+    }, 10000)
+    warnTimeout.unref()
 
     const tasks: Promise<void>[] = []
     for (const [init, entry] of entries) {
@@ -64,6 +65,7 @@ export namespace State {
     entries.clear()
     recordsByKey.delete(key)
 
+    clearTimeout(warnTimeout)
     disposalFinished = true
     log.info("state disposal completed", { key })
   }

packages/opencode/src/provider/models.ts

@@ -123,10 +123,12 @@ export namespace ModelsDev {
 
 if (!Flag.OPENCODE_DISABLE_MODELS_FETCH && !process.argv.includes("--get-yargs-completions")) {
   ModelsDev.refresh()
-  setInterval(
+  const modelsRefreshInterval = setInterval(
     async () => {
       await ModelsDev.refresh()
     },
     60 * 1000 * 60,
-  ).unref()
+  )
+  modelsRefreshInterval.unref()
+  process.on("exit", () => clearInterval(modelsRefreshInterval))
 }

packages/opencode/src/pty/index.ts

@@ -234,6 +234,7 @@ export namespace Pty {
       }
     }
     session.subscribers.clear()
+    session.buffer = ""
     Bus.publish(Event.Deleted, { id })
   }