@pikku/core 0.11.2 → 0.12.1

package/src/wirings/mcp/mcp-endpoint-registry.test.ts

@@ -147,7 +147,7 @@ describe('MCPEndpointRegistry', () => {
           uri: 'file://test.txt',
           title: 'Test Resource',
           description: 'Test description',
-          pikkuFuncName: 'testResource',
+          pikkuFuncId: 'testResource',
           inputSchema: null,
           outputSchema: null,
           mimeType: 'text/plain',
@@ -164,7 +164,7 @@ describe('MCPEndpointRegistry', () => {
           name: 'test-tool',
           title: 'Test Tool',
           description: 'Test description',
-          pikkuFuncName: 'testTool',
+          pikkuFuncId: 'testTool',
           inputSchema: null,
           outputSchema: null,
         },
@@ -179,7 +179,7 @@ describe('MCPEndpointRegistry', () => {
         'test-prompt': {
           name: 'test-prompt',
           description: 'Test Prompt',
-          pikkuFuncName: 'testPrompt',
+          pikkuFuncId: 'testPrompt',
           inputSchema: null,
           outputSchema: null,
           arguments: [],

package/src/wirings/mcp/mcp-endpoint-registry.ts

@@ -1,4 +1,8 @@
-import { MCPResourceMeta, MCPToolMeta, MCPPromptMeta } from '@pikku/core/mcp'
+import type {
+  MCPResourceMeta,
+  MCPToolMeta,
+  MCPPromptMeta,
+} from '@pikku/core/mcp'
 
 export interface MCPToolEndpoint {
   name: string

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

@@ -1,13 +1,6 @@
-import {
-  PikkuWire,
-  type CoreServices,
-  type CoreSingletonServices,
-  type CoreUserSession,
-  type CreateWireServices,
-} from '../../types/core.types.js'
+import type { PikkuWire } from '../../types/core.types.js'
 import type {
   CoreMCPResource,
-  CoreMCPTool,
   CoreMCPPrompt,
   JsonRpcRequest,
   JsonRpcResponse,
@@ -20,10 +13,21 @@ import type {
 } from '../../function/functions.types.js'
 import { getErrorResponse } from '../../errors/error-handler.js'
 import { closeWireServices } from '../../utils.js'
-import { pikkuState } from '../../pikku-state.js'
+import {
+  pikkuState,
+  getSingletonServices,
+  getCreateWireServices,
+} from '../../pikku-state.js'
 import { addFunction, runPikkuFunc } from '../../function/function-runner.js'
-import { BadRequestError, NotFoundError } from '../../errors/errors.js'
-import { PikkuSessionService } from '../../services/user-session-service.js'
+import {
+  BadRequestError,
+  NotFoundError,
+  PikkuMissingMetaError,
+} from '../../errors/errors.js'
+import {
+  PikkuSessionService,
+  createMiddlewareSessionWireProps,
+} from '../../services/user-session-service.js'
 
 export class MCPError extends Error {
   constructor(public readonly error: JsonRpcErrorResponse) {
@@ -34,13 +38,7 @@ export class MCPError extends Error {
 }
 
 export type RunMCPEndpointParams<Tools extends string = any> = {
-  singletonServices: CoreSingletonServices
   mcp?: PikkuMCP<Tools>
-  createWireServices?: CreateWireServices<
-    CoreSingletonServices,
-    CoreServices<CoreSingletonServices>,
-    CoreUserSession
-  >
 }
 
 export type JsonRpcError = {
@@ -59,9 +57,11 @@ export const wireMCPResource = <
   const resourcesMeta = pikkuState(null, 'mcp', 'resourcesMeta')
   const mcpResourceMeta = resourcesMeta[mcpResource.uri]
   if (!mcpResourceMeta) {
-    throw new Error(`MCP resource metadata not found for '${mcpResource.uri}'`)
+    throw new PikkuMissingMetaError(
+      `Missing generated metadata for MCP resource '${mcpResource.uri}'`
+    )
   }
-  addFunction(mcpResourceMeta.pikkuFuncName, mcpResource.func as any)
+  addFunction(mcpResourceMeta.pikkuFuncId, mcpResource.func as any)
   const resources = pikkuState(null, 'mcp', 'resources')
   if (resources.has(mcpResource.uri)) {
     throw new Error(`MCP resource already exists: ${mcpResource.uri}`)
@@ -69,26 +69,6 @@ export const wireMCPResource = <
   resources.set(mcpResource.uri, mcpResource)
 }
 
-export const wireMCPTool = <
-  PikkuFunctionConfig extends CorePikkuFunctionConfig<
-    CorePikkuFunctionSessionless<any, any>
-  > = CorePikkuFunctionConfig<CorePikkuFunctionSessionless<any, any>>,
->(
-  mcpTool: CoreMCPTool<PikkuFunctionConfig>
-) => {
-  const toolsMeta = pikkuState(null, 'mcp', 'toolsMeta')
-  const mcpToolMeta = toolsMeta[mcpTool.name]
-  if (!mcpToolMeta) {
-    throw new Error(`MCP tool metadata not found for '${mcpTool.name}'`)
-  }
-  addFunction(mcpToolMeta.pikkuFuncName, mcpTool.func as any)
-  const tools = pikkuState(null, 'mcp', 'tools')
-  if (tools.has(mcpTool.name)) {
-    throw new Error(`MCP tool already exists: ${mcpTool.name}`)
-  }
-  tools.set(mcpTool.name, mcpTool)
-}
-
 export const wireMCPPrompt = <
   PikkuFunctionConfig extends CorePikkuFunctionConfig<
     CorePikkuFunctionSessionless<any, any>
@@ -99,9 +79,11 @@ export const wireMCPPrompt = <
   const promptsMeta = pikkuState(null, 'mcp', 'promptsMeta')
   const mcpPromptMeta = promptsMeta[mcpPrompt.name]
   if (!mcpPromptMeta) {
-    throw new Error(`MCP prompt metadata not found for '${mcpPrompt.name}'`)
+    throw new PikkuMissingMetaError(
+      `Missing generated metadata for MCP prompt '${mcpPrompt.name}'`
+    )
   }
-  addFunction(mcpPromptMeta.pikkuFuncName, mcpPrompt.func as any)
+  addFunction(mcpPromptMeta.pikkuFuncId, mcpPrompt.func as any)
   const prompts = pikkuState(null, 'mcp', 'prompts')
   if (prompts.has(mcpPrompt.name)) {
     throw new Error(`MCP prompt already exists: ${mcpPrompt.name}`)
@@ -115,7 +97,7 @@ export async function runMCPResource(
   uri: string
 ) {
   let endpoint: CoreMCPResource | undefined
-  let pikkuFuncName: string | undefined
+  let pikkuFuncId: string | undefined
   let extractedParams: Record<string, string> = {}
 
   const metas = pikkuState(null, 'mcp', 'resourcesMeta')
@@ -123,7 +105,7 @@ export async function runMCPResource(
 
   if (endpoints.has(uri)) {
     endpoint = endpoints.get(uri)
-    pikkuFuncName = metas[uri]?.pikkuFuncName
+    pikkuFuncId = metas[uri]?.pikkuFuncId
   } else {
     for (const [uriTemplate, value] of endpoints.entries()) {
       // Extract parameter names from the template
@@ -139,7 +121,7 @@ export async function runMCPResource(
 
       if (match) {
         endpoint = value
-        pikkuFuncName = metas[uriTemplate]?.pikkuFuncName
+        pikkuFuncId = metas[uriTemplate]?.pikkuFuncId
 
         // Extract parameter values and create params object
         for (let i = 0; i < paramNames.length; i++) {
@@ -158,7 +140,7 @@ export async function runMCPResource(
     'resource',
     uri,
     endpoint,
-    pikkuFuncName,
+    pikkuFuncId,
     { ...params, mcp: { ...params.mcp, uri } } as RunMCPEndpointParams<
       keyof CoreMCPResource
     >
@@ -170,14 +152,13 @@ export async function runMCPTool(
   params: RunMCPEndpointParams,
   name: string
 ) {
-  const endpoint = pikkuState(null, 'mcp', 'tools').get(name)
   const meta = pikkuState(null, 'mcp', 'toolsMeta')[name]
   return await runMCPPikkuFunc(
     request,
     'tool',
     name,
-    endpoint,
-    meta?.pikkuFuncName,
+    undefined,
+    meta?.pikkuFuncId,
     params
   )
 }
@@ -194,7 +175,7 @@ export async function runMCPPrompt(
     'prompt',
     name,
     endpoint,
-    meta?.pikkuFuncName,
+    meta?.pikkuFuncId,
     params
   )
 }
@@ -206,27 +187,28 @@ async function runMCPPikkuFunc(
   request: JsonRpcRequest,
   type: 'resource' | 'tool' | 'prompt',
   name: string,
-  mcp: CoreMCPResource | CoreMCPTool | CoreMCPPrompt | undefined,
-  pikkuFuncName: string | undefined,
-  { singletonServices, createWireServices, mcp: mcpWire }: RunMCPEndpointParams
+  mcp: CoreMCPResource | CoreMCPPrompt | undefined,
+  pikkuFuncId: string | undefined,
+  { mcp: mcpWire }: RunMCPEndpointParams
 ): Promise<JsonRpcResponse> {
+  const singletonServices = getSingletonServices()
+  const createWireServices = getCreateWireServices()
   let wireServices: any
 
   try {
-    // Validate JSON-RPC request structure
     if (request.jsonrpc !== '2.0') {
       throw new BadRequestError(
         'Invalid JSON-RPC version, only supoorted version is 2.0'
       )
     }
 
-    if (!mcp) {
+    if (mcp === undefined && type !== 'tool') {
       throw new NotFoundError(
         `MCP '${type}' registration not found for '${name}'`
       )
     }
 
-    if (!pikkuFuncName) {
+    if (!pikkuFuncId) {
       throw new NotFoundError(
         `MCP '${type}' PikkuFunction Mapping not found for '${name}'`
       )
@@ -234,12 +216,12 @@ async function runMCPPikkuFunc(
 
     singletonServices.logger.debug(`Running MCP ${type}: ${name}`)
 
+    const mcpSessionService = new PikkuSessionService()
     const wire: PikkuWire = {
       mcp: mcpWire,
-      session: new PikkuSessionService(),
+      ...createMiddlewareSessionWireProps(mcpSessionService),
     }
 
-    // Get metadata for the MCP endpoint to access pre-resolved middleware
     let meta: any
     if (type === 'resource') {
       meta = pikkuState(null, 'mcp', 'resourcesMeta')[name]
@@ -249,18 +231,23 @@ async function runMCPPikkuFunc(
       meta = pikkuState(null, 'mcp', 'promptsMeta')[name]
     }
 
-    const result = await runPikkuFunc('mcp', `${type}:${name}`, pikkuFuncName, {
+    let result = await runPikkuFunc('mcp', `${type}:${name}`, pikkuFuncId, {
       singletonServices,
       createWireServices,
       data: () => request.params,
       inheritedMiddleware: meta?.middleware,
-      wireMiddleware: mcp.middleware,
+      wireMiddleware: mcp?.middleware,
       inheritedPermissions: meta?.permissions,
-      wirePermissions: mcp.permissions,
-      tags: mcp.tags,
+      wirePermissions: mcp?.permissions,
+      tags: mcp?.tags,
       wire,
+      sessionService: mcpSessionService,
     })
 
+    if (type === 'tool' && meta?.outputSchema !== 'MCPToolResponse') {
+      result = [{ type: 'text', text: JSON.stringify(result) }]
+    }
+
     return {
       id: request.id,
       result,
@@ -297,10 +284,6 @@ async function runMCPPikkuFunc(
   }
 }
 
-export const getMCPTools = () => {
-  return pikkuState(null, 'mcp', 'tools')
-}
-
 export const getMCPResources = () => {
   return pikkuState(null, 'mcp', 'resources')
 }

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

@@ -1,10 +1,10 @@
-import {
+import type {
   CorePermissionGroup,
   CorePikkuFunctionConfig,
   CorePikkuFunctionSessionless,
   CorePikkuPermission,
 } from '../../function/functions.types.js'
-import {
+import type {
   CorePikkuMiddleware,
   MiddlewareMetadata,
   PermissionMetadata,
@@ -50,7 +50,7 @@ export type PikkuMCP<Tools extends string = any> = {
 export type MCPResourceMeta = Record<
   string,
   Omit<CoreMCPResource, 'func' | 'middleware' | 'permissions'> & {
-    pikkuFuncName: string
+    pikkuFuncId: string
     inputSchema: string | null
     outputSchema: string | null
     middleware?: MiddlewareMetadata[] // Pre-resolved middleware chain (tag + explicit)
@@ -64,7 +64,7 @@ export type MCPResourceMeta = Record<
 export type MCPToolMeta = Record<
   string,
   Omit<CoreMCPTool, 'func' | 'middleware' | 'permissions'> & {
-    pikkuFuncName: string
+    pikkuFuncId: string
     inputSchema: string | null
     outputSchema: string | null
     middleware?: MiddlewareMetadata[] // Pre-resolved middleware chain (tag + explicit)
@@ -78,7 +78,7 @@ export type MCPToolMeta = Record<
 export type MCPPromptMeta = Record<
   string,
   Omit<CoreMCPPrompt, 'func' | 'middleware' | 'permissions'> & {
-    pikkuFuncName: string
+    pikkuFuncId: string
     inputSchema: string | null
     outputSchema: string | null
     arguments: Array<{

package/src/wirings/node/index.ts

@@ -0,0 +1,2 @@
+export type { CoreNodeConfig, NodeType } from './node.types.js'
+export type { NodesMeta } from './node.types.js'

package/src/wirings/node/node.types.ts

@@ -0,0 +1,23 @@
+export type NodeType = 'trigger' | 'action' | 'end'
+
+export type CoreNodeConfig = {
+  displayName: string
+  category: string
+  type: NodeType
+  errorOutput?: boolean
+}
+
+export type NodeMeta = {
+  name: string
+  displayName: string
+  category: string
+  type: NodeType
+  rpc: string
+  description?: string
+  errorOutput: boolean
+  inputSchemaName: string | null
+  outputSchemaName: string | null
+  tags?: string[]
+}
+
+export type NodesMeta = Record<string, NodeMeta>

package/src/wirings/oauth2/index.ts

@@ -0,0 +1,3 @@
+export { OAuth2Client } from './oauth2-client.js'
+export { wireOAuth2Credential } from './wire-oauth2-credential.js'
+export type { OAuth2AppCredential, OAuth2Token } from './oauth2.types.js'