@pikku/cli 0.12.54 → 0.12.56

package/dist/src/fabric/functions/publish.function.d.ts

@@ -26,7 +26,7 @@ export declare const FabricPublish: import("../../../.pikku/pikku-types.gen.js")
     name: string;
     version: string;
     publisher: string | null;
-}, "session" | "rpc", import("../../../.pikku/pikku-types.gen.js").PikkuFunctionSessionless<{
+}, "rpc" | "session", import("../../../.pikku/pikku-types.gen.js").PikkuFunctionSessionless<{
     dir?: string | undefined;
     apiUrl?: string | undefined;
 }, {
@@ -34,7 +34,7 @@ export declare const FabricPublish: import("../../../.pikku/pikku-types.gen.js")
     name: string;
     version: string;
     publisher: string | null;
-}, "session" | "rpc", import("../../../types/application-types.js").Services> | import("../../../.pikku/pikku-types.gen.js").PikkuFunction<{
+}, "rpc" | "session", import("../../../types/application-types.js").Services> | import("../../../.pikku/pikku-types.gen.js").PikkuFunction<{
     dir?: string | undefined;
     apiUrl?: string | undefined;
 }, {
@@ -42,4 +42,4 @@ export declare const FabricPublish: import("../../../.pikku/pikku-types.gen.js")
     name: string;
     version: string;
     publisher: string | null;
-}, "session" | "rpc", import("../../../types/application-types.js").Services>, undefined, undefined>;
+}, "rpc" | "session", import("../../../types/application-types.js").Services>, undefined, undefined>;

package/dist/src/fabric/functions/publish.function.js

@@ -29,7 +29,12 @@ export const FabricPublish = pikkuSessionlessFunc({
     description: 'Publish a package directory to the Fabric community registry.',
     input: FabricPublishInput,
     output: FabricPublishOutput,
-    func: async (_services, { dir, apiUrl: apiUrlOverride }) => {
+    func: async (_services, { dir, apiUrl: apiUrlOverride }, { rpc, cli }) => {
+        const verification = await rpc.invoke('FabricAddonVerify', { dir });
+        await cli?.channel.send(verification);
+        if (!verification.ok) {
+            throw new Error('Addon verification failed — fix the errors above before publishing.');
+        }
         const ctx = await resolveApiContext({ apiUrlOverride });
         if (!ctx.token)
             throw new Error('Not logged in. Run `pikku fabric login` first.');
@@ -64,14 +69,14 @@ export const FabricPublish = pikkuSessionlessFunc({
             return r.json();
         };
         // 1. presigned upload URL (short-lived)
-        const { uploadUrl, artifactKey } = await post('/registry/packages/publish-url', { packageName: pkg.name, version: pkg.version });
+        const { uploadUrl, artifactKey } = await post('/registry/addons/publish-url', { packageName: pkg.name, version: pkg.version });
         // 2. PUT the artifact to the exact signed URL (no extra headers — the URL
         //    is signed over host only; mismatched headers break the signature).
         const put = await fetch(uploadUrl, { method: 'PUT', body: artifact });
         if (!put.ok)
             throw new Error(`upload failed → ${put.status}: ${await put.text()}`);
         // 3. finalize — server reads the artifact back, extracts meta, indexes it
-        const entry = await post('/registry/packages/publish', { artifactKey });
+        const entry = await post('/registry/addons/publish', { artifactKey });
         const publisher = entry.publisher?.name ?? null;
         console.log(`[fabric] published ${entry.name}@${entry.version} (id=${entry.id})` +
             (publisher ? ` as ${publisher}` : ''));

package/dist/src/fabric/functions/rollback.function.d.ts

@@ -37,7 +37,7 @@ export declare const FabricRollback: import("../../../.pikku/pikku-types.gen.js"
     }[];
     deploymentId?: string | undefined;
     rolledBackToDeploymentId?: string | undefined;
-}, "session" | "rpc", import("../../../.pikku/pikku-types.gen.js").PikkuFunctionSessionless<{
+}, "rpc" | "session", import("../../../.pikku/pikku-types.gen.js").PikkuFunctionSessionless<{
     branch: string;
     target?: string | undefined;
     list?: boolean | undefined;
@@ -55,7 +55,7 @@ export declare const FabricRollback: import("../../../.pikku/pikku-types.gen.js"
     }[];
     deploymentId?: string | undefined;
     rolledBackToDeploymentId?: string | undefined;
-}, "session" | "rpc", import("../../../types/application-types.js").Services> | import("../../../.pikku/pikku-types.gen.js").PikkuFunction<{
+}, "rpc" | "session", import("../../../types/application-types.js").Services> | import("../../../.pikku/pikku-types.gen.js").PikkuFunction<{
     branch: string;
     target?: string | undefined;
     list?: boolean | undefined;
@@ -73,4 +73,4 @@ export declare const FabricRollback: import("../../../.pikku/pikku-types.gen.js"
     }[];
     deploymentId?: string | undefined;
     rolledBackToDeploymentId?: string | undefined;
-}, "session" | "rpc", import("../../../types/application-types.js").Services>, undefined, undefined>;
+}, "rpc" | "session", import("../../../types/application-types.js").Services>, undefined, undefined>;

package/dist/src/fabric/functions/secrets-list.function.d.ts

@@ -11,14 +11,14 @@ export declare const FabricSecretsList: import("../../../.pikku/pikku-types.gen.
     json?: boolean | undefined;
 }, {
     names: string[];
-}, "session" | "rpc", import("../../../.pikku/pikku-types.gen.js").PikkuFunctionSessionless<{
+}, "rpc" | "session", import("../../../.pikku/pikku-types.gen.js").PikkuFunctionSessionless<{
     branch: string;
     json?: boolean | undefined;
 }, {
     names: string[];
-}, "session" | "rpc", import("../../../types/application-types.js").Services> | import("../../../.pikku/pikku-types.gen.js").PikkuFunction<{
+}, "rpc" | "session", import("../../../types/application-types.js").Services> | import("../../../.pikku/pikku-types.gen.js").PikkuFunction<{
     branch: string;
     json?: boolean | undefined;
 }, {
     names: string[];
-}, "session" | "rpc", import("../../../types/application-types.js").Services>, undefined, undefined>;
+}, "rpc" | "session", import("../../../types/application-types.js").Services>, undefined, undefined>;

package/dist/src/fabric/functions/secrets-set.function.d.ts

@@ -15,18 +15,18 @@ export declare const FabricSecretsSet: import("../../../.pikku/pikku-types.gen.j
     force?: boolean | undefined;
 }, {
     ok: boolean;
-}, "session" | "rpc", import("../../../.pikku/pikku-types.gen.js").PikkuFunctionSessionless<{
+}, "rpc" | "session", import("../../../.pikku/pikku-types.gen.js").PikkuFunctionSessionless<{
     name: string;
     branch: string;
     value?: string | undefined;
     force?: boolean | undefined;
 }, {
     ok: boolean;
-}, "session" | "rpc", import("../../../types/application-types.js").Services> | import("../../../.pikku/pikku-types.gen.js").PikkuFunction<{
+}, "rpc" | "session", import("../../../types/application-types.js").Services> | import("../../../.pikku/pikku-types.gen.js").PikkuFunction<{
     name: string;
     branch: string;
     value?: string | undefined;
     force?: boolean | undefined;
 }, {
     ok: boolean;
-}, "session" | "rpc", import("../../../types/application-types.js").Services>, undefined, undefined>;
+}, "rpc" | "session", import("../../../types/application-types.js").Services>, undefined, undefined>;

package/dist/src/fabric/functions/smoke.function.d.ts

@@ -47,7 +47,7 @@ export declare const FabricSmoke: import("../../../.pikku/pikku-types.gen.js").P
     }[];
     failure?: string | undefined;
     logTail?: string | undefined;
-}, "session" | "rpc", import("../../../.pikku/pikku-types.gen.js").PikkuFunctionSessionless<{
+}, "rpc" | "session", import("../../../.pikku/pikku-types.gen.js").PikkuFunctionSessionless<{
     keepTemp?: boolean | undefined;
     timeoutSeconds?: number | undefined;
     startupTimeoutSeconds?: number | undefined;
@@ -68,7 +68,7 @@ export declare const FabricSmoke: import("../../../.pikku/pikku-types.gen.js").P
     }[];
     failure?: string | undefined;
     logTail?: string | undefined;
-}, "session" | "rpc", import("../../../types/application-types.js").Services> | import("../../../.pikku/pikku-types.gen.js").PikkuFunction<{
+}, "rpc" | "session", import("../../../types/application-types.js").Services> | import("../../../.pikku/pikku-types.gen.js").PikkuFunction<{
     keepTemp?: boolean | undefined;
     timeoutSeconds?: number | undefined;
     startupTimeoutSeconds?: number | undefined;
@@ -89,5 +89,5 @@ export declare const FabricSmoke: import("../../../.pikku/pikku-types.gen.js").P
     }[];
     failure?: string | undefined;
     logTail?: string | undefined;
-}, "session" | "rpc", import("../../../types/application-types.js").Services>, undefined, undefined>;
+}, "rpc" | "session", import("../../../types/application-types.js").Services>, undefined, undefined>;
 export declare const renderSmoke: (_services: unknown, output: z.infer<typeof FabricSmokeOutput>) => void;

package/dist/src/fabric/functions/status.function.d.ts

@@ -7,13 +7,13 @@ export declare const FabricStatusOutput: z.ZodObject<{
 export declare const FabricStatus: import("../../../.pikku/pikku-types.gen.js").PikkuFunctionConfig<Record<string, never>, {
     projectId: string;
     status: any;
-}, "session" | "rpc", import("../../../.pikku/pikku-types.gen.js").PikkuFunctionSessionless<Record<string, never>, {
+}, "rpc" | "session", import("../../../.pikku/pikku-types.gen.js").PikkuFunctionSessionless<Record<string, never>, {
     projectId: string;
     status: any;
-}, "session" | "rpc", import("../../../types/application-types.js").Services> | import("../../../.pikku/pikku-types.gen.js").PikkuFunction<Record<string, never>, {
+}, "rpc" | "session", import("../../../types/application-types.js").Services> | import("../../../.pikku/pikku-types.gen.js").PikkuFunction<Record<string, never>, {
     projectId: string;
     status: any;
-}, "session" | "rpc", import("../../../types/application-types.js").Services>, undefined, undefined>;
+}, "rpc" | "session", import("../../../types/application-types.js").Services>, undefined, undefined>;
 type StageState = {
     stageBranch: string;
     gitSha?: string | null;

package/dist/src/fabric/functions/trace.function.d.ts

@@ -13,16 +13,16 @@ export declare const FabricTrace: import("../../../.pikku/pikku-types.gen.js").P
     json?: boolean | undefined;
 }, {
     count: number;
-}, "session" | "rpc", import("../../../.pikku/pikku-types.gen.js").PikkuFunctionSessionless<{
+}, "rpc" | "session", import("../../../.pikku/pikku-types.gen.js").PikkuFunctionSessionless<{
     branch: string;
     traceId: string;
     json?: boolean | undefined;
 }, {
     count: number;
-}, "session" | "rpc", import("../../../types/application-types.js").Services> | import("../../../.pikku/pikku-types.gen.js").PikkuFunction<{
+}, "rpc" | "session", import("../../../types/application-types.js").Services> | import("../../../.pikku/pikku-types.gen.js").PikkuFunction<{
     branch: string;
     traceId: string;
     json?: boolean | undefined;
 }, {
     count: number;
-}, "session" | "rpc", import("../../../types/application-types.js").Services>, undefined, undefined>;
+}, "rpc" | "session", import("../../../types/application-types.js").Services>, undefined, undefined>;

package/dist/src/fabric/functions/validate.function.d.ts

@@ -26,7 +26,7 @@ export declare const FabricValidate: import("../../../.pikku/pikku-types.gen.js"
         path: string;
         fixHint: string;
     }[];
-}, "session" | "rpc", import("../../../.pikku/pikku-types.gen.js").PikkuFunctionSessionless<Record<string, never>, {
+}, "rpc" | "session", import("../../../.pikku/pikku-types.gen.js").PikkuFunctionSessionless<Record<string, never>, {
     ok: boolean;
     root: string;
     findings: {
@@ -36,7 +36,7 @@ export declare const FabricValidate: import("../../../.pikku/pikku-types.gen.js"
         path: string;
         fixHint: string;
     }[];
-}, "session" | "rpc", import("../../../types/application-types.js").Services> | import("../../../.pikku/pikku-types.gen.js").PikkuFunction<Record<string, never>, {
+}, "rpc" | "session", import("../../../types/application-types.js").Services> | import("../../../.pikku/pikku-types.gen.js").PikkuFunction<Record<string, never>, {
     ok: boolean;
     root: string;
     findings: {
@@ -46,5 +46,5 @@ export declare const FabricValidate: import("../../../.pikku/pikku-types.gen.js"
         path: string;
         fixHint: string;
     }[];
-}, "session" | "rpc", import("../../../types/application-types.js").Services>, undefined, undefined>;
+}, "rpc" | "session", import("../../../types/application-types.js").Services>, undefined, undefined>;
 export declare const renderValidate: (_s: unknown, { ok, root, findings }: z.infer<typeof FabricValidateOutput>) => void;

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

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

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

@@ -1,7 +1,24 @@
 import { pikkuVoidFunc } from '#pikku';
 export const all = pikkuVoidFunc({
     remote: true,
-    func: async ({ workflowService }, _data, { rpc }) => {
-        await workflowService.runToCompletion('allWorkflow', {}, rpc);
+    func: async ({ workflowService, logger }, _data, { rpc }) => {
+        // Drive the run directly (the CLI is always inline — no queueService) so we
+        // can read back the per-step durations already recorded on each step's
+        // state. startWorkflow runs the job to completion before returning in inline
+        // mode and re-throws on failure, matching runToCompletion's behaviour.
+        const { runId } = await workflowService.startWorkflow('allWorkflow', {}, { type: 'internal' }, rpc, { inline: true });
+        // Per-step timing breakdown for debugging slow runs (e.g. which inspector
+        // re-runs dominate). Opt-in via PIKKU_TIMING so normal runs stay quiet.
+        if (typeof process !== 'undefined' && process.env?.PIKKU_TIMING) {
+            const status = await workflowService.getRunStatus(runId);
+            const rows = (status?.steps ?? [])
+                .filter((s) => typeof s.duration === 'number')
+                .sort((a, b) => (b.duration ?? 0) - (a.duration ?? 0));
+            const total = rows.reduce((sum, s) => sum + (s.duration ?? 0), 0);
+            logger.info(`[TIMING] pikku all — ${rows.length} steps, ${total}ms total (slowest first):`);
+            for (const s of rows) {
+                logger.info(`[TIMING]   ${String(s.duration).padStart(7)}ms  ${s.name}`);
+            }
+        }
     },
 });

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

@@ -1,7 +1,7 @@
 export declare const binary: import("#pikku").PikkuFunctionConfig<{
     compileTarget?: string;
-}, void, "session" | "rpc", import("#pikku").PikkuFunctionSessionless<{
+}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{
     compileTarget?: string;
-}, void, "session" | "rpc", import("#pikku").Services> | import("#pikku").PikkuFunction<{
+}, void, "rpc" | "session", import("#pikku").Services> | import("#pikku").PikkuFunction<{
     compileTarget?: string;
-}, void, "session" | "rpc", import("#pikku").Services>, undefined, undefined>;
+}, void, "rpc" | "session", import("#pikku").Services>, undefined, undefined>;

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

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

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

@@ -4,6 +4,9 @@ export const bootstrap = pikkuVoidFunc({
     func: async ({ logger, getInspectorState }, _data, { rpc }) => {
         await getInspectorState(false, true, true);
         await rpc.invoke('pikkuFunctionTypesSplit', { bootstrap: true });
+        // Stub auth.types.ts (if better-auth is used) so the pikkuBetterAuth
+        // re-export resolves before any user file is imported.
+        await rpc.invoke('pikkuAuth', { bootstrap: true });
         await rpc.invoke('pikkuFunctionTypes', { bootstrap: true });
         await rpc.invoke('pikkuHTTPTypes');
         await rpc.invoke('pikkuChannelTypes');

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

@@ -2,12 +2,12 @@ export declare const consoleCommand: import("#pikku").PikkuFunctionConfig<{
     port?: string;
     open?: string;
     hmr?: boolean;
-}, void, "session" | "rpc", import("#pikku").PikkuFunctionSessionless<{
+}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{
     port?: string;
     open?: string;
     hmr?: boolean;
-}, void, "session" | "rpc", import("#pikku").Services> | import("#pikku").PikkuFunction<{
+}, void, "rpc" | "session", import("#pikku").Services> | import("#pikku").PikkuFunction<{
     port?: string;
     open?: string;
     hmr?: boolean;
-}, void, "session" | "rpc", import("#pikku").Services>, undefined, undefined>;
+}, void, "rpc" | "session", import("#pikku").Services>, undefined, undefined>;

package/dist/src/functions/commands/db-audit.d.ts

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

package/dist/src/functions/commands/db-generate.d.ts

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

package/dist/src/functions/commands/db-migrate.d.ts

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

package/dist/src/functions/commands/db-reset.d.ts

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

package/dist/src/functions/commands/db-seed.d.ts

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

package/dist/src/functions/commands/deploy-apply.d.ts

@@ -15,16 +15,16 @@ export declare const deployApply: import("#pikku").PikkuFunctionConfig<{
     runtime?: string;
     resultFile?: string;
     debugArtifacts?: boolean;
-}, void, "session" | "rpc", import("#pikku").PikkuFunctionSessionless<{
+}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{
     fromPlan?: boolean;
     provider?: string;
     runtime?: string;
     resultFile?: string;
     debugArtifacts?: boolean;
-}, void, "session" | "rpc", import("#pikku").Services> | import("#pikku").PikkuFunction<{
+}, void, "rpc" | "session", import("#pikku").Services> | import("#pikku").PikkuFunction<{
     fromPlan?: boolean;
     provider?: string;
     runtime?: string;
     resultFile?: string;
     debugArtifacts?: boolean;
-}, void, "session" | "rpc", import("#pikku").Services>, undefined, undefined>;
+}, void, "rpc" | "session", import("#pikku").Services>, undefined, undefined>;

package/dist/src/functions/commands/deploy-apply.js

@@ -1,5 +1,6 @@
 import { basename, join, relative } from 'node:path';
 import { readFile } from 'node:fs/promises';
+import { existsSync, readFileSync } from 'node:fs';
 import { pikkuSessionlessFunc } from '#pikku';
 import { runBuildPipeline } from '../../deploy/build-pipeline.js';
 function toRelativeImport(fromDir, toFile) {
@@ -25,6 +26,32 @@ export function getEntryContext(unitDir, pikkuDir, unit, inspectorState) {
     const servicesType = singletonServicesType
         ? `Partial<${singletonServicesType.type}>`
         : 'Record<string, unknown>';
+    // MCP: when the unit's .pikku has a non-empty mcp.gen.json, import it and pass
+    // it to the generated server so PikkuNodeHTTPServer mounts /mcp. Without this
+    // the deployed bundle never serves MCP even though the dev server does.
+    let mcpImport = '';
+    let mcpServerOption = '';
+    const mcpJsonAbs = join(pikkuDir, 'mcp', 'mcp.gen.json');
+    if (existsSync(mcpJsonAbs)) {
+        let hasMcp = false;
+        try {
+            const parsed = JSON.parse(readFileSync(mcpJsonAbs, 'utf-8'));
+            hasMcp =
+                (parsed.tools?.length ?? 0) +
+                    (parsed.resources?.length ?? 0) +
+                    (parsed.prompts?.length ?? 0) >
+                    0;
+        }
+        catch (err) {
+            console.warn(`[pikku] could not parse ${mcpJsonAbs} — skipping MCP mount: ${err instanceof Error ? err.message : String(err)}`);
+        }
+        if (hasMcp) {
+            const rel = relative(unitDir, mcpJsonAbs).replace(/\\/g, '/');
+            const relImport = rel.startsWith('.') ? rel : `./${rel}`;
+            mcpImport = `import mcpJson from '${relImport}' with { type: 'json' }`;
+            mcpServerOption = 'mcpJson, ';
+        }
+    }
     return {
         unit,
         unitDir,
@@ -35,6 +62,8 @@ export function getEntryContext(unitDir, pikkuDir, unit, inspectorState) {
         servicesVar: singletonServicesFactory.variable,
         singletonServicesImport,
         servicesType,
+        mcpImport,
+        mcpServerOption,
     };
 }
 function sanitizeProjectId(raw) {
@@ -147,7 +176,7 @@ async function runDeploy(provider, providerDir, logger, resultFile) {
     }
 }
 export const deployApply = pikkuSessionlessFunc({
-    func: async ({ logger, config, getInspectorState }, data) => {
+    func: async ({ logger, config, getInspectorState, bundler }, data) => {
         const projectDir = config.rootDir;
         const provider = await resolveProvider(config, data?.provider, {
             runtime: data?.runtime,
@@ -180,10 +209,12 @@ export const deployApply = pikkuSessionlessFunc({
             provider,
             inspectorState,
             serverlessIncompatible: config.deploy?.serverlessIncompatible,
+            defaultTarget: config.deploy?.defaultTarget,
             getEntryContext,
             outDir: config.outDir,
             debugArtifacts: data?.debugArtifacts ?? false,
             logger,
+            bundler,
         });
         if (buildResult.manifest.units.length === 0) {
             logger.info('No deployment units found. Nothing to deploy.');

package/dist/src/functions/commands/deploy-info.d.ts

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

package/dist/src/functions/commands/deploy-plan.d.ts

@@ -3,14 +3,14 @@ export declare const deployPlan: import("#pikku").PikkuFunctionConfig<{
     provider?: string;
     runtime?: string;
     debugArtifacts?: boolean;
-}, void, "session" | "rpc", import("#pikku").PikkuFunctionSessionless<{
+}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{
     resultFile?: string;
     provider?: string;
     runtime?: string;
     debugArtifacts?: boolean;
-}, void, "session" | "rpc", import("#pikku").Services> | import("#pikku").PikkuFunction<{
+}, void, "rpc" | "session", import("#pikku").Services> | import("#pikku").PikkuFunction<{
     resultFile?: string;
     provider?: string;
     runtime?: string;
     debugArtifacts?: boolean;
-}, void, "session" | "rpc", import("#pikku").Services>, undefined, undefined>;
+}, void, "rpc" | "session", import("#pikku").Services>, undefined, undefined>;

package/dist/src/functions/commands/deploy-plan.js

@@ -43,7 +43,7 @@ function createEmptyProvider() {
     };
 }
 export const deployPlan = pikkuSessionlessFunc({
-    func: async ({ logger, config, getInspectorState }, data) => {
+    func: async ({ logger, config, getInspectorState, bundler }, data) => {
         const projectDir = config.rootDir;
         const inspectorState = await getInspectorState(true);
         const projectId = await resolveProjectId(projectDir);
@@ -56,10 +56,12 @@ export const deployPlan = pikkuSessionlessFunc({
             provider,
             inspectorState,
             serverlessIncompatible: config.deploy?.serverlessIncompatible,
+            defaultTarget: config.deploy?.defaultTarget,
             getEntryContext,
             outDir: config.outDir,
             debugArtifacts: data?.debugArtifacts ?? false,
             logger,
+            bundler,
         });
         if (result.manifest.units.length === 0) {
             logger.info('No deployment units found.');

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

@@ -2,12 +2,12 @@ export declare const dev: import("#pikku").PikkuFunctionConfig<{
     port?: string;
     watch?: boolean;
     hmr?: boolean;
-}, void, "session" | "rpc", import("#pikku").PikkuFunctionSessionless<{
+}, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<{
     port?: string;
     watch?: boolean;
     hmr?: boolean;
-}, void, "session" | "rpc", import("#pikku").Services> | import("#pikku").PikkuFunction<{
+}, void, "rpc" | "session", import("#pikku").Services> | import("#pikku").PikkuFunction<{
     port?: string;
     watch?: boolean;
     hmr?: boolean;
-}, void, "session" | "rpc", import("#pikku").Services>, undefined, undefined>;
+}, void, "rpc" | "session", import("#pikku").Services>, undefined, undefined>;

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

@@ -7,20 +7,22 @@ import { KyselyAIStorageService, KyselyAIRunStateService, KyselyAgentRunService,
 import { stopSingletonServices } from '@pikku/core';
 import { pikkuState } from '@pikku/core/internal';
 import { LocalMetaService } from '@pikku/core/services/local-meta';
-import { LocalEventHubService } from '@pikku/core/channel/local';
 import { LocalContent, } from '@pikku/core/services/local-content';
-import { pikkuWebsocketHandler } from '@pikku/ws';
-import { PikkuNodeHTTPServer } from '@pikku/node-http-server';
-import { WebSocketServer } from 'ws';
 import { InMemorySchedulerService } from '@pikku/schedule';
 import { resolveDb, createKysely, parseDatabaseUrl, } from '../db/local-db.js';
 import { loadUserBootstrap, loadUserModule } from './load-user-project.js';
 import { createDevAIAgentRunner } from './dev-ai-runner.js';
 export const dev = pikkuSessionlessFunc({
     remote: true,
-    func: async ({ logger, config, getInspectorState, variables }, { port, watch, hmr }, { rpc }) => {
+    func: async ({ logger, config, getInspectorState, variables, devServerRunner }, { port, watch, hmr }, { rpc }) => {
         const resolvedPort = parseInt(port || '3000', 10);
         const hostname = 'localhost';
+        // Bind on IPv4 loopback explicitly. Under Bun, hostname 'localhost' resolves
+        // to IPv6 [::1] only, so a 127.0.0.1 proxy (e.g. the sandbox Caddy) can't
+        // reach it. '127.0.0.1' binds IPv4 on both Node and Bun (Node otherwise
+        // relies on --dns-result-order=ipv4first for the same effect). `hostname`
+        // stays 'localhost' for the user-facing content URL below.
+        const bindHostname = '127.0.0.1';
         const enableWatch = watch !== false;
         const enableHmr = hmr !== false;
         const watchDirectories = [
@@ -168,20 +170,10 @@ export const dev = pikkuSessionlessFunc({
                 variables,
             })
             : undefined;
-        // When the CLI itself runs under bun (e.g. the compiled brew binary), serve
-        // over @pikku/bun-server (native Bun.serve WebSockets) instead of the node
-        // http server + ws package. The bun runtime is dynamically imported so a
-        // node-run CLI never loads it. The same BunEventHubService instance is
-        // shared with the singleton services so function-side broadcasts reach the
-        // sockets the transport holds.
-        const isBun = typeof globalThis.Bun !== 'undefined';
-        const bun = isBun
-            ? await (async () => {
-                const mod = await import('@pikku/bun-server');
-                return { mod, eventHub: new mod.BunEventHubService() };
-            })()
-            : null;
-        const eventHub = bun ? bun.eventHub : new LocalEventHubService();
+        // The dev server runner (node http+ws, or bun-server) is resolved by DI in
+        // services.ts. Its EventHub is shared into the singleton services so
+        // function-side broadcasts reach the sockets the transport holds.
+        const eventHub = await devServerRunner.createEventHub();
         const inMemoryServices = {
             logger: devLogger,
             ...(aiAgentRunner ? { aiAgentRunner } : {}),
@@ -207,29 +199,12 @@ export const dev = pikkuSessionlessFunc({
             ...singletonServices,
             getInspectorState,
         });
-        let wss;
-        let pikkuServer;
-        if (bun) {
-            pikkuServer = new bun.mod.PikkuBunServer({
-                ...userConfig,
-                hostname,
-                port: resolvedPort,
-                content: localContentConfig,
-            }, logger, { eventHub: bun.eventHub });
-        }
-        else {
-            wss = new WebSocketServer({ noServer: true });
-            pikkuServer = new PikkuNodeHTTPServer({
-                ...userConfig,
-                hostname,
-                port: resolvedPort,
-                content: localContentConfig,
-            }, logger, {
-                configureServer: (httpServer) => {
-                    pikkuWebsocketHandler({ server: httpServer, wss: wss, logger });
-                },
-            });
-        }
+        const pikkuServer = devServerRunner.createServer({
+            ...userConfig,
+            hostname: bindHostname,
+            port: resolvedPort,
+            content: localContentConfig,
+        }, logger);
         await pikkuServer.init();
         await schedulerService.start();
         await pikkuServer.start();
@@ -241,9 +216,6 @@ export const dev = pikkuSessionlessFunc({
                 await stopSingletonServices();
                 await configWatcher?.close();
                 await watcher?.close();
-                if (wss) {
-                    await new Promise((resolve, reject) => wss.close((err) => (err ? reject(err) : resolve())));
-                }
                 await pikkuServer.stop();
             }
             finally {

package/dist/src/functions/commands/emails-init.d.ts

@@ -1,5 +1,5 @@
 type EmailsInitInput = {
     force?: boolean;
 };
-export declare const pikkuEmailsInit: import("#pikku").PikkuFunctionConfig<EmailsInitInput, void, "session" | "rpc", import("#pikku").PikkuFunctionSessionless<EmailsInitInput, void, "session" | "rpc", import("#pikku").Services> | import("#pikku").PikkuFunction<EmailsInitInput, void, "session" | "rpc", import("#pikku").Services>, undefined, undefined>;
+export declare const pikkuEmailsInit: import("#pikku").PikkuFunctionConfig<EmailsInitInput, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<EmailsInitInput, void, "rpc" | "session", import("#pikku").Services> | import("#pikku").PikkuFunction<EmailsInitInput, void, "rpc" | "session", import("#pikku").Services>, undefined, undefined>;
 export {};

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

@@ -1,5 +1,6 @@
-export declare const enableRpc: 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>;
-export declare const enableConsole: 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>;
-export declare const enableAgent: 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>;
-export declare const enableWorkflow: 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>;
-export declare const enableEvents: 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>;
+export declare const enableRpc: import("#pikku").PikkuFunctionConfig<void, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<void, void, "rpc" | "session", import("#pikku").Services> | import("#pikku").PikkuFunction<void, void, "rpc" | "session", import("#pikku").Services>, undefined, undefined>;
+export declare const enableConsole: import("#pikku").PikkuFunctionConfig<void, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<void, void, "rpc" | "session", import("#pikku").Services> | import("#pikku").PikkuFunction<void, void, "rpc" | "session", import("#pikku").Services>, undefined, undefined>;
+export declare const enableAgent: import("#pikku").PikkuFunctionConfig<void, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<void, void, "rpc" | "session", import("#pikku").Services> | import("#pikku").PikkuFunction<void, void, "rpc" | "session", import("#pikku").Services>, undefined, undefined>;
+export declare const enableWorkflow: import("#pikku").PikkuFunctionConfig<void, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<void, void, "rpc" | "session", import("#pikku").Services> | import("#pikku").PikkuFunction<void, void, "rpc" | "session", import("#pikku").Services>, undefined, undefined>;
+export declare const enableEvents: import("#pikku").PikkuFunctionConfig<void, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<void, void, "rpc" | "session", import("#pikku").Services> | import("#pikku").PikkuFunction<void, void, "rpc" | "session", import("#pikku").Services>, undefined, undefined>;
+export declare const enableRemoteRpc: import("#pikku").PikkuFunctionConfig<void, void, "rpc" | "session", import("#pikku").PikkuFunctionSessionless<void, void, "rpc" | "session", import("#pikku").Services> | import("#pikku").PikkuFunction<void, void, "rpc" | "session", import("#pikku").Services>, undefined, undefined>;