@funkai/cli 0.2.0 → 0.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@funkai/cli",
-  "version": "0.2.0",
+  "version": "0.3.1",
   "private": false,
   "description": "CLI for the funkai AI SDK framework",
   "keywords": [
@@ -31,15 +31,18 @@
   "dependencies": {
     "@kidd-cli/core": "^0.10.0",
     "es-toolkit": "^1.45.1",
-    "liquidjs": "^10.25.0",
+    "liquidjs": "^10.25.1",
+    "picomatch": "^4.0.3",
     "ts-pattern": "^5.9.0",
-    "yaml": "^2.8.2",
+    "yaml": "^2.8.3",
     "zod": "^4.3.6",
-    "@funkai/prompts": "0.3.0"
+    "@funkai/config": "0.2.0",
+    "@funkai/prompts": "0.4.1"
   },
   "devDependencies": {
     "@kidd-cli/cli": "^0.4.9",
     "@types/node": "^25.5.0",
+    "@types/picomatch": "^4.0.2",
     "@vitest/coverage-v8": "^4.1.0",
     "tsdown": "^0.21.4",
     "typescript": "^5.9.3",

package/src/commands/generate.ts

@@ -1,19 +1,41 @@
 import { command } from "@kidd-cli/core";
 
 import { generateArgs, handleGenerate } from "./prompts/generate.js";
+import { getConfig } from "@/config.js";
 
 export default command({
   description: "Run all code generation across the funkai SDK",
   options: generateArgs,
   handler(ctx) {
     const { silent } = ctx.args;
+    const config = getConfig(ctx);
 
     // --- Prompts codegen ---
     if (!silent) {
       ctx.logger.info("Running prompts code generation...");
     }
 
-    handleGenerate({ args: ctx.args, logger: ctx.logger, fail: ctx.fail });
+    const generateHandleArgs: {
+      silent: boolean;
+      out?: string;
+      includes?: readonly string[];
+      partials?: string;
+    } = { silent: ctx.args.silent };
+    if (ctx.args.out !== undefined) {
+      generateHandleArgs.out = ctx.args.out;
+    }
+    if (ctx.args.includes !== undefined) {
+      generateHandleArgs.includes = ctx.args.includes;
+    }
+    if (ctx.args.partials !== undefined) {
+      generateHandleArgs.partials = ctx.args.partials;
+    }
+    handleGenerate({
+      args: generateHandleArgs,
+      config: config.prompts,
+      logger: ctx.logger,
+      fail: ctx.fail,
+    });
 
     // --- Future: agents codegen ---
   },

package/src/commands/prompts/create.ts

@@ -5,6 +5,8 @@ import { command } from "@kidd-cli/core";
 import { match, P } from "ts-pattern";
 import { z } from "zod";
 
+import { getConfig } from "@/config.js";
+
 /** @private */
 const createTemplate = (name: string) => `---
 name: ${name}
@@ -16,15 +18,44 @@ export default command({
   description: "Create a new .prompt file",
   options: z.object({
     name: z.string().describe("Prompt name (kebab-case)"),
-    out: z.string().optional().describe("Output directory (defaults to cwd)"),
+    out: z
+      .string()
+      .optional()
+      .describe("Output directory (defaults to first root in config or cwd)"),
     partial: z.boolean().default(false).describe("Create as a partial in .prompts/partials/"),
   }),
   handler(ctx) {
     const { name, out, partial } = ctx.args;
+    const config = getConfig(ctx);
+    const promptsConfig = config.prompts;
+    const firstInclude = match(promptsConfig)
+      .with({ includes: P.array(P.string).select() }, (includes) => {
+        if (includes.length > 0) {
+          // Extract the static base directory from the first include pattern
+          const [pattern] = includes;
+          if (pattern === undefined) {
+            return undefined;
+          }
+          const parts = pattern.split("/");
+          const staticParts = parts.filter((p) => !p.includes("*") && !p.includes("?"));
+          if (staticParts.length > 0) {
+            return staticParts.join("/");
+          }
+          return undefined;
+        }
+        return undefined;
+      })
+      .otherwise(() => undefined);
+
     const dir = match({ partial, out })
       .with({ partial: true }, () => resolve(".prompts/partials"))
       .with({ out: P.string }, ({ out: outDir }) => resolve(outDir))
-      .otherwise(() => process.cwd());
+      .otherwise(() => {
+        if (firstInclude) {
+          return resolve(firstInclude);
+        }
+        return process.cwd();
+      });
     const filePath = resolve(dir, `${name}.prompt`);
 
     // oxlint-disable-next-line security/detect-non-literal-fs-filename -- safe: user-provided CLI argument for prompt file creation

package/src/commands/prompts/generate.ts

@@ -1,18 +1,20 @@
 import { mkdirSync, writeFileSync } from "node:fs";
 import { resolve } from "node:path";
 
+import type { FunkaiConfig, PromptGroup } from "@funkai/config";
 import { command } from "@kidd-cli/core";
 import { match } from "ts-pattern";
 import { z } from "zod";
 
-import { generatePromptModule, generateRegistry } from "@/lib/prompts/codegen.js";
+import { getConfig } from "@/config.js";
+import { generatePromptModule, generateRegistry, toFileSlug } from "@/lib/prompts/codegen.js";
 import { hasLintErrors } from "@/lib/prompts/lint.js";
 import { runGeneratePipeline } from "@/lib/prompts/pipeline.js";
 
 /** Zod schema for the `prompts generate` CLI arguments. */
 export const generateArgs = z.object({
-  out: z.string().describe("Output directory for generated files"),
-  roots: z.array(z.string()).describe("Root directories to scan for .prompt files"),
+  out: z.string().optional().describe("Output directory for generated files"),
+  includes: z.array(z.string()).optional().describe("Glob patterns to scan for .prompt files"),
   partials: z.string().optional().describe("Custom partials directory"),
   silent: z.boolean().default(false).describe("Suppress output except errors"),
 });
@@ -25,11 +27,12 @@ export type GenerateArgs = z.infer<typeof generateArgs>;
  */
 export interface HandleGenerateParams {
   readonly args: {
-    readonly out: string;
-    readonly roots: readonly string[];
+    readonly out?: string;
+    readonly includes?: readonly string[];
     readonly partials?: string;
     readonly silent: boolean;
   };
+  readonly config?: FunkaiConfig["prompts"];
   readonly logger: {
     info: (msg: string) => void;
     step: (msg: string) => void;
@@ -41,14 +44,74 @@ export interface HandleGenerateParams {
 }
 
 /**
- * Shared handler for prompts code generation.
+ * Resolve generate args by merging CLI flags with config defaults.
  *
- * @param params - Handler context with args, logger, and fail callback.
+ * @param args - CLI arguments (take precedence).
+ * @param config - Prompts config from funkai.config.ts (fallback).
+ * @param fail - Error handler for missing required values.
+ * @returns Resolved args with required fields guaranteed.
  */
-export function handleGenerate({ args, logger, fail }: HandleGenerateParams): void {
-  const { out, roots, partials, silent } = args;
+function resolveGenerateArgs(
+  args: HandleGenerateParams["args"],
+  config: FunkaiConfig["prompts"],
+  fail: (msg: string) => never,
+): {
+  readonly out: string;
+  readonly includes: readonly string[];
+  readonly excludes: readonly string[];
+  readonly partials?: string;
+  readonly silent: boolean;
+} {
+  const out = args.out ?? (config && config.out);
+  const includes = args.includes ?? (config && config.includes) ?? ["./**"];
+  const excludes = (config && config.excludes) ?? [];
+  const partials = args.partials ?? (config && config.partials);
+
+  if (!out) {
+    fail("Missing --out flag. Provide it via CLI or set prompts.out in funkai.config.ts.");
+  }
 
-  const { discovered, lintResults, prompts } = runGeneratePipeline({ roots, out, partials });
+  const resolved: {
+    out: string;
+    includes: readonly string[];
+    excludes: readonly string[];
+    silent: boolean;
+    partials?: string;
+  } = {
+    out,
+    includes,
+    excludes,
+    silent: args.silent,
+  };
+  if (partials !== undefined) {
+    resolved.partials = partials;
+  }
+  return resolved;
+}
+
+/**
+ * Shared handler for prompts code generation.
+ *
+ * @param params - Handler context with args, config, logger, and fail callback.
+ */
+export function handleGenerate({ args, config, logger, fail }: HandleGenerateParams): void {
+  const { out, includes, excludes, partials, silent } = resolveGenerateArgs(args, config, fail);
+
+  const configGroups = config && config.groups;
+  const pipelineOptions: {
+    includes: readonly string[];
+    excludes: readonly string[];
+    out: string;
+    partials?: string;
+    groups?: readonly PromptGroup[];
+  } = { includes, excludes, out };
+  if (partials !== undefined) {
+    pipelineOptions.partials = partials;
+  }
+  if (configGroups !== undefined) {
+    pipelineOptions.groups = configGroups;
+  }
+  const { discovered, lintResults, prompts } = runGeneratePipeline(pipelineOptions);
 
   if (!silent) {
     logger.info(`Found ${discovered} prompt(s)`);
@@ -82,8 +145,9 @@ export function handleGenerate({ args, logger, fail }: HandleGenerateParams): vo
 
   for (const prompt of prompts) {
     const content = generatePromptModule(prompt);
+    const fileSlug = toFileSlug(prompt.name, prompt.group);
     // oxlint-disable-next-line security/detect-non-literal-fs-filename -- safe: writing generated module to output directory
-    writeFileSync(resolve(outDir, `${prompt.name}.ts`), content, "utf8");
+    writeFileSync(resolve(outDir, `${fileSlug}.ts`), content, "utf8");
   }
 
   const registryContent = generateRegistry(prompts);
@@ -107,6 +171,27 @@ export default command({
   description: "Generate TypeScript modules from .prompt files",
   options: generateArgs,
   handler(ctx) {
-    handleGenerate({ args: ctx.args, logger: ctx.logger, fail: ctx.fail });
+    const config = getConfig(ctx);
+    const generateArgs2: {
+      silent: boolean;
+      out?: string;
+      includes?: readonly string[];
+      partials?: string;
+    } = { silent: ctx.args.silent };
+    if (ctx.args.out !== undefined) {
+      generateArgs2.out = ctx.args.out;
+    }
+    if (ctx.args.includes !== undefined) {
+      generateArgs2.includes = ctx.args.includes;
+    }
+    if (ctx.args.partials !== undefined) {
+      generateArgs2.partials = ctx.args.partials;
+    }
+    handleGenerate({
+      args: generateArgs2,
+      config: config.prompts,
+      logger: ctx.logger,
+      fail: ctx.fail,
+    });
   },
 });

package/src/commands/prompts/lint.ts

@@ -1,13 +1,15 @@
+import type { FunkaiConfig } from "@funkai/config";
 import { command } from "@kidd-cli/core";
 import { match } from "ts-pattern";
 import { z } from "zod";
 
+import { getConfig } from "@/config.js";
 import { hasLintErrors } from "@/lib/prompts/lint.js";
 import { runLintPipeline } from "@/lib/prompts/pipeline.js";
 
 /** Zod schema for the `prompts lint` CLI arguments. */
 export const lintArgs = z.object({
-  roots: z.array(z.string()).describe("Root directories to scan for .prompt files"),
+  includes: z.array(z.string()).optional().describe("Glob patterns to scan for .prompt files"),
   partials: z.string().optional().describe("Custom partials directory"),
   silent: z.boolean().default(false).describe("Suppress output except errors"),
 });
@@ -20,10 +22,11 @@ export type LintArgs = z.infer<typeof lintArgs>;
  */
 export interface HandleLintParams {
   readonly args: {
-    readonly roots: readonly string[];
+    readonly includes?: readonly string[];
     readonly partials?: string;
     readonly silent: boolean;
   };
+  readonly config?: FunkaiConfig["prompts"];
   readonly logger: {
     info: (msg: string) => void;
     error: (msg: string) => void;
@@ -32,15 +35,57 @@ export interface HandleLintParams {
   readonly fail: (msg: string) => never;
 }
 
+/**
+ * Resolve lint args by merging CLI flags with config defaults.
+ *
+ * @param args - CLI arguments (take precedence).
+ * @param config - Prompts config from funkai.config.ts (fallback).
+ * @param fail - Error handler for missing required values.
+ * @returns Resolved args with required fields guaranteed.
+ */
+function resolveLintArgs(
+  args: HandleLintParams["args"],
+  config: FunkaiConfig["prompts"],
+  _fail: (msg: string) => never,
+): {
+  readonly includes: readonly string[];
+  readonly excludes: readonly string[];
+  readonly partials?: string;
+  readonly silent: boolean;
+} {
+  const includes = args.includes ?? (config && config.includes) ?? ["./**"];
+  const excludes = (config && config.excludes) ?? [];
+  const partials = args.partials ?? (config && config.partials);
+
+  const resolved: {
+    includes: readonly string[];
+    excludes: readonly string[];
+    silent: boolean;
+    partials?: string;
+  } = { includes, excludes, silent: args.silent };
+  if (partials !== undefined) {
+    resolved.partials = partials;
+  }
+  return resolved;
+}
+
 /**
  * Shared handler for prompts lint/validation.
  *
- * @param params - Handler context with args, logger, and fail callback.
+ * @param params - Handler context with args, config, logger, and fail callback.
  */
-export function handleLint({ args, logger, fail }: HandleLintParams): void {
-  const { roots, partials, silent } = args;
+export function handleLint({ args, config, logger, fail }: HandleLintParams): void {
+  const { includes, excludes, partials, silent } = resolveLintArgs(args, config, fail);
 
-  const { discovered, results } = runLintPipeline({ roots, partials });
+  const lintPipelineOptions: {
+    includes: readonly string[];
+    excludes: readonly string[];
+    partials?: string;
+  } = { includes, excludes };
+  if (partials !== undefined) {
+    lintPipelineOptions.partials = partials;
+  }
+  const { discovered, results } = runLintPipeline(lintPipelineOptions);
 
   if (!silent) {
     logger.info(`Linting ${discovered} prompt(s)...`);
@@ -80,6 +125,23 @@ export default command({
   description: "Validate .prompt files for schema/template mismatches",
   options: lintArgs,
   handler(ctx) {
-    handleLint({ args: ctx.args, logger: ctx.logger, fail: ctx.fail });
+    const config = getConfig(ctx);
+    const lintHandleArgs: {
+      silent: boolean;
+      includes?: readonly string[];
+      partials?: string;
+    } = { silent: ctx.args.silent };
+    if (ctx.args.includes !== undefined) {
+      lintHandleArgs.includes = ctx.args.includes;
+    }
+    if (ctx.args.partials !== undefined) {
+      lintHandleArgs.partials = ctx.args.partials;
+    }
+    handleLint({
+      args: lintHandleArgs,
+      config: config.prompts,
+      logger: ctx.logger,
+      fail: ctx.fail,
+    });
   },
 });

package/src/commands/prompts/setup.ts

@@ -1,6 +1,7 @@
 import { existsSync, mkdirSync, readFileSync, writeFileSync } from "node:fs";
 import { resolve } from "node:path";
 
+import type { Context } from "@kidd-cli/core";
 import { command } from "@kidd-cli/core";
 
 const VSCODE_DIR = ".vscode";
@@ -12,114 +13,121 @@ const GITIGNORE_ENTRY = ".prompts/client/";
 const PROMPTS_ALIAS = "~prompts";
 const PROMPTS_ALIAS_PATH = "./.prompts/client/index.ts";
 
-export default command({
-  description: "Configure VSCode IDE settings for .prompt files",
-  async handler(ctx) {
-    ctx.logger.intro("Prompt SDK — Project Setup");
-
-    const shouldConfigure = await ctx.prompts.confirm({
-      message: "Configure VSCode to treat .prompt files as Markdown with Liquid syntax?",
-      initialValue: true,
-    });
-
-    if (shouldConfigure) {
-      const vscodeDir = resolve(VSCODE_DIR);
-      mkdirSync(vscodeDir, { recursive: true });
-
-      const settingsPath = resolve(vscodeDir, SETTINGS_FILE);
-      const settings = readJsonFile(settingsPath);
-
-      const updatedSettings = {
-        ...settings,
-        "files.associations": {
-          ...((settings["files.associations"] ?? {}) as Record<string, string>),
-          "*.prompt": "markdown",
-        },
-        "liquid.engine": "standard",
-      };
-
-      writeFileSync(settingsPath, `${JSON.stringify(updatedSettings, null, 2)}\n`, "utf8");
-      ctx.logger.success(`Updated ${settingsPath}`);
-    }
+/**
+ * Shared prompts setup logic used by both `funkai prompts setup` and `funkai setup`.
+ *
+ * @param ctx - The CLI context with prompts and logger.
+ */
+export async function setupPrompts(ctx: Pick<Context, "prompts" | "logger">): Promise<void> {
+  const shouldConfigure = await ctx.prompts.confirm({
+    message: "Configure VSCode to treat .prompt files as Markdown with Liquid syntax?",
+    initialValue: true,
+  });
+
+  if (shouldConfigure) {
+    const vscodeDir = resolve(VSCODE_DIR);
+    mkdirSync(vscodeDir, { recursive: true });
+
+    const settingsPath = resolve(vscodeDir, SETTINGS_FILE);
+    const settings = readJsonFile(settingsPath);
+
+    const updatedSettings = {
+      ...settings,
+      "files.associations": {
+        ...((settings["files.associations"] ?? {}) as Record<string, string>),
+        "*.prompt": "markdown",
+      },
+      "liquid.engine": "standard",
+    };
+
+    writeFileSync(settingsPath, `${JSON.stringify(updatedSettings, null, 2)}\n`, "utf8");
+    ctx.logger.success(`Updated ${settingsPath}`);
+  }
 
-    const shouldRecommend = await ctx.prompts.confirm({
-      message: "Add Shopify Liquid extension to VSCode recommendations?",
-      initialValue: true,
-    });
+  const shouldRecommend = await ctx.prompts.confirm({
+    message: "Add Shopify Liquid extension to VSCode recommendations?",
+    initialValue: true,
+  });
 
-    if (shouldRecommend) {
-      const vscodeDir = resolve(VSCODE_DIR);
-      mkdirSync(vscodeDir, { recursive: true });
+  if (shouldRecommend) {
+    const vscodeDir = resolve(VSCODE_DIR);
+    mkdirSync(vscodeDir, { recursive: true });
 
-      const extensionsPath = resolve(vscodeDir, EXTENSIONS_FILE);
-      const extensions = readJsonFile(extensionsPath);
+    const extensionsPath = resolve(vscodeDir, EXTENSIONS_FILE);
+    const extensions = readJsonFile(extensionsPath);
 
-      const currentRecs = (extensions.recommendations ?? []) as string[];
-      const extensionId = "sissel.shopify-liquid";
+    const currentRecs = (extensions["recommendations"] ?? []) as string[];
+    const extensionId = "sissel.shopify-liquid";
 
-      const recommendations = ensureRecommendation(currentRecs, extensionId);
-      const updatedExtensions = {
-        ...extensions,
-        recommendations,
-      };
+    const recommendations = ensureRecommendation(currentRecs, extensionId);
+    const updatedExtensions = {
+      ...extensions,
+      recommendations,
+    };
 
-      writeFileSync(extensionsPath, `${JSON.stringify(updatedExtensions, null, 2)}\n`, "utf8");
-      ctx.logger.success(`Updated ${extensionsPath}`);
-    }
+    writeFileSync(extensionsPath, `${JSON.stringify(updatedExtensions, null, 2)}\n`, "utf8");
+    ctx.logger.success(`Updated ${extensionsPath}`);
+  }
 
-    const shouldGitignore = await ctx.prompts.confirm({
-      message: "Add .prompts/client/ to .gitignore? (generated client should not be committed)",
-      initialValue: true,
-    });
-
-    if (shouldGitignore) {
-      const gitignorePath = resolve(GITIGNORE_FILE);
-      const existing = readFileOrEmpty(gitignorePath);
-
-      if (existing.includes(GITIGNORE_ENTRY)) {
-        ctx.logger.info(`${GITIGNORE_ENTRY} already in ${gitignorePath}`);
-      } else {
-        const separator = trailingSeparator(existing);
-        const block = `${separator}\n# Generated prompt client (created by \`funkai prompts generate\`)\n${GITIGNORE_ENTRY}\n`;
-        writeFileSync(gitignorePath, `${existing}${block}`, "utf8");
-        ctx.logger.success(`Added ${GITIGNORE_ENTRY} to ${gitignorePath}`);
-      }
+  const shouldGitignore = await ctx.prompts.confirm({
+    message: "Add .prompts/client/ to .gitignore? (generated client should not be committed)",
+    initialValue: true,
+  });
+
+  if (shouldGitignore) {
+    const gitignorePath = resolve(GITIGNORE_FILE);
+    const existing = readFileOrEmpty(gitignorePath);
+
+    if (existing.includes(GITIGNORE_ENTRY)) {
+      ctx.logger.info(`${GITIGNORE_ENTRY} already in ${gitignorePath}`);
+    } else {
+      const separator = trailingSeparator(existing);
+      const block = `${separator}\n# Generated prompt client (created by \`funkai prompts generate\`)\n${GITIGNORE_ENTRY}\n`;
+      writeFileSync(gitignorePath, `${existing}${block}`, "utf8");
+      ctx.logger.success(`Added ${GITIGNORE_ENTRY} to ${gitignorePath}`);
     }
+  }
 
-    const shouldTsconfig = await ctx.prompts.confirm({
-      message: "Add ~prompts path alias to tsconfig.json?",
-      initialValue: true,
-    });
-
-    if (shouldTsconfig) {
-      const tsconfigPath = resolve(TSCONFIG_FILE);
-      const tsconfig = readJsonFile(tsconfigPath);
-
-      const compilerOptions = (tsconfig.compilerOptions ?? {}) as Record<string, unknown>;
-      const existingPaths = (compilerOptions.paths ?? {}) as Record<string, string[]>;
-
-      // oxlint-disable-next-line security/detect-object-injection -- safe: PROMPTS_ALIAS is a known constant string
-      if (existingPaths[PROMPTS_ALIAS]) {
-        ctx.logger.info(`${PROMPTS_ALIAS} alias already in ${tsconfigPath}`);
-      } else {
-        const updatedTsconfig = {
-          ...tsconfig,
-          compilerOptions: {
-            ...compilerOptions,
-            paths: {
-              ...existingPaths,
-              // oxlint-disable-next-line security/detect-object-injection -- safe: PROMPTS_ALIAS is a known constant string
-              [PROMPTS_ALIAS]: [PROMPTS_ALIAS_PATH],
-            },
+  const shouldTsconfig = await ctx.prompts.confirm({
+    message: "Add ~prompts path alias to tsconfig.json?",
+    initialValue: true,
+  });
+
+  if (shouldTsconfig) {
+    const tsconfigPath = resolve(TSCONFIG_FILE);
+    const tsconfig = readJsonFile(tsconfigPath);
+
+    const compilerOptions = (tsconfig["compilerOptions"] ?? {}) as Record<string, unknown>;
+    const existingPaths = (compilerOptions["paths"] ?? {}) as Record<string, string[]>;
+
+    // oxlint-disable-next-line security/detect-object-injection -- safe: PROMPTS_ALIAS is a known constant string
+    if (existingPaths[PROMPTS_ALIAS]) {
+      ctx.logger.info(`${PROMPTS_ALIAS} alias already in ${tsconfigPath}`);
+    } else {
+      const updatedTsconfig = {
+        ...tsconfig,
+        compilerOptions: {
+          ...compilerOptions,
+          paths: {
+            ...existingPaths,
+            // oxlint-disable-next-line security/detect-object-injection -- safe: PROMPTS_ALIAS is a known constant string
+            [PROMPTS_ALIAS]: [PROMPTS_ALIAS_PATH],
           },
-        };
+        },
+      };
 
-        writeFileSync(tsconfigPath, `${JSON.stringify(updatedTsconfig, null, 2)}\n`, "utf8");
-        ctx.logger.success(`Added ${PROMPTS_ALIAS} alias to ${tsconfigPath}`);
-      }
+      writeFileSync(tsconfigPath, `${JSON.stringify(updatedTsconfig, null, 2)}\n`, "utf8");
+      ctx.logger.success(`Added ${PROMPTS_ALIAS} alias to ${tsconfigPath}`);
     }
+  }
+}
 
-    ctx.logger.outro("Project setup complete.");
+export default command({
+  description: "Configure VSCode IDE settings for .prompt files",
+  async handler(ctx) {
+    ctx.logger.intro("Prompt SDK — Project Setup");
+    await setupPrompts(ctx);
+    ctx.logger.outro("Prompts setup complete.");
   },
 });