fix(app): stop the remaining cleanup aborts from pinning disposed batches (#58439)

This commit is contained in:
Luke Parker
2026-10-23 22:05:59 +10:00
committed by GitHub
Unverified
parent 79a143f82b
commit 80ea2130e7
8 changed files with 35 additions and 25 deletions
+3 -2
View File
@@ -1,3 +1,4 @@
import { abort } from "@opencode/util/abort"
import {
batch,
catchError,
@@ -336,7 +337,7 @@ function createHost(input: HostInput) {
// Each handle names its own dialog, so it never closes one another extension or instance opened. Closing a
// dialog that still waits for the app interface, or for its deferred open, cancels it.
const close = () => {
opening.abort()
abort(opening)
waiting.cancel()
dialog.close(id)
}
@@ -750,7 +751,7 @@ function createHost(input: HostInput) {
},
preload: (session) => sessions.forEach((store) => store.get(session)),
dispose() {
controller.abort()
abort(controller)
// One batch: every contribution and contract of the extension disappears in the same frame.
batch(() => {
Array.from(cleanups).reverse().forEach(release)
@@ -1,6 +1,7 @@
import type { FormInfo, FormOption, SessionFormReplyInput, FormStringField } from "@opencode/client/promise"
import { createEffect, createMemo, createResource, on, onCleanup } from "solid-js"
import { createStore } from "solid-js/store"
import { abort } from "@opencode/util/abort"
import type { OpenCodeEventStream } from "@/runtime/server/client"
function webSearchProviderField(form: FormInfo) {
@@ -49,7 +50,7 @@ export function createWebSearchRequest(input: {
createEffect(
on([input.owner, input.connected], () => {
store.sending?.abort.abort()
abort(store.sending?.abort)
setStore({ sending: undefined, selected: "random", error: false })
}),
)
@@ -64,7 +65,7 @@ export function createWebSearchRequest(input: {
},
),
)
onCleanup(() => store.sending?.abort.abort())
onCleanup(() => abort(store.sending?.abort))
const submit = async (selection: string | false) => {
const form = input.request()
@@ -1,6 +1,7 @@
import { createEffect, createMemo, createSignal, on, onCleanup, Show, type Accessor, type JSX } from "solid-js"
import { createStore } from "solid-js/store"
import { Predicate } from "effect"
import { abort } from "@opencode/util/abort"
import { createAnimatedPresence } from "@/runtime/animated-presence"
import type { SessionUserActions } from "@opencode/session-ui/actions"
import { Button } from "@opencode/ui/button"
@@ -113,7 +114,7 @@ export function MessageTimeline(props: MessageTimelineProps) {
// Start the required worker job while the rest of the selected view is constructed.
if (content?.type === "text" && content.text.trim()) {
const preload = new AbortController()
onCleanup(() => preload.abort())
onCleanup(() => abort(preload))
void preloadMarkdown(content.text, tail.group.ref.partID, preload.signal).catch(() => undefined)
}
}
+3 -2
View File
@@ -1,3 +1,4 @@
import { abort } from "@opencode/util/abort"
import { getFilename } from "@opencode/util/path"
import type { Project } from "@/runtime/server/types"
import type { SessionInfo } from "@opencode/client/promise"
@@ -264,7 +265,7 @@ export function createServerSessionEntries(props: {
].toSorted((a, b) => b.time.updated - a.time.updated),
)
onCleanup(() => state.abort?.abort())
onCleanup(() => abort(state.abort))
const entries = (sessions: SessionInfo[], search: string): CommandPaletteEntry[] => {
const projects = props.projects()
@@ -295,7 +296,7 @@ export function createServerSessionEntries(props: {
const search = async (text: string): Promise<CommandPaletteEntry[]> => {
const search = text.trim()
state.abort?.abort()
abort(state.abort)
const current = new AbortController()
state.abort = current
+3 -2
View File
@@ -1,3 +1,4 @@
import { abort } from "@opencode/util/abort"
import { createMemo, createResource, onCleanup } from "solid-js"
import { uniqueCommandPaletteEntries, type CommandPaletteEntry } from "./palette"
@@ -55,12 +56,12 @@ export function createCommandPaletteSearch(props: {
const sources = props.sources.map((load) => {
const state: SourceState = { seen: [] }
onCleanup(() => state.abort?.abort())
onCleanup(() => abort(state.abort))
const [result] = createResource<SourceResult, string>(
query,
async (query, info) => {
state.abort?.abort()
abort(state.abort)
const current = new AbortController()
state.abort = current
const previous = info.value ?? emptyResult
@@ -1,7 +1,8 @@
import { abort } from "@opencode/util/abort"
import { checksum } from "@opencode/util/encode"
import { parseSmallMarkdown } from "@opencode/ui/context/marked-base"
import DOMPurify from "dompurify"
import { MarkdownWorkerDisposedError, parseMarkdown } from "./markdown-worker"
import { markdownWorkerDisposed, parseMarkdown } from "./markdown-worker"
import { localImagePath, localLinkPath } from "./markdown-image"
export type MarkdownCacheEntry = {
@@ -95,7 +96,7 @@ export function touchCachedMarkdown(key: string, value: MarkdownCacheEntry) {
}
export async function preloadMarkdown(text: string, cacheKey: string, signal?: AbortSignal) {
if (signal?.aborted) throw new MarkdownWorkerDisposedError()
if (signal?.aborted) throw markdownWorkerDisposed
const block = { raw: text, src: text }
const key = `${cacheKey}:0:full`
@@ -135,7 +136,7 @@ export function getReadyMarkdown(block: { raw: string; src: string }, key?: stri
}
export async function renderCachedMarkdown(block: { raw: string; src: string }, key?: string, signal?: AbortSignal) {
if (signal?.aborted) throw new MarkdownWorkerDisposedError()
if (signal?.aborted) throw markdownWorkerDisposed
const cached = key ? getCachedMarkdown(key) : undefined
if (key && cached && (cached.src ?? cached.raw) === block.src) {
@@ -152,21 +153,21 @@ export async function renderCachedMarkdown(block: { raw: string; src: string },
return new Promise<MarkdownCacheEntry>((resolve, reject) => {
const release = () => {
signal?.removeEventListener("abort", abort)
signal?.removeEventListener("abort", cancel)
// A disposed consumer must not cancel another consumer's shared parse.
if (!job.consumers.delete(consumer) || job.consumers.size > 0) return
job.controller.abort()
abort(job.controller)
if (key && pending.get(key) === job) pending.delete(key)
}
const abort = () => {
const cancel = () => {
release()
reject(new MarkdownWorkerDisposedError())
reject(markdownWorkerDisposed)
}
signal?.addEventListener("abort", abort, { once: true })
signal?.addEventListener("abort", cancel, { once: true })
void job.promise.then(resolve, reject).finally(release)
})
}
@@ -176,7 +177,7 @@ function startMarkdown(block: { raw: string; src: string }, key?: string) {
const promise = parseMarkdown(block.src, controller.signal)
.then((html) => {
if (controller.signal.aborted) throw new MarkdownWorkerDisposedError()
if (controller.signal.aborted) throw markdownWorkerDisposed
const hash = checksum(block.src)
const result = { raw: block.raw, src: block.src, hash: hash ?? "", html: sanitizeMarkdown(html) }
@@ -67,12 +67,12 @@ const projectTransport = createWorkerTransport<Extract<MarkdownWorkerRequest, {
})
export function parseMarkdown(text: string, signal: AbortSignal) {
if (signal.aborted) return Promise.reject(new MarkdownWorkerDisposedError())
if (signal.aborted) return Promise.reject(markdownWorkerDisposed)
const instance = getWorker()
const id = ++nextID
const abort = () => {
parses.get(id)?.reject(new MarkdownWorkerDisposedError())
parses.get(id)?.reject(markdownWorkerDisposed)
parses.delete(id)
}
@@ -101,7 +101,7 @@ export function disposeMarkdownProjection(key: string) {
projects.forEach((request, id) => {
if (request.key !== key) return
projects.delete(id)
request.reject(new MarkdownWorkerDisposedError())
request.reject(markdownWorkerDisposed)
})
worker?.postMessage({ type: "dispose", key } satisfies MarkdownWorkerRequest)
}
@@ -129,13 +129,17 @@ export function disposeStreamingCode(key: string) {
pending.forEach((request, id) => {
if (request.key !== key) return
pending.delete(id)
request.reject(new MarkdownWorkerDisposedError())
request.reject(markdownWorkerDisposed)
})
worker?.postMessage({ type: "dispose", key } satisfies MarkdownWorkerRequest)
}
export class MarkdownWorkerDisposedError extends Error {}
// Made once: disposal rejects from inside a Solid cleanup, and a new error there would record that stack and keep the
// whole disposing batch alive for as long as the rejected promise is reachable.
export const markdownWorkerDisposed = new MarkdownWorkerDisposedError()
export class MarkdownWorkerSupersededError extends Error {}
export class MarkdownWorkerUnavailableError extends Error {}
@@ -226,7 +230,7 @@ function getWorker() {
pending.delete(event.data.id)
if (!keys.has(key)) {
result.reject(new MarkdownWorkerDisposedError())
result.reject(markdownWorkerDisposed)
transport.complete(key, event.data.id)
return
+2 -2
View File
@@ -4,6 +4,6 @@
// made once, so its stack holds only this module's load.
const reason = new DOMException("signal is aborted without reason", "AbortError")
export function abort(controller: AbortController) {
controller.abort(reason)
export function abort(controller: AbortController | undefined) {
controller?.abort(reason)
}