@pikku/cli 0.11.1 → 0.11.2

package/dist/.pikku/cli/pikku-cli-wirings-meta.gen.js

@@ -1,160 +1,6 @@
 /**
- * This file was generated by @pikku/cli@0.11.1
+ * This file was generated by @pikku/cli@0.11.2
  */
 import { pikkuState } from '@pikku/core';
-pikkuState('cli', 'meta', {
-    "programs": {
-        "pikku": {
-            "program": "pikku",
-            "commands": {
-                "all": {
-                    "pikkuFuncName": "all",
-                    "positionals": [],
-                    "options": {
-                        "tags": {
-                            "description": "Filter functions by tags (comma-separated)",
-                            "short": "t"
-                        },
-                        "types": {
-                            "description": "Filter functions by types (comma-separated)"
-                        },
-                        "directories": {
-                            "description": "Filter functions by directories (comma-separated)",
-                            "short": "d"
-                        },
-                        "httpMethods": {
-                            "description": "Filter HTTP routes by methods (comma-separated)"
-                        },
-                        "httpRoutes": {
-                            "description": "Filter HTTP routes by route patterns (comma-separated)"
-                        },
-                        "names": {
-                            "description": "Filter functions by name patterns (supports wildcards)",
-                            "short": "n"
-                        }
-                    },
-                    "description": "Generate all Pikku files (types, schemas, wirings, etc.)",
-                    "isDefault": true
-                },
-                "bootstrap": {
-                    "pikkuFuncName": "bootstrap",
-                    "positionals": [],
-                    "options": {},
-                    "description": "Generate only type files (setup phase only)"
-                },
-                "watch": {
-                    "pikkuFuncName": "watch",
-                    "positionals": [],
-                    "options": {},
-                    "description": "Watch for file changes and regenerate automatically"
-                },
-                "schemas": {
-                    "pikkuFuncName": "pikkuSchemas",
-                    "positionals": [],
-                    "options": {},
-                    "description": "Generate JSON schemas for function input/output types"
-                },
-                "fetch": {
-                    "pikkuFuncName": "pikkuFetch",
-                    "positionals": [],
-                    "options": {},
-                    "description": "Generate type-safe HTTP fetch client"
-                },
-                "websocket": {
-                    "pikkuFuncName": "pikkuWebSocketTyped",
-                    "positionals": [],
-                    "options": {},
-                    "description": "Generate type-safe WebSocket client"
-                },
-                "rpc": {
-                    "pikkuFuncName": "pikkuRPCClient",
-                    "positionals": [],
-                    "options": {},
-                    "description": "Generate RPC client wrappers"
-                },
-                "queue-service": {
-                    "pikkuFuncName": "pikkuQueueService",
-                    "positionals": [],
-                    "options": {},
-                    "description": "Generate queue service wrapper"
-                },
-                "openapi": {
-                    "pikkuFuncName": "pikkuOpenAPI",
-                    "positionals": [],
-                    "options": {},
-                    "description": "Generate OpenAPI specification from HTTP routes"
-                },
-                "nextjs": {
-                    "pikkuFuncName": "pikkuNext",
-                    "positionals": [],
-                    "options": {},
-                    "description": "Generate Next.js backend and HTTP wrappers"
-                }
-            },
-            "options": {
-                "config": {
-                    "description": "Path to pikku.config.json file",
-                    "short": "c"
-                },
-                "logLevel": {
-                    "description": "Set log level",
-                    "short": "l",
-                    "choices": [
-                        "trace",
-                        "debug",
-                        "info",
-                        "warn",
-                        "error",
-                        "critical"
-                    ]
-                },
-                "userSessionType": {
-                    "description": "Specify which UserSession type to use (when multiple exist)"
-                },
-                "singletonServicesFactoryType": {
-                    "description": "Specify which singleton services factory to use"
-                },
-                "sessionServicesFactoryType": {
-                    "description": "Specify which session services factory to use"
-                },
-                "stateOutput": {
-                    "description": "Save inspector state to JSON file for reuse"
-                },
-                "stateInput": {
-                    "description": "Load inspector state from JSON file (skips inspection)"
-                }
-            },
-            "defaultRenderName": "clientCLIRenderer"
-        }
-    },
-    "renderers": {
-        "defaultCLIRenderer": {
-            "name": "defaultCLIRenderer",
-            "exportedName": "defaultCLIRenderer",
-            "services": {
-                "optimized": true,
-                "services": [
-                    "logger",
-                    "getInspectorState",
-                    "schema",
-                    "jwt",
-                    "config",
-                    "variables",
-                    "workflowService",
-                    "queueService",
-                    "schedulerService"
-                ]
-            },
-            "filePath": "/home/runner/work/pikku/pikku/packages/cli/src/services.ts"
-        },
-        "clientCLIRenderer": {
-            "name": "clientCLIRenderer",
-            "exportedName": "clientCLIRenderer",
-            "services": {
-                "optimized": true,
-                "services": []
-            },
-            "filePath": "/home/runner/work/pikku/pikku/packages/cli/src/services.ts"
-        }
-    }
-});
+import metaData from './pikku-cli-wirings-meta.gen.json' with { type: 'json' };
+pikkuState('cli', 'meta', metaData);

package/dist/.pikku/cli/pikku-cli-wirings-meta.gen.json

@@ -0,0 +1,146 @@
+{
+    "programs": {
+        "pikku": {
+            "program": "pikku",
+            "commands": {
+                "all": {
+                    "pikkuFuncName": "all",
+                    "positionals": [],
+                    "options": {
+                        "tags": {
+                            "description": "Filter functions by tags (comma-separated)",
+                            "short": "t"
+                        },
+                        "types": {
+                            "description": "Filter functions by types (comma-separated)"
+                        },
+                        "directories": {
+                            "description": "Filter functions by directories (comma-separated)",
+                            "short": "d"
+                        },
+                        "httpMethods": {
+                            "description": "Filter HTTP routes by methods (comma-separated)"
+                        },
+                        "httpRoutes": {
+                            "description": "Filter HTTP routes by route patterns (comma-separated)"
+                        },
+                        "names": {
+                            "description": "Filter functions by name patterns (supports wildcards)",
+                            "short": "n"
+                        }
+                    },
+                    "description": "Generate all Pikku files (types, schemas, wirings, etc.)",
+                    "isDefault": true
+                },
+                "bootstrap": {
+                    "pikkuFuncName": "bootstrap",
+                    "positionals": [],
+                    "options": {},
+                    "description": "Generate only type files (setup phase only)"
+                },
+                "watch": {
+                    "pikkuFuncName": "watch",
+                    "positionals": [],
+                    "options": {},
+                    "description": "Watch for file changes and regenerate automatically"
+                },
+                "schemas": {
+                    "pikkuFuncName": "pikkuSchemas",
+                    "positionals": [],
+                    "options": {},
+                    "description": "Generate JSON schemas for function input/output types"
+                },
+                "fetch": {
+                    "pikkuFuncName": "pikkuFetch",
+                    "positionals": [],
+                    "options": {},
+                    "description": "Generate type-safe HTTP fetch client"
+                },
+                "websocket": {
+                    "pikkuFuncName": "pikkuWebSocketTyped",
+                    "positionals": [],
+                    "options": {},
+                    "description": "Generate type-safe WebSocket client"
+                },
+                "rpc": {
+                    "pikkuFuncName": "pikkuRPCClient",
+                    "positionals": [],
+                    "options": {},
+                    "description": "Generate RPC client wrappers"
+                },
+                "queue-service": {
+                    "pikkuFuncName": "pikkuQueueService",
+                    "positionals": [],
+                    "options": {},
+                    "description": "Generate queue service wrapper"
+                },
+                "openapi": {
+                    "pikkuFuncName": "pikkuOpenAPI",
+                    "positionals": [],
+                    "options": {},
+                    "description": "Generate OpenAPI specification from HTTP routes"
+                },
+                "nextjs": {
+                    "pikkuFuncName": "pikkuNext",
+                    "positionals": [],
+                    "options": {},
+                    "description": "Generate Next.js backend and HTTP wrappers"
+                }
+            },
+            "options": {
+                "config": {
+                    "description": "Path to pikku.config.json file",
+                    "short": "c"
+                },
+                "logLevel": {
+                    "description": "Set log level",
+                    "short": "l",
+                    "choices": [
+                        "trace",
+                        "debug",
+                        "info",
+                        "warn",
+                        "error",
+                        "critical"
+                    ]
+                },
+                "userSessionType": {
+                    "description": "Specify which UserSession type to use (when multiple exist)"
+                },
+                "singletonServicesFactoryType": {
+                    "description": "Specify which singleton services factory to use"
+                },
+                "wireServicesFactoryType": {
+                    "description": "Specify which wire services factory to use"
+                },
+                "stateOutput": {
+                    "description": "Save inspector state to JSON file for reuse"
+                },
+                "stateInput": {
+                    "description": "Load inspector state from JSON file (skips inspection)"
+                }
+            }
+        }
+    },
+    "renderers": {
+        "defaultCLIRenderer": {
+            "name": "defaultCLIRenderer",
+            "exportedName": "defaultCLIRenderer",
+            "services": {
+                "optimized": true,
+                "services": [
+                    "logger",
+                    "getInspectorState",
+                    "schema",
+                    "jwt",
+                    "config",
+                    "variables",
+                    "workflowService",
+                    "queueService",
+                    "schedulerService"
+                ]
+            },
+            "filePath": "src/services.ts"
+        }
+    }
+}

package/dist/.pikku/cli/pikku-cli-wirings.gen.d.ts

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.11.1
+ * This file was generated by @pikku/cli@0.11.2
  */
-import '../../src/services.js';
 import '../../src/cli.wiring.js';
+import '../../src/services.js';

package/dist/.pikku/cli/pikku-cli-wirings.gen.js

@@ -1,6 +1,6 @@
 /**
- * This file was generated by @pikku/cli@0.11.1
+ * This file was generated by @pikku/cli@0.11.2
  */
 /* The files with an wireCLI function call */
-import '../../src/services.js';
 import '../../src/cli.wiring.js';
+import '../../src/services.js';

package/dist/.pikku/cli/pikku-cli.gen.d.ts

@@ -1,5 +1,5 @@
 /**
- * This file was generated by @pikku/cli@0.11.1
+ * This file was generated by @pikku/cli@0.11.2
  */
 import '../pikku-bootstrap.gen.js';
 /**

package/dist/.pikku/cli/pikku-cli.gen.js

@@ -1,10 +1,10 @@
 /**
- * This file was generated by @pikku/cli@0.11.1
+ * This file was generated by @pikku/cli@0.11.2
  */
 import { executeCLI, CLIError } from '@pikku/core/cli';
 import { createConfig as createConfig } from '../../src/services.js';
 import { createSingletonServices as createSingletonServices } from '../../src/services.js';
-import { createSessionServices as createSessionServices } from '../../src/services.js';
+import { createWireServices as createWireServices } from '../../src/services.js';
 import '../pikku-bootstrap.gen.js';
 /**
  * Pikku CLI function
@@ -17,7 +17,7 @@ export async function PikkuCLI(args) {
             args: args || process.argv.slice(2),
             createConfig,
             createSingletonServices,
-            createSessionServices,
+            createWireServices,
         });
     }
     catch (error) {

package/dist/.pikku/function/pikku-function-types.gen.d.ts

@@ -1,19 +1,17 @@
 /**
- * This file was generated by @pikku/cli@0.11.1
+ * This file was generated by @pikku/cli@0.11.2
  */
 /**
  * Core function, middleware, and permission types for all wirings
  */
-import { CorePikkuFunctionConfig, CorePikkuPermission, CorePikkuMiddleware, CorePermissionGroup } from '@pikku/core';
+import { CorePikkuFunctionConfig, CorePikkuPermission, CorePikkuMiddleware, CorePermissionGroup, PikkuWire, PickRequired } from '@pikku/core';
 import { CorePikkuFunction, CorePikkuFunctionSessionless } from '@pikku/core/function';
-import { PikkuChannel } from '@pikku/core/channel';
-import { PikkuMCP } from '@pikku/core/mcp';
 import type { UserSession } from '../../types/application-types.d.js';
 import type { SingletonServices } from '../../types/application-types.d.js';
 import type { Services } from '../../types/application-types.d.js';
 import type { Config } from '../../types/application-types.d.js';
 import type { TypedPikkuRPC } from '../rpc/pikku-rpc-wirings-map.internal.gen.d.js';
-import type { RequiredSingletonServices, RequiredSessionServices } from '../pikku-services.gen.js';
+import type { RequiredSingletonServices, RequiredWireServices } from '../pikku-services.gen.js';
 type Session = UserSession;
 /**
  * Type-safe API permission definition that integrates with your application's session type.
@@ -22,14 +20,14 @@ type Session = UserSession;
  * @template In - The input type that the permission check will receive
  * @template RequiredServices - The services required for this permission check
  */
-export type PikkuPermission<In = unknown, RequiredServices extends Services = Services> = CorePikkuPermission<In, RequiredServices, Session>;
+export type PikkuPermission<In = unknown, RequiredServices extends Services = Services> = CorePikkuPermission<In, RequiredServices, PikkuWire<In, never, false, Session>>;
 /**
  * Type-safe middleware definition that can access your application's services and session.
  * Use this to define reusable middleware that can be applied to multiple wirings.
  *
  * @template RequiredServices - The services required for this middleware
  */
-export type PikkuMiddleware<RequiredServices extends SingletonServices = SingletonServices> = CorePikkuMiddleware<RequiredServices, Session>;
+export type PikkuMiddleware<RequiredServices extends SingletonServices = SingletonServices> = CorePikkuMiddleware<RequiredServices>;
 /**
  * Configuration object for creating a permission with metadata
  */
@@ -48,7 +46,8 @@ export type PikkuPermissionConfig<In = unknown, RequiredServices extends Service
  * @example
  * ```typescript
  * // Direct function syntax
- * const permission = pikkuPermission(({ logger }, data, session) => {
+ * const permission = pikkuPermission(async ({ logger }, data, { session }) => {
+ *   const session = await session?.get()
  *   return session?.role === 'admin'
  * })
  *
@@ -56,7 +55,8 @@ export type PikkuPermissionConfig<In = unknown, RequiredServices extends Service
  * const adminPermission = pikkuPermission({
  *   name: 'Admin Permission',
  *   description: 'Checks if user has admin role',
- *   func: async ({ logger }, data, session) => {
+ *   func: async ({ logger }, data, { session }) => {
+ *     const session = await session?.get()
  *     return session?.role === 'admin'
  *   }
  * })
@@ -81,7 +81,7 @@ export type PikkuMiddlewareConfig<RequiredServices extends SingletonServices = S
  * @example
  * ```typescript
  * // Direct function syntax
- * const middleware = pikkuMiddleware(({ logger }, interactions, next) => {
+ * const middleware = pikkuMiddleware(({ logger }, wires, next) => {
  *   logger.info('Middleware executed')
  *   await next()
  * })
@@ -90,7 +90,7 @@ export type PikkuMiddlewareConfig<RequiredServices extends SingletonServices = S
  * const logMiddleware = pikkuMiddleware({
  *   name: 'Request Logger',
  *   description: 'Logs all incoming requests',
- *   func: async ({ logger }, interactions, next) => {
+ *   func: async ({ logger }, wires, next) => {
  *     logger.info('Request started')
  *     await next()
  *   }
@@ -108,7 +108,7 @@ export declare const pikkuMiddleware: <RequiredServices extends SingletonService
  *   message,
  *   level = 'info'
  * }) => {
- *   return pikkuMiddleware(async ({ logger }, _interaction, next) => {
+ *   return pikkuMiddleware(async ({ logger }, next) => {
  *     logger[level](message)
  *     await next()
  *   })
@@ -125,8 +125,8 @@ export declare const pikkuMiddlewareFactory: <In = any>(factory: (input: In) =>
  * export const requireRole = pikkuPermissionFactory<{ role: string }>(({
  *   role
  * }) => {
- *   return pikkuPermission(async ({ logger }, data, session) => {
- *     if (!session || session.role !== role) {
+ *   return pikkuPermission(async ({ logger }, data, { initialSession }) => {
+ *     if (!initialSession || initialSession.role !== role) {
  *       logger.warn(`Permission denied: required role '${role}'`)
  *       return false
  *     }
@@ -142,61 +142,27 @@ export declare const pikkuPermissionFactory: <In = any>(factory: (input: In) =>
  *
  * @template In - The input type
  * @template Out - The output type that the function returns
- * @template ChannelData - Channel data type (null = optional channel)
- * @template MCPData - MCP data type (null = optional MCP)
  * @template RequiredServices - Services required by this function
  */
-export type PikkuFunctionSessionless<In = unknown, Out = never, ChannelData = null, // null means optional channel
-MCPData = null, // null means optional MCP
-RequiredServices extends Services = Omit<Services, 'rpc' | 'channel' | 'mcp'> & {
-    rpc: TypedPikkuRPC;
-} & ([
-    ChannelData
-] extends [null] ? {
-    channel?: PikkuChannel<unknown, Out>;
-} : {
-    channel: PikkuChannel<ChannelData, Out>;
-}) & ([MCPData] extends [null] ? {
-    mcp?: PikkuMCP;
-} : {
-    mcp: PikkuMCP;
-})> = CorePikkuFunctionSessionless<In, Out, ChannelData, RequiredServices, Session>;
+export type PikkuFunctionSessionless<In = unknown, Out = never, RequiredWires extends keyof PikkuWire = never, RequiredServices extends Services = Services> = CorePikkuFunctionSessionless<In, Out, RequiredServices, PickRequired<PikkuWire<In, Out, false, Session, TypedPikkuRPC, null, any>, RequiredWires>>;
 /**
  * A session-aware API function that requires user authentication.
  * Use this for protected endpoints that need access to user session data.
  *
  * @template In - The input type
  * @template Out - The output type that the function returns
- * @template ChannelData - Channel data type (null = optional channel)
- * @template MCPData - MCP data type (null = optional MCP)
  * @template RequiredServices - Services required by this function
  */
-export type PikkuFunction<In = unknown, Out = never, ChannelData = null, // null means optional channel
-MCPData = null, // null means optional MCP
-RequiredServices extends Services = Omit<Services, 'rpc' | 'channel' | 'mcp'> & {
-    rpc: TypedPikkuRPC;
-} & ([
-    ChannelData
-] extends [null] ? {
-    channel?: PikkuChannel<unknown, Out>;
-} : {
-    channel: PikkuChannel<ChannelData, Out>;
-}) & ([MCPData] extends [null] ? {
-    mcp?: PikkuMCP;
-} : {
-    mcp: PikkuMCP;
-})> = CorePikkuFunction<In, Out, ChannelData, RequiredServices, Session>;
+export type PikkuFunction<In = unknown, Out = never, RequiredWires extends keyof PikkuWire = 'session', RequiredServices extends Services = Services> = CorePikkuFunction<In, Out, RequiredServices, PickRequired<PikkuWire<In, Out, true, Session, TypedPikkuRPC, null, any>, RequiredWires>>;
 /**
  * Configuration object for Pikku functions with optional middleware, permissions, tags, and documentation.
  * This type wraps CorePikkuFunctionConfig with the user's custom types.
  *
  * @template In - The input type
  * @template Out - The output type
- * @template ChannelData - Channel data type
- * @template MCPData - MCP data type
  * @template PikkuFunc - The function type (can be narrowed to PikkuFunction or PikkuFunctionSessionless)
  */
-export type PikkuFunctionConfig<In = unknown, Out = unknown, ChannelData = unknown, MCPData = unknown, PikkuFunc extends PikkuFunction<In, Out, ChannelData, MCPData> | PikkuFunctionSessionless<In, Out, ChannelData, MCPData> = PikkuFunction<In, Out, ChannelData, MCPData> | PikkuFunctionSessionless<In, Out, ChannelData, MCPData>> = CorePikkuFunctionConfig<PikkuFunc, PikkuPermission<In>, PikkuMiddleware>;
+export type PikkuFunctionConfig<In = unknown, Out = unknown, RequiredWires extends keyof PikkuWire = never, PikkuFunc extends PikkuFunction<In, Out, RequiredWires> | PikkuFunctionSessionless<In, Out, RequiredWires> = PikkuFunction<In, Out, RequiredWires> | PikkuFunctionSessionless<In, Out, RequiredWires>> = CorePikkuFunctionConfig<PikkuFunc, PikkuPermission<In>, PikkuMiddleware>;
 /**
  * Creates a Pikku function that can be either session-aware or sessionless.
  * This is the main function wrapper for creating API endpoints.
@@ -209,7 +175,8 @@ export type PikkuFunctionConfig<In = unknown, Out = unknown, ChannelData = unkno
  * @example
  * \`\`\`typescript
  * const createUser = pikkuFunc<{name: string, email: string}, {id: number, message: string}>({
- *   func: async ({db, logger}, input) => {
+ *   func: async ({db, logger}, input, wire) => {
+ *     const session = await wire.session.get()
  *     logger.info('Creating user', input.name)
  *     const user = await db.users.create(input)
  *     return {id: user.id, message: \`User \${input.name} created successfully\`}
@@ -218,13 +185,7 @@ export type PikkuFunctionConfig<In = unknown, Out = unknown, ChannelData = unkno
  * })
  * \`\`\`
  */
-export declare const pikkuFunc: <In, Out = unknown>(func: PikkuFunction<In, Out> | CorePikkuFunctionConfig<PikkuFunction<In, Out>, PikkuPermission<In>, PikkuMiddleware>) => CorePikkuFunctionConfig<PikkuFunction<In, Out, null, null, Omit<Services, "rpc" | "channel" | "mcp"> & {
-    rpc: TypedPikkuRPC;
-} & {
-    channel?: PikkuChannel<unknown, Out> | undefined;
-} & {
-    mcp?: PikkuMCP;
-}>, PikkuPermission<In, Services>, PikkuMiddleware<SingletonServices>>;
+export declare const pikkuFunc: <In, Out = unknown>(func: PikkuFunction<In, Out, "session" | "rpc"> | PikkuFunctionConfig<In, Out, "session" | "rpc">) => PikkuFunctionConfig<In, Out, "rpc" | "session", PikkuFunction<In, Out, "rpc" | "session", Services> | PikkuFunctionSessionless<In, Out, "rpc" | "session", Services>>;
 /**
  * Creates a sessionless Pikku function that doesn't require user authentication.
  * Use this for public endpoints, webhooks, or background tasks.
@@ -237,7 +198,7 @@ export declare const pikkuFunc: <In, Out = unknown>(func: PikkuFunction<In, Out>
  * @example
  * \`\`\`typescript
  * const healthCheck = pikkuSessionlessFunc<void, {status: string, timestamp: string}>({
- *   func: async ({logger}) => {
+ *   func: async ({logger}, input) => {
  *     logger.info('Health check requested')
  *     return {status: 'healthy', timestamp: new Date().toISOString()}
  *   },
@@ -245,13 +206,7 @@ export declare const pikkuFunc: <In, Out = unknown>(func: PikkuFunction<In, Out>
  * })
  * \`\`\`
  */
-export declare const pikkuSessionlessFunc: <In, Out = unknown>(func: PikkuFunctionSessionless<In, Out> | CorePikkuFunctionConfig<PikkuFunctionSessionless<In, Out>, PikkuPermission<In>, PikkuMiddleware>) => CorePikkuFunctionConfig<PikkuFunctionSessionless<In, Out, null, null, Omit<Services, "rpc" | "channel" | "mcp"> & {
-    rpc: TypedPikkuRPC;
-} & {
-    channel?: PikkuChannel<unknown, Out> | undefined;
-} & {
-    mcp?: PikkuMCP;
-}>, PikkuPermission<In, Services>, PikkuMiddleware<SingletonServices>>;
+export declare const pikkuSessionlessFunc: <In, Out = unknown>(func: PikkuFunctionSessionless<In, Out, "session" | "rpc"> | PikkuFunctionConfig<In, Out, "session" | "rpc">) => PikkuFunctionConfig<In, Out, "rpc" | "session", PikkuFunctionSessionless<In, Out, "rpc" | "session", Services> | PikkuFunction<In, Out, "rpc" | "session", Services>>;
 /**
  * Creates a function that takes no input and returns no output.
  * Useful for health checks, triggers, or cleanup operations.
@@ -268,13 +223,7 @@ export declare const pikkuSessionlessFunc: <In, Out = unknown>(func: PikkuFuncti
  * })
  * \`\`\`
  */
-export declare const pikkuVoidFunc: (func: PikkuFunctionSessionless<void, void> | CorePikkuFunctionConfig<PikkuFunctionSessionless<void, void>, PikkuPermission<void>>) => CorePikkuFunctionConfig<PikkuFunctionSessionless<void, void, null, null, Omit<Services, "rpc" | "channel" | "mcp"> & {
-    rpc: TypedPikkuRPC;
-} & {
-    channel?: PikkuChannel<unknown, void> | undefined;
-} & {
-    mcp?: PikkuMCP;
-}>, PikkuPermission<void, Services>>;
+export declare const pikkuVoidFunc: (func: PikkuFunctionSessionless<void, void, "session" | "rpc"> | PikkuFunctionConfig<void, void, "session" | "rpc">) => PikkuFunctionConfig<void, void, "rpc" | "session", PikkuFunctionSessionless<void, void, "rpc" | "session", Services> | PikkuFunction<void, void, "rpc" | "session", Services>>;
 /**
  * Creates a Pikku config factory.
  * Use this to define your application's configuration factory.
@@ -313,22 +262,23 @@ export declare const pikkuConfig: (func: (variables?: any, ...args: any[]) => Pr
  */
 export declare const pikkuServices: (func: (config: Config, existingServices?: Partial<SingletonServices>) => Promise<RequiredSingletonServices>) => (config: Config, existingServices?: Partial<SingletonServices>) => Promise<RequiredSingletonServices>;
 /**
- * Creates a Pikku session services factory.
+ * Creates a Pikku wire services factory.
  * Use this to define services that are created per-request/session.
  *
- * @param func - Session services factory function
- * @returns The session services factory function
+ * @param func - Wire services factory function
+ * @returns The wire services factory function
  *
  * @example
  * ```typescript
- * export const createSessionServices = pikkuSessionServices(async (services, interaction, session) => {
+ * export const createWireServices = pikkuWireServices(async (services, wire) => {
+ *   const session = await wire.session?.get()
  *   return {
  *     userCache: new UserCache(session?.userId)
  *   }
  * })
  * ```
  */
-export declare const pikkuSessionServices: (func: (services: SingletonServices, interaction: any, session: Session | undefined) => Promise<RequiredSessionServices>) => (services: SingletonServices, interaction: any, session: Session | undefined) => Promise<RequiredSessionServices>;
+export declare const pikkuWireServices: (func: (services: SingletonServices, wire: any) => Promise<RequiredWireServices>) => (services: SingletonServices, wire: any) => Promise<RequiredWireServices>;
 /**
  * Adds global middleware for a specific tag.
  *