@@ -5,14 +5,15 @@ import { Session } from "./session"
55import { SessionID , MessageID , PartID } from "./schema"
66import { Provider } from "@/provider/provider"
77import { MessageV2 } from "./message-v2"
8+ import { LLM } from "./llm"
89import { Token } from "@/util/token"
910import { SessionProcessor } from "./processor"
1011import { Agent } from "@/agent/agent"
1112import { Plugin } from "@/plugin"
1213import { Config } from "@/config/config"
1314import { NotFoundError } from "@/storage/storage"
1415
15- import { Effect , Layer , Context } from "effect"
16+ import { Cause , Effect , Layer , Context } from "effect"
1617import { InstanceState } from "@/effect/instance-state"
1718import { isOverflow as overflow , usable } from "./overflow"
1819import { serviceUse } from "@opencode-ai/core/effect/service-use"
@@ -22,6 +23,7 @@ import { ProviderV2 } from "@opencode-ai/core/provider"
2223import { ModelV2 } from "@opencode-ai/core/model"
2324import { buildPrompt } from "@opencode-ai/core/session/compaction"
2425import { SessionCompactionEvent } from "@opencode-ai/schema/session-compaction-event"
26+ import { SessionStatus } from "./status"
2527
2628export const Event = SessionCompactionEvent
2729
@@ -164,6 +166,7 @@ const layer = Layer.effect(
164166 const provider = yield * Provider . Service
165167 const events = yield * EventV2Bridge . Service
166168 const flags = yield * RuntimeFlags . Service
169+ const status = yield * SessionStatus . Service
167170
168171 const isOverflow = Effect . fn ( "SessionCompaction.isOverflow" ) ( function * ( input : {
169172 tokens : SessionV1 . Assistant [ "tokens" ]
@@ -339,19 +342,7 @@ const layer = Layer.effect(
339342 cfg,
340343 model,
341344 } )
342- // Allow plugins to inject context or replace compaction prompt.
343- const compacting = yield * plugin . trigger (
344- "experimental.session.compacting" ,
345- { sessionID : input . sessionID } ,
346- { context : [ ] , prompt : undefined } ,
347- )
348- const nextPrompt = compacting . prompt ?? buildPrompt ( { previousSummary, context : compacting . context } )
349345 const msgs = structuredClone ( selected . head )
350- yield * plugin . trigger ( "experimental.chat.messages.transform" , { } , { messages : msgs } )
351- const modelMessages = yield * MessageV2 . toModelMessagesEffect ( msgs , model , {
352- stripMedia : true ,
353- toolOutputMaxChars : TOOL_OUTPUT_MAX_CHARS ,
354- } )
355346 const ctx = yield * InstanceState . context
356347 const msg : SessionV1 . Assistant = {
357348 id : MessageID . ascending ( ) ,
@@ -380,22 +371,78 @@ const layer = Layer.effect(
380371 } ,
381372 }
382373 yield * session . updateMessage ( msg )
383- const processor = yield * processors . create ( {
384- assistantMessage : msg ,
385- sessionID : input . sessionID ,
386- model ,
374+ const system = LLM . buildSystem ( { agent , model , parts : [ ] , user : userMessage } )
375+ const removeInterruptedSummary = Effect . gen ( function * ( ) {
376+ yield * session . removeMessage ( { sessionID : input . sessionID , messageID : msg . id } ) . pipe ( Effect . ignore )
377+ yield * status . set ( input . sessionID , { type : "idle" } )
387378 } )
379+ const finalizeFailedSummary = ( error : unknown ) =>
380+ Effect . gen ( function * ( ) {
381+ msg . error = MessageV2 . fromError ( error , { providerID : model . providerID } )
382+ msg . finish = "error"
383+ msg . time . completed = Date . now ( )
384+ yield * session . updateMessage ( msg )
385+ yield * events . publish ( Session . Event . Error , { sessionID : input . sessionID , error : msg . error } )
386+ yield * status . set ( input . sessionID , { type : "idle" } )
387+ } )
388+ const prepared = yield * Effect . gen ( function * ( ) {
389+ // Allow plugins to inject context or replace compaction prompt.
390+ const compacting = yield * plugin . trigger (
391+ "experimental.session.compacting" ,
392+ { sessionID : input . sessionID } ,
393+ { context : [ ] , prompt : undefined } ,
394+ )
395+ const systemHeader = system [ 0 ]
396+ yield * plugin . trigger (
397+ "experimental.chat.system.transform" ,
398+ { sessionID : input . sessionID , model } ,
399+ { system } ,
400+ )
401+ LLM . rejoinSystemForCaching ( system , systemHeader )
402+ yield * plugin . trigger (
403+ "experimental.chat.messages.transform" ,
404+ { sessionID : input . sessionID , model : { providerID : model . providerID , modelID : model . id } } ,
405+ { messages : msgs } ,
406+ )
407+ const messages = yield * MessageV2 . toModelMessagesEffect ( msgs , model , {
408+ stripMedia : true ,
409+ toolOutputMaxChars : TOOL_OUTPUT_MAX_CHARS ,
410+ } )
411+ return {
412+ messages,
413+ nextPrompt : compacting . prompt ?? buildPrompt ( { previousSummary, context : compacting . context } ) ,
414+ }
415+ } ) . pipe (
416+ Effect . catchCauseIf ( ( cause ) => ! Cause . hasInterruptsOnly ( cause ) , ( cause ) =>
417+ finalizeFailedSummary ( Cause . squash ( cause ) ) . pipe ( Effect . as ( undefined ) ) ,
418+ ) ,
419+ Effect . onInterrupt ( ( ) => removeInterruptedSummary ) ,
420+ )
421+ if ( ! prepared ) return "stop"
422+ const processor = yield * processors
423+ . create ( {
424+ assistantMessage : msg ,
425+ sessionID : input . sessionID ,
426+ model,
427+ } )
428+ . pipe (
429+ Effect . catchCauseIf ( ( cause ) => ! Cause . hasInterruptsOnly ( cause ) , ( cause ) =>
430+ finalizeFailedSummary ( Cause . squash ( cause ) ) . pipe ( Effect . as ( undefined ) ) ,
431+ ) ,
432+ Effect . onInterrupt ( ( ) => removeInterruptedSummary ) ,
433+ )
434+ if ( ! processor ) return "stop"
388435 const result = yield * processor . process ( {
389436 user : userMessage ,
390437 agent,
391438 sessionID : input . sessionID ,
392439 tools : { } ,
393- system : [ ] ,
440+ system,
394441 messages : [
395- ...modelMessages ,
442+ ...prepared . messages ,
396443 {
397444 role : "user" ,
398- content : [ { type : "text" , text : nextPrompt } ] ,
445+ content : [ { type : "text" , text : prepared . nextPrompt } ] ,
399446 } ,
400447 ] ,
401448 model,
@@ -556,6 +603,7 @@ export const node = LayerNode.make({
556603 Provider . node ,
557604 EventV2Bridge . node ,
558605 RuntimeFlags . node ,
606+ SessionStatus . node ,
559607 ] ,
560608} )
561609
0 commit comments