feat(plugin): filter event subscriptions by type

packages/cli/test/run/noninteractive.test.ts

@@ -239,7 +239,7 @@ async function run(input: {
       yield value
     }
   })()
-  spyOn(sdk.event, "subscribe").mockImplementation(() => stream)
+  spyOn(sdk.event, "subscribe").mockImplementation((() => stream) as typeof sdk.event.subscribe)
   spyOn(sdk.permission, "list").mockImplementation(() => ok([]) as never)
   spyOn(sdk.session.form, "list").mockImplementation(
     (request) => ok(input.pendingForms?.filter((item) => item.sessionID === request.sessionID) ?? []) as never,

packages/client/src/effect/api.ts

@@ -1,6 +1,7 @@
 import type { WebsearchApi } from "./api/api.js"
 
 export type { RpcApi, RpcClient } from "./rpc.js"
+export type { SelectedEvent } from "../shared-events.js"
 
 export type * from "./api/api.js"
 

packages/client/src/effect/client.ts

@@ -4,9 +4,12 @@ import { Cause, Context, Effect, Stream } from "effect"
 import { HttpClient, HttpClientRequest } from "effect/http"
 import { SharedEvents } from "../shared-events.js"
 import { ClientError, OpenCode } from "./generated/index.js"
+import type { EventSubscribeInput } from "./api.js"
 import { RpcClientRuntime } from "./rpc.js"
 import type { RpcCallOptions } from "../promise/rpc.js"
 
+type EventType = NonNullable<EventSubscribeInput["types"]>[number]
+
 const CurrentHeaders = Context.Reference<RpcCallOptions["headers"]>("@opencode/client/effect/rpc/headers", {
   defaultValue: () => undefined,
 })
@@ -38,8 +41,8 @@ export const make = Effect.fn("OpenCode.make")(function* (options?: { readonly b
       context,
     ),
   )
-  const subscribe = () =>
-    Stream.fromAsyncIterable(shared.subscribe(), (error) => error).pipe(
+  const subscribe = <Type extends EventType = EventType>(input?: { readonly types?: ReadonlyArray<Type> }) =>
+    Stream.fromAsyncIterable(shared.subscribe({ types: input?.types }), (error) => error).pipe(
       Stream.catch((error) =>
         Stream.failCause(error instanceof EventFailure ? error.cause : Cause.fail(new ClientError({ cause: error }))),
       ),

packages/client/src/promise/api.ts

@@ -3,6 +3,7 @@ import type { OpenCode } from "./client.js"
 type Client = ReturnType<typeof OpenCode.make>
 
 export type { RpcApi, RpcCallOptions, RpcClient, RpcEventPayload } from "./rpc.js"
+export type { SelectedEvent, SubscribeOptions } from "../shared-events.js"
 
 export type AgentApi = Client["agent"]
 export type CommandApi = Client["command"]

packages/client/src/promise/client.ts

@@ -9,7 +9,7 @@ export type { ClientOptions, RequestOptions } from "./generated/client.js"
 
 export function make(options: ClientOptions) {
   const raw = OpenCode.make(options)
-  const events = SharedEvents.make((signal, onActivity) => raw.event.subscribe({ signal, onActivity }))
+  const events = SharedEvents.make((signal, onActivity) => raw.event.subscribe(undefined, { signal, onActivity }))
   return {
     ...raw,
     rpc: Object.assign(makeRpc(raw, events), raw.rpc),