refactor(schema): extract public event definitions (#33579)

packages/server/src/api.ts

@@ -1,4 +1,4 @@
-import { HttpApi, OpenApi } from "effect/unstable/httpapi"
+import { HttpApi, HttpApiGroup, OpenApi } from "effect/unstable/httpapi"
 import { SchemaErrorMiddleware } from "./middleware/schema-error"
 import { MessageGroup } from "./groups/message"
 import { ModelGroup } from "./groups/model"
@@ -8,7 +8,8 @@ import { PermissionGroup } from "./groups/permission"
 import { FileSystemGroup } from "./groups/fs"
 import { CommandGroup } from "./groups/command"
 import { SkillGroup } from "./groups/skill"
-import { EventGroup } from "./groups/event"
+import { EventGroup, makeEventGroup } from "./groups/event"
+import type { Definition } from "@opencode-ai/core/event"
 import { AgentGroup } from "./groups/agent"
 import { HealthGroup } from "./groups/health"
 import { PtyGroup } from "./groups/pty"
@@ -20,31 +21,36 @@ import { IntegrationGroup } from "./groups/integration"
 import { CredentialGroup } from "./groups/credential"
 import { ProjectCopyGroup } from "./groups/project-copy"
 
-export const Api = HttpApi.make("server")
-  .add(HealthGroup)
-  .add(LocationGroup)
-  .add(AgentGroup)
-  .add(SessionGroup)
-  .add(MessageGroup)
-  .add(ModelGroup)
-  .add(ProviderGroup)
-  .add(IntegrationGroup)
-  .add(CredentialGroup)
-  .add(PermissionGroup)
-  .add(FileSystemGroup)
-  .add(CommandGroup)
-  .add(SkillGroup)
-  .add(EventGroup)
-  .add(PtyGroup)
-  .add(QuestionGroup)
-  .add(ReferenceGroup)
-  .add(ProjectCopyGroup)
-  .annotateMerge(
-    OpenApi.annotations({
-      title: "opencode HttpApi",
-      version: "0.0.1",
-      description: "Experimental HttpApi surface for selected instance routes.",
-    }),
-  )
-  .middleware(Authorization)
-  .middleware(SchemaErrorMiddleware)
+const makeApiFromGroup = <const Group extends HttpApiGroup.Any>(eventGroup: Group) =>
+  HttpApi.make("server")
+    .add(HealthGroup)
+    .add(LocationGroup)
+    .add(AgentGroup)
+    .add(SessionGroup)
+    .add(MessageGroup)
+    .add(ModelGroup)
+    .add(ProviderGroup)
+    .add(IntegrationGroup)
+    .add(CredentialGroup)
+    .add(PermissionGroup)
+    .add(FileSystemGroup)
+    .add(CommandGroup)
+    .add(SkillGroup)
+    .add(eventGroup)
+    .add(PtyGroup)
+    .add(QuestionGroup)
+    .add(ReferenceGroup)
+    .add(ProjectCopyGroup)
+    .annotateMerge(
+      OpenApi.annotations({
+        title: "opencode HttpApi",
+        version: "0.0.1",
+        description: "Experimental HttpApi surface for selected instance routes.",
+      }),
+    )
+    .middleware(Authorization)
+    .middleware(SchemaErrorMiddleware)
+
+export const makeApi = (definitions: ReadonlyArray<Definition>) => makeApiFromGroup(makeEventGroup(definitions))
+
+export const Api = makeApiFromGroup(EventGroup)

packages/server/src/groups/event.ts

@@ -1,5 +1,7 @@
 import { EventV2 } from "@opencode-ai/core/event"
+import { PublicEventManifest } from "@opencode-ai/core/public-event-manifest"
 import { Location } from "@opencode-ai/core/location"
+import type { Definition } from "@opencode-ai/core/event"
 import { Schema } from "effect"
 import { HttpApiEndpoint, HttpApiGroup, OpenApi } from "effect/unstable/httpapi"
 
@@ -10,25 +12,47 @@ const fields = {
   location: Schema.optional(Location.Ref),
 }
 
-const Event = Schema.Union([
-  ...EventV2.definitions().map((definition) =>
-    Schema.Struct({
-      ...fields,
-      type: Schema.Literal(definition.type),
-      data: definition.data as Schema.Struct<{}>,
-    }).annotate({ identifier: `V2Event.${definition.type}` }),
-  ),
-  Schema.Struct({
-    ...fields,
-    type: Schema.Literal("server.connected"),
-    data: Schema.Struct({}),
-  }).annotate({ identifier: "V2Event.server.connected" }),
-]).annotate({ identifier: "V2Event" })
+const schema = <const Definitions extends ReadonlyArray<Definition>>(definitions: Definitions) =>
+  Schema.Union([
+    ...definitions.map((definition) =>
+      Schema.Struct({
+        ...fields,
+        type: Schema.Literal(definition.type),
+        data: definition.data,
+      }).annotate({ identifier: `V2Event.${definition.type}` }),
+    ),
+    ...(definitions.some((definition) => definition.type === "server.connected")
+      ? []
+      : [
+          Schema.Struct({
+            ...fields,
+            type: Schema.Literal("server.connected"),
+            data: Schema.Struct({}),
+          }).annotate({ identifier: "V2Event.server.connected" }),
+        ]),
+  ]).annotate({ identifier: "V2Event" })
+
+export const makeEventGroup = <const Definitions extends ReadonlyArray<Definition>>(definitions: Definitions) =>
+  HttpApiGroup.make("server.event")
+    .add(
+      HttpApiEndpoint.get("event.subscribe", "/api/event", {
+        success: schema(definitions),
+      }).annotateMerge(
+        OpenApi.annotations({
+          identifier: "v2.event.subscribe",
+          summary: "Subscribe to events",
+          description: "Subscribe to native event payloads for the server.",
+        }),
+      ),
+    )
+    .annotateMerge(OpenApi.annotations({ title: "events", description: "Experimental event stream route." }))
+
+const EventSchema = schema(PublicEventManifest.Definitions)
 
 export const EventGroup = HttpApiGroup.make("server.event")
   .add(
     HttpApiEndpoint.get("event.subscribe", "/api/event", {
-      success: Event,
+      success: EventSchema,
     }).annotateMerge(
       OpenApi.annotations({
         identifier: "v2.event.subscribe",
@@ -38,5 +62,4 @@ export const EventGroup = HttpApiGroup.make("server.event")
     ),
   )
   .annotateMerge(OpenApi.annotations({ title: "events", description: "Experimental event stream route." }))
-
-export type Event = typeof Event.Type
+export type Event = typeof EventSchema.Type