Skip to content
Merged
Show file tree
Hide file tree
Changes from 7 commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ describe("desktop sidecar source guard", () => {
expect(source).toContain('app.setPath("logs", join(app.getPath("userData"), "logs"))')
expect(source).toContain('logger.log("server ready", { url: res.url })')
expect(source).toContain('logger.log("init done")')
expect(source).toContain("server.stop(true)")
expect(source).not.toContain("sqliteFileExists")
expect(source).not.toContain('username: "opencode"')
})
Expand Down
2 changes: 1 addition & 1 deletion packages/desktop-electron/src/main/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -615,7 +615,7 @@ registerAboutIpc()

function killSidecar() {
if (!server) return
server.stop()
server.stop(true)
server = null
}

Expand Down
117 changes: 108 additions & 9 deletions packages/opencode/src/pty/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,15 @@ import { envValueCaseInsensitive, withoutInternalServerAuthEnv } from "@/util/en
import { PtyID } from "./schema"
import { Effect, Layer, Context } from "effect"
import * as EffectLogger from "@opencode-ai/core/effect/logger"
import { setTimeout as sleep } from "node:timers/promises"

export namespace Pty {
const log = Log.create({ service: "pty" })

const BUFFER_LIMIT = 1024 * 1024 * 2
const BUFFER_CHUNK = 64 * 1024
const TERMINATION_GRACE_MS = 200
const EXIT_WAIT_MS = 1000
const encoder = new TextEncoder()

type Socket = {
Expand All @@ -42,6 +45,7 @@ export namespace Pty {
type State = {
dir: string
sessions: Map<PtyID, Active>
cleanupTasks: Set<Promise<void>>
}

// WebSocket control frame: 0x00 + UTF-8 JSON.
Expand Down Expand Up @@ -121,10 +125,8 @@ export namespace Pty {
Effect.gen(function* () {
const bus = yield* Bus.Service
const plugin = yield* Plugin.Service
function teardown(session: Active) {
try {
session.process.kill()
} catch {}

function closeSubscribers(session: Active) {
for (const [sub, ws] of session.subscribers.entries()) {
try {
if (sock(ws) === sub) ws.close()
Expand All @@ -133,17 +135,102 @@ export namespace Pty {
session.subscribers.clear()
}

function waitForExit(session: Active) {
if (session.info.status === "exited") return Promise.resolve()
return new Promise<void>((resolve) => {
const timer = setTimeout(resolve, EXIT_WAIT_MS)
const sub = session.process.onExit(() => {
clearTimeout(timer)
sub.dispose()
resolve()
})
})
}
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved

function processExists(pid: number) {
try {
process.kill(pid, 0)
return true
} catch {
return false
}
}

const hasExited = (session: Active) => session.info.status === "exited" || !processExists(session.process.pid)

async function descendantPids(pid: number) {
if (process.platform === "win32") return []
const seen = new Set<number>()
const pending = [pid]
while (pending.length) {
const parent = pending.pop()!
const out = await Bun.$`pgrep -P ${parent}`.quiet().nothrow().text()
for (const line of out.split(/\s+/)) {
const child = Number(line)
if (!Number.isInteger(child) || child <= 0 || seen.has(child)) continue
seen.add(child)
pending.push(child)
}
}
return Array.from(seen)
}

function signalProcess(session: Active, signal: string) {
if (session.info.status === "exited") return
try {
session.process.kill(signal)
} catch {}
}

const terminate = Effect.fn("Pty.terminate")(function* (session: Active) {
if (hasExited(session)) return
const exited = waitForExit(session)
if (process.platform === "win32") {
signalProcess(session, "SIGTERM")
yield* Effect.promise(() => exited)
return
}

const descendants = yield* Effect.promise(() => descendantPids(session.process.pid))
signalProcess(session, "SIGTERM")
for (const child of descendants) {
try {
if (processExists(child)) process.kill(child, "SIGTERM")
} catch {}
}
yield* Effect.promise(() =>
Promise.race([exited.then(() => true), sleep(TERMINATION_GRACE_MS).then(() => false)]),
)
if (hasExited(session)) return
signalProcess(session, "SIGKILL")
for (const child of descendants) {
try {
if (processExists(child)) process.kill(child, "SIGKILL")
} catch {}
}
yield* Effect.promise(() => exited)
})

const teardown = Effect.fn("Pty.teardown")(function* (session: Active) {
closeSubscribers(session)
yield* terminate(session)
})

const state = yield* InstanceState.make<State>(
Effect.fn("Pty.state")(function* (ctx) {
const state = {
dir: ctx.directory,
sessions: new Map<PtyID, Active>(),
cleanupTasks: new Set<Promise<void>>(),
}

yield* Effect.addFinalizer(() =>
Effect.sync(() => {
Effect.gen(function* () {
if (state.cleanupTasks.size) {
yield* Effect.promise(() => Promise.allSettled(state.cleanupTasks)).pipe(Effect.asVoid)
}
for (const session of state.sessions.values()) {
teardown(session)
yield* teardown(session)
}
state.sessions.clear()
}),
Expand All @@ -153,13 +240,20 @@ export namespace Pty {
}),
)

const trackCleanup = (s: State, effect: Effect.Effect<void>) => {
const task = Effect.runPromise(effect.pipe(Effect.provide(EffectLogger.layer))).finally(() => {
s.cleanupTasks.delete(task)
})
s.cleanupTasks.add(task)
}

const remove = Effect.fn("Pty.remove")(function* (id: PtyID) {
const s = yield* InstanceState.get(state)
const session = s.sessions.get(id)
if (!session) return
s.sessions.delete(id)
log.info("removing session", { id })
teardown(session)
yield* teardown(session)
yield* bus.publish(Event.Deleted, { id: session.info.id })
})

Expand Down Expand Up @@ -264,8 +358,13 @@ export namespace Pty {
if (session.info.status === "exited") return
log.info("session exited", { id, exitCode })
session.info.status = "exited"
Effect.runFork(bus.publish(Event.Exited, { id, exitCode }).pipe(Effect.provide(EffectLogger.layer)))
Effect.runFork(remove(id).pipe(Effect.provide(EffectLogger.layer)))
trackCleanup(
s,
Effect.gen(function* () {
yield* bus.publish(Event.Exited, { id, exitCode })
yield* remove(id)
}),
)
}),
)
yield* bus.publish(Event.Created, { info })
Expand Down
34 changes: 28 additions & 6 deletions packages/opencode/src/session/llm.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Provider } from "@/provider/provider"
import { Log } from "@opencode-ai/core/util/log"
import { Context, Effect, Layer, Record } from "effect"
import { Context, Duration, Effect, Layer, Record } from "effect"
import * as Stream from "effect/Stream"
import { streamText, wrapLanguageModel, type ModelMessage, type Tool, tool, jsonSchema } from "ai"
import { mergeDeep, pipe } from "remeda"
Expand All @@ -25,6 +25,7 @@ import * as Option from "effect/Option"

const log = Log.create({ service: "llm" })
export const OUTPUT_TOKEN_MAX = ProviderTransform.OUTPUT_TOKEN_MAX
export const SILENT_STREAM_TIMEOUT_MS = Duration.toMillis(Duration.minutes(10))
type Result = Awaited<ReturnType<typeof streamText>>

export type StreamInput = {
Expand All @@ -39,6 +40,7 @@ export type StreamInput = {
small?: boolean
tools: Record<string, Tool>
retries?: number
streamTimeoutMs?: number
toolChoice?: "auto" | "required" | "none"
}

Expand Down Expand Up @@ -399,14 +401,34 @@ const live: Layer.Layer<
Stream.scoped(
Stream.unwrap(
Effect.gen(function* () {
const ctrl = yield* Effect.acquireRelease(
Effect.sync(() => new AbortController()),
(ctrl) => Effect.sync(() => ctrl.abort()),
const timeoutMs = input.streamTimeoutMs ?? SILENT_STREAM_TIMEOUT_MS
Comment thread
coderabbitai[bot] marked this conversation as resolved.
Resolved
const request = yield* Effect.acquireRelease(
Effect.sync(() => {
const ctrl = new AbortController()
let timeout = setTimeout(() => ctrl.abort(), timeoutMs)
return {
ctrl,
resetTimeout() {
clearTimeout(timeout)
timeout = setTimeout(() => ctrl.abort(), timeoutMs)
},
cleanup() {
clearTimeout(timeout)
ctrl.abort()
},
}
}),
(request) => Effect.sync(() => request.cleanup()),
)

const result = yield* run({ ...input, abort: ctrl.signal })
const result = yield* run({ ...input, abort: request.ctrl.signal })

return Stream.fromAsyncIterable(result.fullStream, (e) => (e instanceof Error ? e : new Error(String(e))))
// This is a silent-stream timeout: it limits how long we wait for
// the next provider event, not the total model runtime.
return Stream.fromAsyncIterable(result.fullStream, (e) => (e instanceof Error ? e : new Error(String(e)))).pipe(
Stream.tap(() => Effect.sync(() => request.resetTimeout())),
Stream.timeout(Duration.millis(timeoutMs)),
)
}),
),
)
Expand Down
Loading
Loading