refactor(server): canonicalize service API (#31049)

packages/server/src/handlers.ts

@@ -2,56 +2,40 @@ import { SessionV2 } from "@opencode-ai/core/session"
 import { LocationServiceMap } from "@opencode-ai/core/location-layer"
 import { PermissionSaved } from "@opencode-ai/core/permission/saved"
 import { Layer } from "effect"
-import { layer as v2LocationLayer } from "./groups/v2/location"
-import { messageHandlers } from "./handlers/v2/message"
-import { modelHandlers } from "./handlers/v2/model"
-import { providerHandlers } from "./handlers/v2/provider"
-import { sessionHandlers } from "./handlers/v2/session"
-import { permissionHandlers, savedPermissionHandlers, sessionPermissionHandlers } from "./handlers/v2/permission"
-import { fileSystemHandlers } from "./handlers/v2/fs"
-import { commandHandlers } from "./handlers/v2/command"
-import { skillHandlers } from "./handlers/v2/skill"
-import { eventHandlers } from "./handlers/v2/event"
-import { agentHandlers } from "./handlers/v2/agent"
-import { healthHandlers } from "./handlers/v2/health"
-import { questionHandlers, sessionQuestionHandlers } from "./handlers/v2/question"
-import { Database } from "@opencode-ai/core/database/database"
-import { EventV2 } from "@opencode-ai/core/event"
-import { ProjectV2 } from "@opencode-ai/core/project"
+import { layer as locationLayer } from "./groups/location"
+import { sessionLocationLayer } from "./middleware/session-location"
+import { MessageHandler } from "./handlers/message"
+import { ModelHandler } from "./handlers/model"
+import { ProviderHandler } from "./handlers/provider"
+import { SessionHandler } from "./handlers/session"
+import { PermissionHandler } from "./handlers/permission"
+import { FileSystemHandler } from "./handlers/fs"
+import { CommandHandler } from "./handlers/command"
+import { SkillHandler } from "./handlers/skill"
+import { EventHandler } from "./handlers/event"
+import { AgentHandler } from "./handlers/agent"
+import { HealthHandler } from "./handlers/health"
+import { QuestionHandler } from "./handlers/question"
 import * as SessionExecutionLocal from "@opencode-ai/core/session/execution/local"
-import { SessionProjector } from "@opencode-ai/core/session/projector"
-import { SessionStore } from "@opencode-ai/core/session/store"
 
-const routedSessions = SessionV2.layer.pipe(
-  Layer.provide(SessionProjector.layer),
-  Layer.provide(SessionExecutionLocal.layer),
-  Layer.provide(LocationServiceMap.layer),
-  Layer.provide(SessionStore.layer),
-  Layer.provide(EventV2.layer),
-  Layer.provide(Database.defaultLayer),
-  Layer.provide(ProjectV2.defaultLayer),
-  Layer.orDie,
-)
-
-export const v2Handlers = Layer.mergeAll(
-  healthHandlers,
-  agentHandlers,
-  sessionHandlers,
-  messageHandlers,
-  modelHandlers,
-  providerHandlers,
-  permissionHandlers,
-  sessionPermissionHandlers,
-  savedPermissionHandlers,
-  fileSystemHandlers,
-  commandHandlers,
-  skillHandlers,
-  eventHandlers,
-  questionHandlers,
-  sessionQuestionHandlers,
+export const handlers = Layer.mergeAll(
+  HealthHandler,
+  AgentHandler,
+  SessionHandler,
+  MessageHandler,
+  ModelHandler,
+  ProviderHandler,
+  PermissionHandler,
+  FileSystemHandler,
+  CommandHandler,
+  SkillHandler,
+  EventHandler,
+  QuestionHandler,
 ).pipe(
-  Layer.provide(v2LocationLayer),
+  Layer.provide(sessionLocationLayer),
+  Layer.provide(locationLayer),
+  Layer.provide(SessionV2.defaultLayer),
+  Layer.provide(SessionExecutionLocal.defaultLayer),
+  Layer.provide(PermissionSaved.defaultLayer),
   Layer.provide(LocationServiceMap.layer),
-  Layer.provide(PermissionSaved.layer),
-  Layer.provide(routedSessions),
 )