The open source coding agent.
TypeScript
refactor(effect): inline session processor interrupt cleanup (#21593)
Kit Langton8bdcc22541e0
diff --git a/packages/opencode/src/file/time.ts b/packages/opencode/src/file/time.tsindex bd2b5f04f36..d5ca3db8534 100644--- a/packages/opencode/src/file/time.ts+++ b/packages/opencode/src/file/time.ts@@ -46,7 +46,7 @@ export namespace FileTime {const disableCheck = yield* Flag.OPENCODE_DISABLE_FILETIME_CHECKconst stamp = Effect.fnUntraced(function* (file: string) {- const info = yield* fsys.stat(file).pipe(Effect.catch(() => Effect.succeed(undefined)))+ const info = yield* fsys.stat(file).pipe(Effect.catch(() => Effect.void))return {read: yield* DateTime.nowAsDate,mtime: info ? Option.getOrUndefined(info.mtime)?.getTime() : undefined,diff --git a/packages/opencode/src/mcp/index.ts b/packages/opencode/src/mcp/index.tsindex 8c92bb6b2e6..45e3e2567a2 100644--- a/packages/opencode/src/mcp/index.ts+++ b/packages/opencode/src/mcp/index.ts@@ -501,7 +501,7 @@ export namespace MCP {return}- const result = yield* create(key, mcp).pipe(Effect.catch(() => Effect.succeed(undefined)))+ const result = yield* create(key, mcp).pipe(Effect.catch(() => Effect.void))if (!result) returns.status[key] = result.statusdiff --git a/packages/opencode/src/project/project.ts b/packages/opencode/src/project/project.tsindex f4b8b940d20..f587f50b399 100644--- a/packages/opencode/src/project/project.ts+++ b/packages/opencode/src/project/project.ts@@ -158,7 +158,7 @@ export namespace Project {return yield* fs.readFileString(pathSvc.join(dir, "opencode")).pipe(Effect.map((x) => x.trim()),Effect.map(ProjectID.make),- Effect.catch(() => Effect.succeed(undefined)),+ Effect.catch(() => Effect.void),)})diff --git a/packages/opencode/src/session/compaction.ts b/packages/opencode/src/session/compaction.tsindex bbdce9fd747..0961c20a6e1 100644--- a/packages/opencode/src/session/compaction.ts+++ b/packages/opencode/src/session/compaction.ts@@ -253,23 +253,21 @@ When constructing the summary, try to stick to this template:sessionID: input.sessionID,model,})- const result = yield* processor- .process({- user: userMessage,- agent,- sessionID: input.sessionID,- tools: {},- system: [],- messages: [- ...modelMessages,- {- role: "user",- content: [{ type: "text", text: prompt }],- },- ],- model,- })- .pipe(Effect.onInterrupt(() => processor.abort()))+ const result = yield* processor.process({+ user: userMessage,+ agent,+ sessionID: input.sessionID,+ tools: {},+ system: [],+ messages: [+ ...modelMessages,+ {+ role: "user",+ content: [{ type: "text", text: prompt }],+ },+ ],+ model,+ })if (result === "compact") {processor.message.error = new MessageV2.ContextOverflowError({diff --git a/packages/opencode/src/session/processor.ts b/packages/opencode/src/session/processor.tsindex 146c73f2771..74c4a0cdbd6 100644--- a/packages/opencode/src/session/processor.ts+++ b/packages/opencode/src/session/processor.ts@@ -30,7 +30,6 @@ export namespace SessionProcessor {export interface Handle {readonly message: MessageV2.Assistantreadonly partFromToolCall: (toolCallID: string) => MessageV2.ToolPart | undefined- readonly abort: () => Effect.Effect<void>readonly process: (streamInput: LLM.StreamInput) => Effect.Effect<Result>}@@ -429,19 +428,6 @@ export namespace SessionProcessor {yield* status.set(ctx.sessionID, { type: "idle" })})- const abort = Effect.fn("SessionProcessor.abort")(() =>- Effect.gen(function* () {- if (!ctx.assistantMessage.error) {- yield* halt(new DOMException("Aborted", "AbortError"))- }- if (!ctx.assistantMessage.time.completed) {- yield* cleanup()- return- }- yield* session.updateMessage(ctx.assistantMessage)- }),- )-const process = Effect.fn("SessionProcessor.process")(function* (streamInput: LLM.StreamInput) {log.info("process")ctx.needsCompaction = false@@ -459,7 +445,14 @@ export namespace SessionProcessor {Stream.runDrain,)}).pipe(- Effect.onInterrupt(() => Effect.sync(() => void (aborted = true))),+ Effect.onInterrupt(() =>+ Effect.gen(function* () {+ aborted = true+ if (!ctx.assistantMessage.error) {+ yield* halt(new DOMException("Aborted", "AbortError"))+ }+ }),+ ),Effect.catchCauseIf((cause) => !Cause.hasInterruptsOnly(cause),(cause) => Effect.fail(Cause.squash(cause)),@@ -480,13 +473,10 @@ export namespace SessionProcessor {Effect.ensuring(cleanup()),)- if (aborted && !ctx.assistantMessage.error) {- yield* abort()- }if (ctx.needsCompaction) return "compact"- if (ctx.blocked || ctx.assistantMessage.error || aborted) return "stop"+ if (ctx.blocked || ctx.assistantMessage.error) return "stop"return "continue"- }).pipe(Effect.onInterrupt(() => abort().pipe(Effect.asVoid)))+ })})return {@@ -496,7 +486,6 @@ export namespace SessionProcessor {partFromToolCall(toolCallID: string) {return ctx.toolcalls[toolCallID]},- abort,process,} satisfies Handle})diff --git a/packages/opencode/src/session/prompt.ts b/packages/opencode/src/session/prompt.tsindex a18f9e37909..118206332b3 100644--- a/packages/opencode/src/session/prompt.ts+++ b/packages/opencode/src/session/prompt.ts@@ -964,9 +964,7 @@ NOTE: At any point in time through this workflow you should feel free to ask theconst same = ag.model && model.providerID === ag.model.providerID && model.modelID === ag.model.modelIDconst full =!input.variant && ag.variant && same- ? yield* provider- .getModel(model.providerID, model.modelID)- .pipe(Effect.catch(() => Effect.succeed(undefined)))+ ? yield* provider.getModel(model.providerID, model.modelID).pipe(Effect.catchDefect(() => Effect.void)): undefinedconst variant = input.variant ?? (ag.variant && full?.variants?.[ag.variant] ? ag.variant : undefined)@@ -986,9 +984,7 @@ NOTE: At any point in time through this workflow you should feel free to ask theformat: input.format,}- yield* Effect.addFinalizer(() =>- InstanceState.withALS(() => instruction.clear(info.id)).pipe(Effect.flatMap((x) => x)),- )+ yield* Effect.addFinalizer(() => instruction.clear(info.id))type Draft<T> = T extends MessageV2.Part ? Omit<T, "id"> & { id?: string } : neverconst assign = (part: Draft<MessageV2.Part>): MessageV2.Part => ({@@ -1459,110 +1455,104 @@ NOTE: At any point in time through this workflow you should feel free to ask themodel,})- const outcome: "break" | "continue" = yield* Effect.onExit(- Effect.gen(function* () {- const lastUserMsg = msgs.findLast((m) => m.info.role === "user")- const bypassAgentCheck = lastUserMsg?.parts.some((p) => p.type === "agent") ?? false-- const tools = yield* resolveTools({- agent,- session,- model,- tools: lastUser.tools,- processor: handle,- bypassAgentCheck,- messages: msgs,- })+ const outcome: "break" | "continue" = yield* Effect.gen(function* () {+ const lastUserMsg = msgs.findLast((m) => m.info.role === "user")+ const bypassAgentCheck = lastUserMsg?.parts.some((p) => p.type === "agent") ?? false- if (lastUser.format?.type === "json_schema") {- tools["StructuredOutput"] = createStructuredOutputTool({- schema: lastUser.format.schema,- onSuccess(output) {- structured = output- },- })- }+ const tools = yield* resolveTools({+ agent,+ session,+ model,+ tools: lastUser.tools,+ processor: handle,+ bypassAgentCheck,+ messages: msgs,+ })- if (step === 1) SessionSummary.summarize({ sessionID, messageID: lastUser.id })-- if (step > 1 && lastFinished) {- for (const m of msgs) {- if (m.info.role !== "user" || m.info.id <= lastFinished.id) continue- for (const p of m.parts) {- if (p.type !== "text" || p.ignored || p.synthetic) continue- if (!p.text.trim()) continue- p.text = [- "<system-reminder>",- "The user sent the following message:",- p.text,- "",- "Please address this message and continue with your tasks.",- "</system-reminder>",- ].join("\n")- }+ if (lastUser.format?.type === "json_schema") {+ tools["StructuredOutput"] = createStructuredOutputTool({+ schema: lastUser.format.schema,+ onSuccess(output) {+ structured = output+ },+ })+ }++ if (step === 1) SessionSummary.summarize({ sessionID, messageID: lastUser.id })++ if (step > 1 && lastFinished) {+ for (const m of msgs) {+ if (m.info.role !== "user" || m.info.id <= lastFinished.id) continue+ for (const p of m.parts) {+ if (p.type !== "text" || p.ignored || p.synthetic) continue+ if (!p.text.trim()) continue+ p.text = [+ "<system-reminder>",+ "The user sent the following message:",+ p.text,+ "",+ "Please address this message and continue with your tasks.",+ "</system-reminder>",+ ].join("\n")}}+ }- yield* plugin.trigger("experimental.chat.messages.transform", {}, { messages: msgs })-- const [skills, env, instructions, modelMsgs] = yield* Effect.all([- Effect.promise(() => SystemPrompt.skills(agent)),- Effect.promise(() => SystemPrompt.environment(model)),- instruction.system().pipe(Effect.orDie),- Effect.promise(() => MessageV2.toModelMessages(msgs, model)),- ])- const system = [...env, ...(skills ? [skills] : []), ...instructions]- const format = lastUser.format ?? { type: "text" as const }- if (format.type === "json_schema") system.push(STRUCTURED_OUTPUT_SYSTEM_PROMPT)- const result = yield* handle.process({- user: lastUser,- agent,- permission: session.permission,- sessionID,- parentSessionID: session.parentID,- system,- messages: [...modelMsgs, ...(isLastStep ? [{ role: "assistant" as const, content: MAX_STEPS }] : [])],- tools,- model,- toolChoice: format.type === "json_schema" ? "required" : undefined,- })+ yield* plugin.trigger("experimental.chat.messages.transform", {}, { messages: msgs })++ const [skills, env, instructions, modelMsgs] = yield* Effect.all([+ Effect.promise(() => SystemPrompt.skills(agent)),+ Effect.promise(() => SystemPrompt.environment(model)),+ instruction.system().pipe(Effect.orDie),+ Effect.promise(() => MessageV2.toModelMessages(msgs, model)),+ ])+ const system = [...env, ...(skills ? [skills] : []), ...instructions]+ const format = lastUser.format ?? { type: "text" as const }+ if (format.type === "json_schema") system.push(STRUCTURED_OUTPUT_SYSTEM_PROMPT)+ const result = yield* handle.process({+ user: lastUser,+ agent,+ permission: session.permission,+ sessionID,+ parentSessionID: session.parentID,+ system,+ messages: [...modelMsgs, ...(isLastStep ? [{ role: "assistant" as const, content: MAX_STEPS }] : [])],+ tools,+ model,+ toolChoice: format.type === "json_schema" ? "required" : undefined,+ })++ if (structured !== undefined) {+ handle.message.structured = structured+ handle.message.finish = handle.message.finish ?? "stop"+ yield* sessions.updateMessage(handle.message)+ return "break" as const+ }- if (structured !== undefined) {- handle.message.structured = structured- handle.message.finish = handle.message.finish ?? "stop"+ const finished = handle.message.finish && !["tool-calls", "unknown"].includes(handle.message.finish)+ if (finished && !handle.message.error) {+ if (format.type === "json_schema") {+ handle.message.error = new MessageV2.StructuredOutputError({+ message: "Model did not produce structured output",+ retries: 0,+ }).toObject()yield* sessions.updateMessage(handle.message)return "break" as const}+ }- const finished = handle.message.finish && !["tool-calls", "unknown"].includes(handle.message.finish)- if (finished && !handle.message.error) {- if (format.type === "json_schema") {- handle.message.error = new MessageV2.StructuredOutputError({- message: "Model did not produce structured output",- retries: 0,- }).toObject()- yield* sessions.updateMessage(handle.message)- return "break" as const- }- }-- if (result === "stop") return "break" as const- if (result === "compact") {- yield* compaction.create({- sessionID,- agent: lastUser.agent,- model: lastUser.model,- auto: true,- overflow: !handle.message.finish,- })- }- return "continue" as const- }),- Effect.fnUntraced(function* (exit) {- if (Exit.isFailure(exit) && Cause.hasInterruptsOnly(exit.cause)) yield* handle.abort()- yield* InstanceState.withALS(() => instruction.clear(handle.message.id)).pipe(Effect.flatMap((x) => x))- }),- )+ if (result === "stop") return "break" as const+ if (result === "compact") {+ yield* compaction.create({+ sessionID,+ agent: lastUser.agent,+ model: lastUser.model,+ auto: true,+ overflow: !handle.message.finish,+ })+ }+ return "continue" as const+ }).pipe(Effect.ensuring(instruction.clear(handle.message.id)))if (outcome === "break") breakcontinue}diff --git a/packages/opencode/src/tool/read.ts b/packages/opencode/src/tool/read.tsindex 0b44c7ad5a7..f963b415bec 100644--- a/packages/opencode/src/tool/read.ts+++ b/packages/opencode/src/tool/read.ts@@ -67,9 +67,7 @@ export const ReadTool = Tool.defineEffect(if (item.type === "directory") return item.name + "/"if (item.type !== "symlink") return item.name- const target = yield* fs- .stat(path.join(filepath, item.name))- .pipe(Effect.catch(() => Effect.succeed(undefined)))+ const target = yield* fs.stat(path.join(filepath, item.name)).pipe(Effect.catch(() => Effect.void))if (target?.type === "Directory") return item.name + "/"return item.name}),diff --git a/packages/opencode/test/session/compaction.test.ts b/packages/opencode/test/session/compaction.test.tsindex 799bb3e2aeb..c37371d9f87 100644--- a/packages/opencode/test/session/compaction.test.ts+++ b/packages/opencode/test/session/compaction.test.ts@@ -139,7 +139,6 @@ function fake(get message() {return msg},- abort: Effect.fn("TestSessionProcessor.abort")(() => Effect.void),partFromToolCall() {return {id: PartID.ascending(),diff --git a/packages/opencode/test/session/processor-effect.test.ts b/packages/opencode/test/session/processor-effect.test.tsindex 0fc25c1a6b4..86149272bcb 100644--- a/packages/opencode/test/session/processor-effect.test.ts+++ b/packages/opencode/test/session/processor-effect.test.ts@@ -593,9 +593,6 @@ it.live("session.processor effect tests mark pending tools as aborted on cleanupyield* Fiber.interrupt(run)const exit = yield* Fiber.await(run)- if (Exit.isFailure(exit) && Cause.hasInterruptsOnly(exit.cause)) {- yield* handle.abort()- }const parts = MessageV2.parts(msg.id)const call = parts.find((part): part is MessageV2.ToolPart => part.type === "tool")@@ -665,9 +662,6 @@ it.live("session.processor effect tests record aborted errors and idle state", (yield* Fiber.interrupt(run)const exit = yield* Fiber.await(run)- if (Exit.isFailure(exit) && Cause.hasInterruptsOnly(exit.cause)) {- yield* handle.abort()- }yield* Effect.promise(() => seen.promise)const stored = MessageV2.get({ sessionID: chat.id, messageID: msg.id })const state = yield* sts.get(chat.id)