@pikku/cli 0.11.3 → 0.12.1

package/dist/src/functions/wirings/triggers/serialize-trigger-types.js

@@ -0,0 +1,163 @@
+/**
+ * Generates type definitions for trigger wirings
+ */
+export const serializeTriggerTypes = (singletonServicesTypeImport, singletonServicesTypeName) => {
+    return `/**
+ * Trigger-specific type definitions for tree-shaking optimization
+ */
+
+import { CorePikkuTriggerFunction, CorePikkuTriggerFunctionConfig, CoreTrigger, wireTrigger as wireTriggerCore, wireTriggerSource as wireTriggerSourceCore } from '@pikku/core/trigger'
+import type { CoreNodeConfig } from '@pikku/core/node'
+${singletonServicesTypeImport}
+import type { StandardSchemaV1 } from '@standard-schema/spec'
+
+${singletonServicesTypeName !== 'SingletonServices' ? `type SingletonServices = ${singletonServicesTypeName}` : ''}
+
+/**
+ * A trigger function that sets up a subscription and returns a teardown function.
+ * The trigger is fired via wire.trigger.invoke(data).
+ *
+ * @template TInput - Input type (configuration passed when wired)
+ * @template TOutput - Output type produced when trigger fires
+ */
+export type PikkuTriggerFunction<
+  TInput = unknown,
+  TOutput = unknown
+> = CorePikkuTriggerFunction<TInput, TOutput, SingletonServices>
+
+/**
+ * Configuration object for creating a trigger function with metadata
+ */
+export type PikkuTriggerFunctionConfig<
+  TInput = unknown,
+  TOutput = unknown,
+  InputSchema extends StandardSchemaV1 | undefined = undefined,
+  OutputSchema extends StandardSchemaV1 | undefined = undefined
+> = CorePikkuTriggerFunctionConfig<TInput, TOutput, SingletonServices, InputSchema, OutputSchema>
+
+/**
+ * Helper type to infer the output type from a Standard Schema
+ */
+type InferSchemaOutput<T> = T extends StandardSchemaV1<any, infer Output> ? Output : never
+
+/**
+ * Configuration object for trigger functions with Zod schema validation.
+ * Use this when you want to define input/output schemas using Zod.
+ * Types are automatically inferred from the schemas.
+ */
+export type PikkuTriggerFunctionConfigWithSchema<
+  InputSchema extends StandardSchemaV1,
+  OutputSchema extends StandardSchemaV1 | undefined = undefined
+> = {
+  title?: string
+  description?: string
+  tags?: string[]
+  func: PikkuTriggerFunction<
+    InferSchemaOutput<InputSchema>,
+    OutputSchema extends StandardSchemaV1 ? InferSchemaOutput<OutputSchema> : unknown
+  >
+  input: InputSchema
+  output?: OutputSchema
+  node?: CoreNodeConfig
+}
+
+/**
+ * Type definition for trigger wirings.
+ * Declares a trigger name and its target pikku function.
+ */
+export type TriggerWiring = CoreTrigger
+
+/**
+ * A trigger source with the subscription function, using project-specific services.
+ *
+ * @template TInput - Input type passed to the trigger function
+ * @template TOutput - Output type produced when trigger fires
+ */
+export type TriggerSource<
+  TInput = unknown,
+  TOutput = unknown
+> = {
+  name: string
+  func: PikkuTriggerFunctionConfig<TInput, TOutput>
+} & (unknown extends TInput ? { input?: TInput } : { input: TInput })
+
+/**
+ * Creates a trigger function configuration.
+ * Use this to define trigger functions that set up subscriptions.
+ *
+ * @param triggerOrConfig - Function definition or configuration object
+ * @returns The normalized configuration object
+ *
+ * @example
+ * \`\`\`typescript
+ * export const redisSubscribeTrigger = pikkuTriggerFunc<
+ *   { channel: string },
+ *   { message: string }
+ * >(async ({ redis }, { channel }, { trigger }) => {
+ *   const subscriber = redis.duplicate()
+ *   await subscriber.subscribe(channel, (msg) => {
+ *     trigger.invoke({ message: msg })
+ *   })
+ *   return () => subscriber.unsubscribe()
+ * })
+ *
+ * export const redisSubscribeTrigger = pikkuTriggerFunc({
+ *   title: 'Redis Subscribe Trigger',
+ *   description: 'Listens to Redis pub/sub channel',
+ *   input: z.object({ channel: z.string() }),
+ *   output: z.object({ message: z.string() }),
+ *   func: async ({ redis }, { channel }, { trigger }) => {
+ *     const subscriber = redis.duplicate()
+ *     await subscriber.subscribe(channel, (msg) => {
+ *       trigger.invoke({ message: msg })
+ *     })
+ *     return () => subscriber.unsubscribe()
+ *   }
+ * })
+ * \`\`\`
+ */
+export function pikkuTriggerFunc<
+  InputSchema extends StandardSchemaV1,
+  OutputSchema extends StandardSchemaV1 | undefined = undefined
+>(
+  config: PikkuTriggerFunctionConfigWithSchema<InputSchema, OutputSchema>
+): PikkuTriggerFunctionConfig<InferSchemaOutput<InputSchema>, OutputSchema extends StandardSchemaV1 ? InferSchemaOutput<OutputSchema> : unknown, InputSchema, OutputSchema>
+export function pikkuTriggerFunc<TInput, TOutput = unknown>(
+  triggerOrConfig:
+    | PikkuTriggerFunction<TInput, TOutput>
+    | PikkuTriggerFunctionConfig<TInput, TOutput>
+): PikkuTriggerFunctionConfig<TInput, TOutput>
+export function pikkuTriggerFunc(triggerOrConfig: any) {
+  if (typeof triggerOrConfig === 'function') {
+    return { func: triggerOrConfig }
+  }
+  return triggerOrConfig
+}
+
+/**
+ * Registers a trigger with the Pikku framework.
+ * Declares a trigger name and its target pikku function.
+ * Runs everywhere — inspector extracts at build time.
+ *
+ * @param trigger - Trigger definition with name and function config
+ */
+export const wireTrigger = (
+  trigger: TriggerWiring
+) => {
+  wireTriggerCore(trigger as any)
+}
+
+/**
+ * Registers a trigger source with the Pikku framework.
+ * Provides the subscription function and input data.
+ * Only imported in the trigger worker process.
+ *
+ * @param source - Trigger source with name, func, and input
+ */
+export const wireTriggerSource = <TInput = unknown, TOutput = unknown>(
+  source: TriggerSource<TInput, TOutput>
+) => {
+  wireTriggerSourceCore(source as any)
+}
+`;
+};

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

@@ -0,0 +1 @@
+export declare const pikkuVariables: import("#pikku").PikkuFunctionConfig<void, void, "session" | "rpc", import("#pikku").PikkuFunctionSessionless<void, void, "session" | "rpc", import("#pikku").Services> | import("#pikku").PikkuFunction<void, void, "session" | "rpc", import("#pikku").Services>, undefined, undefined>;

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

@@ -0,0 +1,31 @@
+import { pikkuSessionlessFunc } from '#pikku';
+import { writeFileInDir } from '../../../utils/file-writer.js';
+import { logCommandInfoAndTime } from '../../../middleware/log-command-info-and-time.js';
+import { serializeVariablesTypes } from './serialize-variables-types.js';
+import { validateAndBuildVariableDefinitionsMeta } from '@pikku/core/variable';
+export const pikkuVariables = pikkuSessionlessFunc({
+    func: async ({ logger, config, getInspectorState }) => {
+        const { variablesFile, variablesMetaJsonFile, packageMappings } = config;
+        if (!variablesFile) {
+            return;
+        }
+        const state = await getInspectorState();
+        const content = serializeVariablesTypes({
+            definitions: state.variables.definitions,
+            schemaLookup: state.schemaLookup,
+            variablesFile,
+            packageMappings,
+        });
+        await writeFileInDir(logger, variablesFile, content);
+        if (variablesMetaJsonFile) {
+            const meta = validateAndBuildVariableDefinitionsMeta(state.variables.definitions, state.schemaLookup);
+            await writeFileInDir(logger, variablesMetaJsonFile, JSON.stringify(meta, null, 2));
+        }
+    },
+    middleware: [
+        logCommandInfoAndTime({
+            commandStart: 'Creating PikkuVariables types',
+            commandEnd: 'Created PikkuVariables types',
+        }),
+    ],
+});

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

@@ -0,0 +1,9 @@
+import type { VariableDefinitions } from '@pikku/core/variable';
+import type { SchemaRef } from '@pikku/inspector';
+export interface SerializeVariablesOptions {
+    definitions: VariableDefinitions;
+    schemaLookup: Map<string, SchemaRef>;
+    variablesFile: string;
+    packageMappings: Record<string, string>;
+}
+export declare const serializeVariablesTypes: ({ definitions, schemaLookup, variablesFile, packageMappings, }: SerializeVariablesOptions) => string;

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

@@ -0,0 +1,53 @@
+import { validateAndBuildVariableDefinitionsMeta } from '@pikku/core/variable';
+import { getFileImportRelativePath } from '../../../utils/file-import-path.js';
+export const serializeVariablesTypes = ({ definitions, schemaLookup, variablesFile, packageMappings, }) => {
+    const variables = validateAndBuildVariableDefinitionsMeta(definitions, schemaLookup);
+    const variableEntries = Object.entries(variables);
+    const schemaImports = new Map();
+    let needsZod = false;
+    const mapEntries = [];
+    const metaEntries = [];
+    for (const [name, meta] of variableEntries) {
+        if (meta.schema && typeof meta.schema === 'string') {
+            const schemaRef = schemaLookup.get(meta.schema);
+            if (schemaRef) {
+                needsZod = true;
+                if (!schemaImports.has(schemaRef.sourceFile)) {
+                    schemaImports.set(schemaRef.sourceFile, new Set());
+                }
+                schemaImports.get(schemaRef.sourceFile).add(schemaRef.variableName);
+                mapEntries.push(`  '${meta.variableId}': z.infer<typeof ${schemaRef.variableName}>`);
+                metaEntries.push(`  '${meta.variableId}': { name: '${name}', displayName: '${meta.displayName}' }`);
+            }
+        }
+    }
+    const imports = [];
+    imports.push(`import { TypedVariablesService as CoreTypedVariablesService, type VariableMeta } from '@pikku/core/services'`);
+    imports.push(`import type { VariablesService } from '@pikku/core/services'`);
+    if (needsZod) {
+        imports.push(`import type { z } from 'zod'`);
+    }
+    for (const [sourceFile, variableNames] of schemaImports) {
+        const importPath = getFileImportRelativePath(variablesFile, sourceFile, packageMappings);
+        const vars = Array.from(variableNames).join(', ');
+        imports.push(`import { ${vars} } from '${importPath}'`);
+    }
+    return `${imports.join('\n')}
+
+export interface VariablesMap {
+${mapEntries.join('\n')}
+}
+
+export type VariableId = keyof VariablesMap
+
+const VARIABLES_META: Record<string, VariableMeta> = {
+${metaEntries.join(',\n')}
+}
+
+export class TypedVariablesService extends CoreTypedVariablesService<VariablesMap> {
+  constructor(variables: VariablesService) {
+    super(variables, VARIABLES_META)
+  }
+}
+`;
+};

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

@@ -1 +1 @@
-export declare const pikkuWorkflow: any;
+export declare const pikkuWorkflow: import("#pikku").PikkuFunctionConfig<void, boolean | undefined, "session" | "rpc", import("#pikku").PikkuFunctionSessionless<void, boolean | undefined, "session" | "rpc", import("#pikku").Services> | import("#pikku").PikkuFunction<void, boolean | undefined, "session" | "rpc", import("#pikku").Services>, undefined, undefined>;

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

@@ -1,5 +1,5 @@
-import { pikkuSessionlessFunc } from '../../../../.pikku/pikku-types.gen.js';
-import { convertDslToGraph, ErrorCode } from '@pikku/inspector';
+import { pikkuSessionlessFunc } from '#pikku';
+import { ErrorCode } from '@pikku/inspector';
 import { writeFileInDir } from '../../../utils/file-writer.js';
 import { logCommandInfoAndTime } from '../../../middleware/log-command-info-and-time.js';
 import { serializeWorkflowTypes } from './serialize-workflow-types.js';
@@ -16,14 +16,8 @@ export const pikkuWorkflow = pikkuSessionlessFunc({
         const { workflowsWiringFile, workflowsWiringMetaFile, workflowMetaDir, workflowMapDeclarationFile, workflowTypesFile, functionTypesFile, typesDeclarationFile, packageMappings, schema, } = config;
         const { workflows, functions: functionState } = visitState;
         const { typesMap } = functionState;
-        // Get all workflow names (both DSL and graph-based)
-        const dslWorkflowNames = Object.keys(workflows.meta);
-        const graphWorkflowNames = Object.keys(workflows.graphMeta);
-        const allWorkflowNames = [
-            ...new Set([...dslWorkflowNames, ...graphWorkflowNames]),
-        ];
+        const allWorkflowNames = Object.keys(workflows.graphMeta);
         const hasWorkflows = allWorkflowNames.length > 0;
-        // Validate that workflowService is configured if workflows are defined
         if (hasWorkflows) {
             const hasWorkflowState = visitState.serviceAggregation.allSingletonServices.includes('workflowService');
             if (!hasWorkflowState) {
@@ -31,50 +25,27 @@ export const pikkuWorkflow = pikkuSessionlessFunc({
                 throw new Error('WorkflowState service not configured but workflows are defined');
             }
         }
-        // Generate individual JSON files for each workflow (convert DSL to graph format)
         if (hasWorkflows && workflowMetaDir) {
-            // Write individual JSON files for DSL workflows
-            const dslMeta = workflows.meta;
-            for (const [name, meta] of Object.entries(dslMeta)) {
-                const graphMeta = convertDslToGraph(name, meta);
-                // Write minimal version (runtime-only fields)
-                const minimalMeta = stripVerboseFields(graphMeta);
-                const minimalPath = join(workflowMetaDir, `${name}.gen.json`);
-                await writeFileInDir(logger, minimalPath, JSON.stringify(minimalMeta, null, 2), { ignoreModifyComment: true });
-                // Write verbose version only if it has additional fields
-                if (hasVerboseFields(graphMeta)) {
-                    const verbosePath = join(workflowMetaDir, `${name}-verbose.gen.json`);
-                    await writeFileInDir(logger, verbosePath, JSON.stringify(graphMeta, null, 2), { ignoreModifyComment: true });
-                }
-            }
-            // Write individual JSON files for graph workflows
             for (const [name, graphMeta] of Object.entries(workflows.graphMeta)) {
-                // Write minimal version (runtime-only fields)
                 const minimalMeta = stripVerboseFields(graphMeta);
                 const minimalPath = join(workflowMetaDir, `${name}.gen.json`);
                 await writeFileInDir(logger, minimalPath, JSON.stringify(minimalMeta, null, 2), { ignoreModifyComment: true });
-                // Write verbose version only if it has additional fields
                 if (hasVerboseFields(graphMeta)) {
                     const verbosePath = join(workflowMetaDir, `${name}-verbose.gen.json`);
                     await writeFileInDir(logger, verbosePath, JSON.stringify(graphMeta, null, 2), { ignoreModifyComment: true });
                 }
             }
         }
-        // Generate workflow meta aggregation file
         if (workflowsWiringMetaFile && workflowMetaDir) {
-            await writeFileInDir(logger, workflowsWiringMetaFile, serializeWorkflowMeta(workflowsWiringMetaFile, workflowMetaDir, allWorkflowNames, packageMappings, schema?.supportsImportAttributes ?? false, config.externalPackageName));
+            await writeFileInDir(logger, workflowsWiringMetaFile, serializeWorkflowMeta(workflowsWiringMetaFile, workflowMetaDir, allWorkflowNames, packageMappings, schema?.supportsImportAttributes ?? false, config.addonName));
         }
-        // Generate workflow registration (meta + DSL workflow registrations)
         const metaImportPath = getFileImportRelativePath(workflowsWiringFile, workflowsWiringMetaFile, packageMappings);
-        await writeFileInDir(logger, workflowsWiringFile, serializeWorkflowRegistration(workflowsWiringFile, metaImportPath, allWorkflowNames, workflows.files, workflows.graphFiles, packageMappings, config.externalPackageName));
-        // Generate workflow types (DSL + graph helpers in one file)
+        await writeFileInDir(logger, workflowsWiringFile, serializeWorkflowRegistration(workflowsWiringFile, metaImportPath, allWorkflowNames, workflows.files, workflows.graphFiles, packageMappings, config.addonName));
         const functionTypesImportPath = getFileImportRelativePath(workflowTypesFile, functionTypesFile, packageMappings);
         const rpcMapImportPath = getFileImportRelativePath(workflowTypesFile, config.rpcInternalMapDeclarationFile, packageMappings);
-        await writeFileInDir(logger, workflowTypesFile, serializeWorkflowTypes(functionTypesImportPath, rpcMapImportPath));
-        // Generate workflow map (I/O types for type-safe client)
-        // Always generate even if empty - RPC map imports WorkflowMap
-        await writeFileInDir(logger, workflowMapDeclarationFile, serializeWorkflowMap(workflowMapDeclarationFile, packageMappings, typesMap, functionState.meta, workflows.meta));
-        // Generate workflow workers if configured
+        const workflowMapImportPath = getFileImportRelativePath(workflowTypesFile, workflowMapDeclarationFile, packageMappings);
+        await writeFileInDir(logger, workflowTypesFile, serializeWorkflowTypes(functionTypesImportPath, rpcMapImportPath, workflowMapImportPath));
+        await writeFileInDir(logger, workflowMapDeclarationFile, serializeWorkflowMap(logger, workflowMapDeclarationFile, packageMappings, typesMap, functionState.meta, workflows.meta, workflows.graphMeta));
         if (config.workflows) {
             if (config.workflows.singleQueue) {
                 const workflowPath = join(config.rootDir, config.workflows.path);

package/dist/src/functions/wirings/workflow/serialize-workflow-map.d.ts

@@ -2,6 +2,8 @@
  * Generate workflow map type definitions for type-safe client API
  */
 import type { WorkflowsMeta } from '@pikku/core/workflow';
-import { TypesMap } from '@pikku/inspector';
-import { FunctionsMeta } from '@pikku/core';
-export declare const serializeWorkflowMap: (relativeToPath: string, packageMappings: Record<string, string>, typesMap: TypesMap, functionsMeta: FunctionsMeta, workflowsMeta: WorkflowsMeta) => string;
+import { type TypesMap } from '@pikku/inspector';
+import type { SerializedWorkflowGraphs } from '@pikku/inspector/workflow-graph';
+import type { FunctionsMeta } from '@pikku/core';
+import type { Logger } from '@pikku/core/services';
+export declare const serializeWorkflowMap: (logger: Logger, relativeToPath: string, packageMappings: Record<string, string>, typesMap: TypesMap, functionsMeta: FunctionsMeta, workflowsMeta: WorkflowsMeta, graphMeta: SerializedWorkflowGraphs) => string;

package/dist/src/functions/wirings/workflow/serialize-workflow-map.js

@@ -1,31 +1,41 @@
 import { serializeImportMap } from '../../../utils/serialize-import-map.js';
-import { generateCustomTypes } from '../../../utils/custom-types-generator.js';
-export const serializeWorkflowMap = (relativeToPath, packageMappings, typesMap, functionsMeta, workflowsMeta) => {
+import { generateCustomTypes } from '@pikku/inspector';
+import { parseVersionedId } from '@pikku/core';
+export const serializeWorkflowMap = (logger, relativeToPath, packageMappings, typesMap, functionsMeta, workflowsMeta, graphMeta) => {
     const requiredTypes = new Set();
-    // First generate workflows to collect required types
     const serializedWorkflows = generateWorkflows(workflowsMeta, functionsMeta, typesMap, requiredTypes);
-    // Only generate custom types if we have workflows with types
-    const hasWorkflows = Object.keys(workflowsMeta).length > 0;
-    const serializedCustomTypes = hasWorkflows
+    const serializedGraphs = generateGraphs(graphMeta, functionsMeta, typesMap, requiredTypes);
+    const hasAny = Object.keys(workflowsMeta).length > 0 || Object.keys(graphMeta).length > 0;
+    const serializedCustomTypes = hasAny
         ? generateCustomTypes(typesMap, requiredTypes)
         : '';
-    const serializedImportMap = hasWorkflows
-        ? serializeImportMap(relativeToPath, packageMappings, typesMap, requiredTypes)
+    const serializedImportMap = hasAny
+        ? serializeImportMap(logger, relativeToPath, packageMappings, typesMap, requiredTypes)
         : '';
+    const serializedCustomTypesDeclarationsOnly = serializedCustomTypes
+        .split('\n')
+        .filter((line) => !line.startsWith('import '))
+        .join('\n');
     return `/**
  * Workflow type map with input/output types for each workflow
  */
 
 ${serializedImportMap}
-${serializedCustomTypes}
+${serializedCustomTypesDeclarationsOnly}
 
 interface WorkflowHandler<I, O> {
     input: I;
     output: O;
 }
 
+interface GraphNodeHandler<I> {
+    input: I;
+}
+
 ${serializedWorkflows}
 
+${serializedGraphs}
+
 export type WorkflowClient<Name extends keyof WorkflowMap> = {
   start: (input: WorkflowMap[Name]['input']) => Promise<{ runId: string }>;
   getRun: <output extends keyof WorkflowMap[Name]>(runId: string) => Promise<WorkflowMap[Name][output]>;
@@ -39,8 +49,8 @@ export type TypedWorkflowClients = {
 };
 function generateWorkflows(workflowsMeta, functionsMeta, typesMap, requiredTypes) {
     const workflowsObj = {};
-    for (const [workflowName, { pikkuFuncName }] of Object.entries(workflowsMeta)) {
-        const functionMeta = functionsMeta[pikkuFuncName];
+    for (const [workflowName, { pikkuFuncId }] of Object.entries(workflowsMeta)) {
+        const functionMeta = functionsMeta[pikkuFuncId];
         if (!functionMeta) {
             throw new Error(`Function ${workflowName} not found in functionsMeta. Please check your configuration.`);
         }
@@ -72,6 +82,47 @@ function generateWorkflows(workflowsMeta, functionsMeta, typesMap, requiredTypes
     for (const [workflowName, handler] of Object.entries(workflowsObj)) {
         workflowsStr += `  readonly '${workflowName}': WorkflowHandler<${handler.inputType}, ${handler.outputType}>,\n`;
     }
-    workflowsStr += '};\n';
+    workflowsStr += '};';
     return workflowsStr;
 }
+function generateGraphs(graphMeta, functionsMeta, typesMap, requiredTypes) {
+    const graphsObj = {};
+    for (const [graphName, graph] of Object.entries(graphMeta)) {
+        graphsObj[graphName] = {};
+        for (const [nodeId, node] of Object.entries(graph.nodes)) {
+            if (!('rpcName' in node) || typeof node.rpcName !== 'string') {
+                continue;
+            }
+            let functionMeta = functionsMeta[node.rpcName];
+            if (!functionMeta) {
+                const { baseName } = parseVersionedId(node.rpcName);
+                functionMeta = functionsMeta[baseName];
+            }
+            if (!functionMeta) {
+                continue;
+            }
+            const input = functionMeta.inputs ? functionMeta.inputs[0] : undefined;
+            let inputType = 'void';
+            if (input) {
+                try {
+                    inputType = typesMap.getTypeMeta(input).uniqueName;
+                }
+                catch {
+                    inputType = input;
+                }
+            }
+            requiredTypes.add(inputType);
+            graphsObj[graphName][nodeId] = { inputType };
+        }
+    }
+    let graphsStr = 'export type GraphsMap = {\n';
+    for (const [graphName, nodes] of Object.entries(graphsObj)) {
+        graphsStr += `  readonly '${graphName}': {\n`;
+        for (const [nodeId, handler] of Object.entries(nodes)) {
+            graphsStr += `    readonly '${nodeId}': GraphNodeHandler<${handler.inputType}>,\n`;
+        }
+        graphsStr += '  },\n';
+    }
+    graphsStr += '};';
+    return graphsStr;
+}

package/dist/src/functions/wirings/workflow/serialize-workflow-meta.js

@@ -3,43 +3,42 @@
  * and registers them with pikkuState
  */
 import { getFileImportRelativePath } from '../../../utils/file-import-path.js';
+import { sanitizeTypeName } from '@pikku/inspector';
 export const serializeWorkflowMeta = (outputPath, metaDir, workflowNames, packageMappings, supportsImportAttributes, packageName) => {
-    const lines = [];
+    const pkg = packageName ? `'${packageName}'` : 'null';
     if (workflowNames.length === 0) {
-        // Empty meta file - still need to register empty meta
-        lines.push("import { pikkuState } from '@pikku/core'");
-        lines.push("import type { SerializedWorkflowGraphs } from '@pikku/inspector/workflow-graph'");
-        lines.push('');
-        lines.push('const workflowsMeta: SerializedWorkflowGraphs = {}');
-        lines.push('');
-        const packageNameValue = packageName ? `'${packageName}'` : 'null';
-        lines.push(`pikkuState(${packageNameValue}, 'workflows', 'meta', workflowsMeta)`);
-        return lines.join('\n');
+        return `import { pikkuState } from '@pikku/core/internal'
+import type { SerializedWorkflowGraphs } from '@pikku/inspector/workflow-graph'
+
+const workflowsMeta: SerializedWorkflowGraphs = {}
+
+pikkuState(${pkg}, 'workflows', 'meta', workflowsMeta)`;
     }
-    // Imports
-    lines.push("import { pikkuState } from '@pikku/core'");
-    lines.push("import type { SerializedWorkflowGraphs } from '@pikku/inspector/workflow-graph'");
-    lines.push('');
-    // Import each workflow meta JSON
     const sortedNames = [...workflowNames].sort();
-    for (const name of sortedNames) {
+    const imports = sortedNames
+        .map((name) => {
+        const sanitizedIdentifier = sanitizeTypeName(name);
         const jsonPath = `${metaDir}/${name}.gen.json`;
         const importPath = getFileImportRelativePath(outputPath, jsonPath, packageMappings);
-        const importStatement = supportsImportAttributes
-            ? `import ${name}Meta from '${importPath}' with { type: 'json' }`
-            : `import ${name}Meta from '${importPath}'`;
-        lines.push(importStatement);
-    }
-    lines.push('');
-    // Create aggregated meta object (cast JSON imports to proper types)
-    lines.push('const workflowsMeta = {');
-    for (const name of sortedNames) {
-        lines.push(`  '${name}': ${name}Meta,`);
-    }
-    lines.push('} as SerializedWorkflowGraphs');
-    lines.push('');
-    // Register meta with pikkuState
-    const packageNameValue = packageName ? `'${packageName}'` : 'null';
-    lines.push(`pikkuState(${packageNameValue}, 'workflows', 'meta', workflowsMeta)`);
-    return lines.join('\n');
+        return supportsImportAttributes
+            ? `import ${sanitizedIdentifier}Meta from '${importPath}' with { type: 'json' }`
+            : `import ${sanitizedIdentifier}Meta from '${importPath}'`;
+    })
+        .join('\n');
+    const metaEntries = sortedNames
+        .map((name) => {
+        const sanitizedIdentifier = sanitizeTypeName(name);
+        return `  '${name}': ${sanitizedIdentifier}Meta,`;
+    })
+        .join('\n');
+    return `import { pikkuState } from '@pikku/core/internal'
+import type { SerializedWorkflowGraphs } from '@pikku/inspector/workflow-graph'
+
+${imports}
+
+const workflowsMeta = {
+${metaEntries}
+} as SerializedWorkflowGraphs
+
+pikkuState(${pkg}, 'workflows', 'meta', workflowsMeta)`;
 };

package/dist/src/functions/wirings/workflow/serialize-workflow-registration.d.ts

@@ -1,7 +1,7 @@
 export declare const serializeWorkflowRegistration: (outputPath: string, metaImportPath: string, workflowNames: string[], workflowFiles: Map<string, {
     path: string;
     exportedName: string;
-}>, graphFiles: Map<string, {
+}>, _graphFiles: Map<string, {
     path: string;
     exportedName: string;
 }>, packageMappings: Record<string, string>, _packageName?: string) => string;

package/dist/src/functions/wirings/workflow/serialize-workflow-registration.js

@@ -1,50 +1,23 @@
-/**
- * Generate workflow runtime registration
- * Imports meta (which registers with pikkuState) and registers DSL workflows (addWorkflow) and graph workflows (addWorkflowGraph)
- */
 import { getFileImportRelativePath } from '../../../utils/file-import-path.js';
-export const serializeWorkflowRegistration = (outputPath, metaImportPath, workflowNames, workflowFiles, graphFiles, packageMappings, _packageName) => {
+export const serializeWorkflowRegistration = (outputPath, metaImportPath, workflowNames, workflowFiles, _graphFiles, packageMappings, _packageName) => {
     const lines = [];
     const hasWorkflows = workflowNames.length > 0;
     const hasDslWorkflows = workflowFiles.size > 0;
-    const hasGraphWorkflows = graphFiles.size > 0;
-    // Imports
-    const imports = [];
     if (hasDslWorkflows) {
-        imports.push('addWorkflow');
+        lines.push(`import { addWorkflow } from '@pikku/core/workflow'`);
     }
-    if (hasGraphWorkflows) {
-        imports.push('addWorkflowGraph');
-    }
-    if (imports.length > 0) {
-        lines.push(`import { ${imports.join(', ')} } from '@pikku/core/workflow'`);
-    }
-    // Import meta file (which registers meta with pikkuState)
     if (hasWorkflows) {
         lines.push(`import '${metaImportPath}'`);
     }
-    // Import DSL workflow functions
     const sortedWorkflows = Array.from(workflowFiles.entries()).sort((a, b) => a[0].localeCompare(b[0]));
     for (const [, { path, exportedName }] of sortedWorkflows) {
         const importPath = getFileImportRelativePath(outputPath, path, packageMappings);
         lines.push(`import { ${exportedName} } from '${importPath}'`);
     }
-    // Import graph workflow definitions
-    const sortedGraphWorkflows = Array.from(graphFiles.entries()).sort((a, b) => a[0].localeCompare(b[0]));
-    for (const [, { path, exportedName }] of sortedGraphWorkflows) {
-        const importPath = getFileImportRelativePath(outputPath, path, packageMappings);
-        lines.push(`import { ${exportedName} } from '${importPath}'`);
-    }
     lines.push('');
-    // Register DSL workflows
-    for (const [pikkuFuncName, { exportedName }] of sortedWorkflows) {
-        lines.push(`addWorkflow('${pikkuFuncName}', ${exportedName})`);
-    }
-    // Register graph workflows
-    for (const [workflowName, { exportedName }] of sortedGraphWorkflows) {
-        lines.push(`addWorkflowGraph('${workflowName}', ${exportedName})`);
+    for (const [pikkuFuncId, { exportedName }] of sortedWorkflows) {
+        lines.push(`addWorkflow('${pikkuFuncId}', ${exportedName})`);
     }
-    // Export workflow names type
     if (hasWorkflows) {
         lines.push('');
         lines.push(`export type WorkflowNames = '${workflowNames.join("' | '")}'`);

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

@@ -1,6 +1 @@
-/**
- * Generate all workflow type helpers for authoring workflows
- * Combines DSL helpers (pikkuWorkflowFunc, pikkuWorkflowComplexFunc) and
- * graph helpers (pikkuWorkflowGraph) with unified wireWorkflow
- */
-export declare const serializeWorkflowTypes: (functionTypesImportPath: string, rpcMapImportPath: string) => string;
+export declare const serializeWorkflowTypes: (functionTypesImportPath: string, rpcMapImportPath: string, workflowMapImportPath: string) => string;