diff --git a/packages/core/src/plugin/hooks.ts b/packages/core/src/plugin/hooks.ts
index 6d0cbfdfe21..baeaa1e4508 100644
--- a/packages/core/src/plugin/hooks.ts
+++ b/packages/core/src/plugin/hooks.ts
@@ -1,20 +1,25 @@
 export * as PluginHooks from "./hooks"
 
 import type { AISDKHooks } from "@opencode-ai/plugin/effect/aisdk"
-import type { SessionHooks, SessionHttpContext } from "@opencode-ai/plugin/effect/session"
+import type { SessionContext, SessionHttpContext } from "@opencode-ai/plugin/effect/session"
 import type { ShellHooks } from "@opencode-ai/plugin/effect/shell"
 import type { ToolHooks } from "@opencode-ai/plugin/effect/tool"
 import { Context, Effect, Layer, Scope } from "effect"
 import { makeLocationNode } from "@opencode-ai/util/effect/app-node"
 import { State } from "../state"
 
+interface SessionHttpEvent extends SessionHttpContext {
+  request: (input: Request) => Effect.Effect<Response, Error>
+}
+
+interface SessionEvents {
+  readonly context: SessionContext
+  readonly http: SessionHttpEvent
+}
+
 export interface Domains {
   readonly aisdk: AISDKHooks
-  readonly session: SessionHooks & {
-    readonly http: SessionHttpContext & {
-      request: (input: Request) => Effect.Effect<Response, Error>
-    }
-  }
+  readonly session: SessionEvents
   readonly shell: ShellHooks
   readonly tool: ToolHooks
 }