@pikku/core 0.10.2 → 0.11.1

package/src/wirings/mcp/mcp-runner.ts

@@ -1,10 +1,9 @@
 import {
-  PikkuInteraction,
-  PikkuWiringTypes,
+  PikkuWire,
   type CoreServices,
   type CoreSingletonServices,
   type CoreUserSession,
-  type CreateSessionServices,
+  type CreateWireServices,
 } from '../../types/core.types.js'
 import type {
   CoreMCPResource,
@@ -20,11 +19,11 @@ import type {
   CorePikkuFunctionSessionless,
 } from '../../function/functions.types.js'
 import { getErrorResponse } from '../../errors/error-handler.js'
-import { closeSessionServices } from '../../utils.js'
+import { closeWireServices } from '../../utils.js'
 import { pikkuState } from '../../pikku-state.js'
 import { addFunction, runPikkuFunc } from '../../function/function-runner.js'
-import { rpcService } from '../rpc/rpc-runner.js'
 import { BadRequestError, NotFoundError } from '../../errors/errors.js'
+import { PikkuSessionService } from '../../services/user-session-service.js'
 
 export class MCPError extends Error {
   constructor(public readonly error: JsonRpcErrorResponse) {
@@ -37,7 +36,7 @@ export class MCPError extends Error {
 export type RunMCPEndpointParams<Tools extends string = any> = {
   singletonServices: CoreSingletonServices
   mcp?: PikkuMCP<Tools>
-  createSessionServices?: CreateSessionServices<
+  createWireServices?: CreateWireServices<
     CoreSingletonServices,
     CoreServices<CoreSingletonServices>,
     CoreUserSession
@@ -209,13 +208,9 @@ async function runMCPPikkuFunc(
   name: string,
   mcp: CoreMCPResource | CoreMCPTool | CoreMCPPrompt | undefined,
   pikkuFuncName: string | undefined,
-  {
-    singletonServices,
-    createSessionServices,
-    mcp: mcpInteraction,
-  }: RunMCPEndpointParams
+  { singletonServices, createWireServices, mcp: mcpWire }: RunMCPEndpointParams
 ): Promise<JsonRpcResponse> {
-  let sessionServices: any
+  let wireServices: any
 
   try {
     // Validate JSON-RPC request structure
@@ -239,23 +234,9 @@ async function runMCPPikkuFunc(
 
     singletonServices.logger.debug(`Running MCP ${type}: ${name}`)
 
-    const interaction: PikkuInteraction = { mcp: mcpInteraction }
-
-    const getAllServices = async () => {
-      sessionServices = await createSessionServices?.(
-        singletonServices,
-        interaction,
-        undefined
-      )
-
-      return rpcService.injectRPCService(
-        {
-          ...singletonServices,
-          ...sessionServices,
-          mcp: mcpInteraction,
-        },
-        interaction
-      )
+    const wire: PikkuWire = {
+      mcp: mcpWire,
+      session: new PikkuSessionService(),
     }
 
     // Get metadata for the MCP endpoint to access pre-resolved middleware
@@ -268,23 +249,17 @@ async function runMCPPikkuFunc(
       meta = pikkuState('mcp', 'promptsMeta')[name]
     }
 
-    const result = await runPikkuFunc(
-      PikkuWiringTypes.mcp,
-      `${type}:${name}`,
-      pikkuFuncName,
-      {
-        singletonServices,
-        getAllServices,
-        userSession: undefined, // TODO
-        data: () => request.params,
-        inheritedMiddleware: meta?.middleware,
-        wireMiddleware: mcp.middleware,
-        inheritedPermissions: meta?.permissions,
-        wirePermissions: mcp.permissions,
-        tags: mcp.tags,
-        interaction,
-      }
-    )
+    const result = await runPikkuFunc('mcp', `${type}:${name}`, pikkuFuncName, {
+      singletonServices,
+      createWireServices,
+      data: () => request.params,
+      inheritedMiddleware: meta?.middleware,
+      wireMiddleware: mcp.middleware,
+      inheritedPermissions: meta?.permissions,
+      wirePermissions: mcp.permissions,
+      tags: mcp.tags,
+      wire,
+    })
 
     return {
       id: request.id,
@@ -316,8 +291,8 @@ async function runMCPPikkuFunc(
       })
     }
   } finally {
-    if (sessionServices) {
-      await closeSessionServices(singletonServices.logger, sessionServices)
+    if (wireServices) {
+      await closeWireServices(singletonServices.logger, wireServices)
     }
   }
 }

package/src/wirings/mcp/mcp.types.ts

@@ -104,6 +104,8 @@ export type CoreMCPResource<
   uri: string
   title: string
   description: string
+  summary?: string
+  errors?: string[]
   mimeType?: string
   size?: number
   streaming?: boolean
@@ -126,6 +128,8 @@ export type CoreMCPTool<
   name: string
   title?: string
   description: string
+  summary?: string
+  errors?: string[]
   func: PikkuFunctionConfig
   tags?: string[]
   streaming?: boolean
@@ -145,6 +149,8 @@ export type CoreMCPPrompt<
 > = {
   name: string
   description: string
+  summary?: string
+  errors?: string[]
   func: PikkuFunctionConfig
   tags?: string[]
   middleware?: PikkuMiddleware[]