@pikku/cli 0.12.105 → 0.12.107

package/dist/src/functions/commands/meta.d.ts

@@ -1,56 +1,56 @@
-export declare const pikkuMetaFunctionsList: import("#pikku").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
-export declare const pikkuMetaFunctionsGet: import("#pikku").PikkuFunctionConfig<{
+export declare const pikkuMetaFunctionsList: import("#pikku/function").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;
+export declare const pikkuMetaFunctionsGet: import("#pikku/function").PikkuFunctionConfig<{
     functionId: string;
-}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{
+}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{
     functionId: string;
-}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{
+}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{
     functionId: string;
-}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
-export declare const pikkuMetaSchemasList: import("#pikku").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
-export declare const pikkuMetaSchemasGet: import("#pikku").PikkuFunctionConfig<{
+}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;
+export declare const pikkuMetaSchemasList: import("#pikku/function").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;
+export declare const pikkuMetaSchemasGet: import("#pikku/function").PikkuFunctionConfig<{
     schemaName: string;
-}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{
+}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{
     schemaName: string;
-}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{
+}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{
     schemaName: string;
-}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
-export declare const pikkuMetaWorkflowsList: import("#pikku").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
-export declare const pikkuMetaWorkflowsGet: import("#pikku").PikkuFunctionConfig<{
+}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;
+export declare const pikkuMetaWorkflowsList: import("#pikku/function").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;
+export declare const pikkuMetaWorkflowsGet: import("#pikku/function").PikkuFunctionConfig<{
     workflowId: string;
-}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{
+}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{
     workflowId: string;
-}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{
+}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{
     workflowId: string;
-}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
-export declare const pikkuMetaMiddlewareList: import("#pikku").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
-export declare const pikkuMetaMiddlewareGet: import("#pikku").PikkuFunctionConfig<{
+}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;
+export declare const pikkuMetaMiddlewareList: import("#pikku/function").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;
+export declare const pikkuMetaMiddlewareGet: import("#pikku/function").PikkuFunctionConfig<{
     middlewareId: string;
-}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{
+}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{
     middlewareId: string;
-}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{
+}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{
     middlewareId: string;
-}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
-export declare const pikkuMetaPermissionsList: import("#pikku").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
-export declare const pikkuMetaPermissionsGet: import("#pikku").PikkuFunctionConfig<{
+}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;
+export declare const pikkuMetaPermissionsList: import("#pikku/function").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;
+export declare const pikkuMetaPermissionsGet: import("#pikku/function").PikkuFunctionConfig<{
     permissionId: string;
-}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{
+}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{
     permissionId: string;
-}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{
+}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{
     permissionId: string;
-}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
-export declare const pikkuMetaWiresList: import("#pikku").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
-export declare const pikkuMetaWiresType: import("#pikku").PikkuFunctionConfig<{
+}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;
+export declare const pikkuMetaWiresList: import("#pikku/function").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;
+export declare const pikkuMetaWiresType: import("#pikku/function").PikkuFunctionConfig<{
     type: string;
-}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{
+}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{
     type: string;
-}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{
+}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{
     type: string;
-}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
-export declare const pikkuMetaWiresHttp: import("#pikku").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
-export declare const pikkuMetaWiresScheduler: import("#pikku").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
-export declare const pikkuMetaWiresQueue: import("#pikku").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
-export declare const pikkuMetaWiresChannel: import("#pikku").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
-export declare const pikkuMetaWiresTrigger: import("#pikku").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
+}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;
+export declare const pikkuMetaWiresHttp: import("#pikku/function").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;
+export declare const pikkuMetaWiresScheduler: import("#pikku/function").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;
+export declare const pikkuMetaWiresQueue: import("#pikku/function").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;
+export declare const pikkuMetaWiresChannel: import("#pikku/function").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;
+export declare const pikkuMetaWiresTrigger: import("#pikku/function").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;
 /**
  * Bulk context endpoint.
  *
@@ -63,7 +63,7 @@ export declare const pikkuMetaWiresTrigger: import("#pikku").PikkuFunctionConfig
  * Targeted `pikku meta * get` calls are still the right tool when the planner
  * wants schema details (input/output JSON schemas) for a specific entry.
  */
-export declare const pikkuMetaContext: import("#pikku").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
+export declare const pikkuMetaContext: import("#pikku/function").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;
 /**
  * Frontend-targeted metadata.
  *
@@ -79,4 +79,4 @@ export declare const pikkuMetaContext: import("#pikku").PikkuFunctionConfig<{},
  * non-exposed functions, http wires) is a backend concern and stays in
  * `pikku meta context`.
  */
-export declare const pikkuMetaClients: import("#pikku").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
+export declare const pikkuMetaClients: import("#pikku/function").PikkuFunctionConfig<{}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;

package/dist/src/functions/commands/meta.js

@@ -1,4 +1,4 @@
-import { pikkuSessionlessFunc } from '#pikku';
+import { pikkuSessionlessFunc } from '#pikku/function';
 import { getSchema } from '@pikku/core/schema';
 function out(value) {
     console.log(JSON.stringify(value));

package/dist/src/functions/commands/new-addon.d.ts

@@ -27,7 +27,8 @@ export declare function getAddonFiles(vars: AddonVars, flags: {
     /** Delegated login: credential is the upstream token + expiry, checked per call. */
     delegated?: boolean;
 }): Record<string, string>;
-export declare const pikkuNewAddon: import("#pikku").PikkuFunctionConfig<{
+export declare function getTestFiles(vars: AddonVars): Record<string, string>;
+export declare const pikkuNewAddon: import("#pikku/function").PikkuFunctionConfig<{
     name: string;
     displayName?: string;
     description?: string;
@@ -42,7 +43,7 @@ export declare const pikkuNewAddon: import("#pikku").PikkuFunctionConfig<{
     authConfig?: string;
     mcp?: boolean;
     camelCase?: boolean;
-}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{
+}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{
     name: string;
     displayName?: string;
     description?: string;
@@ -57,7 +58,7 @@ export declare const pikkuNewAddon: import("#pikku").PikkuFunctionConfig<{
     authConfig?: string;
     mcp?: boolean;
     camelCase?: boolean;
-}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{
+}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{
     name: string;
     displayName?: string;
     description?: string;
@@ -72,4 +73,4 @@ export declare const pikkuNewAddon: import("#pikku").PikkuFunctionConfig<{
     authConfig?: string;
     mcp?: boolean;
     camelCase?: boolean;
-}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
+}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;

package/dist/src/functions/commands/new-addon.js

@@ -2,7 +2,7 @@ import { existsSync, readFileSync } from 'fs';
 import { dirname, join } from 'path';
 import { mkdir, writeFile } from 'fs/promises';
 import { createEmptyManifest, saveManifest, } from '../../utils/contract-versions.js';
-import { pikkuSessionlessFunc } from '#pikku';
+import { pikkuSessionlessFunc } from '#pikku/function';
 import { parseOpenAPISpec, computeContractHash, generateAddonFromOpenAPI, loadAuthConfig, } from '@pikku/openapi-parser';
 /**
  * Pick the protocol the generated test app uses to depend on its parent addon.
@@ -138,8 +138,8 @@ export function getAddonFiles(vars, flags) {
         // addon's own build resolves #pikku through tsconfig `paths` instead, so
         // these never have to point at the source tree.
         imports: {
-            '#pikku': './dist/.pikku/pikku-types.gen.js',
-            '#pikku/*': './dist/.pikku/*',
+            '#pikku/*.js': './dist/.pikku/*.js',
+            '#pikku/*': './dist/.pikku/*/index.js',
         },
         exports: {
             '.': {
@@ -203,7 +203,8 @@ export function getAddonFiles(vars, flags) {
             forceConsistentCasingInFileNames: true,
             resolveJsonModule: true,
             paths: {
-                '#pikku': ['./.pikku/pikku-types.gen.ts'],
+                '#pikku/*.js': ['./.pikku/*.ts'],
+                '#pikku/*': ['./.pikku/*/index.ts'],
             },
         },
         include: ['src/**/*', 'types/**/*', '.pikku/**/*.ts'],
@@ -234,7 +235,7 @@ ${description}
         files['src/services.ts'] =
             `import { UnauthorizedError } from '@pikku/core/errors'
 import { ${pascalName}Service } from './${name}-api.service.js'
-import { pikkuAddonWireServices } from '#pikku'
+import { pikkuAddonWireServices } from '#pikku/addon/setup'
 
 export const createWireServices = pikkuAddonWireServices(
   async ({ variables }, wire) => {
@@ -260,7 +261,7 @@ export const createWireServices = pikkuAddonWireServices(
         const credField = flags.credential === 'bearer' ? 'token' : 'apiKey';
         files['src/services.ts'] =
             `import { ${pascalName}Service } from './${name}-api.service.js'
-import { pikkuAddonWireServices } from '#pikku'
+import { pikkuAddonWireServices } from '#pikku/addon/setup'
 
 export const createWireServices = pikkuAddonWireServices(
   async ({ variables }, wire) => {
@@ -285,7 +286,7 @@ export const createWireServices = pikkuAddonWireServices(
         files['src/services.ts'] =
             `import { UnauthorizedError } from '@pikku/core/errors'
 import { ${pascalName}Service } from './${name}-api.service.js'
-import { pikkuAddonWireServices } from '#pikku'
+import { pikkuAddonWireServices } from '#pikku/addon/setup'
 
 export const createWireServices = pikkuAddonWireServices(
   async ({ variables }, wire) => {
@@ -307,7 +308,7 @@ export const createWireServices = pikkuAddonWireServices(
         files['src/services.ts'] =
             `import { ${pascalName}Service } from './${name}-api.service.js'
 import type { ${pascalName}Secrets } from './${name}.secret.js'
-import { pikkuAddonServices } from '#pikku'
+import { pikkuAddonServices } from '#pikku/addon/setup'
 
 export const createSingletonServices = pikkuAddonServices(async (
   config,
@@ -323,7 +324,7 @@ export const createSingletonServices = pikkuAddonServices(async (
     else {
         files['src/services.ts'] =
             `import { ${pascalName}Service } from './${name}-api.service.js'
-import { pikkuAddonServices } from '#pikku'
+import { pikkuAddonServices } from '#pikku/addon/setup'
 
 export const createSingletonServices = pikkuAddonServices(async (
   config,
@@ -394,7 +395,7 @@ export class ${pascalName}Service {
         // The access token is resolved (and refreshed) by the platform credential
         // service and injected via createWireServices — this service just uses it.
         files[`src/${name}-api.service.ts`] =
-            `import type { TypedVariablesService } from '#pikku/variables/pikku-variables.gen.js'
+            `import type { TypedVariablesService } from '#pikku/addon/variables/pikku-variables.gen.js'
 
 const BASE_URL = 'https://api.example.com/v1'
 
@@ -553,7 +554,7 @@ export type ${pascalName}Resource = z.infer<typeof ${pascalName}ResourceSchema>
   CoreServices,
   CoreSingletonServices,
   CoreUserSession,
-} from '@pikku/core'
+} from '@pikku/core/types'
 import type { ${pascalName}Service } from '../src/${name}-api.service.js'
 
 export interface Config extends CoreConfig {}
@@ -569,7 +570,7 @@ export interface Services extends CoreServices<SingletonServices> {}
     // Conditional: credential / secret file
     if (flags.credential === 'apikey') {
         files[`src/${name}.credential.ts`] = `import { z } from 'zod'
-import { defineCredential } from '@pikku/core/credential'
+import { defineCredential } from '#pikku/addon/auth'
 
 export const ${camelName}CredentialSchema = z.object({
   apiKey: z.string().describe(${literal(`${displayName} API key`)}),
@@ -591,7 +592,7 @@ defineCredential({
   tenantId: z.string().optional().describe('Upstream tenant id'),`
             : `  token: z.string().describe(${literal(`${displayName} bearer token`)}),`;
         files[`src/${name}.credential.ts`] = `import { z } from 'zod'
-import { defineCredential } from '@pikku/core/credential'
+import { defineCredential } from '#pikku/addon/auth'
 
 export const ${camelName}CredentialSchema = z.object({
 ${credentialFields}
@@ -608,8 +609,8 @@ defineCredential({
     }
     else if (flags.oauth || flags.credential === 'oauth2') {
         files[`src/${name}.credential.ts`] = `import { z } from 'zod'
-import { defineCredential } from '@pikku/core/credential'
-import { defineSecret } from '@pikku/core/secret'
+import { defineCredential } from '#pikku/addon/auth'
+import { defineSecret } from '#pikku/addon/secrets'
 
 export const ${camelName}TokenSchema = z.object({
   accessToken: z.string(),
@@ -641,7 +642,7 @@ defineSecret({
     }
     else if (flags.secret) {
         files[`src/${name}.secret.ts`] = `import { z } from 'zod'
-import { defineSecret } from '@pikku/core/secret'
+import { defineSecret } from '#pikku/addon/secrets'
 
 export const ${camelName}SecretsSchema = z.object({
   apiKey: z.string().describe(${literal(`${displayName} API key`)}),
@@ -662,7 +663,7 @@ defineSecret({
     // Conditional: variable file
     if (flags.variable) {
         files[`src/${name}.variable.ts`] = `import { z } from 'zod'
-import { defineVariable } from '@pikku/core/variable'
+import { defineVariable } from '#pikku/addon/variables'
 
 export const ${camelName}VariableSchema = z.string().optional().describe('TODO: describe this variable')
 
@@ -677,7 +678,7 @@ defineVariable({
     }
     return files;
 }
-function getTestFiles(vars) {
+export function getTestFiles(vars) {
     const { name, camelName, pascalName, screamingName, addonDepProtocol } = vars;
     const files = {};
     // test/package.json
@@ -686,8 +687,8 @@ function getTestFiles(vars) {
         private: true,
         type: 'module',
         imports: {
-            '#pikku': './.pikku/pikku-types.gen.ts',
-            '#pikku/*': './.pikku/*',
+            '#pikku/*.js': './.pikku/*.ts',
+            '#pikku/*': './.pikku/*/index.ts',
         },
         scripts: {
             pretest: 'pikku all',
@@ -725,14 +726,15 @@ function getTestFiles(vars) {
             resolveJsonModule: true,
             types: ['node'],
             paths: {
-                '#pikku': ['./.pikku/pikku-types.gen.ts'],
+                '#pikku/*.js': ['./.pikku/*.ts'],
+                '#pikku/*': ['./.pikku/*/index.ts'],
             },
         },
         include: ['src/*', '.pikku/**/*', 'types/**/*'],
         exclude: ['node_modules', '.pikku/**/*.d.ts'],
     }, null, 2);
     // test/src/addons.ts
-    files['src/addons.ts'] = `import { wireAddon } from '#pikku'
+    files['src/addons.ts'] = `import { wireAddon } from '#pikku/addon'
 
 wireAddon({ name: '${name}', package: '@pikku/addon-${name}' })
 `;
@@ -742,7 +744,7 @@ wireAddon({ name: '${name}', package: '@pikku/addon-${name}' })
   LocalVariablesService,
   LocalSecretService,
 } from '@pikku/core/services'
-import { pikkuServices } from '#pikku'
+import { pikkuServices } from '#pikku/function'
 
 import '../.pikku/pikku-bootstrap.gen.js'
 
@@ -760,7 +762,7 @@ export const createSingletonServices = pikkuServices(async (_config, existingSer
     // test/src/{name}-tests.function.ts
     files[`src/${name}-tests.function.ts`] =
         `import assert from 'node:assert/strict'
-import { pikkuSessionlessFunc } from '#pikku'
+import { pikkuSessionlessFunc } from '#pikku/function'
 
 export type Test${pascalName}Input = {}
 export type Test${pascalName}Output = { passed: number; failed: string[] }
@@ -794,7 +796,7 @@ export const test${pascalName} = pikkuSessionlessFunc<Test${pascalName}Input, Te
 
 import { test } from 'node:test'
 import assert from 'node:assert/strict'
-import { stopSingletonServices } from '@pikku/core'
+import { stopSingletonServices } from '@pikku/core/utils'
 import { rpcService } from '@pikku/core/rpc'
 import { LocalSecretService } from '@pikku/core/services'
 import { createSingletonServices } from './services.js'

package/dist/src/functions/commands/new-function.d.ts

@@ -1,10 +1,10 @@
-export declare const pikkuNewFunction: import("#pikku").PikkuFunctionConfig<{
+export declare const pikkuNewFunction: import("#pikku/function").PikkuFunctionConfig<{
     name: string;
     type?: string;
-}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{
+}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{
     name: string;
     type?: string;
-}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{
+}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{
     name: string;
     type?: string;
-}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
+}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;

package/dist/src/functions/commands/new-function.js

@@ -1,7 +1,7 @@
 import { existsSync } from 'fs';
 import { dirname } from 'path';
 import { mkdir, writeFile } from 'fs/promises';
-import { pikkuSessionlessFunc } from '#pikku';
+import { pikkuSessionlessFunc } from '#pikku/function';
 import { scaffoldFilePath } from '../../utils/file-writer.js';
 function capitalize(s) {
     return s.charAt(0).toUpperCase() + s.slice(1);
@@ -18,7 +18,7 @@ export const pikkuNewFunction = pikkuSessionlessFunc({
         let content;
         switch (type) {
             case 'func':
-                content = `import { pikkuFunc } from '#pikku'
+                content = `import { pikkuFunc } from '#pikku/function'
 
 export type ${inputName} = {
   // TODO: define input
@@ -37,7 +37,7 @@ export const ${name} = pikkuFunc<${inputName}, ${outputName}>({
 `;
                 break;
             case 'void':
-                content = `import { pikkuVoidFunc } from '#pikku'
+                content = `import { pikkuVoidFunc } from '#pikku/function'
 
 export type ${inputName} = {
   // TODO: define input
@@ -52,7 +52,7 @@ export const ${name} = pikkuVoidFunc<${inputName}>({
                 break;
             case 'sessionless':
             default:
-                content = `import { pikkuSessionlessFunc } from '#pikku'
+                content = `import { pikkuSessionlessFunc } from '#pikku/function'
 
 export type ${inputName} = {
   // TODO: define input

package/dist/src/functions/commands/new-middleware.d.ts

@@ -1,10 +1,10 @@
-export declare const pikkuNewMiddleware: import("#pikku").PikkuFunctionConfig<{
+export declare const pikkuNewMiddleware: import("#pikku/function").PikkuFunctionConfig<{
     name: string;
     type?: string;
-}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{
+}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{
     name: string;
     type?: string;
-}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{
+}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{
     name: string;
     type?: string;
-}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
+}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;

package/dist/src/functions/commands/new-middleware.js

@@ -1,7 +1,7 @@
 import { existsSync } from 'fs';
 import { dirname } from 'path';
 import { mkdir, writeFile } from 'fs/promises';
-import { pikkuSessionlessFunc } from '#pikku';
+import { pikkuSessionlessFunc } from '#pikku/function';
 import { scaffoldFilePath } from '../../utils/file-writer.js';
 export const pikkuNewMiddleware = pikkuSessionlessFunc({
     func: async ({ logger, config }, { name, type = 'simple' }) => {
@@ -13,7 +13,7 @@ export const pikkuNewMiddleware = pikkuSessionlessFunc({
         let content;
         switch (type) {
             case 'factory':
-                content = `import { pikkuMiddlewareFactory } from '#pikku'
+                content = `import { pikkuMiddlewareFactory } from '#pikku/function'
 
 export const ${name} = pikkuMiddlewareFactory(
   (param: string) =>
@@ -28,7 +28,7 @@ export const ${name} = pikkuMiddlewareFactory(
                 break;
             case 'simple':
             default:
-                content = `import { pikkuMiddleware } from '#pikku'
+                content = `import { pikkuMiddleware } from '#pikku/function'
 
 export const ${name} = pikkuMiddleware(
   async ({ logger }, _data, next) => {

package/dist/src/functions/commands/new-permission.d.ts

@@ -1,10 +1,10 @@
-export declare const pikkuNewPermission: import("#pikku").PikkuFunctionConfig<{
+export declare const pikkuNewPermission: import("#pikku/function").PikkuFunctionConfig<{
     name: string;
     type?: string;
-}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{
+}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{
     name: string;
     type?: string;
-}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{
+}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{
     name: string;
     type?: string;
-}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
+}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;

package/dist/src/functions/commands/new-permission.js

@@ -1,7 +1,7 @@
 import { existsSync } from 'fs';
 import { dirname } from 'path';
 import { mkdir, writeFile } from 'fs/promises';
-import { pikkuSessionlessFunc } from '#pikku';
+import { pikkuSessionlessFunc } from '#pikku/function';
 import { scaffoldFilePath } from '../../utils/file-writer.js';
 export const pikkuNewPermission = pikkuSessionlessFunc({
     func: async ({ logger, config }, { name, type = 'simple' }) => {
@@ -13,7 +13,7 @@ export const pikkuNewPermission = pikkuSessionlessFunc({
         let content;
         switch (type) {
             case 'factory':
-                content = `import { pikkuPermissionFactory } from '#pikku'
+                content = `import { pikkuPermissionFactory } from '#pikku/auth'
 
 export const ${name} = pikkuPermissionFactory(
   (param: string) =>
@@ -26,7 +26,7 @@ export const ${name} = pikkuPermissionFactory(
                 break;
             case 'simple':
             default:
-                content = `import { pikkuPermission } from '#pikku'
+                content = `import { pikkuPermission } from '#pikku/auth'
 
 export const ${name} = pikkuPermission(
   async ({ logger }, _data, { session }) => {

package/dist/src/functions/commands/new-wiring.d.ts

@@ -1,10 +1,10 @@
-export declare const pikkuNewWiring: import("#pikku").PikkuFunctionConfig<{
+export declare const pikkuNewWiring: import("#pikku/function").PikkuFunctionConfig<{
     name: string;
     type?: string;
-}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{
+}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{
     name: string;
     type?: string;
-}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{
+}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{
     name: string;
     type?: string;
-}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
+}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;

package/dist/src/functions/commands/new-wiring.js

@@ -1,12 +1,12 @@
 import { existsSync } from 'fs';
 import { dirname } from 'path';
 import { mkdir, writeFile } from 'fs/promises';
-import { pikkuSessionlessFunc } from '#pikku';
+import { pikkuSessionlessFunc } from '#pikku/function';
 import { scaffoldFilePath } from '../../utils/file-writer.js';
 function getWiringTemplate(type, name) {
     switch (type) {
         case 'http':
-            return `import { wireHTTP } from '#pikku'
+            return `import { wireHTTP } from '#pikku/http'
 // import { myFunc } from '../functions/${name}.functions.js'
 
 wireHTTP({
@@ -17,7 +17,7 @@ wireHTTP({
 })
 `;
         case 'channel':
-            return `import { wireChannel } from '#pikku'
+            return `import { wireChannel } from '#pikku/channel'
 // import { onConnect, onMessage, onDisconnect } from '../functions/${name}.functions.js'
 
 wireChannel({
@@ -30,7 +30,7 @@ wireChannel({
 })
 `;
         case 'scheduler':
-            return `import { wireScheduler } from '#pikku'
+            return `import { wireScheduler } from '#pikku/scheduler'
 // import { myTask } from '../functions/${name}.functions.js'
 
 wireScheduler({
@@ -40,7 +40,7 @@ wireScheduler({
 })
 `;
         case 'queue':
-            return `import { wireQueueWorker } from '#pikku'
+            return `import { wireQueueWorker } from '#pikku/queue'
 // import { processItem } from '../functions/${name}.functions.js'
 
 wireQueueWorker({
@@ -49,7 +49,7 @@ wireQueueWorker({
 })
 `;
         case 'mcp':
-            return `import { wireMCPResource } from '#pikku'
+            return `import { wireMCPResource } from '#pikku/mcp'
 // import { myResource } from '../functions/${name}.functions.js'
 
 wireMCPResource({
@@ -60,7 +60,7 @@ wireMCPResource({
 })
 `;
         case 'cli':
-            return `import { wireCLI, pikkuCLICommand } from '#pikku'
+            return `import { wireCLI, pikkuCLICommand } from '#pikku/cli'
 // import { myCommand } from '../functions/${name}.functions.js'
 
 wireCLI({
@@ -74,7 +74,7 @@ wireCLI({
 })
 `;
         case 'trigger':
-            return `import { wireTrigger } from '#pikku'
+            return `import { wireTrigger } from '#pikku/trigger'
 // import { handleEvent } from '../functions/${name}.functions.js'
 
 wireTrigger({

package/dist/src/functions/commands/persona-sync.d.ts

@@ -18,16 +18,16 @@
  * command has no way to check that, so pointing it at a stage's API and a local
  * database provisions nobody usefully.
  */
-export declare const personaSync: import("#pikku").PikkuFunctionConfig<{
+export declare const personaSync: import("#pikku/function").PikkuFunctionConfig<{
     environment: string;
     apiUrl?: string;
     dryRun?: boolean;
-}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{
+}, void, "rpc" | "session", import("#pikku/function").PikkuFunctionSessionless<{
     environment: string;
     apiUrl?: string;
     dryRun?: boolean;
-}, void, "rpc" | "session", import("#pikku").WiredServices, unknown> | import("#pikku").PikkuFunction<{
+}, void, "rpc" | "session", import("#pikku/function").WiredServices, unknown> | import("#pikku/function").PikkuFunction<{
     environment: string;
     apiUrl?: string;
     dryRun?: boolean;
-}, void, "rpc" | "session", import("#pikku").WiredServices>, undefined, undefined>;
+}, void, "rpc" | "session", import("#pikku/function").WiredServices>, undefined, undefined>;

package/dist/src/functions/commands/persona-sync.js

@@ -1,6 +1,6 @@
-import { pikkuSessionlessFunc } from '#pikku';
-import { createHttpPersonas } from '@pikku/core/ecosystem/persona';
-import { personaEnvironmentRefusal } from '@pikku/core/ecosystem/persona';
+import { pikkuSessionlessFunc } from '#pikku/function';
+import { createHttpPersonas } from '@pikku/core/persona';
+import { personaEnvironmentRefusal } from '@pikku/core/persona';
 import { resolvePersonas } from '../../utils/resolve-personas.js';
 import { resolveEnvironment } from './environment.js';
 import { loadDeclaredRoles, openScopeServiceForRoles } from './roles-shared.js';