feat(v2): expose canonical schema contracts (#35595)

packages/core/src/session/store.ts

@@ -7,16 +7,16 @@ import { makeGlobalNode } from "../effect/app-node"
 import { SessionHistory } from "./history"
 import { MessageDecodeError } from "./error"
 import { SessionMessage } from "./message"
-import { SessionSchema } from "./schema"
+import { Session } from "@opencode-ai/schema/session"
 import { SessionMessageTable, SessionTable } from "./sql"
 import { fromRow } from "./info"
 
 export interface Interface {
-  readonly get: (sessionID: SessionSchema.ID) => Effect.Effect<SessionSchema.Info | undefined>
-  readonly context: (sessionID: SessionSchema.ID) => Effect.Effect<SessionMessage.Message[], MessageDecodeError>
+  readonly get: (sessionID: Session.ID) => Effect.Effect<Session.Info | undefined>
+  readonly context: (sessionID: Session.ID) => Effect.Effect<SessionMessage.Message[], MessageDecodeError>
   readonly message: (
     messageID: SessionMessage.ID,
-  ) => Effect.Effect<{ readonly sessionID: SessionSchema.ID; readonly message: SessionMessage.Message } | undefined>
+  ) => Effect.Effect<{ readonly sessionID: Session.ID; readonly message: SessionMessage.Message } | undefined>
 }
 
 export class Service extends Context.Service<Service, Interface>()("@opencode/v2/SessionStore") {}
@@ -44,7 +44,7 @@ const layer = Layer.effect(
           .pipe(Effect.orDie)
         return row
           ? {
-              sessionID: SessionSchema.ID.make(row.session_id),
+              sessionID: Session.ID.make(row.session_id),
               message: yield* decodeMessage({ ...row.data, id: row.id, type: row.type }).pipe(Effect.orDie),
             }
           : undefined

packages/core/src/tool/hooks.ts

@@ -1,17 +1,17 @@
 export * as ToolHooks from "./hooks"
 
 import { makeLocationNode } from "../effect/app-node"
-import { AgentV2 } from "../agent"
+import { Agent } from "@opencode-ai/schema/agent"
+import { Session } from "@opencode-ai/schema/session"
 import { SessionMessage } from "../session/message"
-import { SessionSchema } from "../session/schema"
 import { State } from "../state"
 import { Context, Effect, Layer, Scope } from "effect"
 import type { ToolOutput, ToolResultValue } from "@opencode-ai/llm"
 
 export interface BeforeEvent {
   readonly tool: string
-  readonly sessionID: SessionSchema.ID
-  readonly agent: AgentV2.ID
+  readonly sessionID: Session.ID
+  readonly agent: Agent.ID
   readonly assistantMessageID: SessionMessage.ID
   readonly toolCallID: string
   input: unknown
@@ -19,8 +19,8 @@ export interface BeforeEvent {
 
 export interface AfterEvent {
   readonly tool: string
-  readonly sessionID: SessionSchema.ID
-  readonly agent: AgentV2.ID
+  readonly sessionID: Session.ID
+  readonly agent: Agent.ID
   readonly assistantMessageID: SessionMessage.ID
   readonly toolCallID: string
   readonly input: unknown
@@ -80,8 +80,14 @@ const layer = Layer.effect(
 
     return Service.of({
       hook: {
-        before: register(() => beforeHooks, (next) => (beforeHooks = next)),
-        after: register(() => afterHooks, (next) => (afterHooks = next)),
+        before: register(
+          () => beforeHooks,
+          (next) => (beforeHooks = next),
+        ),
+        after: register(
+          () => afterHooks,
+          (next) => (afterHooks = next),
+        ),
       },
       runBefore: (event) => run(beforeHooks, event),
       runAfter: (event) => run(afterHooks, event),