Skip to content

fix(opencode): handle client disconnect in SSE stream writes #15147

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
zaxbysauce wants to merge 2 commits into
base: dev
Choose a base branch
from
+72 −36
Open

fix(opencode): handle client disconnect in SSE stream writes #15147

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3ba7bb3
fix(opencode): handle client disconnect in SSE stream writes
Feb 26, 2026
055eacb
Merge branch 'dev' into fix/sse-client-disconnect-handling
zaxbysauce Feb 26, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 36 additions & 18 deletions packages/opencode/src/server/routes/global.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,33 +69,51 @@ export const GlobalRoutes = lazy(() =>
c.header("X-Accel-Buffering", "no")
c.header("X-Content-Type-Options", "nosniff")
return streamSSE(c, async (stream) => {
stream.writeSSE({
data: JSON.stringify({
payload: {
type: "server.connected",
properties: {},
},
}),
})
async function handler(event: any) {
await stream.writeSSE({
data: JSON.stringify(event),
})
}
GlobalBus.on("event", handler)

// Send heartbeat every 10s to prevent stalled proxy streams.
const heartbeat = setInterval(() => {
try {
stream.writeSSE({
data: JSON.stringify({
payload: {
type: "server.heartbeat",
type: "server.connected",
properties: {},
},
}),
})
} catch {
log.info("global event disconnected (initial write failed)")
return
}

// Heartbeat must be declared before handler to avoid confusion
const heartbeat = setInterval(() => {
try {
stream.writeSSE({
data: JSON.stringify({
payload: {
type: "server.heartbeat",
properties: {},
},
}),
})
} catch {
clearInterval(heartbeat)
GlobalBus.off("event", handler)
log.info("global event disconnected (heartbeat failed)")
}
}, 10_000)

async function handler(event: any) {
try {
await stream.writeSSE({
data: JSON.stringify(event),
})
} catch {
clearInterval(heartbeat)
GlobalBus.off("event", handler)
log.info("global event disconnected (write failed)")
}
}
GlobalBus.on("event", handler)

await new Promise<void>((resolve) => {
stream.onAbort(() => {
clearInterval(heartbeat)
Expand Down
54 changes: 36 additions & 18 deletions packages/opencode/src/server/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,31 +504,49 @@ export namespace Server {
c.header("X-Accel-Buffering", "no")
c.header("X-Content-Type-Options", "nosniff")
return streamSSE(c, async (stream) => {
stream.writeSSE({
data: JSON.stringify({
type: "server.connected",
properties: {},
}),
})
const unsub = Bus.subscribeAll(async (event) => {
await stream.writeSSE({
data: JSON.stringify(event),
})
if (event.type === Bus.InstanceDisposed.type) {
stream.close()
}
})

// Send heartbeat every 10s to prevent stalled proxy streams.
const heartbeat = setInterval(() => {
try {
stream.writeSSE({
data: JSON.stringify({
type: "server.heartbeat",
type: "server.connected",
properties: {},
}),
})
} catch {
log.info("event disconnected (initial write failed)")
return
}

// Heartbeat must be declared before subscription to avoid confusion
const heartbeat = setInterval(() => {
try {
stream.writeSSE({
data: JSON.stringify({
type: "server.heartbeat",
properties: {},
}),
})
} catch {
clearInterval(heartbeat)
unsub()
log.info("event disconnected (heartbeat failed)")
}
}, 10_000)

const unsub = Bus.subscribeAll(async (event) => {
try {
await stream.writeSSE({
data: JSON.stringify(event),
})
if (event.type === Bus.InstanceDisposed.type) {
stream.close()
}
} catch {
clearInterval(heartbeat)
unsub()
log.info("event disconnected (write failed)")
}
})

await new Promise<void>((resolve) => {
stream.onAbort(() => {
clearInterval(heartbeat)
Expand Down
Loading