@@ -21,7 +21,13 @@ import * as Random from "effect/Random";
2121import * as Ref from "effect/Ref" ;
2222import * as Scope from "effect/Scope" ;
2323import * as Stream from "effect/Stream" ;
24- import type { OpencodeClient , Part , PermissionRequest , QuestionRequest } from "@opencode-ai/sdk/v2" ;
24+ import type {
25+ Event as OpenCodeEvent ,
26+ OpencodeClient ,
27+ Part ,
28+ PermissionRequest ,
29+ QuestionRequest ,
30+ } from "@opencode-ai/sdk/v2" ;
2531import { getModelSelectionStringOptionValue } from "@t3tools/shared/model" ;
2632
2733import { resolveAttachmentPath } from "../../attachmentStore.ts" ;
@@ -58,7 +64,7 @@ interface OpenCodeTurnSnapshot {
5864}
5965
6066type OpenCodeSubscribedEvent =
61- Awaited < ReturnType < OpencodeClient [ "event " ] [ "subscribe " ] > > extends {
67+ Awaited < ReturnType < OpencodeClient [ "global " ] [ "event " ] > > extends {
6268 readonly stream : AsyncIterable < infer TEvent > ;
6369 }
6470 ? TEvent
@@ -89,7 +95,7 @@ interface OpenCodeSessionContext {
8995 /**
9096 * Sole lifecycle handle for the session. Closing this scope:
9197 * - aborts the `AbortController` registered as a finalizer
92- * (cancels the in-flight `event.subscribe ` fetch),
98+ * (cancels the in-flight `global.event ` fetch),
9399 * - interrupts the event-pump and server-exit fibers forked
94100 * via `Effect.forkIn(sessionScope)`,
95101 * - tears down the OpenCode server process for scope-owned servers.
@@ -389,6 +395,24 @@ function toolStateCreatedAt(part: Extract<Part, { type: "tool" }>): string | und
389395 }
390396}
391397
398+ function unwrapOpenCodeSubscribedEvent (
399+ raw : OpenCodeSubscribedEvent | OpenCodeEvent ,
400+ ) : OpenCodeEvent | null {
401+ if ( typeof raw !== "object" || raw === null ) {
402+ return null ;
403+ }
404+ if ( "payload" in raw ) {
405+ const payload = raw . payload ;
406+ if ( typeof payload === "object" && payload !== null && "type" in payload ) {
407+ return payload as OpenCodeEvent ;
408+ }
409+ }
410+ if ( "type" in raw ) {
411+ return raw as OpenCodeEvent ;
412+ }
413+ return null ;
414+ }
415+
392416function sessionErrorMessage ( error : unknown ) : string {
393417 if ( ! error || typeof error !== "object" ) {
394418 return "OpenCode session failed." ;
@@ -634,7 +658,7 @@ export function makeOpenCodeAdapter(
634658
635659 const handleSubscribedEvent = Effect . fn ( "handleSubscribedEvent" ) ( function * (
636660 context : OpenCodeSessionContext ,
637- event : OpenCodeSubscribedEvent ,
661+ event : OpenCodeEvent ,
638662 ) {
639663 const payloadSessionId =
640664 "properties" in event ? ( event . properties as { sessionID ?: unknown } ) . sessionID : undefined ;
@@ -863,6 +887,25 @@ export function makeOpenCodeAdapter(
863887 break ;
864888 }
865889
890+ case "session.idle" : {
891+ if ( turnId ) {
892+ context . activeTurnId = undefined ;
893+ yield * updateProviderSession ( context , { status : "ready" } , { clearActiveTurnId : true } ) ;
894+ yield * emit ( {
895+ ...( yield * buildEventBase ( {
896+ threadId : context . session . threadId ,
897+ turnId,
898+ raw : event ,
899+ } ) ) ,
900+ type : "turn.completed" ,
901+ payload : {
902+ state : "completed" ,
903+ } ,
904+ } ) ;
905+ }
906+ break ;
907+ }
908+
866909 case "session.status" : {
867910 if ( event . properties . status . type === "busy" ) {
868911 yield * updateProviderSession ( context , {
@@ -954,7 +997,7 @@ export function makeOpenCodeAdapter(
954997 const startEventPump = Effect . fn ( "startEventPump" ) ( function * ( context : OpenCodeSessionContext ) {
955998 // One AbortController per session scope. The finalizer fires when
956999 // the scope closes (explicit stop, unexpected exit, or layer
957- // shutdown) and cancels the in-flight `event.subscribe ` fetch so
1000+ // shutdown) and cancels the in-flight `global.event ` fetch so
9581001 // the async iterable unwinds cleanly.
9591002 const eventsAbortController = new AbortController ( ) ;
9601003 yield * Scope . addFinalizer (
@@ -965,8 +1008,8 @@ export function makeOpenCodeAdapter(
9651008 // Fibers forked into `context.sessionScope` are interrupted
9661009 // automatically when the scope closes — no bookkeeping required.
9671010 yield * Effect . flatMap (
968- runOpenCodeSdk ( "event.subscribe " , ( ) =>
969- context . client . event . subscribe ( undefined , {
1011+ runOpenCodeSdk ( "global.event " , ( ) =>
1012+ context . client . global . event ( {
9701013 signal : eventsAbortController . signal ,
9711014 } ) ,
9721015 ) ,
@@ -975,11 +1018,15 @@ export function makeOpenCodeAdapter(
9751018 subscription . stream ,
9761019 ( cause ) =>
9771020 new OpenCodeRuntimeError ( {
978- operation : "event.subscribe " ,
1021+ operation : "global.event " ,
9791022 detail : openCodeRuntimeErrorDetail ( cause ) ,
9801023 cause,
9811024 } ) ,
982- ) . pipe ( Stream . runForEach ( ( event ) => handleSubscribedEvent ( context , event ) ) ) ,
1025+ ) . pipe (
1026+ Stream . map ( unwrapOpenCodeSubscribedEvent ) ,
1027+ Stream . filter ( ( event ) : event is OpenCodeEvent => event !== null ) ,
1028+ Stream . runForEach ( ( event ) => handleSubscribedEvent ( context , event ) ) ,
1029+ ) ,
9831030 ) . pipe (
9841031 Effect . exit ,
9851032 Effect . flatMap ( ( exit ) =>
0 commit comments