scale-stack 0.0.1 → 0.0.2

package/dist/index.js

@@ -9,6 +9,27 @@ import { resolve as resolve3 } from "path";
 import { InvalidArgumentError } from "commander";
 import pc5 from "picocolors";
 
+// src/config/feature-predicates.ts
+function hasAuth(selection) {
+  const strategy = typeof selection === "string" ? selection : selection.authStrategy;
+  return strategy !== "none";
+}
+function hasPrisma(config) {
+  return config.orm === "prisma";
+}
+function hasPlausible(config) {
+  return config.analytics === "plausible";
+}
+function hasGithubActions(config) {
+  return config.ci === "github";
+}
+function isImplementedAnalyticsProvider(provider) {
+  return provider === "plausible";
+}
+function isImplementedCiProvider(provider) {
+  return provider === "github";
+}
+
 // src/cli/config.ts
 var DEFAULT_CI_PROVIDER = "github";
 var DEFAULT_ANALYTICS_PROVIDER = "plausible";
@@ -45,6 +66,7 @@ function resolveConfig(flags, answers) {
     jobs: false,
     a11y: false,
     apiClient: false,
+    utilityLibs: flags.utilityLibs ?? optMods.has("utilityLibs"),
     preCommit: flags.preCommit ?? optMods.has("preCommit")
   };
 }
@@ -114,9 +136,12 @@ async function runTechPicker(flags) {
     answers.auth = auth;
   }
   if (flags.jobs === void 0) {
-    console.log(
-      `  ${pc2.yellow("\u25B8")} Background jobs ` + ikea.muted("\u2014 Inngest (not implemented; skipped)")
-    );
+    const jobs = await p.confirm({
+      message: "Add background jobs? " + pc2.yellow("\u2014 COMING SOON") + ikea.muted(" \xB7 Inngest event workflows, retries, and local dev server"),
+      initialValue: false
+    });
+    if (p.isCancel(jobs)) cancelled();
+    answers.jobs = jobs;
   }
   if (flags.chat === void 0) {
     const chat = await p.confirm({
@@ -185,6 +210,7 @@ async function runTechPicker(flags) {
   if (flags.a11y) alreadySelected.add("a11y");
   if (flags.apiClient) alreadySelected.add("apiClient");
   if (flags.i18n) alreadySelected.add("i18n");
+  if (flags.utilityLibs) alreadySelected.add("utilityLibs");
   if (flags.preCommit) alreadySelected.add("preCommit");
   const availableModules = [
     {
@@ -202,6 +228,11 @@ async function runTechPicker(flags) {
       label: "Internationalization",
       hint: ikea.muted("next-intl, locale routing, <LocaleSwitcher>")
     },
+    {
+      value: "utilityLibs",
+      label: "Utility libraries",
+      hint: ikea.muted("Motion, date-fns, es-toolkit, useHooks, ts-pattern")
+    },
     {
       value: "preCommit",
       label: "Pre-commit hooks",
@@ -283,6 +314,7 @@ function buildLines(config) {
     ["a11y", config.a11y],
     ["API Client", config.apiClient],
     ["i18n", config.i18n],
+    ["Utility Libs", config.utilityLibs],
     ["Pre-commit", config.preCommit]
   ];
   const allEntries = [...coreEntries, ...featureEntries, ...moduleEntries];
@@ -416,6 +448,9 @@ var VirtualFS = class {
   merge(path, mergeFn) {
     this.operations.push({ type: "merge", path, mergeFn });
   }
+  delete(path) {
+    this.operations.push({ type: "delete", path });
+  }
   async commit() {
     for (const op of this.operations) {
       switch (op.type) {
@@ -443,6 +478,12 @@ var VirtualFS = class {
           await writeFile(abs, merged, "utf-8");
           break;
         }
+        case "delete": {
+          const abs = this.abs(op.path);
+          await this.trackOriginal(abs);
+          await rm(abs, { recursive: true, force: true });
+          break;
+        }
       }
     }
   }
@@ -532,6 +573,18 @@ var VirtualFS = class {
           }
           break;
         }
+        case "delete": {
+          const abs = this.abs(op.path);
+          if (existsSync(abs)) {
+            const existing = await readFile(abs, "utf-8");
+            results.push({
+              path: op.path,
+              action: "delete",
+              diff: createPatch(op.path, existing, "")
+            });
+          }
+          break;
+        }
       }
     }
     return results;
@@ -937,17 +990,31 @@ function registerInitCommand(program2) {
     "--analytics [provider]",
     "Analytics provider: plausible, posthog, or none (default: plausible)",
     parseAnalyticsProvider
-  ).option("--jobs", "Background jobs (Inngest; not implemented, ignored)").option("--a11y", "Accessibility tooling (coming soon, ignored)").option("--api-client", "API client generation (coming soon, ignored)").option("--pre-commit", "Enable prek pre-commit hooks").option("-y, --yes", "Skip prompts, accept defaults").option("--dry-run", "Show what would be generated without writing files").action(async (positionalName, opts) => {
+  ).option("--jobs", "Background jobs (Inngest; not implemented, ignored)").option("--a11y", "Accessibility tooling (coming soon, ignored)").option("--api-client", "API client generation (coming soon, ignored)").option("--utility-libs", "Add utility libraries and matching Agent Skills").option("--pre-commit", "Enable prek pre-commit hooks").option("-y, --yes", "Skip prompts, accept defaults").option("--dry-run", "Show what would be generated without writing files").action(async (positionalName, opts) => {
     const flags = {
       ...opts,
       name: opts.name ?? positionalName
     };
     const answers = flags.yes ? {} : await runTechPicker(flags);
     const config = resolveConfig(flags, answers);
-    if (flags.jobs) {
+    if (config.ci !== "none" && !isImplementedCiProvider(config.ci)) {
+      console.log(
+        ikea.muted(
+          `  ${pc5.yellow("\u25B8")} CircleCI is coming soon; skipping CI generator.`
+        )
+      );
+    }
+    if (config.analytics !== "none" && !isImplementedAnalyticsProvider(config.analytics)) {
       console.log(
         ikea.muted(
-          `  ${pc5.yellow("\u25B8")} Inngest jobs are not implemented yet; skipping --jobs.`
+          `  ${pc5.yellow("\u25B8")} PostHog analytics is coming soon; skipping analytics generator.`
+        )
+      );
+    }
+    if (flags.jobs || answers.jobs) {
+      console.log(
+        ikea.muted(
+          `  ${pc5.yellow("\u25B8")} Background jobs are coming soon; skipping Inngest.`
         )
       );
     }
@@ -1097,12 +1164,12 @@ function getCliVersion() {
 }
 
 // src/sync/targets.ts
-import { existsSync as existsSync5 } from "fs";
+import { existsSync as existsSync5, readFileSync as readFileSync2 } from "fs";
 import { join as join6 } from "path";
 
 // src/config/eslint-config-contents.ts
 function shouldIgnorePrismaGeneratedOutput(config) {
-  return config.orm === "prisma";
+  return hasPrisma(config);
 }
 function shouldIgnoreAiElementsGeneratedOutput(config) {
   return config.aiChat === true;
@@ -1126,9 +1193,11 @@ var AI_CHAT_DEPENDENCIES = {
 var BETTER_AUTH_VERSION = "^1.6.9";
 var BETTER_AUTH_PRISMA_ADAPTER_VERSION = "^1.6.9";
 var AUTH_DEPENDENCIES = {
-  "@better-auth/prisma-adapter": BETTER_AUTH_PRISMA_ADAPTER_VERSION,
   "better-auth": BETTER_AUTH_VERSION
 };
+var AUTH_PRISMA_DEPENDENCIES = {
+  "@better-auth/prisma-adapter": BETTER_AUTH_PRISMA_ADAPTER_VERSION
+};
 function buildAuthEnvFragment() {
   return {
     variables: [
@@ -1276,17 +1345,42 @@ var STATE_DEPENDENCIES = {
   zustand: ZUSTAND_VERSION
 };
 
+// src/config/utility-libs-fragments.ts
+var MOTION_VERSION = "^12.38.0";
+var DATE_FNS_VERSION = "^4.1.0";
+var ES_TOOLKIT_VERSION = "^1.46.1";
+var UIDOTDEV_USEHOOKS_VERSION = "^2.4.1";
+var TS_PATTERN_VERSION = "^5.9.0";
+var UTILITY_LIBS_DEPENDENCIES = {
+  "@uidotdev/usehooks": UIDOTDEV_USEHOOKS_VERSION,
+  "date-fns": DATE_FNS_VERSION,
+  "es-toolkit": ES_TOOLKIT_VERSION,
+  motion: MOTION_VERSION,
+  "ts-pattern": TS_PATTERN_VERSION
+};
+
 // src/config/package-deps-baseline.ts
-var PACKAGE_DEPS_BASELINE = {
-  ...AI_CHAT_DEPENDENCIES,
-  ...AUTH_DEPENDENCIES,
+var CORE_PACKAGE_DEPS_BASELINE = {
   ...ENV_MANAGEMENT_DEPENDENCIES,
   ...FORM_HANDLING_DEPENDENCIES,
-  ...I18N_DEPENDENCIES,
-  ...ORM_DEPENDENCIES,
   ...SERVER_ACTIONS_DEPENDENCIES,
   ...STATE_DEPENDENCIES
 };
+function buildPackageDepsBaseline(config) {
+  return {
+    ...CORE_PACKAGE_DEPS_BASELINE,
+    ...hasPrisma(config) ? ORM_DEPENDENCIES : {},
+    ...hasAuth(config) ? AUTH_DEPENDENCIES : {},
+    ...config.authStrategy === "stateful" ? AUTH_PRISMA_DEPENDENCIES : {},
+    ...hasAuth(config) ? SERVER_ACTIONS_AUTH_DEPENDENCIES : {},
+    ...config.aiChat ? AI_CHAT_DEPENDENCIES : {},
+    ...config.i18n ? I18N_DEPENDENCIES : {},
+    ...config.utilityLibs ? UTILITY_LIBS_DEPENDENCIES : {}
+  };
+}
+var PACKAGE_DEPS_BASELINE = {
+  ...CORE_PACKAGE_DEPS_BASELINE
+};
 
 // src/config/eslint-prettier-fragments.ts
 var PRETTIER_VERSION = "^3.8.3";
@@ -1310,18 +1404,37 @@ var ESLINT_PRETTIER_SCRIPTS = {
 };
 
 // src/config/package-dev-deps-baseline.ts
+var CORE_PACKAGE_DEV_DEPS_BASELINE = {
+  ...ESLINT_PRETTIER_DEV_DEPS
+};
+function buildPackageDevDepsBaseline(config) {
+  return {
+    ...CORE_PACKAGE_DEV_DEPS_BASELINE,
+    ...hasPrisma(config) ? ORM_DEV_DEPENDENCIES : {}
+  };
+}
 var PACKAGE_DEV_DEPS_BASELINE = {
-  ...ESLINT_PRETTIER_DEV_DEPS,
-  ...ORM_DEV_DEPENDENCIES
+  ...CORE_PACKAGE_DEV_DEPS_BASELINE
 };
 
 // src/config/package-scripts-baseline.ts
-var PACKAGE_SCRIPTS_BASELINE = {
+var CORE_PACKAGE_SCRIPTS = {
   dev: "next dev",
   build: "next build",
-  start: "next start",
-  ...ESLINT_PRETTIER_SCRIPTS,
-  ...ORM_SCRIPTS
+  start: "next start"
+};
+var CORE_PACKAGE_SCRIPTS_BASELINE = {
+  ...CORE_PACKAGE_SCRIPTS,
+  ...ESLINT_PRETTIER_SCRIPTS
+};
+function buildPackageScriptsBaseline(config) {
+  return {
+    ...CORE_PACKAGE_SCRIPTS_BASELINE,
+    ...hasPrisma(config) ? ORM_SCRIPTS : {}
+  };
+}
+var PACKAGE_SCRIPTS_BASELINE = {
+  ...CORE_PACKAGE_SCRIPTS_BASELINE
 };
 
 // src/config/pre-commit-fragments.ts
@@ -1357,7 +1470,7 @@ function buildPreCommitScripts(mode) {
 
 // src/config/next-config-contents.ts
 function shouldEnableAuthInterrupts(context) {
-  return context ? context.config.authStrategy !== "none" : false;
+  return context ? hasAuth(context.config) : false;
 }
 function shouldEnableNextIntl(context) {
   return context ? context.config.i18n === true : false;
@@ -1435,7 +1548,8 @@ function inferOrmProvider(context) {
 }
 function inferAuthStrategy(context) {
   if (!context) return "none";
-  return existsSync5(join6(context.projectRoot, "src/lib/auth.ts")) ? "stateless" : "none";
+  if (!existsSync5(join6(context.projectRoot, "src/lib/auth.ts"))) return "none";
+  return inferOrmProvider(context) === "prisma" ? "stateful" : "stateless";
 }
 function inferAiChat(context) {
   if (!context) return false;
@@ -1445,6 +1559,24 @@ function inferI18n(context) {
   if (!context) return false;
   return existsSync5(join6(context.projectRoot, "src/i18n/routing.ts")) || existsSync5(join6(context.projectRoot, "messages/en.json"));
 }
+function inferUtilityLibs(context) {
+  if (!context) return false;
+  const packageJsonPath = join6(context.projectRoot, "package.json");
+  if (!existsSync5(packageJsonPath)) return false;
+  try {
+    const packageJson = JSON.parse(readFileSync2(packageJsonPath, "utf8"));
+    const dependencies = packageJson.dependencies ?? {};
+    return [
+      "motion",
+      "date-fns",
+      "es-toolkit",
+      "@uidotdev/usehooks",
+      "ts-pattern"
+    ].every((dependency) => dependency in dependencies);
+  } catch {
+    return false;
+  }
+}
 function inferScaleStackConfig(context) {
   return {
     projectName: context ? "synced-project" : "project",
@@ -1457,6 +1589,7 @@ function inferScaleStackConfig(context) {
     jobs: false,
     a11y: false,
     apiClient: false,
+    utilityLibs: inferUtilityLibs(context),
     preCommit: context ? hasPrekConfig(context) : false
   };
 }
@@ -1474,14 +1607,17 @@ var SYNC_TARGETS = [
   {
     relativePath: "package.json",
     kind: "json",
-    getDesiredFragment: (context) => ({
-      scripts: {
-        ...structuredClone(PACKAGE_SCRIPTS_BASELINE),
-        ...context && hasPrekConfig(context) ? buildPreCommitScripts(inferPreCommitMode(context.projectRoot)) : {}
-      },
-      dependencies: structuredClone(PACKAGE_DEPS_BASELINE),
-      devDependencies: structuredClone(PACKAGE_DEV_DEPS_BASELINE)
-    })
+    getDesiredFragment: (context) => {
+      const config = inferScaleStackConfig(context);
+      return {
+        scripts: {
+          ...buildPackageScriptsBaseline(config),
+          ...context && hasPrekConfig(context) ? buildPreCommitScripts(inferPreCommitMode(context.projectRoot)) : {}
+        },
+        dependencies: buildPackageDepsBaseline(config),
+        devDependencies: buildPackageDevDepsBaseline(config)
+      };
+    }
   },
   {
     relativePath: "next.config.ts",
@@ -2464,7 +2600,7 @@ var AI_CHAT_FILES = [
 ];
 function mergePackageJson(existing) {
   const desiredFragment = {
-    dependencies: structuredClone(PACKAGE_DEPS_BASELINE)
+    dependencies: structuredClone(AI_CHAT_DEPENDENCIES)
   };
   return mergeManagedPackageJson({
     existingContent: existing,
@@ -2511,9 +2647,6 @@ var FALLBACK_AGENTS_MD = `# AGENTS.md
 `;
 var FALLBACK_CLAUDE_MD = `@AGENTS.md
 `;
-function hasAuth(config) {
-  return config.authStrategy !== "none";
-}
 function buildTechnologyGuides(config) {
   const guides = [
     {
@@ -2562,11 +2695,6 @@ function buildTechnologyGuides(config) {
       purpose: "local service orchestration",
       selected: false
     },
-    {
-      name: "OpenTelemetry",
-      purpose: "provider-agnostic tracing",
-      selected: false
-    },
     {
       name: "Agent DevTools MCP",
       purpose: "local Next.js agent debugging",
@@ -2580,7 +2708,7 @@ function buildTechnologyGuides(config) {
     { name: "ESLint", purpose: "linting", selected: false },
     { name: "Prettier", purpose: "formatting", selected: false }
   ];
-  if (config.orm === "prisma") {
+  if (hasPrisma(config)) {
     guides.push(
       { name: "Prisma v7", purpose: "ORM", selected: true },
       { name: "PostgreSQL", purpose: "database", selected: true },
@@ -2618,14 +2746,35 @@ function buildTechnologyGuides(config) {
       selected: true
     });
   }
-  if (config.ci === "github") {
+  if (config.utilityLibs) {
+    guides.push(
+      { name: "Motion", purpose: "React animations", selected: true },
+      { name: "date-fns", purpose: "date utilities", selected: true },
+      {
+        name: "es-toolkit",
+        purpose: "general-purpose utilities",
+        selected: true
+      },
+      {
+        name: "@uidotdev/usehooks",
+        purpose: "client-side React hooks",
+        selected: true
+      },
+      {
+        name: "ts-pattern",
+        purpose: "exhaustive TypeScript pattern matching",
+        selected: true
+      }
+    );
+  }
+  if (hasGithubActions(config)) {
     guides.push({
       name: "GitHub Actions",
       purpose: "CI/CD pipeline; pnpm lint and Docker build are active, while typecheck/test/e2e steps are TODO no-ops until scripts exist",
       selected: true
     });
   }
-  if (config.analytics === "plausible") {
+  if (hasPlausible(config)) {
     guides.push(
       {
         name: "Plausible",
@@ -2700,11 +2849,17 @@ function buildInstalledSkillGuides(config) {
       purpose: "write validated, typed Server Actions"
     }
   ];
-  if (config.orm === "prisma") {
-    guides.push({
-      name: "prisma/skills",
-      purpose: "work with Prisma schema, migrations, and client code"
-    });
+  if (hasPrisma(config)) {
+    guides.push(
+      {
+        name: "prisma-cli",
+        purpose: "run Prisma CLI commands safely"
+      },
+      {
+        name: "prisma-client-api",
+        purpose: "write Prisma Client query code"
+      }
+    );
   }
   if (hasAuth(config)) {
     guides.push({
@@ -2724,6 +2879,34 @@ function buildInstalledSkillGuides(config) {
       }
     );
   }
+  if (config.utilityLibs) {
+    guides.push(
+      {
+        name: "guide",
+        purpose: "follow toss/es-toolkit usage guidance for installed utilities"
+      },
+      {
+        name: "recommend",
+        purpose: "choose es-toolkit utilities before adding utility alternatives"
+      },
+      {
+        name: "motion",
+        purpose: "build React animations with the installed Motion package"
+      },
+      {
+        name: "date-fns",
+        purpose: "parse, format, compare, and transform dates consistently"
+      },
+      {
+        name: "usehooks",
+        purpose: "use @uidotdev/usehooks for common client-side React hooks"
+      },
+      {
+        name: "ts-pattern",
+        purpose: "write exhaustive pattern matching for TypeScript unions"
+      }
+    );
+  }
   return guides;
 }
 function replaceManagedSection(existing, startMarker, endMarker, section) {
@@ -2756,12 +2939,14 @@ function buildAgentsScaleStackSection(config) {
   const skillLines = buildInstalledSkillGuides(config).map(
     ({ name, purpose }) => `- \`${name}\`: ${purpose}.`
   );
+  const utilityGuidanceLine = config.utilityLibs ? "- For animations, dates, utility functions, browser hooks, and pattern matching, prefer the installed utility libraries before adding alternatives." : void 0;
   return [
     SCALE_STACK_AGENTS_START,
     "## Scale Stack Guidance",
     "",
     "- Keep route-specific UI, hooks, state, actions, and AI artifacts colocated under private `_folders` inside the route segment that consumes them.",
     "- Use the listed Technology Stack by default; do not add alternatives unless the task requires it.",
+    ...utilityGuidanceLine ? [utilityGuidanceLine] : [],
     "- When adding or changing environment variables, update `src/env.ts` and `env.example`; never bypass the schema.",
     "- Never commit `.env`, credentials, API keys, tokens, or other secrets.",
     "",
@@ -2822,8 +3007,9 @@ var aiAssistantGenerator = {
   resolveDependencies: (config) => [
     ...config.preCommit ? ["pre-commit"] : [],
     ...config.aiChat ? ["ai-chat"] : [],
-    ...config.ci !== "none" ? ["ci"] : [],
-    ...config.analytics !== "none" ? ["analytics"] : []
+    ...hasGithubActions(config) ? ["ci"] : [],
+    ...hasPlausible(config) ? ["analytics"] : [],
+    ...config.utilityLibs ? ["utility-libs"] : []
   ],
   async execute(ctx) {
     ctx.fs.merge(
@@ -2838,7 +3024,6 @@ var aiAssistantGenerator = {
 // src/generators/analytics/analytics.ts
 var ANALYTICS_PROVIDER_PATH = "src/app/_providers/analytics-provider.tsx";
 var ANALYTICS_HELPER_PATH = "src/lib/analytics.ts";
-var POSTHOG_NOT_IMPLEMENTED_MESSAGE = "PostHog analytics is not implemented yet; no analytics runtime files or dependencies generated.";
 var PLAUSIBLE_ENV_FRAGMENT = {
   variables: [
     {
@@ -2879,20 +3064,20 @@ async function writePlausibleFiles(ctx) {
 var analyticsGenerator = {
   name: "analytics",
   dependencies: ["env-management", "ui"],
-  condition: (config) => config.analytics !== "none",
+  condition: (config) => isImplementedAnalyticsProvider(config.analytics),
   async execute(ctx) {
-    if (ctx.config.analytics === "posthog") {
-      ctx.logger.warn("analytics", POSTHOG_NOT_IMPLEMENTED_MESSAGE);
-      return;
-    }
     await writePlausibleFiles(ctx);
   }
 };
 
 // src/generators/orm/orm.ts
+var PHASE_13_ORM_AGENT_SKILLS = [
+  "prisma-cli",
+  "prisma-client-api"
+];
 var PHASE_13_ORM_AGENT_SKILL_COMMAND = buildSkillsAddCommand(
   "prisma/skills",
-  []
+  PHASE_13_ORM_AGENT_SKILLS
 );
 var PHASE_13_PRISMA_GENERATE_COMMAND = "pnpm db:generate";
 var ORM_FILES = [
@@ -2911,9 +3096,9 @@ var ORM_FILES = [
 ];
 function mergePackageJson2(existing) {
   const desiredFragment = {
-    scripts: structuredClone(PACKAGE_SCRIPTS_BASELINE),
-    dependencies: structuredClone(PACKAGE_DEPS_BASELINE),
-    devDependencies: structuredClone(PACKAGE_DEV_DEPS_BASELINE)
+    scripts: structuredClone(ORM_SCRIPTS),
+    dependencies: structuredClone(ORM_DEPENDENCIES),
+    devDependencies: structuredClone(ORM_DEV_DEPENDENCIES)
   };
   return mergeManagedPackageJson({
     existingContent: existing,
@@ -2930,7 +3115,7 @@ async function writeOrmFiles(ctx) {
 var ormGenerator = {
   name: "orm",
   dependencies: ["env-management"],
-  condition: (config) => config.orm === "prisma",
+  condition: (config) => hasPrisma(config),
   async execute(ctx) {
     ctx.fs.merge("package.json", mergePackageJson2);
     await writeOrmFiles(ctx);
@@ -3001,9 +3186,15 @@ function buildAuthAfterInstallEnv(strategy, projectName) {
   }
   return env;
 }
-function mergePackageJson3(existing) {
+function buildDependencies(strategy) {
+  return {
+    ...AUTH_DEPENDENCIES,
+    ...isStatefulAuth(strategy) ? AUTH_PRISMA_DEPENDENCIES : {}
+  };
+}
+function mergePackageJson3(existing, strategy = "none") {
   const desiredFragment = {
-    dependencies: structuredClone(PACKAGE_DEPS_BASELINE)
+    dependencies: buildDependencies(strategy)
   };
   return mergeManagedPackageJson({
     existingContent: existing,
@@ -3028,9 +3219,12 @@ var authGenerator = {
   name: "auth",
   dependencies: ["ui", "env-management"],
   resolveDependencies: (config) => isStatefulAuth(config.authStrategy) ? ["orm"] : [],
-  condition: (config) => config.authStrategy !== "none",
+  condition: (config) => hasAuth(config),
   async execute(ctx) {
-    ctx.fs.merge("package.json", mergePackageJson3);
+    ctx.fs.merge(
+      "package.json",
+      (existing) => mergePackageJson3(existing, ctx.config.authStrategy)
+    );
     await writeAuthFiles(ctx);
     await ctx.exec(PHASE_14_AUTH_AGENT_SKILL_COMMAND, {
       cwd: ctx.targetDir,
@@ -3061,10 +3255,6 @@ var authGenerator = {
 
 // src/generators/ci/ci.ts
 var GITHUB_ACTIONS_WORKFLOW_PATH = ".github/workflows/ci.yml";
-var CIRCLECI_CONFIG_PATH = ".circleci/config.yml";
-function hasPrisma(config) {
-  return config.orm === "prisma";
-}
 function buildPostgresServiceYaml() {
   return [
     "    services:",
@@ -3156,16 +3346,9 @@ var ciGenerator = {
     return hasPrisma(config) ? ["orm"] : [];
   },
   condition(config) {
-    return config.ci !== "none";
+    return isImplementedCiProvider(config.ci);
   },
   async execute(ctx) {
-    if (ctx.config.ci === "circleci") {
-      ctx.logger.warn(
-        "ci",
-        `CircleCI coming soon; no ${CIRCLECI_CONFIG_PATH} generated yet.`
-      );
-      return;
-    }
     ctx.fs.write(
       GITHUB_ACTIONS_WORKFLOW_PATH,
       buildGithubActionsWorkflow(ctx.config)
@@ -3186,8 +3369,8 @@ function buildPrettierIgnoreContents(config) {
 }
 function mergePackageJson4(existing) {
   const desiredFragment = {
-    scripts: structuredClone(PACKAGE_SCRIPTS_BASELINE),
-    devDependencies: structuredClone(PACKAGE_DEV_DEPS_BASELINE)
+    scripts: structuredClone(ESLINT_PRETTIER_SCRIPTS),
+    devDependencies: structuredClone(ESLINT_PRETTIER_DEV_DEPS)
   };
   return mergeManagedPackageJson({
     existingContent: existing,
@@ -3293,7 +3476,7 @@ var BASELINE_ENV_FRAGMENT = {
 };
 function mergePackageJson5(existing) {
   const desiredFragment = {
-    dependencies: structuredClone(PACKAGE_DEPS_BASELINE)
+    dependencies: structuredClone(ENV_MANAGEMENT_DEPENDENCIES)
   };
   return mergeManagedPackageJson({
     existingContent: existing,
@@ -3352,6 +3535,15 @@ function mergeGitignoreContent(existing) {
   return `${parts.join("\n")}
 `;
 }
+function mergePackageJson6(existing) {
+  return mergeManagedPackageJson({
+    existingContent: existing,
+    desiredFragment: {
+      scripts: structuredClone(CORE_PACKAGE_SCRIPTS)
+    },
+    sortSections: []
+  });
+}
 async function writeNextConfig(ctx) {
   ctx.fs.write(
     "next.config.ts",
@@ -3364,12 +3556,7 @@ async function writeNextConfig(ctx) {
   );
 }
 async function writeAppOverlays(ctx) {
-  const { projectName } = ctx.config;
-  const [layout, loading] = await Promise.all([
-    ctx.template.renderFile("core/layout.tsx.ejs", { projectName }),
-    ctx.template.renderFile("core/loading.tsx.ejs", {})
-  ]);
-  ctx.fs.write("src/app/layout.tsx", layout);
+  const loading = await ctx.template.renderFile("core/loading.tsx.ejs", {});
   ctx.fs.write(
     localizeAppRoutePath("src/app/loading.tsx", ctx.config.i18n),
     loading
@@ -3385,6 +3572,7 @@ var projectInitGenerator = {
     await ctx.exec(cmd, { cwd: parentDir });
     await writeNextConfig(ctx);
     await writeAppOverlays(ctx);
+    ctx.fs.merge("package.json", mergePackageJson6);
     ctx.fs.merge(
       "tsconfig.json",
       (existing) => mergeTsconfigContent(existing, ctx.config)
@@ -3402,18 +3590,12 @@ var POSTGRES_IMAGE = "postgres:16-alpine";
 var CLICKHOUSE_IMAGE = "clickhouse/clickhouse-server:24.12-alpine";
 var PLAUSIBLE_IMAGE = "ghcr.io/plausible/community-edition:v3.2.0";
 var PLAUSIBLE_LOCAL_SECRET_KEY_BASE = "local-only-change-me-local-only-change-me-local-only-change-me-local-only-change-me";
-function hasPrisma2(config) {
-  return config.orm === "prisma";
-}
-function hasPlausible(config) {
-  return config.analytics === "plausible";
-}
 function buildComposeDatabaseUrl(projectName) {
   return `postgresql://postgres:postgres@postgres:5432/${buildPostgresDatabaseName(projectName)}`;
 }
 function buildAppEnvironment(config) {
   const lines = ['      PORT: "3000"', '      HOSTNAME: "0.0.0.0"'];
-  if (hasPrisma2(config)) {
+  if (hasPrisma(config)) {
     lines.push(
       `      DATABASE_URL: ${buildComposeDatabaseUrl(config.projectName)}`
     );
@@ -3423,7 +3605,7 @@ function buildAppEnvironment(config) {
 }
 function buildAppDependsOn(config) {
   const lines = [];
-  if (hasPrisma2(config)) {
+  if (hasPrisma(config)) {
     lines.push("      postgres:");
     lines.push("        condition: service_healthy");
   }
@@ -3434,7 +3616,7 @@ function buildAppDependsOn(config) {
   return lines;
 }
 function buildPostgresService(config) {
-  if (!hasPrisma2(config)) return [];
+  if (!hasPrisma(config)) return [];
   const databaseName = buildPostgresDatabaseName(config.projectName);
   return [
     "  postgres:",
@@ -3528,7 +3710,7 @@ function buildPlausibleServices() {
 }
 function buildVolumes(config) {
   const lines = [];
-  if (hasPrisma2(config)) {
+  if (hasPrisma(config)) {
     lines.push("  postgres-data:");
   }
   if (hasPlausible(config)) {
@@ -3563,7 +3745,7 @@ function buildDockerComposeYaml(config) {
   ].join("\n");
 }
 function buildPrismaRunnerAdditions(config) {
-  if (!hasPrisma2(config)) return [];
+  if (!hasPrisma(config)) return [];
   return [
     "RUN apt-get update \\",
     "  && apt-get install -y --no-install-recommends openssl postgresql-client \\",
@@ -3579,7 +3761,7 @@ function buildPrismaRunnerAdditions(config) {
   ];
 }
 function buildPrismaBuilderEnvironment(config) {
-  if (!hasPrisma2(config)) return [];
+  if (!hasPrisma(config)) return [];
   return [
     `ENV DATABASE_URL=${buildComposeDatabaseUrl(config.projectName)}`,
     ""
@@ -3643,7 +3825,7 @@ function buildStartSh(config) {
     "",
     'if [ "${RUN_MIGRATIONS:-false}" = "true" ]; then'
   ];
-  if (hasPrisma2(config)) {
+  if (hasPrisma(config)) {
     lines.push(
       '  until pg_isready -d "${DATABASE_URL}"; do',
       '    echo "Waiting for database..."',
@@ -3684,7 +3866,7 @@ var dockerGenerator = {
   name: "docker",
   dependencies: ["project-init"],
   resolveDependencies(config) {
-    return hasPrisma2(config) ? ["orm"] : [];
+    return hasPrisma(config) ? ["orm"] : [];
   },
   async execute(ctx) {
     ctx.fs.write("Dockerfile", buildDockerfile(ctx.config));
@@ -3721,66 +3903,12 @@ var errorHandlingGenerator = {
       const content = await ctx.template.renderFile(file.templatePath, {
         i18n: ctx.config.i18n
       });
-      const outputPath = file.outputPath === "src/app/global-error.tsx" || file.outputPath === "src/app/[...not-found]/page.tsx" ? file.outputPath : localizeAppRoutePath(file.outputPath, ctx.config.i18n);
+      const outputPath = file.outputPath === "src/app/global-error.tsx" ? file.outputPath : localizeAppRoutePath(file.outputPath, ctx.config.i18n);
       ctx.fs.write(outputPath, content);
     }
   }
 };
 
-// src/generators/server-actions/server-actions.ts
-var PHASE_15_SERVER_ACTIONS_AGENT_SKILL_COMMAND = buildSkillsAddCommand("next-safe-action/skills", []);
-var SERVER_ACTIONS_FILES = [
-  {
-    templatePath: "server-actions/safe-action.ts.ejs",
-    outputPath: "src/lib/safe-action.ts"
-  }
-];
-function hasAuth2(strategy) {
-  return strategy !== "none";
-}
-function buildDependencies(strategy) {
-  const dependencies = structuredClone(PACKAGE_DEPS_BASELINE);
-  if (hasAuth2(strategy)) {
-    Object.assign(dependencies, SERVER_ACTIONS_AUTH_DEPENDENCIES);
-  }
-  return dependencies;
-}
-function mergePackageJson6(existing, strategy = "none") {
-  const desiredFragment = {
-    dependencies: buildDependencies(strategy)
-  };
-  return mergeManagedPackageJson({
-    existingContent: existing,
-    desiredFragment,
-    sortSections: ["dependencies"]
-  });
-}
-async function writeServerActionFiles(ctx) {
-  const hasAuthClient = hasAuth2(ctx.config.authStrategy);
-  for (const file of SERVER_ACTIONS_FILES) {
-    const content = await ctx.template.renderFile(file.templatePath, {
-      hasAuth: hasAuthClient
-    });
-    ctx.fs.write(file.outputPath, content);
-  }
-}
-var serverActionsGenerator = {
-  name: "server-actions",
-  dependencies: ["ui", "env-management"],
-  resolveDependencies: (config) => hasAuth2(config.authStrategy) ? ["auth"] : [],
-  async execute(ctx) {
-    ctx.fs.merge(
-      "package.json",
-      (existing) => mergePackageJson6(existing, ctx.config.authStrategy)
-    );
-    await writeServerActionFiles(ctx);
-    await ctx.exec(PHASE_15_SERVER_ACTIONS_AGENT_SKILL_COMMAND, {
-      cwd: ctx.targetDir,
-      env: { ...AGENT_SKILLS_EXEC_ENV }
-    });
-  }
-};
-
 // src/generators/form-handling/form-handling.ts
 var FORM_HANDLING_FILES = [
   {
@@ -3802,7 +3930,7 @@ var FORM_HANDLING_FILES = [
 ];
 function mergePackageJson7(existing) {
   const desiredFragment = {
-    dependencies: structuredClone(PACKAGE_DEPS_BASELINE)
+    dependencies: structuredClone(FORM_HANDLING_DEPENDENCIES)
   };
   return mergeManagedPackageJson({
     existingContent: existing,
@@ -3811,7 +3939,7 @@ function mergePackageJson7(existing) {
   });
 }
 async function writeFormHandlingFiles(ctx) {
-  const hasAuthClient = hasAuth2(ctx.config.authStrategy);
+  const hasAuthClient = hasAuth(ctx.config.authStrategy);
   for (const file of FORM_HANDLING_FILES) {
     const content = await ctx.template.renderFile(file.templatePath, {
       hasAuth: hasAuthClient,
@@ -3832,6 +3960,24 @@ var formHandlingGenerator = {
   }
 };
 
+// src/generators/app-layout.ts
+function getAppLayoutTemplateData({
+  projectName,
+  variant
+}) {
+  return {
+    templatePath: variant === "locale" ? "i18n/locale-layout.tsx.ejs" : "core/layout.tsx.ejs",
+    data: {
+      projectName,
+      includeClientSideWrappers: variant === "root-with-wrappers"
+    }
+  };
+}
+async function renderAppLayoutContents(template, options) {
+  const { templatePath, data } = getAppLayoutTemplateData(options);
+  return template.renderFile(templatePath, data);
+}
+
 // src/generators/i18n/i18n.ts
 var I18N_FILES = [
   {
@@ -3851,7 +3997,7 @@ var I18N_FILES = [
     outputPath: "src/i18n/next-intl.d.ts"
   },
   {
-    templatePath: "i18n/locale-layout.tsx.ejs",
+    templatePath: null,
     outputPath: "src/app/[locale]/layout.tsx"
   },
   {
@@ -3865,7 +4011,7 @@ var I18N_FILES = [
 ];
 function mergePackageJson8(existing) {
   const desiredFragment = {
-    dependencies: structuredClone(PACKAGE_DEPS_BASELINE)
+    dependencies: structuredClone(I18N_DEPENDENCIES)
   };
   return mergeManagedPackageJson({
     existingContent: existing,
@@ -3873,9 +4019,16 @@ function mergePackageJson8(existing) {
     sortSections: ["dependencies"]
   });
 }
+function deleteRootRouteFiles(ctx) {
+  ctx.fs.delete("src/app/layout.tsx");
+  ctx.fs.delete("src/app/page.tsx");
+}
 async function writeI18nFiles(ctx) {
   for (const file of I18N_FILES) {
-    const content = await ctx.template.renderFile(file.templatePath, {
+    const content = file.templatePath === null ? await renderAppLayoutContents(ctx.template, {
+      projectName: ctx.config.projectName,
+      variant: "locale"
+    }) : await ctx.template.renderFile(file.templatePath, {
       projectName: ctx.config.projectName
     });
     ctx.fs.write(file.outputPath, content);
@@ -3885,12 +4038,13 @@ var i18nGenerator = {
   name: "i18n",
   dependencies: ["ui", "error-handling", "form-handling"],
   resolveDependencies: (config) => [
-    ...config.authStrategy !== "none" ? ["auth"] : [],
+    ...hasAuth(config) ? ["auth"] : [],
     ...config.aiChat ? ["ai-chat"] : []
   ],
   condition: (config) => config.i18n === true,
   async execute(ctx) {
     ctx.fs.merge("package.json", mergePackageJson8);
+    deleteRootRouteFiles(ctx);
     await writeI18nFiles(ctx);
   }
 };
@@ -3930,18 +4084,69 @@ var proxyGenerator = {
   name: "proxy",
   dependencies: ["project-init"],
   resolveDependencies: (config) => [
-    ...config.authStrategy !== "none" ? ["auth"] : [],
+    ...hasAuth(config) ? ["auth"] : [],
     ...config.i18n ? ["i18n"] : []
   ],
   async execute(ctx) {
     const content = await ctx.template.renderFile("proxy/proxy.ts.ejs", {
-      hasAuth: ctx.config.authStrategy !== "none",
+      hasAuth: hasAuth(ctx.config),
       hasI18n: ctx.config.i18n
     });
     ctx.fs.write(PROXY_OUTPUT_PATH, content);
   }
 };
 
+// src/generators/server-actions/server-actions.ts
+var PHASE_15_SERVER_ACTIONS_AGENT_SKILL_COMMAND = buildSkillsAddCommand("next-safe-action/skills", []);
+var SERVER_ACTIONS_FILES = [
+  {
+    templatePath: "server-actions/safe-action.ts.ejs",
+    outputPath: "src/lib/safe-action.ts"
+  }
+];
+function buildDependencies2(strategy) {
+  const dependencies = structuredClone(SERVER_ACTIONS_DEPENDENCIES);
+  if (hasAuth(strategy)) {
+    Object.assign(dependencies, SERVER_ACTIONS_AUTH_DEPENDENCIES);
+  }
+  return dependencies;
+}
+function mergePackageJson10(existing, strategy = "none") {
+  const desiredFragment = {
+    dependencies: buildDependencies2(strategy)
+  };
+  return mergeManagedPackageJson({
+    existingContent: existing,
+    desiredFragment,
+    sortSections: ["dependencies"]
+  });
+}
+async function writeServerActionFiles(ctx) {
+  const hasAuthClient = hasAuth(ctx.config.authStrategy);
+  for (const file of SERVER_ACTIONS_FILES) {
+    const content = await ctx.template.renderFile(file.templatePath, {
+      hasAuth: hasAuthClient
+    });
+    ctx.fs.write(file.outputPath, content);
+  }
+}
+var serverActionsGenerator = {
+  name: "server-actions",
+  dependencies: ["ui", "env-management"],
+  resolveDependencies: (config) => hasAuth(config.authStrategy) ? ["auth"] : [],
+  async execute(ctx) {
+    ctx.fs.merge(
+      "package.json",
+      (existing) => mergePackageJson10(existing, ctx.config.authStrategy)
+    );
+    await writeServerActionFiles(ctx);
+    await ctx.exec(PHASE_15_SERVER_ACTIONS_AGENT_SKILL_COMMAND, {
+      cwd: ctx.targetDir,
+      env: { ...AGENT_SKILLS_EXEC_ENV }
+    });
+  }
+};
+
 // src/generators/state/state.ts
 var PHASE_9_STATE_AGENT_SKILL_COMMANDS = [
   buildSkillsAddCommand("https://github.com/pproenca/dot-skills", ["nuqs"]),
@@ -3949,9 +4154,9 @@ var PHASE_9_STATE_AGENT_SKILL_COMMANDS = [
     "zustand-5"
   ])
 ];
-function mergePackageJson10(existing) {
+function mergePackageJson11(existing) {
   const desiredFragment = {
-    dependencies: structuredClone(PACKAGE_DEPS_BASELINE)
+    dependencies: structuredClone(STATE_DEPENDENCIES)
   };
   return mergeManagedPackageJson({
     existingContent: existing,
@@ -3963,7 +4168,7 @@ var stateGenerator = {
   name: "state",
   dependencies: ["ui"],
   async execute(ctx) {
-    ctx.fs.merge("package.json", mergePackageJson10);
+    ctx.fs.merge("package.json", mergePackageJson11);
     for (const command of PHASE_9_STATE_AGENT_SKILL_COMMANDS) {
       await ctx.exec(command, {
         cwd: ctx.targetDir,
@@ -3975,8 +4180,6 @@ var stateGenerator = {
 
 // src/generators/ui/ui.ts
 var SHADCN_PRESET = "nova";
-var REACT_SUSPENSE_IMPORT = 'import { Suspense } from "react";';
-var CLIENT_SIDE_WRAPPERS_IMPORT = 'import { ClientSideWrappers } from "./_providers/client-side-wrappers";';
 var SONNER_OPTIONAL_THEME_CAST = 'theme={theme as ToasterProps["theme"]}';
 var SONNER_NON_NULLABLE_THEME_CAST = 'theme={theme as NonNullable<ToasterProps["theme"]>}';
 var SELF_REFERENTIAL_FONT_SANS = "--font-sans: var(--font-sans);";
@@ -3992,33 +4195,6 @@ function buildShadcnAddAllCommand() {
 function buildShadcnSkillAddCommand() {
   return "pnpm dlx skills add shadcn/ui -y";
 }
-function mergeRootLayoutWithClientSideWrappers(existing) {
-  if (existing.includes("<ClientSideWrappers>")) return existing;
-  const importMarker = 'import "./globals.css";\n';
-  if (!existing.includes(importMarker)) {
-    throw new Error("Could not find globals.css import in root layout.");
-  }
-  const childrenMarker = [
-    "        {/* Scale Stack: wrap with NuqsAdapter and other root providers under src/app/_providers/ */}",
-    "        {children}"
-  ].join("\n");
-  if (!existing.includes(childrenMarker)) {
-    throw new Error("Could not find root layout children slot.");
-  }
-  return existing.replace(
-    importMarker,
-    `${importMarker}${REACT_SUSPENSE_IMPORT}
-${CLIENT_SIDE_WRAPPERS_IMPORT}
-`
-  ).replace(
-    childrenMarker,
-    [
-      "        <Suspense>",
-      "          <ClientSideWrappers>{children}</ClientSideWrappers>",
-      "        </Suspense>"
-    ].join("\n")
-  );
-}
 function fixSonnerExactOptionalTheme(existing) {
   if (existing.includes(SONNER_NON_NULLABLE_THEME_CAST)) return existing;
   return existing.replace(
@@ -4033,13 +4209,13 @@ async function writeUiFiles(ctx) {
   const [page, clientSideWrappers] = await Promise.all([
     ctx.template.renderFile("ui/page.tsx.ejs", {
       projectName: ctx.config.projectName,
-      hasAuth: ctx.config.authStrategy !== "none",
+      hasAuth: hasAuth(ctx.config),
       hasAiChat: ctx.config.aiChat,
       isStatefulAuth: ctx.config.authStrategy === "stateful",
       i18n: ctx.config.i18n
     }),
     ctx.template.renderFile("ui/client-side-wrappers.tsx.ejs", {
-      hasAnalyticsProvider: ctx.config.analytics === "plausible"
+      hasAnalyticsProvider: hasPlausible(ctx.config)
     })
   ]);
   ctx.fs.write(localizeAppRoutePath("src/app/page.tsx", ctx.config.i18n), page);
@@ -4049,7 +4225,14 @@ async function writeUiFiles(ctx) {
   );
 }
 async function wireRootLayout(ctx) {
-  ctx.fs.merge("src/app/layout.tsx", mergeRootLayoutWithClientSideWrappers);
+  if (ctx.config.i18n) return;
+  ctx.fs.write(
+    "src/app/layout.tsx",
+    await renderAppLayoutContents(ctx.template, {
+      projectName: ctx.config.projectName,
+      variant: "root-with-wrappers"
+    })
+  );
 }
 async function patchGeneratedComponentFiles(ctx) {
   ctx.fs.merge("src/app/globals.css", fixGeneratedFontVariables);
@@ -4068,6 +4251,63 @@ var uiGenerator = {
   }
 };
 
+// src/generators/utility-libs/utility-libs.ts
+var UTILITY_LIBS_ES_TOOLKIT_AGENT_SKILLS = [
+  "guide",
+  "recommend"
+];
+var UTILITY_LIBS_ES_TOOLKIT_AGENT_SKILL_COMMAND = buildSkillsAddCommand(
+  "toss/es-toolkit",
+  UTILITY_LIBS_ES_TOOLKIT_AGENT_SKILLS
+);
+var UTILITY_LIBS_LOCAL_SKILL_FILES = [
+  {
+    templatePath: "utility-libs/motion.SKILL.md.ejs",
+    outputPath: ".agents/skills/motion/SKILL.md"
+  },
+  {
+    templatePath: "utility-libs/date-fns.SKILL.md.ejs",
+    outputPath: ".agents/skills/date-fns/SKILL.md"
+  },
+  {
+    templatePath: "utility-libs/usehooks.SKILL.md.ejs",
+    outputPath: ".agents/skills/usehooks/SKILL.md"
+  },
+  {
+    templatePath: "utility-libs/ts-pattern.SKILL.md.ejs",
+    outputPath: ".agents/skills/ts-pattern/SKILL.md"
+  }
+];
+function mergePackageJson12(existing) {
+  const desiredFragment = {
+    dependencies: structuredClone(UTILITY_LIBS_DEPENDENCIES)
+  };
+  return mergeManagedPackageJson({
+    existingContent: existing,
+    desiredFragment,
+    sortSections: ["dependencies"]
+  });
+}
+async function writeLocalSkillFiles(ctx) {
+  for (const file of UTILITY_LIBS_LOCAL_SKILL_FILES) {
+    const content = await ctx.template.renderFile(file.templatePath, {});
+    ctx.fs.write(file.outputPath, content);
+  }
+}
+var utilityLibsGenerator = {
+  name: "utility-libs",
+  dependencies: ["agent-skills-init"],
+  condition: (config) => config.utilityLibs === true,
+  async execute(ctx) {
+    ctx.fs.merge("package.json", mergePackageJson12);
+    await ctx.exec(UTILITY_LIBS_ES_TOOLKIT_AGENT_SKILL_COMMAND, {
+      cwd: ctx.targetDir,
+      env: { ...AGENT_SKILLS_EXEC_ENV }
+    });
+    await writeLocalSkillFiles(ctx);
+  }
+};
+
 // src/generators/register.ts
 registerGenerator(projectInitGenerator);
 registerGenerator(proxyGenerator);
@@ -4087,6 +4327,7 @@ registerGenerator(ciGenerator);
 registerGenerator(analyticsGenerator);
 registerGenerator(aiChatGenerator);
 registerGenerator(i18nGenerator);
+registerGenerator(utilityLibsGenerator);
 registerGenerator(aiAssistantGenerator);
 
 // src/cli/ui/banner.ts