blockend-cli 1.3.0 → 1.4.0

package/dist/index.js

@@ -4,103 +4,11 @@
 import { Command } from "commander";
 
 // src/commands/init.ts
-import path, { join as join6 } from "path";
+import path, { join } from "path";
 import fs from "fs/promises";
-import { existsSync as existsSync4 } from "fs";
-import { intro, outro, select, text, confirm, spinner, isCancel } from "@clack/prompts";
-
-// ../detector/dist/index.js
-import { join as join5 } from "path";
-import { readFile } from "fs/promises";
-import { join } from "path";
-import { readFile as readFile2 } from "fs/promises";
 import { existsSync } from "fs";
-import { join as join2 } from "path";
-import { existsSync as existsSync2 } from "fs";
-import { join as join3 } from "path";
-import { existsSync as existsSync3 } from "fs";
-import { join as join4 } from "path";
-async function readPackageJson(cwd) {
-  const pkgPath = join(cwd, "package.json");
-  try {
-    const content = await readFile(pkgPath, "utf-8");
-    return JSON.parse(content);
-  } catch {
-    throw new Error(`No package.json found at ${pkgPath}. Run blockend from your project root.`);
-  }
-}
-async function readTsConfig(cwd) {
-  const tsconfigPath = join2(cwd, "tsconfig.json");
-  if (!existsSync(tsconfigPath)) return null;
-  try {
-    const content = await readFile2(tsconfigPath, "utf-8");
-    const cleanLines = content.split(/\r?\n/).filter((line) => {
-      const trimmed = line.trim();
-      return !trimmed.startsWith("//") && !trimmed.startsWith("/*");
-    }).join("\n").replace(/,(\s*[}\]])/g, "$1");
-    return JSON.parse(cleanLines);
-  } catch {
-    return null;
-  }
-}
-async function inferSrcDir(cwd) {
-  const candidates = ["src", "app", "lib"];
-  for (const dir of candidates) {
-    if (existsSync2(join3(cwd, dir))) {
-      return join3(cwd, dir);
-    }
-  }
-  return cwd;
-}
-function detectFramework(deps) {
-  if ("fastify" in deps) return "fastify";
-  if ("hono" in deps) return "hono";
-  if ("express" in deps) return "express";
-  if ("next" in deps) return "next";
-  return "none";
-}
-function detectRuntime(deps) {
-  if ("@types/bun" in deps || "bun-types" in deps) return "bun";
-  return "node";
-}
-function detectPackageManager(cwd) {
-  if (existsSync3(join4(cwd, "pnpm-lock.yaml"))) return "pnpm";
-  if (existsSync3(join4(cwd, "bun.lockb"))) return "bun";
-  if (existsSync3(join4(cwd, "yarn.lock"))) return "yarn";
-  return "npm";
-}
-async function detectProject(cwd) {
-  const [pkg, tsConfig] = await Promise.all([readPackageJson(cwd), readTsConfig(cwd)]);
-  const allDeps = {
-    ...pkg.dependencies,
-    ...pkg.devDependencies,
-    ...pkg.peerDependencies
-  };
-  const srcDir = await inferSrcDir(cwd);
-  return {
-    root: cwd,
-    language: tsConfig !== null ? "typescript" : "javascript",
-    runtime: detectRuntime(allDeps),
-    framework: detectFramework(allDeps),
-    packageManager: detectPackageManager(cwd),
-    hasRedis: "ioredis" in allDeps || "redis" in allDeps,
-    hasPrisma: "@prisma/client" in allDeps,
-    hasDrizzle: "drizzle-orm" in allDeps,
-    aliasMap: tsConfig?.compilerOptions?.paths ? flattenTsPaths(tsConfig.compilerOptions.paths) : {},
-    srcDir,
-    // Default blocks directory: srcDir/lib/blocks
-    blocksDir: join5(srcDir, "lib", "blocks")
-  };
-}
-function flattenTsPaths(paths) {
-  const result = {};
-  for (const [alias, targets] of Object.entries(paths)) {
-    if (targets[0]) {
-      result[alias.replace("/*", "/")] = targets[0].replace("/*", "/");
-    }
-  }
-  return result;
-}
+import { intro, outro, select, text, confirm, spinner, isCancel } from "@clack/prompts";
+import { detectProject } from "@blockend/detector";
 
 // src/ui/theme.ts
 import pc from "picocolors";
@@ -138,19 +46,36 @@ var format = {
 };
 
 // src/commands/init.ts
+async function resolveTsConfigPaths(cwd) {
+  const possiblePaths = [join(cwd, "tsconfig.json"), join(cwd, "jsconfig.json")];
+  for (const configPath of possiblePaths) {
+    if (existsSync(configPath)) {
+      try {
+        const rawContent = await fs.readFile(configPath, "utf-8");
+        const cleanJsonContent = rawContent.replace(/\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm, "$1");
+        const parsed = JSON.parse(cleanJsonContent);
+        const baseUrl = parsed.compilerOptions?.baseUrl || ".";
+        const paths = parsed.compilerOptions?.paths || {};
+        return { baseUrl, paths };
+      } catch {
+      }
+    }
+  }
+  return { baseUrl: ".", paths: {} };
+}
 async function initCommand() {
   const cwd = process.cwd();
-  const configPath = join6(cwd, "blockend.json");
+  const configPath = join(cwd, "blockend.json");
   console.log(`
-\u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2557       \u2588\u2588\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2557  \u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2557   \u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2557
-\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551      \u2588\u2588\u2554\u2550\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2551 \u2588\u2588\u2554\u255D\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557
-\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2551      \u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2551     \u2588\u2588\u2588\u2588\u2588\u2554\u255D \u2588\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2554\u2588\u2588\u2557 \u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2551
-\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551      \u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2551     \u2588\u2588\u2554\u2550\u2588\u2588\u2557 \u2588\u2588\u2554\u2550\u2550\u255D  \u2588\u2588\u2551\u255A\u2588\u2588\u2557\u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2551
+\u2588\u2588\u2588\u2588\u2588\u2588\u2557 \u2588\u2588\u2557         \u2588\u2588\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2557  \u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2588\u2557   \u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2557
+\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551        \u2588\u2588\u2554\u2550\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2551 \u2588\u2588\u2554\u255D\u2588\u2588\u2554\u2550\u2550\u2550\u2550\u255D\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2551\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557
+\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2551        \u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2551     \u2588\u2588\u2588\u2588\u2588\u2554\u255D \u2588\u2588\u2588\u2588\u2588\u2557  \u2588\u2588\u2554\u2588\u2588\u2557 \u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2551
+\u2588\u2588\u2554\u2550\u2550\u2588\u2588\u2557\u2588\u2588\u2551        \u2588\u2588\u2551   \u2588\u2588\u2551\u2588\u2588\u2551     \u2588\u2588\u2554\u2550\u2588\u2588\u2557 \u2588\u2588\u2554\u2550\u2550\u255D  \u2588\u2588\u2551\u255A\u2588\u2588\u2557\u2588\u2588\u2551\u2588\u2588\u2551  \u2588\u2588\u2551
 \u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D\u255A\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2551  \u2588\u2588\u2557\u2588\u2588\u2588\u2588\u2588\u2588\u2588\u2557\u2588\u2588\u2551 \u255A\u2588\u2588\u2588\u2588\u2551\u2588\u2588\u2588\u2588\u2588\u2588\u2554\u255D
 \u255A\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D \u255A\u2550\u2550\u2550\u2550\u2550\u255D  \u255A\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u255D  \u255A\u2550\u255D\u255A\u2550\u2550\u2550\u2550\u2550\u2550\u255D\u255A\u2550\u255D  \u255A\u2550\u2550\u2550\u255D\u255A\u2550\u2550\u2550\u2550\u2550\u255D
 `);
-  intro(format.title("Blockend \xB7 Intelligent Backend Blocks Setup"));
-  if (existsSync4(configPath)) {
+  intro(theme.brand.primary(" Blockend \xB7 Intelligent Backend Blocks Setup "));
+  if (existsSync(configPath)) {
     const action = await select({
       message: "blockend.json already exists. What do you want to do?",
       options: [
@@ -169,53 +94,78 @@ async function initCommand() {
     }
   }
   const s = spinner();
-  s.start("Scanning project structure...");
+  s.start("Scanning project layout...");
   const context = await detectProject(cwd);
-  s.stop(format.success("Project structure detected"));
-  s.start("Analyzing framework signals...");
-  await new Promise((r) => setTimeout(r, 400));
-  s.stop(format.success(`Detected ${context.framework || "unknown"} environment`));
-  s.start("Resolving alias mappings...");
-  await new Promise((r) => setTimeout(r, 300));
-  s.stop(format.success("Import strategy mapped"));
-  console.log(
-    format.muted(
-      `System: ${context.framework || "unknown"} \xB7 ${context.language || "ts"} \xB7 aliases=${Object.keys(context.aliasMap || {}).length}`
-    )
-  );
-  const framework = await select({
-    message: "Confirm framework environment",
-    initialValue: context.framework || "express",
-    options: [
-      { value: "express", label: "Express.js" },
-      { value: "fastify", label: "Fastify" },
-      { value: "next", label: "Next.js (App Router)" },
-      { value: "hono", label: "Hono" }
-    ]
-  });
-  if (isCancel(framework)) {
-    outro(format.muted("Initialization cancelled."));
-    return;
+  const hasSrcDir = existsSync(join(cwd, "src"));
+  const tsConfig = await resolveTsConfigPaths(cwd);
+  s.stop(format.success("Project architecture scanned"));
+  let framework = context.framework;
+  if (framework) {
+    console.log(
+      `${format.success("\u2714")} Framework environment detected: ${theme.state.info(framework)}`
+    );
+  } else {
+    const frameworkSelect = await select({
+      message: "Framework could not be auto-detected. Select framework environment manually:",
+      options: [
+        { value: "express", label: "Express.js" },
+        { value: "fastify", label: "Fastify" },
+        { value: "next", label: "Next.js (App Router)" },
+        { value: "hono", label: "Hono" }
+      ]
+    });
+    if (isCancel(frameworkSelect)) {
+      outro(format.muted("Initialization cancelled."));
+      return;
+    }
+    framework = frameworkSelect;
   }
-  const availableAliases = Object.keys(context.aliasMap || {});
-  const baseAliasToken = availableAliases.length > 0 ? availableAliases[0] : "@/";
-  const blockAliasInput = await text({
-    message: "Configure blocks import alias",
-    initialValue: `${baseAliasToken}blocks`,
-    placeholder: `${baseAliasToken}blocks`
+  const defaultDir = hasSrcDir ? "src/blocks" : "blocks";
+  const directoryPrompt = await text({
+    message: "Configure the targeted physical directory destination for blocks:",
+    placeholder: defaultDir,
+    initialValue: defaultDir,
+    validate(value) {
+      if (value?.trim().length === 0) return "Physical path location directory cannot be empty.";
+    }
   });
-  if (isCancel(blockAliasInput)) {
+  if (isCancel(directoryPrompt)) {
     outro(format.muted("Initialization cancelled."));
     return;
   }
-  const blockAlias = String(blockAliasInput);
-  const aliasPrefix = availableAliases.find((a) => blockAlias.startsWith(a)) || "";
-  const physicalPrefix = aliasPrefix ? context.aliasMap[aliasPrefix] : "./";
-  const resolvedSubDir = blockAlias.replace(aliasPrefix, "");
-  const assumedPhysicalDir = join6(physicalPrefix, resolvedSubDir);
-  const relativeBlocksPath = path.relative(cwd, path.resolve(cwd, assumedPhysicalDir));
-  const normalizedPath = relativeBlocksPath.replace(/\\/g, "/");
-  const finalPath = normalizedPath.startsWith(".") ? normalizedPath : `./${normalizedPath}`;
+  const rawPhysicalInput = String(directoryPrompt).trim();
+  const relativeBlocksPath = path.relative(cwd, path.resolve(cwd, rawPhysicalInput));
+  let finalPath = relativeBlocksPath.replace(/\\/g, "/");
+  if (!finalPath.startsWith(".") && !finalPath.startsWith("/")) {
+    finalPath = `./${finalPath}`;
+  }
+  let finalBlockAlias = "@/blocks";
+  const configuredAliases = Object.keys(tsConfig.paths);
+  if (configuredAliases.length > 0) {
+    const matchedAliasKey = configuredAliases.find((alias) => {
+      const targets = tsConfig.paths[alias];
+      if (Array.isArray(targets) && targets.length > 0) {
+        const targetSubPath = targets[0].replace(/\*$/, "").replace(/\\/g, "/");
+        return finalPath.replace(/^\.\//, "").startsWith(targetSubPath);
+      }
+      return false;
+    });
+    if (matchedAliasKey) {
+      const cleanKey = matchedAliasKey.replace(/\*$/, "");
+      const targets = tsConfig.paths[matchedAliasKey];
+      const targetSubPath = targets[0].replace(/\*$/, "").replace(/\\/g, "/");
+      const relativeSuffix = finalPath.replace(/^\.\//, "").replace(targetSubPath, "");
+      finalBlockAlias = `${cleanKey}${relativeSuffix}`.replace(/\/$/, "");
+    } else {
+      const primaryAlias = configuredAliases.find((k) => k.startsWith("@")) || configuredAliases[0];
+      const inferredBaseAlias = primaryAlias.replace(/\*$/, "");
+      const folderSegmentName = path.basename(finalPath);
+      finalBlockAlias = `${inferredBaseAlias}${folderSegmentName}`;
+    }
+  } else {
+    const folderSegmentName = path.basename(finalPath);
+    finalBlockAlias = `@/${folderSegmentName}`;
+  }
   let includeRedis = false;
   if (context.hasRedis) {
     const redisConfirm = await confirm({
@@ -228,11 +178,11 @@ async function initCommand() {
   }
   const configPayload = {
     $schema: "https://blockend.dev/schema.json",
-    environment: framework,
-    language: "typescript",
+    environment: framework || "express",
+    language: context.language || "typescript",
     includeRedis,
     aliases: {
-      blocks: blockAlias
+      blocks: finalBlockAlias
     },
     paths: {
       blocks: finalPath
@@ -243,14 +193,16 @@ async function initCommand() {
   try {
     await fs.writeFile(configPath, JSON.stringify(configPayload, null, 2), "utf-8");
     writeSpinner.stop(format.success("blockend.json ready"));
-    outro(format.title("Blockend initialized successfully. Run: npx blockend add <block>"));
+    outro(
+      theme.state.success("\u2728 Blockend initialized successfully. Run: npx blockend add <block>")
+    );
   } catch {
     writeSpinner.stop(format.error("Failed to write configuration"));
   }
 }
 
 // src/commands/add.ts
-import path2, { join as join7, dirname } from "path";
+import path2, { join as join2, dirname } from "path";
 import fs2 from "fs/promises";
 import { exec } from "child_process";
 import { intro as intro2, outro as outro2, select as select2, spinner as spinner2, confirm as confirm2, isCancel as isCancel2 } from "@clack/prompts";
@@ -269,7 +221,7 @@ function handleCancel(value) {
 async function findUp(filename, startDir) {
   let dir = startDir;
   while (true) {
-    const checkPath = join7(dir, filename);
+    const checkPath = join2(dir, filename);
     try {
       await fs2.access(checkPath);
       return checkPath;
@@ -294,17 +246,16 @@ async function addCommand(blockName) {
   try {
     const configFile = await fs2.readFile(configPath, "utf-8");
     config = JSON.parse(configFile);
-  } catch {
+  } catch (error) {
     outro2(pc2.red("\u2716 Failed to parse blockend.json layout configuration."));
+    console.error(pc2.dim(String(error)));
     return;
   }
   if (config.language !== "typescript") {
     outro2(
       pc2.yellow(
         `
-\u2139 Blockend forces modern architectural standards.
-  To ensure strict type safety and absolute code ownership, the registry exclusively supports TypeScript.
-  Please migrate your project configuration to TypeScript to ingest blocks.`
+\u2139 Blockend forces modern architectural standards. Registry exclusively supports TypeScript.`
       )
     );
     return;
@@ -317,16 +268,28 @@ async function addCommand(blockName) {
     if (!response.ok) throw new Error(`HTTP Error Status: ${response.status}`);
     registry = await response.json();
     s.stop(pc2.green("\u2714 Remote manifest synchronization complete."));
-  } catch {
+  } catch (error) {
     s.stop(pc2.red("\u2716 Failed to fetch the component registry from GitHub network paths."));
+    console.error(pc2.dim(String(error)));
     return;
   }
+  let blockMap = {};
+  if (registry.blocks && typeof registry.blocks === "object" && !Array.isArray(registry.blocks)) {
+    blockMap = registry.blocks;
+  } else {
+    blockMap = registry;
+  }
   const envKey = String(config.environment);
   let targetBlock = blockName;
   if (!targetBlock) {
-    const availableOptions = Object.keys(registry).filter((key) => registry[key].environments[envKey] !== void 0).map((key) => ({
+    const availableOptions = Object.entries(blockMap).filter(([_, block]) => {
+      if (!block) return false;
+      const hasAdapter = block.adapters?.[envKey] !== void 0;
+      const hasEnvironment = block.environments?.[envKey] !== void 0;
+      return hasAdapter || hasEnvironment;
+    }).map(([key, block]) => ({
       value: key,
-      label: `${key} - ${pc2.dim(registry[key].description)}`
+      label: `${key} - ${pc2.dim(block.description)}`
     }));
     if (availableOptions.length === 0) {
       outro2(
@@ -343,37 +306,45 @@ async function addCommand(blockName) {
     handleCancel(selectBlockPrompt);
     targetBlock = selectBlockPrompt;
   }
-  const blockMeta = registry[targetBlock];
+  const blockMeta = blockMap[targetBlock];
   if (!blockMeta) {
     outro2(pc2.red(`\u2716 Block "${targetBlock}" does not exist in the remote registry.`));
     return;
   }
-  const envConfig = blockMeta.environments[envKey];
-  if (!envConfig) {
+  const adapterContext = blockMeta.adapters?.[envKey] ?? blockMeta.environments?.[envKey];
+  if (!adapterContext) {
     outro2(
       pc2.red(`\u2716 The block "${targetBlock}" does not support your environment layout: ${envKey}`)
     );
     return;
   }
   let selectedVariant;
-  let variantMeta = void 0;
-  if (envConfig.variants && Object.keys(envConfig.variants).length > 0) {
-    const variantKeys = Object.keys(envConfig.variants);
-    if (variantKeys.includes("redis") && config.redisEnabled) {
-      selectedVariant = "redis";
-    } else {
-      const selectVariantPrompt = await select2({
-        message: "Which architectural storage variant do you want to back this block?",
-        options: variantKeys.map((vKey) => ({
-          value: vKey,
-          label: vKey.toUpperCase()
-        }))
-      });
-      handleCancel(selectVariantPrompt);
-      selectedVariant = selectVariantPrompt;
-    }
-    variantMeta = envConfig.variants[selectedVariant];
+  const variantKeys = Object.keys(adapterContext.variants || {});
+  if (variantKeys.length === 0) {
+    outro2(pc2.red(`\u2716 No architecture storage layout variants found for block framework: ${envKey}`));
+    return;
+  }
+  if (variantKeys.includes("redis") && config.redisEnabled) {
+    selectedVariant = "redis";
+  } else if (variantKeys.length === 1) {
+    selectedVariant = variantKeys[0];
+  } else {
+    const selectVariantPrompt = await select2({
+      message: "Which architectural storage variant do you want to back this block?",
+      options: variantKeys.map((vKey) => ({
+        value: vKey,
+        label: vKey.toUpperCase()
+      }))
+    });
+    handleCancel(selectVariantPrompt);
+    selectedVariant = selectVariantPrompt;
+  }
+  const variantMeta = adapterContext.variants[selectedVariant];
+  let physicalPath = config.paths.blocks;
+  if (physicalPath.startsWith("@")) {
+    physicalPath = "./src/blocks";
   }
+  const targetFolder = path2.resolve(rootDir, physicalPath, targetBlock);
   const packageJsonPath = await findUp("package.json", rootDir);
   if (!packageJsonPath) {
     outro2(pc2.red("\u2716 Could not locate package.json in your current directory layout hierarchy."));
@@ -382,21 +353,25 @@ async function addCommand(blockName) {
   const packageJsonDir = dirname(packageJsonPath);
   let packageJson;
   try {
-    packageJson = JSON.parse(await fs2.readFile(packageJsonPath, "utf-8"));
-  } catch {
+    const packageJsonContent = await fs2.readFile(packageJsonPath, "utf-8");
+    packageJson = JSON.parse(packageJsonContent);
+  } catch (error) {
     outro2(pc2.red("\u2716 Failed parsing file data configurations from target package.json location."));
+    console.error(pc2.dim(String(error)));
     return;
   }
   const installedDeps = {
     ...packageJson.dependencies ?? {},
     ...packageJson.devDependencies ?? {}
   };
-  const allRequiredDeps = [...envConfig.dependencies ?? [], ...variantMeta?.dependencies ?? []];
-  const missingDeps = allRequiredDeps.filter((dep) => !(dep in installedDeps));
-  if (missingDeps.length > 0) {
+  const missingProdDeps = (adapterContext.dependencies ?? []).concat(variantMeta?.dependencies ?? []).filter((dep) => !(dep in installedDeps));
+  const missingDevDeps = (adapterContext.devDependencies ?? []).concat(variantMeta?.devDependencies ?? []).filter((dep) => !(dep in installedDeps));
+  const hasMissingDeps = missingProdDeps.length > 0 || missingDevDeps.length > 0;
+  if (hasMissingDeps) {
+    const allMissingNames = [...missingProdDeps, ...missingDevDeps];
     console.log(
       pc2.yellow(`
-\u26A0\uFE0F Missing required infrastructure packages: ${missingDeps.join(", ")}`)
+\u26A0\uFE0F Missing required infrastructure packages: ${allMissingNames.join(", ")}`)
     );
     const shouldInstallPrompt = await confirm2({
       message: "Would you like the CLI to automatically install these dependencies?",
@@ -404,93 +379,105 @@ async function addCommand(blockName) {
     });
     handleCancel(shouldInstallPrompt);
     if (shouldInstallPrompt) {
-      const packageManager = await fs2.access(join7(packageJsonDir, "pnpm-lock.yaml")).then(() => "pnpm").catch(() => "npm");
+      const packageManager = await fs2.access(join2(packageJsonDir, "pnpm-lock.yaml")).then(() => "pnpm").catch(() => "npm");
       s.start(`Preparing native workspace via ${packageManager}...`);
       try {
-        const installCmd = packageManager === "pnpm" ? `pnpm add ${missingDeps.join(" ")}` : `npm install ${missingDeps.join(" ")}`;
-        s.stop(pc2.cyan(`Executing: ${installCmd}
+        const installTasks = [];
+        if (missingProdDeps.length > 0) {
+          installTasks.push(
+            packageManager === "pnpm" ? `pnpm add ${missingProdDeps.join(" ")}` : `npm install ${missingProdDeps.join(" ")}`
+          );
+        }
+        if (missingDevDeps.length > 0) {
+          installTasks.push(
+            packageManager === "pnpm" ? `pnpm add -D ${missingDevDeps.join(" ")}` : `npm install --save-dev ${missingDevDeps.join(" ")}`
+          );
+        }
+        for (const installCmd of installTasks) {
+          s.stop(pc2.cyan(`Executing: ${installCmd}
 `));
-        await new Promise((resolve, reject) => {
-          const child = exec(installCmd, { cwd: packageJsonDir });
-          child.stdout?.on("data", (data) => {
-            process.stdout.write(pc2.dim(data));
-          });
-          child.stderr?.on("data", (data) => {
-            process.stdout.write(pc2.dim(pc2.red(data)));
+          await new Promise((resolve, reject) => {
+            const child = exec(installCmd, { cwd: packageJsonDir });
+            child.stdout?.on("data", (data) => process.stdout.write(pc2.dim(data)));
+            child.stderr?.on("data", (data) => process.stdout.write(pc2.dim(pc2.red(data))));
+            child.on(
+              "close",
+              (code) => code === 0 ? resolve() : reject(new Error(`Exit code ${code}`))
+            );
           });
-          child.on("close", (code) => {
-            if (code === 0) resolve();
-            else reject(new Error(`Exit code ${code}`));
-          });
-        });
-        console.log("");
-        s.start(pc2.green("\u2714 Dependencies installed cleanly. Continuing components build..."));
+        }
+        s.start(pc2.green("\u2714 All dependencies synchronized successfully."));
         s.stop();
-      } catch {
+      } catch (error) {
         s.stop(pc2.red("\u2716 Automated dependency installation failed. Please run setup manually."));
+        console.error(pc2.dim(String(error)));
+        return;
       }
     }
   }
-  s.start(`Downloading clean production template block [${targetBlock}]...`);
-  try {
-    const BASE_URL = RAW_CDN_BASE;
-    const coreFileUrl = `${BASE_URL}/${envConfig.core}`;
-    const coreFetchResponse = await fetch(coreFileUrl);
-    if (!coreFetchResponse.ok) {
-      throw new Error(`Failed downloading core component file: ${coreFetchResponse.statusText}`);
-    }
-    const coreCodeTemplate = await coreFetchResponse.text();
-    let physicalPath = config.paths.blocks;
-    if (physicalPath.startsWith("@")) {
-      physicalPath = "./src/blocks";
-    }
-    let targetFolder = path2.resolve(rootDir, physicalPath);
-    if (variantMeta && selectedVariant) {
-      targetFolder = join7(targetFolder, targetBlock);
+  const filesToDownload = [];
+  if (blockMeta.baseFiles) {
+    filesToDownload.push(...blockMeta.baseFiles);
+  }
+  if (adapterContext.core) {
+    filesToDownload.push({
+      source: adapterContext.core,
+      target: path2.basename(adapterContext.core, ".txt")
+    });
+  }
+  if (variantMeta && Array.isArray(variantMeta.files)) {
+    for (const fileEntry of variantMeta.files) {
+      if (typeof fileEntry === "string") {
+        filesToDownload.push({
+          source: fileEntry,
+          target: path2.basename(fileEntry, ".txt")
+        });
+      } else {
+        filesToDownload.push(fileEntry);
+      }
     }
-    await fs2.mkdir(targetFolder, { recursive: true });
-    const coreOutputFilename = `${targetBlock}.ts`;
-    const coreTargetFileLocation = join7(targetFolder, coreOutputFilename);
+  }
+  let fileExistsConflict = false;
+  for (const fileMap of filesToDownload) {
+    const destinationPath = join2(targetFolder, fileMap.target);
     try {
-      await fs2.access(coreTargetFileLocation);
-      s.stop();
-      const overwritePrompt = await confirm2({
-        message: `\u26A0 Block component file [${coreOutputFilename}] already exists. Overwrite custom code revisions?`,
-        initialValue: false
-      });
-      handleCancel(overwritePrompt);
-      if (!overwritePrompt) {
-        outro2(pc2.yellow("\u2139 Operation aborted safely. Local code modifications preserved."));
-        return;
-      }
-      s.start(`Re-downloading template block [${targetBlock}]...`);
+      await fs2.access(destinationPath);
+      fileExistsConflict = true;
+      break;
     } catch {
     }
-    await fs2.writeFile(coreTargetFileLocation, coreCodeTemplate, "utf-8");
-    if (variantMeta && selectedVariant) {
-      const variantFileUrl = `${BASE_URL}/${variantMeta.path}`;
-      const variantFetchResponse = await fetch(variantFileUrl);
-      if (!variantFetchResponse.ok) {
-        throw new Error(
-          `Failed downloading storage variant file: ${variantFetchResponse.statusText}`
-        );
-      }
-      const variantCodeTemplate = await variantFetchResponse.text();
-      const variantOutputFilename = `store-${selectedVariant}.ts`;
-      await fs2.writeFile(join7(targetFolder, variantOutputFilename), variantCodeTemplate, "utf-8");
+  }
+  if (fileExistsConflict) {
+    const overwritePrompt = await confirm2({
+      message: `\u26A0 Components in [${targetBlock}] already exist. Overwrite custom revisions?`,
+      initialValue: false
+    });
+    handleCancel(overwritePrompt);
+    if (!overwritePrompt) {
+      outro2(pc2.yellow("\u2139 Operation aborted safely. Local code modifications preserved."));
+      return;
+    }
+  }
+  s.start(`Downloading and building template adapter blocks [${targetBlock}]...`);
+  try {
+    for (const fileMap of filesToDownload) {
+      const fileUrl = `${RAW_CDN_BASE}/${fileMap.source}`;
+      const response = await fetch(fileUrl);
+      if (!response.ok) throw new Error(`Download failed for: ${fileMap.source}`);
+      const fileContent = await response.text();
+      const localWriteLocation = join2(targetFolder, fileMap.target);
+      await fs2.mkdir(dirname(localWriteLocation), { recursive: true });
+      await fs2.writeFile(localWriteLocation, fileContent, "utf-8");
     }
-    const cleanDisplayPath = variantMeta && selectedVariant ? `${physicalPath.replace(/\\/g, "/")}/${targetBlock}` : physicalPath.replace(/\\/g, "/");
     s.stop(pc2.green("\u2714 Component isolation structures written smoothly."));
     outro2(
       pc2.cyan(
-        `\u2728 Source blocks written to ${cleanDisplayPath}/ layout. Code ownership transferred!`
+        `\u2728 Source blocks written to ${physicalPath}/${targetBlock}/. Code ownership transferred!`
       )
     );
-    process.exit(0);
   } catch (error) {
-    s.stop(pc2.red("\u2716 Fatal crash occurred while downloading or transferring file layouts."));
-    console.error(error);
-    process.exit(1);
+    s.stop(pc2.red("\u2716 Fatal error occurred while assembling file mappings."));
+    console.error(pc2.dim(String(error)));
   }
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "blockend-cli",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "description": "Intelligent, modular backend blocks right inside your terminal",
   "main": "./dist/index.js",
   "type": "module",
@@ -12,6 +12,8 @@
     "readme.md"
   ],
   "scripts": {
+    "test": "vitest run",
+    "test:watch": "vitest",
     "build": "tsup src/index.ts --format esm --dts --out-dir dist",
     "typecheck": "tsc --noEmit"
   },
@@ -26,11 +28,14 @@
   "license": "ISC",
   "packageManager": "pnpm@10.33.2",
   "dependencies": {
+    "@blockend/detector": "workspace:*",
     "@clack/prompts": "^1.5.1",
     "commander": "^15.0.0",
     "picocolors": "^1.1.1"
   },
   "devDependencies": {
-    "@types/node": "^25.9.3"
+    "@types/node": "^25.9.3",
+    "tsup": "^8.5.1",
+    "vitest": "^1.6.1"
   }
 }