@pikku/core 0.11.0 → 0.11.2

package/dist/wirings/channel/local/local-channel-runner.js

@@ -1,19 +1,18 @@
 import { openChannel } from '../channel-runner.js';
-import { createHTTPInteraction } from '../../http/http-runner.js';
-import { closeSessionServices } from '../../../utils.js';
+import { createHTTPWire } from '../../http/http-runner.js';
+import { closeWireServices } from '../../../utils.js';
 import { processMessageHandlers } from '../channel-handler.js';
 import { PikkuLocalChannelHandler } from './local-channel-handler.js';
 import { handleHTTPError } from '../../../handle-error.js';
-import { PikkuUserSessionService } from '../../../services/user-session-service.js';
-import { rpcService } from '../../rpc/rpc-runner.js';
+import { PikkuSessionService } from '../../../services/user-session-service.js';
 import { runChannelLifecycleWithMiddleware } from '../channel-common.js';
-export const runLocalChannel = async ({ singletonServices, channelId, request, response, route, createSessionServices, skipUserSession = false, respondWith404 = true, coerceDataFromSchema = true, logWarningsForStatusCodes = [], bubbleErrors = false, }) => {
-    let sessionServices;
+export const runLocalChannel = async ({ singletonServices, channelId, request, response, route, createWireServices, skipUserSession = false, respondWith404 = true, coerceDataFromSchema = true, logWarningsForStatusCodes = [], bubbleErrors = false, }) => {
+    let wireServices;
     let channelHandler;
-    const userSession = new PikkuUserSessionService();
+    const userSession = new PikkuSessionService();
     let http;
     if (request) {
-        http = createHTTPInteraction(request, response);
+        http = createHTTPWire(request, response);
         route = http?.request?.path();
     }
     let openingData, channelConfig, meta;
@@ -21,7 +20,7 @@ export const runLocalChannel = async ({ singletonServices, channelId, request, r
         ;
         ({ openingData, channelConfig, meta } = await openChannel({
             channelId,
-            createSessionServices,
+            createWireServices,
             respondWith404,
             request,
             response,
@@ -40,17 +39,11 @@ export const runLocalChannel = async ({ singletonServices, channelId, request, r
         try {
             channelHandler = new PikkuLocalChannelHandler(channelId, channelConfig.name, openingData);
             const channel = channelHandler.getChannel();
-            const session = await userSession.get();
-            if (createSessionServices) {
-                sessionServices = await createSessionServices(singletonServices, { http, channel }, session);
+            const wire = { channel, session: userSession };
+            if (createWireServices) {
+                wireServices = await createWireServices(singletonServices, wire);
             }
-            const getAllServices = (channel, requiresAuth) => rpcService.injectRPCService({
-                ...singletonServices,
-                ...sessionServices,
-                channel,
-                userSession,
-            }, interaction, requiresAuth);
-            const interaction = { channel };
+            const services = { ...singletonServices, ...wireServices };
             channelHandler.registerOnOpen(async () => {
                 if (channelConfig.onConnect && meta.connect) {
                     try {
@@ -59,7 +52,7 @@ export const runLocalChannel = async ({ singletonServices, channelId, request, r
                             meta: meta.connect,
                             lifecycleConfig: channelConfig.onConnect,
                             lifecycleType: 'connect',
-                            services: getAllServices(channel, false),
+                            services,
                             channel,
                             data: openingData,
                         });
@@ -81,7 +74,7 @@ export const runLocalChannel = async ({ singletonServices, channelId, request, r
                             meta: meta.disconnect,
                             lifecycleConfig: channelConfig.onDisconnect,
                             lifecycleType: 'disconnect',
-                            services: getAllServices(channel, false),
+                            services,
                             channel,
                         });
                     }
@@ -90,11 +83,11 @@ export const runLocalChannel = async ({ singletonServices, channelId, request, r
                         channel.send({ error: e.message || 'Unknown error' });
                     }
                 }
-                if (sessionServices) {
-                    await closeSessionServices(singletonServices.logger, sessionServices);
+                if (wireServices) {
+                    await closeWireServices(singletonServices.logger, wireServices);
                 }
             });
-            const onMessage = processMessageHandlers(getAllServices(channel), channelConfig, channelHandler);
+            const onMessage = processMessageHandlers(services, channelConfig, channelHandler, userSession);
             channelHandler.registerOnMessage(async (data) => {
                 try {
                     const result = await onMessage(data);
@@ -110,8 +103,8 @@ export const runLocalChannel = async ({ singletonServices, channelId, request, r
             handleHTTPError(e, http, channelId, singletonServices.logger, logWarningsForStatusCodes, respondWith404, bubbleErrors);
         }
         finally {
-            if (sessionServices) {
-                await closeSessionServices(singletonServices.logger, sessionServices);
+            if (wireServices) {
+                await closeWireServices(singletonServices.logger, wireServices);
             }
         }
     };

package/dist/wirings/channel/log-channels.js

@@ -4,7 +4,7 @@ import { pikkuState } from '../../pikku-state.js';
  * @param logger - A logger for logging information.
  */
 export const logChannels = (logger) => {
-    const channels = pikkuState('channel', 'channels');
+    const channels = pikkuState(null, 'channel', 'channels');
     if (channels.size === 0) {
         logger.info('No channels added');
         return;

package/dist/wirings/channel/serverless/serverless-channel-runner.d.ts

@@ -5,6 +5,6 @@ export interface RunServerlessChannelParams<ChannelData> extends RunChannelParam
     channelHandlerFactory: PikkuChannelHandlerFactory;
     channelObject?: unknown;
 }
-export declare const runChannelConnect: ({ singletonServices, channelId, channelObject, request, response, route, createSessionServices, channelStore, channelHandlerFactory, coerceDataFromSchema, logWarningsForStatusCodes, respondWith404, bubbleErrors, }: Pick<CoreChannel<unknown, any>, "route"> & RunChannelOptions & RunServerlessChannelParams<unknown>) => Promise<void>;
+export declare const runChannelConnect: ({ singletonServices, channelId, channelObject, request, response, route, createWireServices, channelStore, channelHandlerFactory, coerceDataFromSchema, logWarningsForStatusCodes, respondWith404, bubbleErrors, }: Pick<CoreChannel<unknown, any>, "route"> & RunChannelOptions & RunServerlessChannelParams<unknown>) => Promise<void>;
 export declare const runChannelDisconnect: ({ singletonServices, ...params }: RunServerlessChannelParams<unknown>) => Promise<void>;
 export declare const runChannelMessage: ({ singletonServices, ...params }: RunServerlessChannelParams<unknown>, data: unknown) => Promise<unknown>;

package/dist/wirings/channel/serverless/serverless-channel-runner.js

@@ -1,17 +1,16 @@
-import { closeSessionServices } from '../../../utils.js';
+import { closeWireServices } from '../../../utils.js';
 import { processMessageHandlers } from '../channel-handler.js';
 import { openChannel } from '../channel-runner.js';
-import { createHTTPInteraction } from '../../http/http-runner.js';
+import { createHTTPWire } from '../../http/http-runner.js';
 import { handleHTTPError } from '../../../handle-error.js';
-import { PikkuUserSessionService } from '../../../services/user-session-service.js';
+import { PikkuSessionService } from '../../../services/user-session-service.js';
 import { pikkuState } from '../../../pikku-state.js';
 import { PikkuFetchHTTPRequest } from '../../http/pikku-fetch-http-request.js';
 import { runChannelLifecycleWithMiddleware } from '../channel-common.js';
-import { rpcService } from '../../rpc/rpc-runner.js';
 const getVariablesForChannel = ({ channelId, channelName, channelHandlerFactory, openingData, }) => {
-    const channels = pikkuState('channel', 'channels');
+    const channels = pikkuState(null, 'channel', 'channels');
     const channelConfig = channels.get(channelName);
-    const channelsMeta = pikkuState('channel', 'meta');
+    const channelsMeta = pikkuState(null, 'channel', 'meta');
     const meta = channelsMeta[channelName];
     if (!channelConfig) {
         throw new Error(`Channel not found: ${channelName}`);
@@ -27,16 +26,16 @@ const getVariablesForChannel = ({ channelId, channelName, channelHandlerFactory,
         meta,
     };
 };
-export const runChannelConnect = async ({ singletonServices, channelId, channelObject, request, response, route, createSessionServices, channelStore, channelHandlerFactory, coerceDataFromSchema = true, logWarningsForStatusCodes = [], respondWith404 = true, bubbleErrors = false, }) => {
-    let sessionServices;
+export const runChannelConnect = async ({ singletonServices, channelId, channelObject, request, response, route, createWireServices, channelStore, channelHandlerFactory, coerceDataFromSchema = true, logWarningsForStatusCodes = [], respondWith404 = true, bubbleErrors = false, }) => {
+    let wireServices;
     let http;
     if (request instanceof Request) {
-        http = createHTTPInteraction(new PikkuFetchHTTPRequest(request), response);
+        http = createHTTPWire(new PikkuFetchHTTPRequest(request), response);
     }
-    const userSession = new PikkuUserSessionService(channelStore, channelId);
+    const userSession = new PikkuSessionService(channelStore, channelId);
     const { channelConfig, openingData, meta } = await openChannel({
         channelId,
-        createSessionServices,
+        createWireServices,
         request,
         route,
         singletonServices,
@@ -55,23 +54,21 @@ export const runChannelConnect = async ({ singletonServices, channelId, channelO
             channelHandlerFactory,
             channelName: channelConfig.name,
         });
-        if (createSessionServices) {
-            sessionServices = await createSessionServices(singletonServices, { http }, await userSession.get());
+        const wire = { channel, session: userSession };
+        if (createWireServices) {
+            wireServices = await createWireServices(singletonServices, wire);
         }
-        const interaction = { channel };
-        const getAllServices = (requiresAuth) => rpcService.injectRPCService({
+        const services = {
             ...singletonServices,
-            ...sessionServices,
-            channel,
-            userSession,
-        }, interaction, requiresAuth);
+            ...wireServices,
+        };
         if (channelConfig.onConnect && meta.connect) {
             await runChannelLifecycleWithMiddleware({
                 channelConfig,
                 meta: meta.connect,
                 lifecycleConfig: channelConfig.onConnect,
                 lifecycleType: 'connect',
-                services: getAllServices(false),
+                services,
                 channel,
                 data: openingData,
             });
@@ -82,13 +79,13 @@ export const runChannelConnect = async ({ singletonServices, channelId, channelO
         handleHTTPError(e, http, channelId, singletonServices.logger, logWarningsForStatusCodes, respondWith404, bubbleErrors);
     }
     finally {
-        if (sessionServices) {
-            await closeSessionServices(singletonServices.logger, sessionServices);
+        if (wireServices) {
+            await closeWireServices(singletonServices.logger, wireServices);
         }
     }
 };
 export const runChannelDisconnect = async ({ singletonServices, ...params }) => {
-    let sessionServices;
+    let wireServices;
     // Try to get channel from store. In serverless environments (especially with
     // serverless-offline or worker threads), disconnect can be called multiple times
     // or after the channel has already been cleaned up. If channel doesn't exist,
@@ -107,17 +104,16 @@ export const runChannelDisconnect = async ({ singletonServices, ...params }) =>
         openingData,
         channelName,
     });
-    const userSession = new PikkuUserSessionService(params.channelStore, params.channelId);
-    if (!sessionServices && params.createSessionServices) {
-        sessionServices = await params.createSessionServices(singletonServices, { channel }, session);
+    const userSession = new PikkuSessionService(params.channelStore, params.channelId);
+    userSession.setInitial(session);
+    const wire = { channel, session: userSession };
+    if (!wireServices && params.createWireServices) {
+        wireServices = await params.createWireServices(singletonServices, wire);
     }
-    const interaction = { channel };
-    const getAllServices = (requiresAuth) => rpcService.injectRPCService({
+    const services = {
         ...singletonServices,
-        ...sessionServices,
-        channel,
-        userSession,
-    }, interaction, requiresAuth);
+        ...wireServices,
+    };
     if (channelConfig.onDisconnect && meta.disconnect) {
         try {
             await runChannelLifecycleWithMiddleware({
@@ -125,7 +121,7 @@ export const runChannelDisconnect = async ({ singletonServices, ...params }) =>
                 meta: meta.disconnect,
                 lifecycleConfig: channelConfig.onDisconnect,
                 lifecycleType: 'disconnect',
-                services: getAllServices(false),
+                services,
                 channel,
             });
         }
@@ -134,32 +130,31 @@ export const runChannelDisconnect = async ({ singletonServices, ...params }) =>
         }
     }
     await params.channelStore.removeChannels([channel.channelId]);
-    if (sessionServices) {
-        await closeSessionServices(singletonServices.logger, sessionServices);
+    if (wireServices) {
+        await closeWireServices(singletonServices.logger, wireServices);
     }
 };
 export const runChannelMessage = async ({ singletonServices, ...params }, data) => {
-    let sessionServices;
+    let wireServices;
     const { openingData, channelName, session } = await params.channelStore.getChannelAndSession(params.channelId);
     const { channel, channelHandler, channelConfig } = getVariablesForChannel({
         ...params,
         openingData,
         channelName,
     });
-    const userSession = new PikkuUserSessionService(params.channelStore, params.channelId);
-    if (params.createSessionServices) {
-        sessionServices = await params.createSessionServices(singletonServices, { channel }, session);
+    const userSession = new PikkuSessionService(params.channelStore, params.channelId);
+    userSession.setInitial(session);
+    const wire = { channel, session: userSession };
+    if (params.createWireServices) {
+        wireServices = await params.createWireServices(singletonServices, wire);
     }
-    const interaction = { channel };
-    const getAllServices = () => rpcService.injectRPCService({
+    const services = {
         ...singletonServices,
-        ...sessionServices,
-        channel,
-        userSession,
-    }, interaction);
+        ...wireServices,
+    };
     let response;
     try {
-        const onMessage = processMessageHandlers(getAllServices(), channelConfig, channelHandler);
+        const onMessage = processMessageHandlers(services, channelConfig, channelHandler, userSession);
         response = await onMessage(data);
     }
     catch (e) {
@@ -167,8 +162,8 @@ export const runChannelMessage = async ({ singletonServices, ...params }, data)
         return { error: e.message || 'Unknown error' };
     }
     finally {
-        if (sessionServices) {
-            await closeSessionServices(singletonServices.logger, sessionServices);
+        if (wireServices) {
+            await closeWireServices(singletonServices.logger, wireServices);
         }
     }
     return response;

package/dist/wirings/cli/channel/cli-channel-runner.js

@@ -12,10 +12,11 @@ const defaultJSONRenderer = (_services, data) => {
  */
 export async function executeCLIViaChannel({ programName, pikkuWS, args = process.argv.slice(2), renderers = {}, defaultRenderer, }) {
     // Get CLI metadata from state
-    const allCLIMeta = pikkuState('cli', 'meta');
-    if (!allCLIMeta) {
+    const cliMeta = pikkuState(null, 'cli', 'meta');
+    if (!cliMeta || !('programs' in cliMeta)) {
         throw new Error('[PKU342] CLI metadata not found. No CLI wirings were registered. See https://pikku.dev/docs/pikku-cli/errors/pku342 for more information.');
     }
+    const allCLIMeta = cliMeta;
     const programMeta = allCLIMeta.programs[programName];
     if (!programMeta) {
         console.error(`Error: CLI program "${programName}" not found`);

package/dist/wirings/cli/cli-runner.d.ts

@@ -1,6 +1,6 @@
 import { CorePikkuMiddleware, CoreUserSession } from '../../types/core.types.js';
 import { CoreCLI, CorePikkuCLIRender, CoreCLICommandConfig } from './cli.types.js';
-import type { CoreSingletonServices, CoreServices, CreateSessionServices, CreateConfig, CreateSingletonServices } from '../../types/core.types.js';
+import type { CoreSingletonServices, CoreServices, CreateWireServices, CreateConfig, CreateSingletonServices } from '../../types/core.types.js';
 /**
  * CLI command execution error - thrown when CLI execution fails
  * Should be caught by the wrapper to call process.exit()
@@ -16,12 +16,12 @@ export declare const wireCLI: <Commands extends Record<string, CoreCLICommandCon
 /**
  * Executes a CLI command for a specific program
  */
-export declare function runCLICommand({ program, commandPath, data, singletonServices, createSessionServices, }: {
+export declare function runCLICommand({ program, commandPath, data, singletonServices, createWireServices, }: {
     program: string;
     commandPath: string[];
     data: Record<string, any>;
     singletonServices: CoreSingletonServices;
-    createSessionServices?: CreateSessionServices;
+    createWireServices?: CreateWireServices;
 }): Promise<any>;
 /**
  * Factory function for CLI-specific renderers
@@ -33,10 +33,10 @@ export declare const pikkuCLIRender: <Data, Services extends CoreSingletonServic
  *
  * @throws {CLIError} When CLI execution fails - should be caught by wrapper to call process.exit()
  */
-export declare function executeCLI({ programName, args, createConfig, createSingletonServices, createSessionServices, }: {
+export declare function executeCLI({ programName, args, createConfig, createSingletonServices, createWireServices, }: {
     programName: string;
     args?: string[];
     createConfig: CreateConfig<any, any>;
     createSingletonServices: CreateSingletonServices<any, any>;
-    createSessionServices?: CreateSessionServices<any, any, any>;
+    createWireServices?: CreateWireServices<any, any, any>;
 }): Promise<void>;

package/dist/wirings/cli/cli-runner.js

@@ -1,10 +1,7 @@
 import { NotFoundError } from '../../errors/errors.js';
 import { addFunction, runPikkuFunc } from '../../function/function-runner.js';
 import { pikkuState } from '../../pikku-state.js';
-import { PikkuWiringTypes, } from '../../types/core.types.js';
-import { closeSessionServices } from '../../utils.js';
-import { rpcService } from '../rpc/rpc-runner.js';
-import { PikkuUserSessionService } from '../../services/user-session-service.js';
+import { PikkuSessionService } from '../../services/user-session-service.js';
 import { LocalVariablesService } from '../../services/local-variables.js';
 import { generateCommandHelp, parseCLIArguments } from './command-parser.js';
 /**
@@ -30,12 +27,12 @@ const defaultJSONRenderer = (_services, data) => {
  */
 export const wireCLI = (cli) => {
     // Get the existing metadata that was generated during inspection
-    const cliMeta = pikkuState('cli', 'meta') || {};
+    const cliMeta = pikkuState(null, 'cli', 'meta') || {};
     if (!cliMeta.programs?.[cli.program]) {
         throw new Error(`CLI metadata not found for program '${cli.program}'. Did you run 'pikku all'?`);
     }
     // Get existing programs state and add this program
-    const programs = pikkuState('cli', 'programs') || {};
+    const programs = pikkuState(null, 'cli', 'programs') || {};
     programs[cli.program] = {
         defaultRenderer: (cli.render ||
             defaultJSONRenderer),
@@ -43,7 +40,7 @@ export const wireCLI = (cli) => {
         renderers: {},
         tags: cli.tags,
     };
-    pikkuState('cli', 'programs', programs);
+    pikkuState(null, 'cli', 'programs', programs);
     // Register all command functions recursively
     registerCLICommands(cli.commands, [], cli.options || {}, cli.program);
 };
@@ -75,7 +72,7 @@ function unwrapFunc(command) {
  */
 function registerCLICommands(commands, path = [], inheritedOptions = {}, program) {
     // Get the CLI metadata to find actual function names
-    const cliMeta = pikkuState('cli', 'meta').programs[program];
+    const cliMeta = pikkuState(null, 'cli', 'meta').programs[program];
     for (const [name, command] of Object.entries(commands)) {
         const fullPath = [...path, name];
         const commandId = fullPath.join('.');
@@ -99,7 +96,7 @@ function registerCLICommands(commands, path = [], inheritedOptions = {}, program
         const commandOptions = typeof command === 'object' ? command.options || {} : {};
         const mergedOptions = { ...inheritedOptions, ...commandOptions };
         // Store the options and middleware in program state for use during execution
-        const programs = pikkuState('cli', 'programs');
+        const programs = pikkuState(null, 'cli', 'programs');
         if (programs[program]) {
             if (!programs[program].commandOptions) {
                 programs[program].commandOptions = {};
@@ -130,10 +127,10 @@ function registerCLICommands(commands, path = [], inheritedOptions = {}, program
  * Plucks only the data that the function expects based on its schema
  */
 function pluckCLIData(mergedData, funcName, availableOptions) {
-    const funcMeta = pikkuState('function', 'meta')[funcName];
+    const funcMeta = pikkuState(null, 'function', 'meta')[funcName];
     const schemaName = funcMeta?.inputSchemaName;
     const schema = schemaName
-        ? pikkuState('misc', 'schemas').get(schemaName)
+        ? pikkuState(null, 'misc', 'schemas').get(schemaName)
         : null;
     if (schema && schema.properties) {
         // If we have a schema, only include fields that are in the schema
@@ -157,9 +154,9 @@ function pluckCLIData(mergedData, funcName, availableOptions) {
 /**
  * Executes a CLI command for a specific program
  */
-export async function runCLICommand({ program, commandPath, data, singletonServices, createSessionServices, }) {
+export async function runCLICommand({ program, commandPath, data, singletonServices, createWireServices, }) {
     // Get the command metadata to find the function name
-    const cliMeta = pikkuState('cli', 'meta');
+    const cliMeta = pikkuState(null, 'cli', 'meta');
     const programMeta = cliMeta.programs?.[program];
     if (!programMeta) {
         throw new NotFoundError(`Program not found: ${program}`);
@@ -178,7 +175,7 @@ export async function runCLICommand({ program, commandPath, data, singletonServi
     }
     const funcName = currentCommand.pikkuFuncName;
     // Get program-specific data
-    const programs = pikkuState('cli', 'programs') || {};
+    const programs = pikkuState(null, 'cli', 'programs') || {};
     const programData = programs[program];
     // Combine program middleware + command middleware from the hierarchy
     const allWireMiddleware = [
@@ -217,39 +214,28 @@ export async function runCLICommand({ program, commandPath, data, singletonServi
         },
         state: 'open',
     };
-    const userSession = new PikkuUserSessionService();
-    let sessionServices;
-    const interaction = {
+    const userSession = new PikkuSessionService();
+    const wire = {
         cli: {
             program,
             command: commandPath,
             data: pluckedData,
             channel,
         },
-    };
-    const getAllServices = async (session) => {
-        // Create session-specific services for handling the command
-        sessionServices = await createSessionServices?.(singletonServices, interaction, session);
-        return rpcService.injectRPCService({
-            ...singletonServices,
-            ...sessionServices,
-            userSession,
-            channel,
-        }, interaction, false);
+        session: userSession,
     };
     try {
-        const result = await runPikkuFunc(PikkuWiringTypes.cli, commandId, funcName, {
+        const result = await runPikkuFunc('cli', commandId, funcName, {
             singletonServices,
-            getAllServices,
+            createWireServices,
             data: pluckedData,
             auth: false,
-            userSession,
             inheritedMiddleware: currentCommand.middleware,
             wireMiddleware: allWireMiddleware,
             inheritedPermissions: currentCommand.permissions,
             wirePermissions: undefined,
             tags: programData?.tags,
-            interaction,
+            wire,
         });
         // Apply renderer one final time with the final output (if renderer exists)
         if (renderer) {
@@ -260,10 +246,6 @@ export async function runCLICommand({ program, commandPath, data, singletonServi
     finally {
         // Close the channel
         channel.close();
-        // Clean up session services
-        if (sessionServices) {
-            await closeSessionServices(singletonServices.logger, sessionServices);
-        }
     }
 }
 /**
@@ -278,13 +260,13 @@ export const pikkuCLIRender = (renderer) => {
  *
  * @throws {CLIError} When CLI execution fails - should be caught by wrapper to call process.exit()
  */
-export async function executeCLI({ programName, args, createConfig, createSingletonServices, createSessionServices, }) {
+export async function executeCLI({ programName, args, createConfig, createSingletonServices, createWireServices, }) {
     if (!args) {
         throw new Error('CLI arguments are required, this is to satisfy release diffs');
     }
     try {
         // Get CLI metadata from state
-        const allCLIMeta = pikkuState('cli', 'meta');
+        const allCLIMeta = pikkuState(null, 'cli', 'meta');
         if (!allCLIMeta) {
             throw new Error('[PKU342] CLI metadata not found. No CLI wirings were registered. See https://pikku.dev/docs/pikku-cli/errors/pku342 for more information.');
         }
@@ -333,7 +315,7 @@ export async function executeCLI({ programName, args, createConfig, createSingle
             commandPath: parsed.commandPath,
             data,
             singletonServices,
-            createSessionServices,
+            createWireServices,
         });
     }
     catch (error) {

package/dist/wirings/cli/cli.types.d.ts

@@ -1,4 +1,4 @@
-import { CorePikkuMiddleware, CoreSingletonServices, CoreUserSession, PikkuDocs, CoreServices, MiddlewareMetadata, PermissionMetadata } from '../../types/core.types.js';
+import { CorePikkuMiddleware, CoreSingletonServices, CoreUserSession, CoreServices, MiddlewareMetadata, PermissionMetadata } from '../../types/core.types.js';
 import { CorePikkuFunctionConfig, CorePikkuPermission, CorePikkuFunction, CorePikkuFunctionSessionless } from '../../function/functions.types.js';
 import { PikkuChannel } from '../channel/channel.types.js';
 /**
@@ -27,7 +27,7 @@ export interface CLIPositional {
     variadic?: boolean;
 }
 /**
- * CLI interaction context
+ * CLI wire context
  */
 export type PikkuCLI = {
     program: string;
@@ -55,8 +55,9 @@ export interface CLICommandMeta {
     positionals: CLIPositional[];
     options: Record<string, CLIOption>;
     renderName?: string;
+    summary?: string;
     description?: string;
-    docs?: PikkuDocs;
+    errors?: string[];
     tags?: string[];
     subcommands?: Record<string, CLICommandMeta>;
     middleware?: MiddlewareMetadata[];
@@ -99,7 +100,7 @@ export type CorePikkuCLIRender<Data, Services extends CoreSingletonServices = Co
 /**
  * Extract input parameters from a Pikku function config type
  */
-export type ExtractFunctionInput<Func> = Func extends CorePikkuFunctionConfig<infer FuncType, any, any> ? FuncType extends CorePikkuFunction<infer Input, any, any, any, any> | CorePikkuFunctionSessionless<infer Input, any, any, any, any> ? Input : never : never;
+export type ExtractFunctionInput<Func> = Func extends CorePikkuFunctionConfig<infer FuncType, any, any> ? FuncType extends CorePikkuFunction<infer Input, any, any, any> | CorePikkuFunctionSessionless<infer Input, any, any, any> ? Input : never : never;
 /**
  * Strip < > [ ] characters from a string
  */
@@ -131,14 +132,15 @@ export type ValidateParameters<Params extends string, Input> = AllParamsValid<Ex
 /**
  * Extract output type from a Pikku function config type
  */
-export type ExtractFunctionOutput<Func> = Func extends CorePikkuFunctionConfig<infer FuncType, any, any> ? FuncType extends CorePikkuFunction<any, infer Output, any, any, any> | CorePikkuFunctionSessionless<any, infer Output, any, any, any> ? Output : never : never;
+export type ExtractFunctionOutput<Func> = Func extends CorePikkuFunctionConfig<infer FuncType, any, any> ? FuncType extends CorePikkuFunction<any, infer Output, any, any> | CorePikkuFunctionSessionless<any, infer Output, any, any> ? Output : never : never;
 /**
  * CLI command configuration that infers options from function input type.
  * This is a helper type for creating type-safe CLI commands.
  */
-export type CoreCLICommandConfig<FuncConfig, PikkuMiddleware extends CorePikkuMiddleware<any> = CorePikkuMiddleware<any>, PikkuCLIRender extends CorePikkuCLIRender<any, any, any> = CorePikkuCLIRender<any, any>, Params extends string = string> = {
+export type CoreCLICommandConfig<FuncConfig, PikkuMiddleware extends CorePikkuMiddleware<any, any> = CorePikkuMiddleware<any, any>, PikkuCLIRender extends CorePikkuCLIRender<any, any, any> = CorePikkuCLIRender<any, any>, Params extends string = string> = {
     parameters?: ValidateParameters<Params, ExtractFunctionInput<FuncConfig>>;
     func?: FuncConfig;
+    title?: string;
     description?: string;
     render?: PikkuCLIRender;
     options?: {
@@ -157,7 +159,7 @@ export type CoreCLICommandConfig<FuncConfig, PikkuMiddleware extends CorePikkuMi
 /**
  * CLI command definition
  */
-export interface CoreCLICommand<In, Out, PikkuFunctionConfig extends CorePikkuFunctionConfig<CorePikkuFunction<In, Out, any, any, any> | CorePikkuFunctionSessionless<In, Out, any, any, any>>, PikkuPermission extends CorePikkuPermission<any, any, any>, PikkuMiddleware extends CorePikkuMiddleware, Options = any, Subcommands extends Record<string, CoreCLICommandConfig<any, any, any>> = Record<string, CoreCLICommandConfig<any, any, any>>> {
+export interface CoreCLICommand<In, Out, PikkuFunctionConfig extends CorePikkuFunctionConfig<CorePikkuFunction<In, Out, any, any> | CorePikkuFunctionSessionless<In, Out, any, any>>, PikkuPermission extends CorePikkuPermission<any, any, any>, PikkuMiddleware extends CorePikkuMiddleware, Options = any, Subcommands extends Record<string, CoreCLICommandConfig<any, any, any>> = Record<string, CoreCLICommandConfig<any, any, any>>> {
     parameters?: string;
     func: PikkuFunctionConfig;
     render?: CorePikkuCLIRender<Out>;
@@ -166,18 +168,20 @@ export interface CoreCLICommand<In, Out, PikkuFunctionConfig extends CorePikkuFu
     middleware?: PikkuMiddleware[];
     permissions?: Record<string, PikkuPermission | PikkuPermission[]>;
     auth?: boolean;
-    docs?: PikkuDocs;
+    summary?: string;
+    errors?: string[];
+    tags?: string[];
     subcommands?: Subcommands;
     isDefault?: boolean;
 }
 /**
  * Shorthand command definition (just a function)
  */
-export type CLICommandShorthand<In, Out, PikkuFunctionConfig extends CorePikkuFunctionConfig<CorePikkuFunction<In, Out, any, any, any> | CorePikkuFunctionSessionless<In, Out, any, any, any>>> = PikkuFunctionConfig;
+export type CLICommandShorthand<In, Out, PikkuFunctionConfig extends CorePikkuFunctionConfig<CorePikkuFunction<In, Out, any, any> | CorePikkuFunctionSessionless<In, Out, any, any>>> = PikkuFunctionConfig;
 /**
  * Command definition (either full or shorthand)
  */
-export type CLICommandDefinition<In, Out, PikkuFunctionConfig extends CorePikkuFunctionConfig<CorePikkuFunction<In, Out, any, any, any> | CorePikkuFunctionSessionless<In, Out, any, any, any>>, PikkuPermission extends CorePikkuPermission<any, any, any>, PikkuMiddleware extends CorePikkuMiddleware, Options = any, Subcommands extends Record<string, CoreCLICommandConfig<any, any, any>> = Record<string, CoreCLICommandConfig<any, any, any>>> = CoreCLICommand<In, Out, PikkuFunctionConfig, PikkuPermission, PikkuMiddleware, Options, Subcommands> | CLICommandShorthand<In, Out, PikkuFunctionConfig>;
+export type CLICommandDefinition<In, Out, PikkuFunctionConfig extends CorePikkuFunctionConfig<CorePikkuFunction<In, Out, any, any> | CorePikkuFunctionSessionless<In, Out, any, any>>, PikkuPermission extends CorePikkuPermission<any, any, any>, PikkuMiddleware extends CorePikkuMiddleware, Options = any, Subcommands extends Record<string, CoreCLICommandConfig<any, any, any>> = Record<string, CoreCLICommandConfig<any, any, any>>> = CoreCLICommand<In, Out, PikkuFunctionConfig, PikkuPermission, PikkuMiddleware, Options, Subcommands> | CLICommandShorthand<In, Out, PikkuFunctionConfig>;
 /**
  * CLI wiring configuration
  */
@@ -188,7 +192,8 @@ export interface CoreCLI<Commands extends Record<string, CoreCLICommandConfig<an
     options?: CLIOptions<Options>;
     middleware?: PikkuMiddleware[];
     render?: PikkuCLIRender;
-    docs?: PikkuDocs;
+    summary?: string;
+    errors?: string[];
     tags?: string[];
 }
 /**