blokctl 0.6.21 → 0.7.0

package/dist/__tests__/modular-observability.capstone.e2e.test.js

@@ -0,0 +1,72 @@
+import fs from "node:fs";
+import os from "node:os";
+import path from "node:path";
+import { afterEach, beforeEach, describe, expect, it } from "vitest";
+import { parse as parseYaml } from "yaml";
+import { resolveObservabilitySelection } from "../commands/observability/apply.js";
+import { setupObservabilityStack } from "../services/obs-setup.js";
+import { rewriteObservabilityEnvBlock } from "../services/observability-mutations.js";
+import { readProjectConfig, writeProjectConfig } from "../services/runtime-setup.js";
+function findRepoRoot() {
+    let dir = import.meta.dirname;
+    for (let i = 0; i < 8; i++) {
+        if (fs.existsSync(path.join(dir, "infra", "metrics", "docker-compose.yml")))
+            return dir;
+        const up = path.dirname(dir);
+        if (up === dir)
+            break;
+        dir = up;
+    }
+    return null;
+}
+const REPO = findRepoRoot();
+describe("capstone — modular observability footprint", () => {
+    let tmp;
+    let envLocal;
+    beforeEach(() => {
+        tmp = fs.mkdtempSync(path.join(os.tmpdir(), "blok-capstone-"));
+        envLocal = path.join(tmp, ".env.local");
+    });
+    afterEach(() => fs.rmSync(tmp, { recursive: true, force: true }));
+    function scaffold(modules, tier) {
+        const sel = resolveObservabilitySelection(modules.filter((m) => m !== "obs-stack"), { addedAt: "2026-01-01T00:00:00.000Z", version: "0.6.0", projectDir: tmp });
+        const obsConfig = Object.keys(sel.configMap).length > 0 ? sel.configMap : undefined;
+        writeProjectConfig(tmp, [], [], obsConfig);
+        fs.writeFileSync(envLocal, rewriteObservabilityEnvBlock("", sel.envBlocks));
+        if (REPO)
+            setupObservabilityStack(REPO, tmp, tier);
+        return { added: sel.added };
+    }
+    it("a metrics+tracing subset enables ONLY those — unselected modules leave no footprint", () => {
+        scaffold(["metrics", "tracing"], "none");
+        expect(Object.keys(readProjectConfig(tmp)?.observability ?? {}).sort()).toEqual(["metrics", "tracing"]);
+        const env = fs.readFileSync(envLocal, "utf8");
+        expect(env).toContain("BLOK_METRICS_DISABLED");
+        expect(env).toContain("OTEL_EXPORTER_OTLP_ENDPOINT");
+        expect(env).not.toContain("CONSOLE_LOG_ACTIVE");
+        expect(env).not.toContain("SENTRY_DSN");
+        expect(env).not.toContain("BLOK_TRACE_STORE");
+        expect(env).not.toContain("BLOK_ALERTING_ENABLED");
+    });
+    it("selecting alerting auto-pulls its metrics dependency", () => {
+        const { added } = scaffold(["alerting"], "none");
+        expect(added).toEqual(["metrics"]);
+        expect(Object.keys(readProjectConfig(tmp)?.observability ?? {}).sort()).toEqual(["alerting", "metrics"]);
+    });
+    it("BLOK_METRICS_DISABLED round-trips inert (commented) — metrics stay ON by default", () => {
+        scaffold(["metrics"], "none");
+        for (const line of fs.readFileSync(envLocal, "utf8").split("\n")) {
+            if (/BLOK_METRICS_DISABLED=/.test(line))
+                expect(line.trim().startsWith("#")).toBe(true);
+        }
+    });
+    it("obs-stack=none copies no infra/metrics", () => {
+        scaffold(["metrics"], "none");
+        expect(fs.existsSync(path.join(tmp, "infra", "metrics"))).toBe(false);
+    });
+    it.skipIf(!REPO)("obs-stack=lite copies exactly prometheus + grafana", () => {
+        scaffold(["metrics"], "lite");
+        const compose = parseYaml(fs.readFileSync(path.join(tmp, "infra", "metrics", "docker-compose.yml"), "utf8"));
+        expect(Object.keys(compose.services ?? {}).sort()).toEqual(["grafana", "prometheus"]);
+    });
+});

package/dist/commands/create/node.js

@@ -8,7 +8,7 @@ import fsExtra from "fs-extra";
 import color from "picocolors";
 import { isNonInteractive, resolveOrThrow } from "../../services/non-interactive.js";
 import { manager as pm } from "../../services/package-manager.js";
-import { csharp_csproj_file, csharp_dockerfile, csharp_node_file, function_first_node_file, go_dockerfile, go_mod_file, go_node_file, java_dockerfile, java_node_file, java_pom_file, php_composer_file, php_dockerfile, php_node_file, python3_file, ruby_dockerfile, ruby_gemfile, ruby_node_file, rust_cargo_file, rust_dockerfile, rust_node_file, } from "./utils/Examples.js";
+import { csharp_node_file, function_first_node_file, go_node_file, java_node_file, php_node_file, python3_file, ruby_node_file, rust_node_file, } from "./utils/Examples.js";
 const exec = util.promisify(child_process.exec);
 const HOME_DIR = `${os.homedir()}/.blok`;
 function toPascalCase(name) {
@@ -252,7 +252,8 @@ export async function createNode(opts, currentPath = false) {
                     throw new Error("ops2");
             }
             fsExtra.ensureDirSync(dirPath);
-            fsExtra.writeFileSync(`${dirPath}/node.py`, python3_file);
+            const pythonNodeContent = python3_file.replace(/\{\{NODE_NAME\}\}/g, nodeName);
+            fsExtra.writeFileSync(`${dirPath}/node.py`, pythonNodeContent);
             fsExtra.writeFileSync(`${dirPath}/__init__.py`, "");
         }
         if (node_runtime === "go") {
@@ -283,14 +284,13 @@ export async function createNode(opts, currentPath = false) {
                     throw new Error("ops2");
             }
             fsExtra.ensureDirSync(dirPath);
-            const goNodeContent = go_node_file.replace(/\{\{NODE_NAME\}\}/g, nodeName);
-            const goModContent = go_mod_file.replace(/\{\{NODE_NAME\}\}/g, nodeName);
-            const goDockerContent = go_dockerfile.replace(/\{\{NODE_NAME\}\}/g, nodeName);
-            fsExtra.writeFileSync(`${dirPath}/main.go`, goNodeContent);
-            fsExtra.writeFileSync(`${dirPath}/go.mod`, goModContent);
-            fsExtra.writeFileSync(`${dirPath}/go.sum`, "");
-            fsExtra.writeFileSync(`${dirPath}/Dockerfile`, goDockerContent);
-            const readmeContent = `# ${nodeName}\n\nGo-based Blok node.\n\n## Build\n\n\`\`\`bash\ndocker build -t blok-${nodeName}:latest .\n\`\`\`\n\n## Run\n\n\`\`\`bash\ndocker run -p 8080:8080 blok-${nodeName}:latest\n\`\`\`\n`;
+            const goPkg = nodeName.replace(/[^a-z0-9]/gi, "").toLowerCase();
+            const goNodeContent = go_node_file
+                .replace(/\{\{NODE_NAME_PASCAL\}\}/g, toPascalCase(nodeName))
+                .replace(/\{\{NODE_PKG\}\}/g, goPkg)
+                .replace(/\{\{NODE_NAME\}\}/g, nodeName);
+            fsExtra.writeFileSync(`${dirPath}/node.go`, goNodeContent);
+            const readmeContent = `# ${nodeName}\n\nGo-based Blok node, served by the Go runtime over gRPC.\n\nRun \`blokctl dev\` — the node is discovered under \`runtimes/go/nodes/\` and registered automatically.\n`;
             fsExtra.writeFileSync(`${dirPath}/README.md`, readmeContent);
         }
         if (node_runtime === "java") {
@@ -321,15 +321,14 @@ export async function createNode(opts, currentPath = false) {
                     throw new Error("ops2");
             }
             fsExtra.ensureDirSync(dirPath);
-            const srcDir = `${dirPath}/src/main/java/com/blok/nodes`;
+            const srcDir = `${dirPath}/src/main/java/com/blok/blok/nodes`;
             fsExtra.ensureDirSync(srcDir);
-            const javaNodeContent = java_node_file.replace(/\{\{NODE_NAME\}\}/g, nodeName);
-            const javaPomContent = java_pom_file.replace(/\{\{NODE_NAME\}\}/g, nodeName);
-            const javaDockerContent = java_dockerfile.replace(/\{\{NODE_NAME\}\}/g, nodeName);
-            fsExtra.writeFileSync(`${srcDir}/HelloWorldNode.java`, javaNodeContent);
-            fsExtra.writeFileSync(`${dirPath}/pom.xml`, javaPomContent);
-            fsExtra.writeFileSync(`${dirPath}/Dockerfile`, javaDockerContent);
-            const readmeContent = `# ${nodeName}\n\nJava-based Blok node.\n\n## Build\n\n\`\`\`bash\ndocker build -t blok-${nodeName}:latest .\n\`\`\`\n\n## Run\n\n\`\`\`bash\ndocker run -p 8080:8080 blok-${nodeName}:latest\n\`\`\`\n`;
+            const pascalName = toPascalCase(nodeName);
+            const javaNodeContent = java_node_file
+                .replace(/\{\{NODE_NAME_PASCAL\}\}/g, pascalName)
+                .replace(/\{\{NODE_NAME\}\}/g, nodeName);
+            fsExtra.writeFileSync(`${srcDir}/${pascalName}Node.java`, javaNodeContent);
+            const readmeContent = `# ${nodeName}\n\nJava-based Blok node, compiled into the Java runtime jar.\n\nRun \`blokctl dev\` — the node is discovered under \`runtimes/java/nodes/\` and registered automatically.\n`;
             fsExtra.writeFileSync(`${dirPath}/README.md`, readmeContent);
         }
         if (node_runtime === "rust") {
@@ -360,18 +359,12 @@ export async function createNode(opts, currentPath = false) {
                     throw new Error("ops2");
             }
             fsExtra.ensureDirSync(dirPath);
-            const srcDir = `${dirPath}/src`;
-            fsExtra.ensureDirSync(srcDir);
             const pascalName = toPascalCase(nodeName);
             const rustNodeContent = rust_node_file
-                .replace(/\{\{NODE_NAME\}\}/g, nodeName)
-                .replace(/\{\{NODE_NAME_PASCAL\}\}/g, pascalName);
-            const rustCargoContent = rust_cargo_file.replace(/\{\{NODE_NAME\}\}/g, nodeName);
-            const rustDockerContent = rust_dockerfile.replace(/\{\{NODE_NAME\}\}/g, nodeName);
-            fsExtra.writeFileSync(`${srcDir}/main.rs`, rustNodeContent);
-            fsExtra.writeFileSync(`${dirPath}/Cargo.toml`, rustCargoContent);
-            fsExtra.writeFileSync(`${dirPath}/Dockerfile`, rustDockerContent);
-            const readmeContent = `# ${nodeName}\n\nRust-based Blok node.\n\n## Build\n\n\`\`\`bash\ndocker build -t blok-${nodeName}:latest .\n\`\`\`\n\n## Run\n\n\`\`\`bash\ndocker run -p 8080:8080 blok-${nodeName}:latest\n\`\`\`\n`;
+                .replace(/\{\{NODE_NAME_PASCAL\}\}/g, pascalName)
+                .replace(/\{\{NODE_NAME\}\}/g, nodeName);
+            fsExtra.writeFileSync(`${dirPath}/node.rs`, rustNodeContent);
+            const readmeContent = `# ${nodeName}\n\nRust-based Blok node, served by the Rust runtime over gRPC.\n\nRun \`blokctl dev\` — the node is discovered under \`runtimes/rust/nodes/\` and registered automatically.\n`;
             fsExtra.writeFileSync(`${dirPath}/README.md`, readmeContent);
         }
         if (node_runtime === "csharp") {
@@ -382,7 +375,15 @@ export async function createNode(opts, currentPath = false) {
                     fsExtra.ensureDirSync(currentDir);
                 }
                 const currentNodesDir = `${currentDir}/nodes`;
-                fsExtra.ensureDirSync(currentNodesDir);
+                if (!skipPrompts) {
+                    fsExtra.ensureDirSync(currentNodesDir);
+                }
+                else {
+                    const nodeDirExists = fsExtra.existsSync(currentNodesDir);
+                    if (!nodeDirExists) {
+                        fsExtra.ensureDirSync(currentNodesDir);
+                    }
+                }
                 dirPath = path.join(currentNodesDir, nodeName);
             }
             if (!skipPrompts)
@@ -392,16 +393,12 @@ export async function createNode(opts, currentPath = false) {
                     throw new Error("ops2");
             }
             fsExtra.ensureDirSync(dirPath);
-            const srcDir = `${dirPath}/src/Nodes`;
-            fsExtra.ensureDirSync(srcDir);
             const pascalName = toPascalCase(nodeName);
-            const csNodeContent = csharp_node_file.replace(/\{\{NODE_NAME_PASCAL\}\}/g, pascalName);
-            const csprojContent = csharp_csproj_file.replace(/\{\{NODE_NAME\}\}/g, nodeName);
-            const csDockerContent = csharp_dockerfile.replace(/\{\{NODE_NAME\}\}/g, nodeName);
-            fsExtra.writeFileSync(`${srcDir}/${pascalName}Node.cs`, csNodeContent);
-            fsExtra.writeFileSync(`${dirPath}/BlokRuntime.csproj`, csprojContent);
-            fsExtra.writeFileSync(`${dirPath}/Dockerfile`, csDockerContent);
-            const readmeContent = `# ${nodeName}\n\nC#/.NET-based Blok node.\n\n## Build\n\n\`\`\`bash\ndocker build -t blok-${nodeName}:latest .\n\`\`\`\n\n## Run\n\n\`\`\`bash\ndocker run -p 8080:8080 blok-${nodeName}:latest\n\`\`\`\n`;
+            const csNodeContent = csharp_node_file
+                .replace(/\{\{NODE_NAME_PASCAL\}\}/g, pascalName)
+                .replace(/\{\{NODE_NAME\}\}/g, nodeName);
+            fsExtra.writeFileSync(`${dirPath}/${pascalName}Node.cs`, csNodeContent);
+            const readmeContent = `# ${nodeName}\n\nC#/.NET-based Blok node, served by the C# runtime over gRPC.\n\nRun \`blokctl dev\` — the node is discovered under \`runtimes/csharp/nodes/\` and registered automatically.\n`;
             fsExtra.writeFileSync(`${dirPath}/README.md`, readmeContent);
         }
         if (node_runtime === "php") {
@@ -428,12 +425,8 @@ export async function createNode(opts, currentPath = false) {
             const phpNodeContent = php_node_file
                 .replace(/\{\{NODE_NAME\}\}/g, nodeName)
                 .replace(/\{\{NODE_NAME_PASCAL\}\}/g, pascalName);
-            const phpComposerContent = php_composer_file.replace(/\{\{NODE_NAME\}\}/g, nodeName);
-            const phpDockerContent = php_dockerfile.replace(/\{\{NODE_NAME\}\}/g, nodeName);
             fsExtra.writeFileSync(`${srcDir}/${pascalName}Node.php`, phpNodeContent);
-            fsExtra.writeFileSync(`${dirPath}/composer.json`, phpComposerContent);
-            fsExtra.writeFileSync(`${dirPath}/Dockerfile`, phpDockerContent);
-            const readmeContent = `# ${nodeName}\n\nPHP-based Blok node.\n\n## Build\n\n\`\`\`bash\ndocker build -t blok-${nodeName}:latest .\n\`\`\`\n\n## Run\n\n\`\`\`bash\ndocker run -p 8080:8080 blok-${nodeName}:latest\n\`\`\`\n`;
+            const readmeContent = `# ${nodeName}\n\nPHP-based Blok node, served by the PHP runtime over gRPC.\n\nRun \`blokctl dev\` — the node is discovered under \`runtimes/php/nodes/\` and registered automatically.\n`;
             fsExtra.writeFileSync(`${dirPath}/README.md`, readmeContent);
         }
         if (node_runtime === "ruby") {
@@ -454,18 +447,11 @@ export async function createNode(opts, currentPath = false) {
                     throw new Error("ops2");
             }
             fsExtra.ensureDirSync(dirPath);
-            const libDir = `${dirPath}/lib/nodes`;
-            fsExtra.ensureDirSync(libDir);
-            const pascalName = toPascalCase(nodeName);
             const rubyNodeContent = ruby_node_file
-                .replace(/\{\{NODE_NAME\}\}/g, nodeName)
-                .replace(/\{\{NODE_NAME_PASCAL\}\}/g, pascalName);
-            const rubyGemContent = ruby_gemfile.replace(/\{\{NODE_NAME\}\}/g, nodeName);
-            const rubyDockerContent = ruby_dockerfile.replace(/\{\{NODE_NAME\}\}/g, nodeName);
-            fsExtra.writeFileSync(`${libDir}/${nodeName.replace(/-/g, "_")}.rb`, rubyNodeContent);
-            fsExtra.writeFileSync(`${dirPath}/Gemfile`, rubyGemContent);
-            fsExtra.writeFileSync(`${dirPath}/Dockerfile`, rubyDockerContent);
-            const readmeContent = `# ${nodeName}\n\nRuby-based Blok node.\n\n## Build\n\n\`\`\`bash\ndocker build -t blok-${nodeName}:latest .\n\`\`\`\n\n## Run\n\n\`\`\`bash\ndocker run -p 8080:8080 blok-${nodeName}:latest\n\`\`\`\n`;
+                .replace(/\{\{NODE_NAME_PASCAL\}\}/g, toPascalCase(nodeName))
+                .replace(/\{\{NODE_NAME\}\}/g, nodeName);
+            fsExtra.writeFileSync(`${dirPath}/node.rb`, rubyNodeContent);
+            const readmeContent = `# ${nodeName}\n\nRuby-based Blok node, served by the Ruby runtime over gRPC.\n\nRun \`blokctl dev\` — the node is discovered under \`runtimes/ruby/nodes/\` and registered automatically.\n`;
             fsExtra.writeFileSync(`${dirPath}/README.md`, readmeContent);
         }
         if (!skipPrompts)
@@ -486,33 +472,27 @@ export async function createNode(opts, currentPath = false) {
         }
         if (!currentPath && node_runtime === "go") {
             console.log(`\nNavigate to the node directory by running: cd runtimes/go/nodes/${nodeName}`);
-            console.log(`\nBuild the Docker image: docker build -t blok-${nodeName}:latest .`);
-            console.log(`Run the container: docker run -p 8080:8080 blok-${nodeName}:latest`);
+            console.log(`\nRun "blokctl dev" — the Go runtime discovers and registers this node automatically.`);
         }
         if (!currentPath && node_runtime === "java") {
             console.log(`\nNavigate to the node directory by running: cd runtimes/java/nodes/${nodeName}`);
-            console.log(`\nBuild the Docker image: docker build -t blok-${nodeName}:latest .`);
-            console.log(`Run the container: docker run -p 8080:8080 blok-${nodeName}:latest`);
+            console.log(`\nRun "blokctl dev" — the Java runtime discovers and registers this node automatically.`);
         }
         if (!currentPath && node_runtime === "rust") {
             console.log(`\nNavigate to the node directory by running: cd runtimes/rust/nodes/${nodeName}`);
-            console.log(`\nBuild the Docker image: docker build -t blok-${nodeName}:latest .`);
-            console.log(`Run the container: docker run -p 8080:8080 blok-${nodeName}:latest`);
+            console.log(`\nRun "blokctl dev" — the Rust runtime discovers and registers this node automatically.`);
         }
         if (!currentPath && node_runtime === "csharp") {
             console.log(`\nNavigate to the node directory by running: cd runtimes/csharp/nodes/${nodeName}`);
-            console.log(`\nBuild the Docker image: docker build -t blok-${nodeName}:latest .`);
-            console.log(`Run the container: docker run -p 8080:8080 blok-${nodeName}:latest`);
+            console.log(`\nRun "blokctl dev" — the C# runtime discovers and registers this node automatically.`);
         }
         if (!currentPath && node_runtime === "php") {
             console.log(`\nNavigate to the node directory by running: cd runtimes/php/nodes/${nodeName}`);
-            console.log(`\nBuild the Docker image: docker build -t blok-${nodeName}:latest .`);
-            console.log(`Run the container: docker run -p 8080:8080 blok-${nodeName}:latest`);
+            console.log(`\nRun "blokctl dev" — the PHP runtime discovers and registers this node automatically.`);
         }
         if (!currentPath && node_runtime === "ruby") {
             console.log(`\nNavigate to the node directory by running: cd runtimes/ruby/nodes/${nodeName}`);
-            console.log(`\nBuild the Docker image: docker build -t blok-${nodeName}:latest .`);
-            console.log(`Run the container: docker run -p 8080:8080 blok-${nodeName}:latest`);
+            console.log(`\nRun "blokctl dev" — the Ruby runtime discovers and registers this node automatically.`);
         }
         console.log("\nFor more documentation, visit https://blok.build/docs/d/core-concepts/nodes");
     }

package/dist/commands/create/project.js

@@ -8,16 +8,21 @@ import fsExtra from "fs-extra";
 import color from "picocolors";
 import simpleGit from "simple-git";
 import { isNonInteractive, parseCommaSeparated, resolveOrThrow } from "../../services/non-interactive.js";
+import { setupObservabilityStack } from "../../services/obs-setup.js";
+import { parseObsTier } from "../../services/obs-tiers.js";
+import { rewriteObservabilityEnvBlock } from "../../services/observability-mutations.js";
 import { manager as pm } from "../../services/package-manager.js";
 import { detectRuntimes } from "../../services/runtime-detector.js";
 import { createTriggerConfig, generateRuntimeEnvVars, generateSupervisordConfig, generateTriggerEnvVars, generateTriggerSupervisordConfig, setupRuntime, writeProjectConfig, } from "../../services/runtime-setup.js";
 import { computeDefaultConstraint } from "../../services/semver-utils.js";
+import { resolveObservabilitySelection } from "../observability/apply.js";
+import { OBSERVABILITY_MODULE_IDS, allObservabilityModules, getObservabilityModule, } from "../observability/descriptor.js";
 import { agents_md, claude_md, examples_url, node_file, package_dependencies, package_dev_dependencies, } from "./utils/Examples.js";
 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.21";
+const GITHUB_REPO_RELEASE_TAG = "v0.7.0";
 const RUNTIME_HELLO_EXAMPLES = {
     go: "runtime-go-hello.ts",
     rust: "runtime-rust-hello.ts",
@@ -53,6 +58,15 @@ export async function createProject(opts, version, currentPath = false, localRep
     let pubsubProvider = opts.pubsubProvider || "gcp";
     let queueProvider = opts.queueProvider || "kafka";
     let explicitQueueProvider = Boolean(opts.queueProvider);
+    let selectedObsTier = opts.obsStack ? parseObsTier(opts.obsStack) : "none";
+    let selectedObsModules = opts.observability
+        ? parseCommaSeparated(opts.observability).map((s) => s.trim().toLowerCase())
+        : [];
+    for (const id of selectedObsModules) {
+        if (id !== "obs-stack" && !getObservabilityModule(id)) {
+            throw new Error(`Invalid --observability "${id}". Known: ${OBSERVABILITY_MODULE_IDS.join(", ")}.`);
+        }
+    }
     let detectedRuntimes = [];
     if (!skipPrompts) {
         console.log(figlet.textSync("blok CLI".toUpperCase(), {
@@ -168,6 +182,27 @@ export async function createProject(opts, version, currentPath = false, localRep
                     initialValues: ["node"],
                     required: true,
                 }),
+            obsStack: () => opts.obsStack
+                ? Promise.resolve(opts.obsStack)
+                : p.select({
+                    message: "Observability dev stack?",
+                    options: [
+                        { label: "None", value: "none", hint: "no infra/metrics — boots standalone (default)" },
+                        { label: "Lite", value: "lite", hint: "Prometheus + Grafana only" },
+                        { label: "Full", value: "full", hint: "Prometheus, Grafana, Loki, Tempo, Alloy, …" },
+                    ],
+                    initialValue: "none",
+                }),
+            observability: () => opts.observability
+                ? Promise.resolve(parseCommaSeparated(opts.observability))
+                : p.multiselect({
+                    message: "Observability modules (optional — none by default)",
+                    options: allObservabilityModules()
+                        .filter((m) => m.id !== "obs-stack")
+                        .map((m) => ({ value: m.id, label: m.label, hint: m.description })),
+                    initialValues: [],
+                    required: false,
+                }),
             selectedManager: () => resolveSelectedManager(),
         }, {
             onCancel: () => {
@@ -181,6 +216,8 @@ export async function createProject(opts, version, currentPath = false, localRep
         explicitQueueProvider = blokctlProject.queueProvider != null;
         queueProvider = blokctlProject.queueProvider || "kafka";
         selectedRuntimeKinds = blokctlProject.runtimes;
+        selectedObsTier = parseObsTier(blokctlProject.obsStack);
+        selectedObsModules = blokctlProject.observability ?? [];
         selectedManager = blokctlProject.selectedManager;
         const unavailableSelected = selectedRuntimeKinds.filter((kind) => {
             if (kind === "node")
@@ -286,7 +323,7 @@ export async function createProject(opts, version, currentPath = false, localRep
         const primaryTriggerDir = primaryTrigger === "pubsub" || primaryTrigger === "queue" || primaryTrigger === "worker"
             ? `${repoSource}/triggers/${primaryTrigger === "queue" || primaryTrigger === "worker" ? "worker" : primaryTrigger}/template`
             : `${repoSource}/triggers/${primaryTrigger}`;
-        const baseFiles = ["package.json", "tsconfig.json", ".env.example", ".gitignore", "vitest.config.ts"];
+        const baseFiles = ["package.json", "tsconfig.json", ".env.example", ".gitignore"];
         for (const file of baseFiles) {
             const src = `${primaryTriggerDir}/${file}`;
             if (fsExtra.existsSync(src)) {
@@ -441,9 +478,7 @@ export async function createProject(opts, version, currentPath = false, localRep
         catch (error) {
             console.error(`Failed to change ownership of directory ${dirPath}:`, error);
         }
-        fsExtra.ensureDirSync(`${dirPath}/infra`);
-        fsExtra.ensureDirSync(`${dirPath}/infra/metrics`);
-        fsExtra.copySync(`${repoSource}/infra/metrics`, `${dirPath}/infra/metrics`);
+        setupObservabilityStack(repoSource, dirPath, selectedObsTier);
         fsExtra.removeSync(`${dirPath}/public/metric`);
         if (selectedTriggers.includes("queue") || selectedTriggers.includes("worker")) {
             fsExtra.ensureDirSync(`${dirPath}/infra/development`);
@@ -515,7 +550,7 @@ export async function createProject(opts, version, currentPath = false, localRep
             "@blokjs/trigger-websocket": "triggers/websocket",
             "@blokjs/trigger-worker": "triggers/worker",
         };
-        const BLOKJS_DEP_RANGE = "^0.6.21";
+        const BLOKJS_DEP_RANGE = "^0.7.0";
         for (const depGroup of ["dependencies", "devDependencies", "peerDependencies"]) {
             const deps = packageJsonContent[depGroup];
             if (!deps)
@@ -571,6 +606,8 @@ export async function createProject(opts, version, currentPath = false, localRep
             ...packageJsonContent.devDependencies,
             blokctl: blokctlRef,
         };
+        packageJsonContent.scripts = Object.fromEntries(Object.entries(packageJsonContent.scripts).filter(([s]) => s !== "test" && s !== "test:dev"));
+        packageJsonContent.devDependencies = Object.fromEntries(Object.entries(packageJsonContent.devDependencies).filter(([d]) => d !== "vitest" && !d.startsWith("@vitest/")));
         const providerDeps = getProviderDependencies(selectedTriggers, pubsubProvider, queueProvider, explicitQueueProvider);
         if (Object.keys(providerDeps).length > 0) {
             packageJsonContent.dependencies = {
@@ -673,7 +710,16 @@ export async function createProject(opts, version, currentPath = false, localRep
                 fsExtra.appendFileSync(envLocal, envVars);
             }
         }
-        writeProjectConfig(dirPath, runtimeConfigs, spawnedTriggerConfigs);
+        const obsSelection = resolveObservabilitySelection(selectedObsModules.filter((id) => id !== "obs-stack"), { addedAt: new Date().toISOString(), version, projectDir: dirPath });
+        if (obsSelection.added.length > 0) {
+            p.log.info(`Auto-enabling required observability dependencies: ${obsSelection.added.join(", ")}`);
+        }
+        const obsConfigMap = Object.keys(obsSelection.configMap).length > 0 ? obsSelection.configMap : undefined;
+        writeProjectConfig(dirPath, runtimeConfigs, spawnedTriggerConfigs, obsConfigMap);
+        if (obsSelection.envBlocks.some((b) => b.trim())) {
+            const current = fsExtra.existsSync(envLocal) ? fsExtra.readFileSync(envLocal, "utf8") : "";
+            fsExtra.writeFileSync(envLocal, rewriteObservabilityEnvBlock(current, obsSelection.envBlocks));
+        }
         if (triggerConfigs.length > 0) {
             const triggerEnvVars = generateTriggerEnvVars(triggerConfigs);
             fsExtra.appendFileSync(envLocal, triggerEnvVars);
@@ -868,10 +914,10 @@ function generateSharedWorkflowsFile(triggers, runtimeKinds = [], examples = fal
     }
     const importSection = imports.length > 0 ? `${imports.join("\n")}\n` : "";
     const entriesSection = workflowEntries.length > 0 ? workflowEntries.join("\n") : "\t// Add your workflows here";
-    return `import type { HelperResponse, WorkflowV2Builder } from "@blokjs/helper";
+    return `import type { WorkflowV2Builder } from "@blokjs/helper";
 
 ${importSection}
-const workflows: Record<string, HelperResponse | WorkflowV2Builder> = {
+const workflows: Record<string, WorkflowV2Builder> = {
 ${entriesSection}
 };