fwinit 1.5.4 → 1.6.0

package/README.md

@@ -25,6 +25,10 @@ fwinit
 fwinit fastify mi-api
 fwinit aspnet mi-app
 fwinit react-native mi-mobile
+fwinit flutter mi-app
+
+# Flutter: saltear la pregunta de organización (bundle id)
+fwinit flutter mi-app -o ar.miempresa
 
 # Crear un proyecto completo: backend + frontend (+ db incluida)
 fwinit fullstack mi-proyecto
@@ -75,7 +79,7 @@ fwinit --help
 fwinit fullstack mi-proyecto
 ```
 
-Pregunta qué backend querés (ASP.NET, Express, Fastify, Node.js Vanilla) y qué frontend (React Native). Genera:
+Pregunta qué backend querés (ASP.NET, Express, Fastify, Node.js Vanilla) y qué frontend (React Native, Flutter, Astro, Tauri). Genera:
 
 ```
 mi-proyecto/
@@ -104,13 +108,14 @@ fwinit express mi-api --no-backend
 fwinit express mi-api --backend
 ```
 
-Igual para frontend: `fwinit react-native mi-app` pregunta por `frontend/`.
+Igual para frontend: `fwinit react-native mi-app` o `fwinit flutter mi-app` pregunta por `frontend/`.
 
 ## Flags
 
 | Flag | Descripción |
 |------|-------------|
 | `-p, --pm <manager>` | Package manager: `npm`, `pnpm` o `bun` (saltea la pregunta) |
+| `-o, --org <domain>` | Organización reverse-domain del bundle id. Solo aplica a Flutter (saltea la pregunta; default `com.example`) |
 | `--backend` | Empaquetar el código en `backend/` (solo modo single, saltea la pregunta) |
 | `--no-backend` | Dejar el código en la raíz del proyecto (saltea la pregunta) |
 | `-b, --backend-template <tpl>` | Backend a usar en fullstack (saltea la pregunta) |
@@ -129,8 +134,11 @@ Igual para frontend: `fwinit react-native mi-app` pregunta por `frontend/`.
 | `astro` | frontend | Landing estática con Astro 7 y TypeScript | node |
 | `tauri` | frontend | Dashboard de escritorio con React, Vite y Tauri 2 | node |
 | `react-native` | frontend | App móvil con React Native, Expo y TypeScript | node |
+| `flutter` | frontend | App multiplataforma con Flutter, Clean Architecture y Riverpod | flutter |
+
+La capa y el runtime son metadata de cada template (`layer` y `runtime` en `templates/<TEMPLATE>/template.json`), pero **el template se registra en `cli/src/templates.ts`**: el `template.json` documenta y aporta los comandos de `postInit`, no resuelve el alias. Para sumar un template nuevo alcanzan la carpeta, su `template.json` y su entrada en `TEMPLATES`.
 
-La capa es metadata de cada template (`layer` en `templates/<TEMPLATE>/template.json`): para sumar un frontend nuevo (Astro, Next.js...), alcanza con agregar la carpeta del template y su `layer`. Los templates se clasifican por capa en la metadata, no por estructura de carpetas.
+Flutter es el único template que pregunta una identidad propia: la organización reverse-domain (default `com.example`) para armar los bundle ids nativos. `-o, --org` la saltea; en modo scripting/CI se usa el default.
 
 El runtime `bun` de un template se porta automáticamente a `node` (npm/pnpm) si elegís npm o pnpm: scripts con `tsx`, tests con `vitest` y sin `bun-types`.
 
@@ -138,10 +146,10 @@ El runtime `bun` de un template se porta automáticamente a `node` (npm/pnpm) si
 
 1. Descarga el ZIP del repositorio de templates desde GitHub (una sola vez, también en fullstack)
 2. Extrae y copia el template (o los dos, `backend/` + `frontend/`) al proyecto
-3. Sustituye el nombre del proyecto (package.json, app.json de Expo, proyectos ASP.NET con "Example")
+3. Sustituye el nombre del proyecto (package.json, app.json de Expo, proyectos ASP.NET con "Example", y en Flutter el paquete Dart, los imports, los bundle ids nativos y los nombres de binario)
 4. Si corresponde, porta el template de runtime bun a node (npm/pnpm)
 5. Instala `.opencode/`, `.pi/` y `.agents/` con las skills `create-specs` y `create-specs-from-code`, sus comandos (`/create-specs` rutea entre ambos según el estado del repo) y la biblioteca de diseño (mismo bundle para OpenCode, Pi/Gentle Shell y Agent Skills: elegí el agente que quieras)
-6. Limpia los lock files (cada proyecto instala los suyos)
+6. Limpia los lock files (cada proyecto instala los suyos; incluye `pubspec.lock` en Flutter)
 7. Si lo elegís (o pasás `--git`), inicializa un repositorio git en la raíz
 8. Te muestra los próximos pasos (install y dev de cada carpeta)
 

package/dist/index.js

@@ -6,7 +6,7 @@ import ora from "ora";
 import chalk from "chalk";
 import { readFileSync } from "fs";
 import { mkdir as mkdir3, cp as cp3, readFile as readFile3 } from "fs/promises";
-import { join as join3, basename } from "path";
+import { join as join3, basename as basename2 } from "path";
 
 // src/templates.ts
 var TEMPLATES = [
@@ -65,6 +65,14 @@ var TEMPLATES = [
     folder: "REACT-NATIVE",
     runtime: "node",
     layer: "frontend"
+  },
+  {
+    name: "Flutter",
+    alias: ["flutter", "dart", "fwiflu"],
+    description: "App multiplataforma con Flutter, Clean Architecture y Riverpod",
+    folder: "FLUTTER",
+    runtime: "flutter",
+    layer: "frontend"
   }
 ];
 function getTemplatesByLayer(layer) {
@@ -79,10 +87,191 @@ function findTemplate(input) {
 
 // src/downloader.ts
 import AdmZip from "adm-zip";
-import { mkdir, rm, cp, readdir, readFile, writeFile, rename } from "fs/promises";
-import { join, extname } from "path";
+import { mkdir, rm, cp, readdir, readFile, writeFile, rename, stat } from "fs/promises";
+import { join, extname, basename, dirname, relative, sep } from "path";
 import { tmpdir } from "os";
 import { randomBytes } from "crypto";
+
+// src/flutter-naming.ts
+var FLUTTER_ORG_DEFAULT = "com.example";
+var DART_KEYWORDS = /* @__PURE__ */ new Set([
+  "abstract",
+  "as",
+  "assert",
+  "async",
+  "await",
+  "break",
+  "case",
+  "catch",
+  "class",
+  "const",
+  "continue",
+  "covariant",
+  "default",
+  "deferred",
+  "do",
+  "dynamic",
+  "else",
+  "enum",
+  "export",
+  "extends",
+  "extension",
+  "external",
+  "factory",
+  "final",
+  "finally",
+  "for",
+  "get",
+  "hide",
+  "if",
+  "implements",
+  "import",
+  "in",
+  "interface",
+  "is",
+  "late",
+  "library",
+  "mixin",
+  "new",
+  "on",
+  "operator",
+  "part",
+  "required",
+  "rethrow",
+  "return",
+  "set",
+  "show",
+  "static",
+  "super",
+  "switch",
+  "sync",
+  "this",
+  "throw",
+  "try",
+  "typedef",
+  "var",
+  "void",
+  "while",
+  "with",
+  "yield"
+]);
+var FLUTTER_SDK_PACKAGES = /* @__PURE__ */ new Set([
+  "flutter",
+  "flutter_test",
+  "flutter_localizations",
+  "flutter_web_plugins",
+  "sky_engine"
+]);
+var TEMPLATE_DEPENDENCIES = /* @__PURE__ */ new Set([
+  "cupertino_icons",
+  "flutter_riverpod",
+  "go_router",
+  "dio",
+  "freezed_annotation",
+  "json_annotation",
+  "shared_preferences",
+  "flutter_secure_storage",
+  "logger",
+  "intl",
+  "flutter_lints",
+  "build_runner",
+  "freezed",
+  "json_serializable",
+  "mocktail"
+]);
+var RESERVED_DART_PACKAGE_NAMES = [
+  DART_KEYWORDS,
+  FLUTTER_SDK_PACKAGES,
+  TEMPLATE_DEPENDENCIES
+];
+function isReservedDartPackageName(name) {
+  return RESERVED_DART_PACKAGE_NAMES.some((reserved) => reserved.has(name));
+}
+function toDartPackageName(projectName) {
+  let name = projectName.trim().toLowerCase();
+  name = name.replace(/[-_.\s]+/g, "_");
+  name = name.replace(/[^a-z0-9_]/g, "");
+  name = name.replace(/_+/g, "_").replace(/^_+|_+$/g, "");
+  if (name === "") {
+    return "app";
+  }
+  if (!/^[a-z]/.test(name)) {
+    name = `app_${name}`;
+  }
+  if (isReservedDartPackageName(name)) {
+    name = `${name}_app`;
+  }
+  return name;
+}
+function normalizeOrg(org) {
+  return org.trim().toLowerCase();
+}
+function isValidOrg(org) {
+  return /^[a-z][a-z0-9_]*(\.[a-z][a-z0-9_]*)+$/.test(org);
+}
+function checkOrg(value) {
+  if (isValidOrg(normalizeOrg(value))) {
+    return true;
+  }
+  return "Organizaci\xF3n inv\xE1lida. Us\xE1 formato reverse-domain en min\xFAsculas, por ejemplo com.example o ar.miempresa";
+}
+
+// src/dart-directives.ts
+var LIBRARY_RE = /^library\s*(?:['"]([^'"]*)['"])?\s*;$/;
+var DIRECTIVE_URI_RE = /^(import|export|part)\s+(['"])(.+?)\2/;
+var GROUP_LIBRARY = 0;
+var GROUP_DART = 1;
+var GROUP_PACKAGE = 2;
+var GROUP_OTHER = 3;
+function parseDirective(line) {
+  const trimmed = line.trim();
+  const library = trimmed.match(LIBRARY_RE);
+  if (library) {
+    return { group: GROUP_LIBRARY, uri: library[1] ?? "" };
+  }
+  const directive = trimmed.match(DIRECTIVE_URI_RE);
+  if (!directive) return void 0;
+  const uri = directive[3];
+  let group = GROUP_OTHER;
+  if (uri.startsWith("dart:")) {
+    group = GROUP_DART;
+  } else if (uri.startsWith("package:")) {
+    group = GROUP_PACKAGE;
+  }
+  return { group, uri };
+}
+function compareKeys(a, b) {
+  if (a.group !== b.group) return a.group - b.group;
+  return a.uri < b.uri ? -1 : a.uri > b.uri ? 1 : 0;
+}
+function sortDartDirectiveRuns(content) {
+  const lines = content.split("\n");
+  const result = lines.slice();
+  let i = 0;
+  while (i < lines.length) {
+    const key = parseDirective(lines[i]);
+    if (!key) {
+      i++;
+      continue;
+    }
+    let j = i;
+    const run = [];
+    while (j < lines.length) {
+      const runKey = parseDirective(lines[j]);
+      if (!runKey) break;
+      run.push({ line: lines[j], key: runKey });
+      j++;
+    }
+    run.sort((a, b) => compareKeys(a.key, b.key));
+    for (let k = 0; k < run.length; k++) {
+      result[i + k] = run[k].line;
+    }
+    i = j;
+  }
+  return result.join("\n");
+}
+
+// src/downloader.ts
 var GITHUB_REPO = "orlandotellez/fwinit";
 var GITHUB_BRANCH = "main";
 async function downloadAndExtractRepo() {
@@ -115,8 +304,25 @@ async function downloadAndExtract(templateFolder) {
   }
   return { tempDir, templatePath, repoRoot };
 }
+var COPY_EXCLUDED_DIRS = /* @__PURE__ */ new Set([
+  ".git",
+  ".dart_tool",
+  ".idea",
+  ".atl",
+  "node_modules",
+  "build"
+]);
 async function copyTemplate(source, destination) {
-  await cp(source, destination, { recursive: true });
+  await cp(source, destination, {
+    recursive: true,
+    // Solo se descartan directorios con esos nombres: un archivo homónimo
+    // (p. ej. un script llamado `build`) se copia igual.
+    filter: async (src) => {
+      if (!COPY_EXCLUDED_DIRS.has(basename(src))) return true;
+      const stats = await stat(src).catch(() => void 0);
+      return stats === void 0 || !stats.isDirectory();
+    }
+  });
   await cleanTemplate(destination);
 }
 async function cleanTemplate(dir) {
@@ -124,7 +330,10 @@ async function cleanTemplate(dir) {
     "bun.lock",
     "pnpm-lock.yaml",
     "package-lock.json",
-    "yarn.lock"
+    "yarn.lock",
+    // Cada proyecto Flutter instala su propio árbol de dependencias, igual
+    // que con los lock files de npm.
+    "pubspec.lock"
   ];
   for (const file of lockFiles) {
     const path = join(dir, file);
@@ -137,9 +346,15 @@ async function cleanTemplate(dir) {
 async function cleanup(tempDir) {
   await rm(tempDir, { recursive: true, force: true });
 }
-async function substituteTemplate(dir, projectName, templateFolder) {
+async function substituteTemplate(dir, projectName, templateFolder, options = {}) {
   if (templateFolder === "ASPNET") {
     await substituteAspNet(dir, projectName);
+  } else if (templateFolder === "FLUTTER") {
+    await substituteFlutter(
+      dir,
+      projectName,
+      options.org ?? FLUTTER_ORG_DEFAULT
+    );
   } else {
     await substituteNodejs(dir, projectName);
   }
@@ -190,6 +405,188 @@ async function substituteAspNet(dir, projectName) {
   }
   await renameAll(dir, pascalName);
 }
+var FLUTTER_TEXT_EXTENSIONS = /* @__PURE__ */ new Set([
+  ".dart",
+  ".arb",
+  ".yaml",
+  ".yml",
+  ".json",
+  ".kt",
+  ".kts",
+  ".gradle",
+  ".xml",
+  ".plist",
+  ".pbxproj",
+  ".xcconfig",
+  ".xcscheme",
+  ".xcsettings",
+  ".xcworkspacedata",
+  ".storyboard",
+  ".xib",
+  ".swift",
+  ".h",
+  ".cpp",
+  ".cc",
+  ".cmake",
+  ".txt",
+  ".rc",
+  ".properties",
+  ".manifest",
+  ".md",
+  ".html",
+  ".gitignore",
+  ".metadata",
+  ".iml",
+  ".sh"
+]);
+var FLUTTER_TEXT_BASENAMES = /* @__PURE__ */ new Set([
+  "makefile",
+  "license",
+  "podfile",
+  ".gitignore",
+  ".metadata"
+]);
+var FLUTTER_DISPLAY_FILES = /* @__PURE__ */ new Set([
+  "lib/l10n/arb/app_en.arb",
+  "lib/l10n/arb/app_es.arb",
+  "lib/l10n/gen/app_localizations.dart",
+  "lib/l10n/gen/app_localizations_en.dart",
+  "lib/l10n/gen/app_localizations_es.dart",
+  "lib/core/config/app_config.dart",
+  "android/app/src/main/AndroidManifest.xml",
+  "ios/Runner/Info.plist",
+  "web/index.html",
+  "web/manifest.json",
+  "linux/runner/my_application.cc",
+  "windows/runner/main.cpp"
+]);
+var FLUTTER_RUNNER_RC = "windows/runner/Runner.rc";
+var FLUTTER_NATIVE_ROOTS = ["kotlin", "java"];
+function isFlutterTextFile(filePath) {
+  if (FLUTTER_TEXT_EXTENSIONS.has(extname(filePath).toLowerCase())) {
+    return true;
+  }
+  return FLUTTER_TEXT_BASENAMES.has(basename(filePath).toLowerCase());
+}
+function replaceToken(content, token, value) {
+  return content.split(token).join(value);
+}
+function matchPackageDeclaration(content) {
+  const match = content.match(
+    /^[ \t]*package[ \t]+([A-Za-z_][\w.]*)[ \t]*;?[ \t]*$/m
+  );
+  return match?.[1];
+}
+function substituteRunnerRc(content, dartName, displayName, org) {
+  return content.split("\n").map((line) => {
+    const isInternalName = line.includes("InternalName") || line.includes("OriginalFilename");
+    let replaced = replaceToken(
+      line,
+      "fwiflu",
+      isInternalName ? dartName : displayName
+    );
+    replaced = replaceToken(replaced, "mx.apto", org);
+    return replaced;
+  }).join("\n");
+}
+async function getAllFilesOrEmpty(dir) {
+  try {
+    return await getAllFiles(dir);
+  } catch {
+    return [];
+  }
+}
+async function removeEmptySubdirectories(dir) {
+  let entries;
+  try {
+    entries = await readdir(dir, { withFileTypes: true });
+  } catch {
+    return false;
+  }
+  let isEmpty = true;
+  for (const entry of entries) {
+    const childPath = join(dir, entry.name);
+    if (!entry.isDirectory()) {
+      isEmpty = false;
+      continue;
+    }
+    if (await removeEmptySubdirectories(childPath)) {
+      await rm(childPath, { recursive: true, force: true });
+    } else {
+      isEmpty = false;
+    }
+  }
+  return isEmpty;
+}
+async function substituteFlutter(dir, projectName, orgInput) {
+  const dartName = toDartPackageName(projectName);
+  const displayName = projectName.trim();
+  const org = normalizeOrg(orgInput);
+  const androidMainDir = join(dir, "android", "app", "src", "main");
+  const nativeFiles = [];
+  for (const root of FLUTTER_NATIVE_ROOTS) {
+    const files = await getAllFilesOrEmpty(join(androidMainDir, root));
+    for (const filePath of files) {
+      const ext = extname(filePath).toLowerCase();
+      if (ext !== ".kt" && ext !== ".java") continue;
+      try {
+        const content = await readFile(filePath, "utf-8");
+        if (matchPackageDeclaration(content) !== void 0) {
+          nativeFiles.push({ path: filePath, root });
+        }
+      } catch {
+      }
+    }
+  }
+  const allFiles = await getAllFiles(dir);
+  for (const filePath of allFiles) {
+    if (!isFlutterTextFile(filePath)) continue;
+    let content;
+    try {
+      content = await readFile(filePath, "utf-8");
+    } catch {
+      continue;
+    }
+    const relPath = relative(dir, filePath).split(sep).join("/");
+    let replaced;
+    if (relPath === FLUTTER_RUNNER_RC) {
+      replaced = substituteRunnerRc(content, dartName, displayName, org);
+    } else if (FLUTTER_DISPLAY_FILES.has(relPath)) {
+      replaced = replaceToken(content, "fwiflu", displayName);
+      replaced = replaceToken(replaced, "mx.apto", org);
+    } else {
+      replaced = replaceToken(content, "fwiflu", dartName);
+      replaced = replaceToken(replaced, "mx.apto", org);
+    }
+    if (extname(filePath).toLowerCase() === ".dart") {
+      replaced = sortDartDirectiveRuns(replaced);
+    }
+    if (replaced !== content) {
+      await writeFile(filePath, replaced);
+    }
+  }
+  for (const nativeFile of nativeFiles) {
+    let content;
+    try {
+      content = await readFile(nativeFile.path, "utf-8");
+    } catch {
+      continue;
+    }
+    const newPackage = matchPackageDeclaration(content);
+    if (newPackage === void 0) continue;
+    const expectedDir = join(
+      androidMainDir,
+      nativeFile.root,
+      ...newPackage.split(".")
+    );
+    if (dirname(nativeFile.path) === expectedDir) continue;
+    await mkdir(expectedDir, { recursive: true });
+    await rename(nativeFile.path, join(expectedDir, basename(nativeFile.path)));
+  }
+  for (const root of FLUTTER_NATIVE_ROOTS) {
+    await removeEmptySubdirectories(join(androidMainDir, root));
+  }
+}
 async function getAllFiles(dir) {
   const results = [];
   const entries = await readdir(dir, { withFileTypes: true });
@@ -450,6 +847,18 @@ async function selectSkillsAction() {
   ]);
   return action;
 }
+async function askFlutterOrg() {
+  const { org } = await inquirer.prompt([
+    {
+      type: "input",
+      name: "org",
+      message: "Organizaci\xF3n para el bundle id (reverse-domain, ej. com.example):",
+      default: FLUTTER_ORG_DEFAULT,
+      validate: checkOrg
+    }
+  ]);
+  return normalizeOrg(org);
+}
 async function askGlobalSkillsToo() {
   const { global } = await inquirer.prompt([
     {
@@ -908,9 +1317,9 @@ async function readTemplatePostInit(dir) {
     return void 0;
   }
 }
-async function createFullStackProject(projectPath, backendTpl, frontendTpl, pm) {
+async function createFullStackProject(projectPath, backendTpl, frontendTpl, pm, org) {
   const { tempDir, repoRoot } = await downloadAndExtractRepo();
-  const projectName = basename(projectPath);
+  const projectName = basename2(projectPath);
   const backendPath = join3(projectPath, "backend");
   const frontendPath = join3(projectPath, "frontend");
   await copyTemplate(
@@ -921,8 +1330,12 @@ async function createFullStackProject(projectPath, backendTpl, frontendTpl, pm)
     join3(repoRoot, "templates", frontendTpl.folder),
     frontendPath
   );
-  await substituteTemplate(backendPath, projectName, backendTpl.folder);
-  await substituteTemplate(frontendPath, projectName, frontendTpl.folder);
+  await substituteTemplate(backendPath, projectName, backendTpl.folder, {
+    org
+  });
+  await substituteTemplate(frontendPath, projectName, frontendTpl.folder, {
+    org
+  });
   await installAgentSkills(repoRoot, projectPath);
   if (backendTpl.runtime === "bun" && pm !== "bun") {
     await adaptToNodeRuntime(backendPath);
@@ -1073,10 +1486,20 @@ program.command("skills").description(
     process.exit(1);
   }
 });
-program.argument("[template]", "Template a usar (o 'fullstack' para backend + frontend)").argument("[project-name]", "Nombre del proyecto").option("-p, --pm <package-manager>", "Package manager a usar: npm, pnpm o bun").option("--backend", "Empaquetar el c\xF3digo en backend/ (saltea la pregunta)").option("--no-backend", "Dejar el c\xF3digo en la ra\xEDz del proyecto (saltea la pregunta)").option("-b, --backend-template <tpl>", "Backend a usar en fullstack (saltea la pregunta)").option("-f, --frontend-template <tpl>", "Frontend a usar en fullstack (saltea la pregunta)").option("--git", "Inicializar un repositorio git (saltea la pregunta)").option("--no-git", "No inicializar git (saltea la pregunta)").action(
+program.argument("[template]", "Template a usar (o 'fullstack' para backend + frontend)").argument("[project-name]", "Nombre del proyecto").option("-p, --pm <package-manager>", "Package manager a usar: npm, pnpm o bun").option(
+  "-o, --org <domain>",
+  "Organizaci\xF3n reverse-domain para el bundle id de Flutter (ej: ar.miempresa)"
+).option("--backend", "Empaquetar el c\xF3digo en backend/ (saltea la pregunta)").option("--no-backend", "Dejar el c\xF3digo en la ra\xEDz del proyecto (saltea la pregunta)").option("-b, --backend-template <tpl>", "Backend a usar en fullstack (saltea la pregunta)").option("-f, --frontend-template <tpl>", "Frontend a usar en fullstack (saltea la pregunta)").option("--git", "Inicializar un repositorio git (saltea la pregunta)").option("--no-git", "No inicializar git (saltea la pregunta)").action(
   async (templateArg, projectNameArg) => {
     try {
-      const { pm: pmArg, backend, backendTemplate, frontendTemplate, git } = program.opts();
+      const {
+        pm: pmArg,
+        org: orgArg,
+        backend,
+        backendTemplate,
+        frontendTemplate,
+        git
+      } = program.opts();
       if (pmArg && !PACKAGE_MANAGERS.includes(pmArg)) {
         console.error(
           chalk.red(
@@ -1163,10 +1586,29 @@ program.argument("[template]", "Template a usar (o 'fullstack' para backend + fr
       if (!projectName) {
         projectName = await askProjectName();
       }
+      const runtimes = template ? [template.runtime] : [backendTpl.runtime, frontendTpl.runtime];
+      let org;
+      if (runtimes.includes("flutter")) {
+        if (orgArg) {
+          const check = checkOrg(orgArg);
+          if (check !== true) {
+            console.error(chalk.red(`
+\u2716 ${check}
+`));
+            process.exit(1);
+          }
+          org = normalizeOrg(orgArg);
+        } else if (git === void 0) {
+          org = await askFlutterOrg();
+        } else {
+          org = FLUTTER_ORG_DEFAULT;
+        }
+      }
       const layer = template?.layer;
       const useLayerLayout = !template ? false : backend === void 0 ? await askLayerLayout(layer) : backend;
-      const runtimes = template ? [template.runtime] : [backendTpl.runtime, frontendTpl.runtime];
-      const needsPm = runtimes.some((r) => r !== "dotnet");
+      const needsPm = runtimes.some(
+        (r) => r !== "dotnet" && r !== "flutter"
+      );
       if (!pm && needsPm) {
         pm = await selectPackageManager();
       }
@@ -1190,7 +1632,8 @@ program.argument("[template]", "Template a usar (o 'fullstack' para backend + fr
           projectPath,
           backendTpl,
           frontendTpl,
-          pm ?? "npm"
+          pm ?? "npm",
+          org
         );
         spinner.succeed("Template descargado");
       } else {
@@ -1198,7 +1641,9 @@ program.argument("[template]", "Template a usar (o 'fullstack' para backend + fr
         const codePath = useLayerLayout ? join3(projectPath, layer) : projectPath;
         spinner.text = "Creando proyecto...";
         await copyTemplate(templatePath, codePath);
-        await substituteTemplate(codePath, projectName, template.folder);
+        await substituteTemplate(codePath, projectName, template.folder, {
+          org
+        });
         await installAgentSkills(repoRoot, projectPath);
         if (useLayerLayout) {
           await writeRootGitignore(projectPath);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "fwinit",
-  "version": "1.5.4",
+  "version": "1.6.0",
   "description": "CLI para crear proyectos desde templates",
   "type": "module",
   "bin": {
@@ -14,6 +14,7 @@
     "dev": "tsup src/index.ts --format esm --watch",
     "start": "node dist/index.js",
     "typecheck": "tsc --noEmit",
+    "test": "bun test",
     "prepublishOnly": "chmod +x dist/index.js"
   },
   "dependencies": {
@@ -25,6 +26,7 @@
   },
   "devDependencies": {
     "@types/adm-zip": "^0.5.7",
+    "@types/bun": "^1.3.0",
     "@types/node": "^22.13.10",
     "tsup": "^8.4.0",
     "typescript": "^5.8.2"