@pikku/cli 0.12.105 → 0.12.109

package/dist/src/functions/wirings/channels/serialize-channel-types.js

@@ -1,17 +1,20 @@
 /**
  * Generates type definitions for WebSocket channel wirings
  */
-export const serializeChannelTypes = (functionTypesImportPath, packageName) => {
-    const packageNameValue = packageName ? `'${packageName}'` : 'null';
+export const serializeChannelTypes = (functionTypesImportPath, middlewareTypesImportPath, authTypesImportPath, { addon = false } = {}) => {
     return `/**
  * Channel-specific type definitions for tree-shaking optimization
  */
 
-import { wireChannel as wireChannelCore, defineChannelRoutes as defineChannelRoutesCore } from '@pikku/core/channel'
-import { CoreChannel, CorePikkuChannelMiddleware, CorePikkuChannelMiddlewareFactory, addChannelMiddleware as addChannelMiddlewareCore } from '@pikku/core/ecosystem/channel'
-import { AssertHTTPWiringParams } from '@pikku/core/ecosystem/http'
-import type { PikkuFunctionConfig, PikkuFunctionSessionless, PikkuPermission, PikkuMiddleware, Services } from '${functionTypesImportPath}'
-import type { CorePermissionGroup } from '@pikku/core/ecosystem/types'
+import { ${addon ? '' : 'wireChannel as wireChannelCore, '}defineChannelRoutes as defineChannelRoutesCore } from '@pikku/core/channel'
+${addon
+        ? ''
+        : `import {
+  CoreChannel,
+} from '@pikku/core/channel'\n`}${addon ? '' : `import { AssertHTTPWiringParams } from '@pikku/core/http'\n`}import type { PikkuFunctionConfig, PikkuFunctionSessionless } from '${functionTypesImportPath}'
+import type { PikkuPermission } from '${authTypesImportPath}'
+import type { PikkuMiddleware } from '${middlewareTypesImportPath}'
+import type { CorePermissionGroup } from '@pikku/core/function'
 import type { StandardSchemaV1 } from '@standard-schema/spec'
 
 /**
@@ -19,7 +22,9 @@ import type { StandardSchemaV1 } from '@standard-schema/spec'
  */
 type InferSchemaOutput<T> = T extends StandardSchemaV1<any, infer Output> ? Output : never
 
-/**
+${addon
+        ? ''
+        : `/**
  * Type definition for WebSocket channels with typed data exchange.
  * Supports connection, disconnection, and message handling.
  * Accepts both session-based (PikkuFunction) and sessionless (PikkuFunctionSessionless) functions.
@@ -36,6 +41,7 @@ type ChannelWiring<ChannelData, Channel extends string> = CoreChannel<
   PikkuPermission,
   PikkuMiddleware
 >
+`}
 
 /**
  * Creates a function that handles WebSocket channel connections.
@@ -137,7 +143,9 @@ export function pikkuChannelFunc(func: any) {
   return typeof func === 'function' ? { func } : func
 }
 
-/**
+${addon
+        ? ''
+        : `/**
  * Registers a WebSocket channel with the Pikku framework.
  *
  * @template ChannelData - Type of data associated with the channel
@@ -149,7 +157,7 @@ export const wireChannel = <ChannelData, Channel extends string>(
 ) => {
   wireChannelCore(channel as any)
 }
-
+`}
 /**
  * Type-safe helper for defining channel message routes that can be composed.
  * Returns the routes record as-is for use with wireChannel's onMessageWiring.
@@ -162,21 +170,6 @@ export function defineChannelRoutes<T extends Record<string, any>>(routes: T): T
   return defineChannelRoutesCore(routes)
 }
 
-export type PikkuChannelMiddleware<RequiredServices extends Services = Services, Event = unknown> = CorePikkuChannelMiddleware<RequiredServices, Event>
-
-export const pikkuChannelMiddleware = <RequiredServices extends Services = Services, Event = unknown>(
-  middleware: PikkuChannelMiddleware<RequiredServices, Event>
-): PikkuChannelMiddleware<RequiredServices, Event> => {
-  return middleware
-}
-
-export const pikkuChannelMiddlewareFactory = <In = any>(
-  factory: CorePikkuChannelMiddlewareFactory<In>
-): CorePikkuChannelMiddlewareFactory<In> => {
-  return factory
-}
 
-export const addChannelMiddleware = (tag: string, middleware: PikkuChannelMiddleware[]) =>
-  addChannelMiddlewareCore(tag, middleware, ${packageNameValue})
 `;
 };

package/dist/src/functions/wirings/channels/serialize-typed-channel-map.d.ts

@@ -1,5 +1,4 @@
-import type { ChannelsMeta } from '@pikku/core/ecosystem/channel';
+import type { ChannelsMeta } from '@pikku/core/channel';
 import type { TypesMap } from '@pikku/inspector';
-import type { FunctionsMeta } from '@pikku/core/ecosystem/services';
-import type { Logger } from '@pikku/core/services';
+import type { FunctionsMeta, Logger } from '@pikku/core/services';
 export declare const serializeTypedChannelsMap: (logger: Logger, relativeToPath: string, packageMappings: Record<string, string>, typesMap: TypesMap, functionsMeta: FunctionsMeta, addonFunctions: Record<string, FunctionsMeta>, channelsMeta: ChannelsMeta, rpcInternalMapDeclarationFile: string) => string;

package/dist/src/functions/wirings/cli/pikku-command-cli-entry.d.ts

@@ -1 +1 @@
-export declare const pikkuCLIEntry: import("#pikku").PikkuFunctionConfig<void, boolean, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<void, boolean, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<void, boolean, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
+export declare const pikkuCLIEntry: import("#pikku/function").PikkuFunctionConfig<void, boolean, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<void, boolean, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<void, boolean, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;

package/dist/src/functions/wirings/cli/pikku-command-cli-entry.js

@@ -1,4 +1,4 @@
-import { pikkuSessionlessFunc } from '#pikku';
+import { pikkuSessionlessFunc } from '#pikku/function';
 import { writeFileInDir } from '../../../utils/file-writer.js';
 import { checkRequiredTypes } from '../../../utils/check-required-types.js';
 import { logCommandInfoAndTime } from '../../../middleware/log-command-info-and-time.js';
@@ -57,7 +57,7 @@ export const pikkuCLIEntry = pikkuSessionlessFunc({
                             `Move it to a source directory like "src/wirings/cli-channel.gen.ts".`);
                     }
                     const channelWireFile = resolvedWirePath;
-                    const channelCode = serializeChannelCLI(programName, programMeta, channelWireFile, visitState.functions.files, config.packageMappings, config.channelsTypesFile, config.functionTypesFile, channelName, channelRoute, config.globalHTTPPrefix || '', visitState.rpc?.wireAddonDeclarations);
+                    const channelCode = serializeChannelCLI(programName, programMeta, channelWireFile, visitState.functions.files, config.packageMappings, config.channelsTypesFile, config.functionTypesFile, config.middlewareTypesFile, channelName, channelRoute, config.globalHTTPPrefix || '', visitState.rpc?.wireAddonDeclarations);
                     await writeFileInDir(logger, channelWireFile, channelCode);
                     channelWireGenerated = true;
                     logger.debug(`Serialized CLI channel for ${programName}: ${channelWireFile}`);

package/dist/src/functions/wirings/cli/pikku-command-cli-types.d.ts

@@ -1,5 +1,5 @@
 type CLITypesCommandInput = {
     bootstrap?: boolean;
 };
-export declare const pikkuCLITypes: import("#pikku").PikkuFunctionConfig<CLITypesCommandInput, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<CLITypesCommandInput, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<CLITypesCommandInput, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
+export declare const pikkuCLITypes: import("#pikku/function").PikkuFunctionConfig<CLITypesCommandInput, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<CLITypesCommandInput, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<CLITypesCommandInput, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;
 export {};

package/dist/src/functions/wirings/cli/pikku-command-cli-types.js

@@ -1,4 +1,4 @@
-import { pikkuSessionlessFunc } from '#pikku';
+import { pikkuSessionlessFunc } from '#pikku/function';
 import { writeFileInDir } from '../../../utils/file-writer.js';
 import { getFileImportRelativePath } from '../../../utils/file-import-path.js';
 import { logCommandInfoAndTime } from '../../../middleware/log-command-info-and-time.js';
@@ -10,7 +10,7 @@ export const pikkuCLITypes = pikkuSessionlessFunc({
         const bootstrap = input?.bootstrap === true;
         // In bootstrap mode we only need filesAndMethods (userSession/singleton
         // services types) — skip schema generation. Full mode would dynamic-import
-        // pikku-types.gen.ts, which re-exports the not-yet-written cli-types file.
+        // the not-yet-written cli-types file through '#pikku/cli'.
         const visitState = bootstrap
             ? await getInspectorState(false, true, true)
             : await getInspectorState();
@@ -25,7 +25,7 @@ export const pikkuCLITypes = pikkuSessionlessFunc({
         if (!userSessionType || !singletonServicesType) {
             throw new Error('Required types not found');
         }
-        const content = serializeCLITypes(functionTypesImportPath, `import type { ${userSessionType.type} } from '${getFileImportRelativePath(cliTypesFile, userSessionType.typePath, packageMappings)}'`, userSessionType.type, `import type { ${singletonServicesType.type} } from '${getFileImportRelativePath(cliTypesFile, singletonServicesType.typePath, packageMappings)}'`, singletonServicesType.type);
+        const content = serializeCLITypes(functionTypesImportPath, getFileImportRelativePath(cliTypesFile, config.middlewareTypesFile, packageMappings), `import type { ${userSessionType.type} } from '${getFileImportRelativePath(cliTypesFile, userSessionType.typePath, packageMappings)}'`, userSessionType.type, `import type { ${singletonServicesType.type} } from '${getFileImportRelativePath(cliTypesFile, singletonServicesType.typePath, packageMappings)}'`, singletonServicesType.type);
         await writeFileInDir(logger, cliTypesFile, content);
     },
     middleware: [

package/dist/src/functions/wirings/cli/pikku-command-cli.d.ts

@@ -1 +1 @@
-export declare const pikkuCLI: import("#pikku").PikkuFunctionConfig<void, boolean | undefined, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<void, boolean | undefined, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<void, boolean | undefined, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
+export declare const pikkuCLI: import("#pikku/function").PikkuFunctionConfig<void, boolean | undefined, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<void, boolean | undefined, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<void, boolean | undefined, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;

package/dist/src/functions/wirings/cli/pikku-command-cli.js

@@ -1,4 +1,4 @@
-import { pikkuSessionlessFunc } from '#pikku';
+import { pikkuSessionlessFunc } from '#pikku/function';
 import { serializeFileImports } from '../../../utils/file-imports-serializer.js';
 import { writeFileInDir } from '../../../utils/file-writer.js';
 import { logCommandInfoAndTime } from '../../../middleware/log-command-info-and-time.js';
@@ -41,7 +41,7 @@ export const pikkuCLI = pikkuSessionlessFunc({
         const importStatement = supportsImportAttributes
             ? `import metaData from '${jsonImportPath}' with { type: 'json' }`
             : `import metaData from '${jsonImportPath}'`;
-        await writeFileInDir(logger, cliWiringMetaFile, `import { pikkuState } from '@pikku/core/ecosystem'\nimport { CLIMeta } from '@pikku/core/ecosystem/cli'\n${importStatement}\npikkuState(null, 'cli', 'meta', metaData as CLIMeta)`);
+        await writeFileInDir(logger, cliWiringMetaFile, `import { pikkuState } from '@pikku/core/state'\nimport { CLIMeta } from '@pikku/core/cli'\n${importStatement}\npikkuState(null, 'cli', 'meta', metaData as CLIMeta)`);
         return true;
     },
     middleware: [

package/dist/src/functions/wirings/cli/serialize-channel-cli-client.d.ts

@@ -1,4 +1,4 @@
-import type { CLIProgramMeta } from '@pikku/core/ecosystem/cli';
+import type { CLIProgramMeta } from '@pikku/core/cli';
 import type { Config } from '../../../../types/application-types.js';
 /**
  * Collect all unique renderer names from CLI metadata (populated by inspector)

package/dist/src/functions/wirings/cli/serialize-channel-cli-client.js

@@ -111,9 +111,9 @@ export function serializeChannelCLIClient(programName, programMeta, clientFile,
         ? `,\n    defaultRenderer: ${defaultRendererBinding} as CorePikkuCLIClientRender<any>`
         : '';
     return `
-import { executeRawCLIViaChannel } from '@pikku/core/ecosystem/cli/channel'
-import type { CorePikkuCLIClientRender } from '@pikku/core/ecosystem/cli/channel'
-import type { Capabilities } from '@pikku/core/ecosystem/channel'
+import { executeRawCLIViaChannel } from '@pikku/core/cli/channel'
+import type { CorePikkuCLIClientRender } from '@pikku/core/cli/channel'
+import type { Capabilities } from '@pikku/core/channel'
 import { CorePikkuWebsocket } from '@pikku/websocket'
 ${rendererImports}
 /**

package/dist/src/functions/wirings/cli/serialize-channel-cli.d.ts

@@ -1,4 +1,4 @@
-import type { CLIProgramMeta } from '@pikku/core/ecosystem/cli';
+import type { CLIProgramMeta } from '@pikku/core/cli';
 type WireAddonDeclarations = Map<string, {
     package: string;
 }>;
@@ -9,5 +9,5 @@ type WireAddonDeclarations = Map<string, {
 export declare function serializeChannelCLI(programName: string, programMeta: CLIProgramMeta, channelFile: string, functionFiles: Map<string, {
     path: string;
     exportedName: string;
-}>, packageMappings: Record<string, string>, channelTypesFile: string, functionTypesFile: string, channelName?: string, channelRoute?: string, globalHTTPPrefix?: string, wireAddonDeclarations?: WireAddonDeclarations): string;
+}>, packageMappings: Record<string, string>, channelTypesFile: string, functionTypesFile: string, middlewareTypesFile: string, channelName?: string, channelRoute?: string, globalHTTPPrefix?: string, wireAddonDeclarations?: WireAddonDeclarations): string;
 export {};

package/dist/src/functions/wirings/cli/serialize-channel-cli.js

@@ -3,7 +3,7 @@ import { getFileImportRelativePath } from '../../../utils/file-import-path.js';
  * Serializes a wireChannel call from CLI metadata
  * This creates a WebSocket backend for all CLI commands
  */
-export function serializeChannelCLI(programName, programMeta, channelFile, functionFiles, packageMappings, channelTypesFile, functionTypesFile, channelName, channelRoute, globalHTTPPrefix = '', wireAddonDeclarations) {
+export function serializeChannelCLI(programName, programMeta, channelFile, functionFiles, packageMappings, channelTypesFile, functionTypesFile, middlewareTypesFile, channelName, channelRoute, globalHTTPPrefix = '', wireAddonDeclarations) {
     const packageToNamespace = new Map();
     if (wireAddonDeclarations) {
         for (const [namespace, decl] of wireAddonDeclarations.entries()) {
@@ -54,14 +54,20 @@ export function serializeChannelCLI(programName, programMeta, channelFile, funct
     const channelTypesPath = getFileImportRelativePath(channelFile, channelTypesFile, packageMappings);
     // Get relative path to function types file
     const functionTypesPath = getFileImportRelativePath(channelFile, functionTypesFile, packageMappings);
+    const middlewareTypesPath = getFileImportRelativePath(channelFile, middlewareTypesFile, packageMappings);
     return `/**
  * WebSocket channel backend for '${programName}' CLI commands
  */
 import { wireChannel } from '${channelTypesPath}'
-import { pikkuMiddleware${hasAddonFuncs ? ', ref' : ''}, pikkuSessionlessFunc } from '${functionTypesPath}'
-import { generateCommandHelp } from '@pikku/core/ecosystem/cli'
-import { handleRawCLI, type RawCLIFrame } from '@pikku/core/ecosystem/cli/channel'
-import { pikkuState, getSingletonServices, getCreateWireServices } from '@pikku/core/ecosystem'
+import { ${hasAddonFuncs ? 'ref, ' : ''}pikkuSessionlessFunc } from '${functionTypesPath}'
+import { pikkuMiddleware } from '${middlewareTypesPath}'
+import { generateCommandHelp } from '@pikku/core/cli'
+import { handleRawCLI, type RawCLIFrame } from '@pikku/core/cli/channel'
+import {
+  pikkuState,
+  getSingletonServices,
+  getCreateWireServices,
+} from '@pikku/core/state'
 ${imports}
 
 // Middleware to close the channel after CLI command completes

package/dist/src/functions/wirings/cli/serialize-cli-types.d.ts

@@ -1,4 +1,4 @@
 /**
  * Generates type definitions for CLI wirings
  */
-export declare const serializeCLITypes: (functionTypesImportPath: string, userSessionTypeImport: string, userSessionTypeName: string, singletonServicesTypeImport: string, singletonServicesTypeName: string) => string;
+export declare const serializeCLITypes: (functionTypesImportPath: string, middlewareTypesImportPath: string, userSessionTypeImport: string, userSessionTypeName: string, singletonServicesTypeImport: string, singletonServicesTypeName: string) => string;

package/dist/src/functions/wirings/cli/serialize-cli-types.js

@@ -1,15 +1,20 @@
 /**
  * Generates type definitions for CLI wirings
  */
-export const serializeCLITypes = (functionTypesImportPath, userSessionTypeImport, userSessionTypeName, singletonServicesTypeImport, singletonServicesTypeName) => {
+export const serializeCLITypes = (functionTypesImportPath, middlewareTypesImportPath, userSessionTypeImport, userSessionTypeName, singletonServicesTypeImport, singletonServicesTypeName) => {
     return `/**
 
  * CLI-specific type definitions for tree-shaking optimization
  */
 
 import { wireCLI as wireCLICore, defineCLICommands as defineCLICommandsCore } from '@pikku/core/cli'
-import { CoreCLI, CorePikkuCLIRender, CoreCLICommandConfig } from '@pikku/core/ecosystem/cli'
-import type { PikkuFunctionConfig, PikkuMiddleware } from '${functionTypesImportPath}'
+import {
+  CoreCLI,
+  CorePikkuCLIRender,
+  CoreCLICommandConfig,
+} from '@pikku/core/cli'
+import type { PikkuFunctionConfig } from '${functionTypesImportPath}'
+import type { PikkuMiddleware } from '${middlewareTypesImportPath}'
 ${userSessionTypeImport}
 ${singletonServicesTypeImport}
 

package/dist/src/functions/wirings/cli/serialize-local-cli-bootstrap.js

@@ -14,7 +14,7 @@ export function serializeLocalCLIBootstrap(programName, _programMeta, bootstrapF
         : null;
     const cliBootstrapPath = getFileImportRelativePath(bootstrapFile, config.bootstrapFile, config.packageMappings);
     return `
-import { executeCLI, CLIError } from '@pikku/core/ecosystem/cli'
+import { executeCLI, CLIError } from '@pikku/core/cli'
 ${pikkuConfigFactory ? `import { ${pikkuConfigFactory.variable} as createConfig } from '${pikkuConfigPath}'` : ''}
 import { ${singletonServicesFactory.variable} as createSingletonServices } from '${singletonServicesPath}'
 ${wireServicesFactory ? `import { ${wireServicesFactory.variable} as createWireServices } from '${wireServicesPath}'` : ''}

package/dist/src/functions/wirings/console/pikku-command-console-functions.d.ts

@@ -1 +1 @@
-export declare const pikkuConsoleFunctions: import("#pikku").PikkuFunctionConfig<void, boolean, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<void, boolean, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<void, boolean, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
+export declare const pikkuConsoleFunctions: import("#pikku/function").PikkuFunctionConfig<void, boolean, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<void, boolean, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<void, boolean, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;

package/dist/src/functions/wirings/console/pikku-command-console-functions.js

@@ -1,14 +1,15 @@
-import { pikkuSessionlessFunc } from '#pikku';
+import { pikkuSessionlessFunc } from '#pikku/function';
 import { getFileImportRelativePath } from '../../../utils/file-import-path.js';
+import { getLeafImportPath } from '../../../utils/leaf-import-path.js';
 import { writeFileInDir } from '../../../utils/file-writer.js';
 import { logCommandInfoAndTime } from '../../../middleware/log-command-info-and-time.js';
 import { projectDeclaresBetterAuth } from '../../../utils/detect-better-auth.js';
 import { removeLegacyScaffoldFile } from '../../../utils/remove-legacy-scaffold-file.js';
 import { serializeConsoleFunctions } from './serialize-console-functions.js';
+import { isDeployCodegen } from '../../../utils/is-deploy-codegen.js';
 export const pikkuConsoleFunctions = pikkuSessionlessFunc({
     func: async ({ logger, config, variables }) => {
-        const deployCodegenFlag = await variables.get('PIKKU_DEPLOY_CODEGEN');
-        if (deployCodegenFlag === '1') {
+        if (await isDeployCodegen(variables)) {
             return false;
         }
         if (config.scaffold?.console && config.consoleSchemasFile) {
@@ -24,9 +25,9 @@ export const pikkuConsoleFunctions = pikkuSessionlessFunc({
                     `Fix: set up Better Auth (add a pikkuBetterAuth(...) config) before scaffolding the console, ` +
                     `or remove "scaffold.console" from pikku.config.json.`);
             }
-            const pathToPikkuTypes = getFileImportRelativePath(config.consoleFunctionsFile, config.typesDeclarationFile, config.packageMappings);
+            const leaf = (name) => getLeafImportPath(config.consoleFunctionsFile, name, config);
             const pathToAgentTypes = getFileImportRelativePath(config.consoleFunctionsFile, config.agentTypesFile, config.packageMappings);
-            const { schemas, functions } = serializeConsoleFunctions(pathToPikkuTypes, pathToAgentTypes, config.globalHTTPPrefix || '');
+            const { schemas, functions } = serializeConsoleFunctions(leaf, pathToAgentTypes, config.globalHTTPPrefix || '');
             await writeFileInDir(logger, config.consoleSchemasFile, schemas);
             await writeFileInDir(logger, config.consoleFunctionsFile, functions);
             await removeLegacyScaffoldFile(config.consoleFunctionsFile);

package/dist/src/functions/wirings/console/pikku-command-nodes-meta.d.ts

@@ -1 +1 @@
-export declare const pikkuNodesMeta: import("#pikku").PikkuFunctionConfig<void, boolean | undefined, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<void, boolean | undefined, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<void, boolean | undefined, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
+export declare const pikkuNodesMeta: import("#pikku/function").PikkuFunctionConfig<void, boolean | undefined, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<void, boolean | undefined, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<void, boolean | undefined, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;

package/dist/src/functions/wirings/console/pikku-command-nodes-meta.js

@@ -1,11 +1,11 @@
-import { pikkuSessionlessFunc } from '#pikku';
+import { pikkuSessionlessFunc } from '#pikku/function';
 import { ErrorCode } from '@pikku/inspector';
 import { writeFileInDir } from '../../../utils/file-writer.js';
 import { logCommandInfoAndTime } from '../../../middleware/log-command-info-and-time.js';
 import { readFile } from 'fs/promises';
 import { join, isAbsolute } from 'path';
 import { stripVerboseFields, hasVerboseFields, } from '../../../utils/strip-verbose-meta.js';
-import { validateAndBuildSecretDefinitionsMeta } from '@pikku/core/ecosystem/secret';
+import { validateAndBuildSecretDefinitionsMeta } from '@pikku/core/secret';
 const loadIcon = async (iconPath, rootDir, logger) => {
     if (!iconPath)
         return undefined;

package/dist/src/functions/wirings/console/serialize-console-functions.d.ts

@@ -2,4 +2,4 @@ export interface ConsoleGenOutput {
     schemas: string;
     functions: string;
 }
-export declare const serializeConsoleFunctions: (pathToPikkuTypes: string, _pathToAgentTypes: string, globalHTTPPrefix?: string) => ConsoleGenOutput;
+export declare const serializeConsoleFunctions: (leaf: (name: string) => string, _pathToAgentTypes: string, globalHTTPPrefix?: string) => ConsoleGenOutput;

package/dist/src/functions/wirings/console/serialize-console-functions.js

@@ -1,4 +1,4 @@
-export const serializeConsoleFunctions = (pathToPikkuTypes, _pathToAgentTypes, globalHTTPPrefix = '') => {
+export const serializeConsoleFunctions = (leaf, _pathToAgentTypes, globalHTTPPrefix = '') => {
     const schemas = `/**
  * Auto-generated console function schemas
  * Do not edit manually - regenerate with 'npx pikku'
@@ -19,7 +19,9 @@ export const ValueResult = z.object({
 
 export const Success = z.object({ success: z.boolean() })
 `;
-    const functions = `import { pikkuFunc, defineHTTPRoutes, wireHTTPRoutes, ref, wireAddon } from '${pathToPikkuTypes}'
+    const functions = `import { pikkuFunc, ref } from '${leaf('function')}'
+import { wireAddon } from '${leaf('addon')}'
+import { defineHTTPRoutes, wireHTTPRoutes } from '${leaf('http')}'
 import {
   VariableRef,
   SetVariable,
@@ -74,17 +76,31 @@ export const consoleRoutes = defineHTTPRoutes({
       sse: true,
       func: ref('console:streamWorkflowRun'),
     },
+    // A route rather than an RPC because a <video> and an <img> take a URL.
+    // Authenticated even though the group is not: everything else here is
+    // metadata, and these are recordings of an application being used. \`path\`
+    // arrives as a query parameter because an artifact key contains slashes.
+    scenarioArtifact: {
+      route: '/scenario-run/:runId/artifact',
+      method: 'get',
+      auth: true,
+      func: ref('console:getScenarioArtifact'),
+    },
   },
 })
 
+// The console's own root, not \`admin\`: administering the application (users,
+// roles, credentials, the audit trail) is \`@pikku/addon-admin\` under the
+// \`admin\` tree, and the two are granted separately. Addon scopes union with
+// each function's, so this is the floor for reaching the console at all.
 wireAddon({
   name: 'console',
   package: '@pikku/addon-console',
-  scopes: ['admin'],
+  scopes: ['pikku:console'],
   globalSecrets:
     'the console administers secrets an operator names at runtime, so no static declaration can cover them',
   globalCredentials:
-    'the console lists and links credentials across every user, so it cannot be scoped to a declared set',
+    'the console reports whether the caller has connected the OAuth credentials an agent needs, which are declared by other addons',
 })
 wireHTTPRoutes({ basePath: '${globalHTTPPrefix}', routes: { console: consoleRoutes } })
 `;

package/dist/src/functions/wirings/credentials/pikku-command-credentials.d.ts

@@ -1 +1 @@
-export declare const pikkuCredentials: import("#pikku").PikkuFunctionConfig<void, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<void, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<void, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
+export declare const pikkuCredentials: import("#pikku/function").PikkuFunctionConfig<void, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<void, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<void, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;

package/dist/src/functions/wirings/credentials/pikku-command-credentials.js

@@ -1,8 +1,8 @@
-import { pikkuSessionlessFunc } from '#pikku';
+import { pikkuSessionlessFunc } from '#pikku/function';
 import { writeFileInDir } from '../../../utils/file-writer.js';
 import { logCommandInfoAndTime } from '../../../middleware/log-command-info-and-time.js';
 import { serializeCredentialsTypes } from './serialize-credentials-types.js';
-import { validateAndBuildCredentialDefinitionsMeta } from '@pikku/core/ecosystem/credential';
+import { validateAndBuildCredentialDefinitionsMeta, } from '@pikku/core/credential';
 export const pikkuCredentials = pikkuSessionlessFunc({
     func: async ({ logger, config, getInspectorState }) => {
         const { credentialsFile, credentialsMetaJsonFile, packageMappings } = config;

package/dist/src/functions/wirings/credentials/serialize-credentials-types.d.ts

@@ -1,4 +1,4 @@
-import type { CredentialDefinitions } from '@pikku/core/ecosystem/credential';
+import type { CredentialDefinitions } from '@pikku/core/credential';
 import type { SchemaRef } from '@pikku/inspector';
 export interface SerializeCredentialsOptions {
     definitions: CredentialDefinitions;

package/dist/src/functions/wirings/credentials/serialize-credentials-types.js

@@ -1,4 +1,4 @@
-import { validateAndBuildCredentialDefinitionsMeta } from '@pikku/core/ecosystem/credential';
+import { validateAndBuildCredentialDefinitionsMeta } from '@pikku/core/credential';
 import { getFileImportRelativePath } from '../../../utils/file-import-path.js';
 /**
  * A display name is the human-facing label a developer wrote, so an apostrophe
@@ -43,10 +43,10 @@ export const serializeCredentialsTypes = ({ definitions, schemaLookup, credentia
     }
     const imports = [];
     imports.push(`import { TypedCredentialService as CoreTypedCredentialService } from '@pikku/core/services'
-import type { CredentialMetaInfo } from '@pikku/core/ecosystem/services'`);
+import type { CredentialMetaInfo } from '@pikku/core/services'`);
     imports.push(`import type { CredentialService } from '@pikku/core/services'`);
     if (oauth2Entries.length > 0) {
-        imports.push(`import type { OAuth2CredentialConfig } from '@pikku/core/ecosystem/secret'`);
+        imports.push(`import type { OAuth2CredentialConfig } from '@pikku/core/secret'`);
     }
     if (needsZod) {
         imports.push(`import type { z } from 'zod'`);
@@ -71,12 +71,10 @@ ${oauth2Entries.join(',\n')}
         : '';
     return `${imports.join('\n')}
 
-export interface CredentialsMap {
+export type CredentialsMap = {
 ${mapEntries.join('\n')}
 }
 
-export type CredentialName = keyof CredentialsMap
-
 const CREDENTIALS_META: Record<string, CredentialMetaInfo> = {
 ${metaEntries.join(',\n')}
 }

package/dist/src/functions/wirings/emails/pikku-command-emails.d.ts

@@ -1,6 +1,6 @@
 import type { PikkuCLIConfig } from '../../../../types/config.js';
 import type { CLILogger } from '../../../services/cli-logger.service.js';
-export declare const pikkuEmails: import("#pikku").PikkuFunctionConfig<void, boolean | undefined, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<void, boolean | undefined, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<void, boolean | undefined, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
+export declare const pikkuEmails: import("#pikku/function").PikkuFunctionConfig<void, boolean | undefined, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<void, boolean | undefined, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<void, boolean | undefined, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;
 export declare function generateEmailsArtifacts(logger: CLILogger, config: Pick<PikkuCLIConfig, 'outDir'> & {
     emailTemplatesDir?: string;
 }): Promise<true | undefined>;

package/dist/src/functions/wirings/emails/pikku-command-emails.js

@@ -1,7 +1,7 @@
 import { createHash } from 'node:crypto';
 import { readdir, readFile } from 'node:fs/promises';
 import { basename, extname, join } from 'node:path';
-import { pikkuSessionlessFunc } from '#pikku';
+import { pikkuSessionlessFunc } from '#pikku/function';
 import { writeFileInDir } from '../../../utils/file-writer.js';
 import { logCommandInfoAndTime } from '../../../middleware/log-command-info-and-time.js';
 import { serializeEmailsModule } from './serialize-emails.js';
@@ -27,8 +27,8 @@ function collectTemplateVariables(rootSources, locales, partials) {
         const source = queue.shift();
         if (!source)
             continue;
-        for (const match of source.matchAll(/\{\{\s*([^}]+?)\s*\}\}/g)) {
-            const key = String(match[1]).trim();
+        for (const match of source.matchAll(/\{\{\{\s*([^{}]+?)\s*\}\}\}|\{\{\s*([^}]+?)\s*\}\}/g)) {
+            const key = String(match[1] ?? match[2]).trim();
             if (!key)
                 continue;
             if (key.startsWith('>')) {