blokctl 0.6.11 → 0.6.13

package/dist/commands/create/project.js

@@ -17,7 +17,7 @@ const exec = util.promisify(child_process.exec);
 const HOME_DIR = `${os.homedir()}/.blok`;
 const GITHUB_REPO_LOCAL = `${HOME_DIR}/blok`;
 const GITHUB_REPO_REMOTE = "https://github.com/well-prado/blok.git";
-const GITHUB_REPO_RELEASE_TAG = "v0.6.11";
+const GITHUB_REPO_RELEASE_TAG = "v0.6.13";
 fsExtra.ensureDirSync(HOME_DIR);
 const options = {
     baseDir: HOME_DIR,
@@ -117,6 +117,7 @@ export async function createProject(opts, version, currentPath = false, localRep
                             value: "websocket",
                             hint: "Bi-directional real-time (mounts on HTTP port)",
                         },
+                        { label: "MCP", value: "mcp", hint: "Model Context Protocol server (mounts on HTTP port)" },
                         { label: "Queue", value: "queue", hint: "Kafka/RabbitMQ/SQS/Redis (port 4005)" },
                         { label: "Pub/Sub", value: "pubsub", hint: "GCP/AWS/Azure messaging (port 4006)" },
                     ],
@@ -264,7 +265,7 @@ export async function createProject(opts, version, currentPath = false, localRep
         const triggerConfigs = selectedTriggers.map((kind) => createTriggerConfig(kind));
         const mountedOnHttp = new Set();
         if (selectedTriggers.includes("http")) {
-            for (const kind of ["sse", "websocket", "webhook"]) {
+            for (const kind of ["sse", "websocket", "webhook", "mcp"]) {
                 if (selectedTriggers.includes(kind))
                     mountedOnHttp.add(kind);
             }
@@ -480,12 +481,13 @@ export async function createProject(opts, version, currentPath = false, localRep
             "@blokjs/trigger-cron": "triggers/cron",
             "@blokjs/trigger-grpc": "triggers/grpc",
             "@blokjs/trigger-pubsub": "triggers/pubsub",
+            "@blokjs/trigger-mcp": "triggers/mcp",
             "@blokjs/trigger-sse": "triggers/sse",
             "@blokjs/trigger-webhook": "triggers/webhook",
             "@blokjs/trigger-websocket": "triggers/websocket",
             "@blokjs/trigger-worker": "triggers/worker",
         };
-        const BLOKJS_DEP_RANGE = "^0.6.11";
+        const BLOKJS_DEP_RANGE = "^0.6.13";
         for (const depGroup of ["dependencies", "devDependencies", "peerDependencies"]) {
             const deps = packageJsonContent[depGroup];
             if (!deps)
@@ -606,6 +608,16 @@ export async function createProject(opts, version, currentPath = false, localRep
                 ...wsDeps,
             };
         }
+        if (selectedTriggers.includes("mcp")) {
+            const mcpDeps = {
+                "@blokjs/trigger-mcp": localRepoPath ? `file:${path.resolve(repoSource, "triggers/mcp")}` : BLOKJS_DEP_RANGE,
+                hono: "^4.11.7",
+            };
+            packageJsonContent.dependencies = {
+                ...packageJsonContent.dependencies,
+                ...mcpDeps,
+            };
+        }
         if (Object.keys(triggerPackageDeps).length > 0) {
             packageJsonContent.dependencies = {
                 ...packageJsonContent.dependencies,
@@ -716,7 +728,13 @@ export async function createProject(opts, version, currentPath = false, localRep
         const httpPort = triggerConfigs.find((tc) => tc.kind === "http")?.port;
         for (const tc of triggerConfigs) {
             if (mountedOnHttp.has(tc.kind) && httpPort !== undefined) {
-                const samplePath = tc.kind === "sse" ? "/sse/demo" : "/ws/echo";
+                const samplePath = tc.kind === "sse"
+                    ? "/sse/demo"
+                    : tc.kind === "mcp"
+                        ? "/mcp/sse"
+                        : tc.kind === "webhook"
+                            ? "/webhooks"
+                            : "/ws/echo";
                 console.log(`  ${tc.label}: http://localhost:${httpPort}${samplePath}  (mounted on HTTP)`);
             }
             else {
@@ -829,13 +847,15 @@ function generateTriggerEntryFile(triggerKind, selectedTriggers = [triggerKind])
         const sseAlsoSelected = selectedTriggers.includes("sse");
         const wsAlsoSelected = selectedTriggers.includes("websocket");
         const webhookAlsoSelected = selectedTriggers.includes("webhook");
-        const needsShared = sseAlsoSelected || wsAlsoSelected || webhookAlsoSelected;
+        const mcpAlsoSelected = selectedTriggers.includes("mcp");
+        const needsShared = sseAlsoSelected || wsAlsoSelected || webhookAlsoSelected || mcpAlsoSelected;
         const sharedHelperImports = needsShared
             ? `\nimport { NodeMap, WorkflowRegistry } from "@blokjs/runner";\nimport sharedNodes from "../../Nodes";\nimport sharedWorkflows from "../../Workflows";`
             : "";
         const sseImports = sseAlsoSelected ? `\nimport SSETrigger from "@blokjs/trigger-sse";` : "";
         const wsImports = wsAlsoSelected ? `\nimport WebSocketTrigger from "@blokjs/trigger-websocket";` : "";
         const webhookImports = webhookAlsoSelected ? `\nimport WebhookTrigger from "@blokjs/trigger-webhook";` : "";
+        const mcpImports = mcpAlsoSelected ? `\nimport McpTrigger from "@blokjs/trigger-mcp";` : "";
         const sharedBootstrapPrelude = needsShared
             ? `\n\n			// Build a NodeMap from the shared Nodes record; both SSE and
 			// WebSocket triggers consume this via setNodeMap so they can
@@ -858,15 +878,21 @@ function generateTriggerEntryFile(triggerKind, selectedTriggers = [triggerKind])
 				for (const [name, wf] of Object.entries(sharedWorkflows)) {
 					const w = wf as {
 						name?: string;
-						trigger?: { sse?: unknown; websocket?: unknown; webhook?: unknown };
-						_config?: { name?: string; trigger?: { sse?: unknown; websocket?: unknown; webhook?: unknown } };
+						trigger?: { sse?: unknown; websocket?: unknown; webhook?: unknown; mcp?: unknown };
+						_config?: { name?: string; trigger?: { sse?: unknown; websocket?: unknown; webhook?: unknown; mcp?: unknown } };
 					};
 					const triggerCfg = w._config?.trigger ?? w.trigger;
 					if (!triggerCfg) continue;
-					if (!triggerCfg.sse && !triggerCfg.websocket && !triggerCfg.webhook) continue;
+					if (!triggerCfg.sse && !triggerCfg.websocket && !triggerCfg.webhook && !triggerCfg.mcp) continue;
 					const resolvedName = w._config?.name ?? w.name ?? name;
 					if (registry.get(resolvedName)) continue;
-					const kind = triggerCfg.sse ? "sse" : triggerCfg.websocket ? "websocket" : "webhook";
+					const kind = triggerCfg.sse
+						? "sse"
+						: triggerCfg.websocket
+							? "websocket"
+							: triggerCfg.webhook
+								? "webhook"
+								: "mcp";
 					registry.register({
 						name: resolvedName,
 						source: \`\${kind}:\${name}\`,
@@ -919,10 +945,25 @@ function generateTriggerEntryFile(triggerKind, selectedTriggers = [triggerKind])
 			});
 			await webhookTrigger.listen();`
             : "";
-        const fullBootstrap = `${sharedBootstrapPrelude}${sseBootstrap}${wsBootstrap}${webhookBootstrap}`;
+        const mcpBootstrap = mcpAlsoSelected
+            ? `\n			// Mount the MCP server on the HTTP process's shared Hono app.
+			// McpTrigger.constructor(app, httpTrigger?) mirrors SSE / WS / Webhook —
+			// it registers its SSE (/<path>/sse + /<path>/messages) and
+			// Streamable-HTTP (/<path>) routes inside addPreCatchAllHook so they
+			// win Hono's first-match dispatch over the legacy workflow catch-all.
+			// Workflows with \`trigger.mcp\` (registered above) become MCP tools /
+			// resources; tools/call runs them through the runner.
+			const mcpTrigger = new McpTrigger(this.httpTrigger.getApp(), this.httpTrigger);
+			mcpTrigger.setNodeMap({
+				nodes: subTriggerNodeMap,
+				workflows: sharedWorkflows as unknown as Parameters<typeof mcpTrigger.setNodeMap>[0]["workflows"],
+			});
+			await mcpTrigger.listen();`
+            : "";
+        const fullBootstrap = `${sharedBootstrapPrelude}${sseBootstrap}${wsBootstrap}${webhookBootstrap}${mcpBootstrap}`;
         return `import { DefaultLogger } from "@blokjs/runner";
 import { type Span, metrics, trace } from "@opentelemetry/api";
-import HttpTrigger from "./runner/HttpTrigger";${sharedHelperImports}${sseImports}${wsImports}${webhookImports}
+import HttpTrigger from "./runner/HttpTrigger";${sharedHelperImports}${sseImports}${wsImports}${webhookImports}${mcpImports}
 
 export default class App {
 	private httpTrigger: HttpTrigger = <HttpTrigger>{};
@@ -1511,7 +1552,7 @@ function getProviderDependencies(triggers, pubsubProvider, queueProvider) {
     if (triggers.includes("pubsub") && pubsubProviderDeps[pubsubProvider]) {
         Object.assign(deps, pubsubProviderDeps[pubsubProvider]);
     }
-    if (triggers.includes("queue") && queueProviderDeps[queueProvider]) {
+    if ((triggers.includes("queue") || triggers.includes("worker")) && queueProviderDeps[queueProvider]) {
         Object.assign(deps, queueProviderDeps[queueProvider]);
     }
     return deps;
@@ -1558,7 +1599,7 @@ NATS_STREAM_NAME=blok-queue`,
     if (triggers.includes("pubsub") && pubsubEnvVars[pubsubProvider]) {
         lines.push(pubsubEnvVars[pubsubProvider]);
     }
-    if (triggers.includes("queue") && queueEnvVars[queueProvider]) {
+    if ((triggers.includes("queue") || triggers.includes("worker")) && queueEnvVars[queueProvider]) {
         lines.push(queueEnvVars[queueProvider]);
     }
     return lines.join("\n");

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "blokctl",
-	"version": "0.6.11",
+	"version": "0.6.13",
 	"author": "Deskree Technologies Inc.",
 	"license": "Apache-2.0",
 	"description": "cli for blok",
@@ -30,7 +30,7 @@
 	"keywords": ["blokctl", "cli", "blok", "blok"],
 	"dependencies": {
 		"@ai-sdk/openai": "^1.3.22",
-		"@blokjs/runner": "^0.6.11",
+		"@blokjs/runner": "^0.6.13",
 		"@clack/prompts": "^1.0.0",
 		"ai": "^4.3.16",
 		"better-sqlite3": "^12.6.2",