kalo-cli 0.1.0 → 0.1.2

package/README.md

@@ -33,6 +33,27 @@ bun add -g kalo-cli
 kalo
 ```
 
+### Configuration
+
+Vous pouvez personnaliser le comportement de Kalo en créant un fichier `kalo.config.json` ou `kalo.config.js` à la racine de votre projet.
+
+Exemple `kalo.config.json` :
+
+```json
+{
+  "appDir": "apps",
+  "aiProvider": "Qwen",
+  "temperature": 0.5,
+  "verbosity": "standard"
+}
+```
+
+Options disponibles :
+- `appDir` : Le dossier où se trouvent vos applications Django (par défaut: `app`).
+- `aiProvider` : Le fournisseur d'IA par défaut (`Qwen`, `Ollama`, `Mistral`, `OpenAI`).
+- `temperature` : La créativité de l'IA (entre 0 et 1).
+- `verbosity` : Le niveau de détail des commentaires générés (`minimal`, `standard`, `verbose`).
+
 ### Si installé dans un projet
 
 Utilisez `bun run` ou `bunx` :

package/bin/kalo.ts

@@ -1,17 +1,53 @@
 #!/usr/bin/env bun
 import path from "node:path";
+import fs from "node:fs";
 import minimist from "minimist";
 import { Plop, run } from "plop";
 import { fileURLToPath } from "node:url";
+import { loadConfig } from "../generators/utils/config";
 
 const args = process.argv.slice(2);
 const argv = minimist(args);
 
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
 
+/**
+ * Recherche le répertoire racine du projet en remontant à partir d'un dossier donné.
+ */
+function findProjectRoot(startDir: string): string {
+  let currentDir = startDir;
+  while (currentDir !== path.parse(currentDir).root) {
+    const packageJsonPath = path.join(currentDir, 'package.json');
+    if (fs.existsSync(packageJsonPath)) {
+      try {
+        const pkg = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+        if (pkg.name !== 'kalo-cli' || currentDir.includes('node_modules')) {
+          if (!currentDir.includes('node_modules')) {
+            return currentDir;
+          }
+        } else {
+          return currentDir;
+        }
+      } catch (e) {}
+    }
+    currentDir = path.dirname(currentDir);
+  }
+  return startDir;
+}
+
+const projectRoot = findProjectRoot(process.cwd());
+const config = await loadConfig();
+
 Plop.prepare({
-  cwd: argv.cwd,
+  cwd: argv.cwd || projectRoot,
   configPath: path.join(__dirname, '../plopfile.ts'),
   preload: argv.require || [],
   completion: argv.completion
-}, env => Plop.execute(env, (env) => run(env, undefined, true)));
+}, env => Plop.execute(env, (env) => {
+    const options = {
+        ...env,
+        dest: argv.dest || env.dest,
+        config: config // Passer la config au contexte Plop
+    };
+    return run(options, undefined, true);
+}));

package/generators/ai-enhancer/index.ts

@@ -144,7 +144,7 @@ export const aiEnhancerGenerator: PlopGeneratorConfig = {
             name: 'aiProvider',
             message: 'Select AI Provider:',
             default: 'Qwen',
-            when: (answers) => !isBack(answers),
+            when: (answers: any) => !isBack(answers) && !answers.config?.aiProvider,
             source: async (answers, input) => {
                 const choices = AI_PROVIDER_TYPES.map(p => ({ name: p, value: p }));
                 const results = await searchChoices(input, choices);
@@ -158,7 +158,7 @@ export const aiEnhancerGenerator: PlopGeneratorConfig = {
             name: 'temperature',
             message: 'Select Creativity Level:',
             default: 0.5,
-            when: (answers) => !isBack(answers),
+            when: (answers: any) => !isBack(answers) && answers.config?.temperature === undefined,
             source: async (answers, input) => {
                 const results = await searchChoices(input, AI_TEMP_TYPES);
                 results.push({ name: 'Exit', value: EXIT_VALUE });
@@ -171,7 +171,7 @@ export const aiEnhancerGenerator: PlopGeneratorConfig = {
             name: 'verbosity',
             message: 'Select Verbosity Level:',
             default: 'standard',
-            when: (answers) => !isBack(answers),
+            when: (answers: any) => !isBack(answers) && !answers.config?.verbosity,
             source: async (answers, input) => {
                 const choices = [
                     { name: 'Minimal (Code only)', value: 'minimal' },

package/generators/django-app/index.ts

@@ -21,47 +21,50 @@ export const djangoAppGenerator: PlopGeneratorConfig = {
       },
     },
   ],
-  actions: [
-    {
-      type: 'add',
-      path: 'app/__init__.py',
-      templateFile: 'generators/django-app/templates/init.py.hbs',
-      skipIfExists: true,
-    },
-    {
-      type: 'add',
-      path: 'app/{{name}}/__init__.py',
-      templateFile: 'generators/django-app/templates/init.py.hbs',
-    },
-    {
-      type: 'add',
-      path: 'app/{{name}}/apps.py',
-      templateFile: 'generators/django-app/templates/apps.py.hbs',
-    },
-    {
-      type: 'add',
-      path: 'app/{{name}}/models/__init__.py',
-      templateFile: 'generators/django-app/templates/models_init.py.hbs',
-    },
-    {
-      type: 'add',
-      path: 'app/{{name}}/tests/__init__.py',
-      templateFile: 'generators/django-app/templates/init.py.hbs',
-    },
-    {
-      type: 'add',
-      path: 'app/{{name}}/views.py',
-      templateFile: 'generators/django-app/templates/views.py.hbs',
-    },
-    {
-      type: 'add',
-      path: 'app/{{name}}/urls.py',
-      templateFile: 'generators/django-app/templates/urls.py.hbs',
-    },
-    {
-      type: 'add',
-      path: 'app/{{name}}/admin.py',
-      templateFile: 'generators/django-app/templates/admin.py.hbs',
-    },
-  ],
+  actions: (data: any) => {
+    const appDir = data.config?.appDir || 'app';
+    return [
+      {
+        type: 'add',
+        path: `${appDir}/__init__.py`,
+        templateFile: 'generators/django-app/templates/init.py.hbs',
+        skipIfExists: true,
+      },
+      {
+        type: 'add',
+        path: `${appDir}/{{name}}/__init__.py`,
+        templateFile: 'generators/django-app/templates/init.py.hbs',
+      },
+      {
+        type: 'add',
+        path: `${appDir}/{{name}}/apps.py`,
+        templateFile: 'generators/django-app/templates/apps.py.hbs',
+      },
+      {
+        type: 'add',
+        path: `${appDir}/{{name}}/models/__init__.py`,
+        templateFile: 'generators/django-app/templates/models_init.py.hbs',
+      },
+      {
+        type: 'add',
+        path: `${appDir}/{{name}}/tests/__init__.py`,
+        templateFile: 'generators/django-app/templates/init.py.hbs',
+      },
+      {
+        type: 'add',
+        path: `${appDir}/{{name}}/views.py`,
+        templateFile: 'generators/django-app/templates/views.py.hbs',
+      },
+      {
+        type: 'add',
+        path: `${appDir}/{{name}}/urls.py`,
+        templateFile: 'generators/django-app/templates/urls.py.hbs',
+      },
+      {
+        type: 'add',
+        path: `${appDir}/{{name}}/admin.py`,
+        templateFile: 'generators/django-app/templates/admin.py.hbs',
+      },
+    ];
+  },
 };

package/generators/django-channel/index.ts

@@ -39,9 +39,10 @@ export const djangoChannelGenerator: PlopGeneratorConfig = {
       message: 'Nom de l\'application cible',
     },
   ],
-  actions: (data) => {
+  actions: (data: any) => {
     const actions = [];
-    const appPath = `app/${data.app}`;
+    const appDir = data.config?.appDir || 'app';
+    const appPath = `${appDir}/${data.app}`;
     const isAsync = data.type === 'async';
     data.isAsync = isAsync;
 

package/generators/django-form/index.ts

@@ -38,15 +38,16 @@ export const djangoFormGenerator: PlopGeneratorConfig = {
       message: 'Nom de l\'application cible',
     },
   ],
-  actions: (data) => {
+  actions: (data: any) => {
     const actions = [];
-    const appPath = `app/${data.app}`;
+    const appDir = data.config?.appDir || 'app';
+    const appPath = `${appDir}/${data.app}`;
     const isModelForm = data.type === 'model_form';
 
     // Ensure suffix
     data.name = ensureSuffix(data.name, 'Form');
 
-    const templateFile = isModelForm 
+    const templateFile = isModelForm
         ? 'generators/django-form/templates/model_form.py.hbs'
         : 'generators/django-form/templates/form.py.hbs';
 

package/generators/django-view/index.ts

@@ -34,9 +34,10 @@ export const djangoViewGenerator: PlopGeneratorConfig = {
       message: 'Nom de l\'application cible',
     },
   ],
-  actions: (data) => {
+  actions: (data: any) => {
     const actions = [];
-    const appPath = `app/${data.app}`;
+    const appDir = data.config?.appDir || 'app';
+    const appPath = `${appDir}/${data.app}`;
     const isCBV = data.type !== 'fbv';
 
     // Helper to ensure correct suffix for CBV

package/generators/main/index.ts

@@ -11,15 +11,15 @@ import keywordConfig from '../ai-enhancer/keywords.json';
 import { getAppList, getAppFiles } from '../utils/filesystem';
 import { analyzeAppFile, analyzeFile } from '../utils/analysis';
 import { searchChoices } from '../utils/search';
-import { 
-    MAIN_COMPONENT_TYPES, 
-    VIEW_TYPES, 
-    FORM_TYPES, 
-    ADMIN_EXT_TYPES, 
-    CHANNEL_TYPES, 
-    AI_PROVIDER_TYPES, 
+import {
+    MAIN_COMPONENT_TYPES,
+    VIEW_TYPES,
+    FORM_TYPES,
+    ADMIN_EXT_TYPES,
+    CHANNEL_TYPES,
+    AI_PROVIDER_TYPES,
     AI_TEMP_TYPES,
-    EXIT_VALUE 
+    EXIT_VALUE
 } from '../constants';
 
 /**
@@ -143,19 +143,19 @@ const mainGenerator: PlopGeneratorConfig = {
         name: 'selectedApp',
         message: 'Sélectionnez l\'application cible :',
         when: (answers) => ['add', 'modify'].includes(answers.mode),
-        source: (answers, input) => {
-          const apps = getAppList();
+        source: (answers: any, input) => {
+          const apps = getAppList(answers.config);
           if (apps.length === 0) {
             return Promise.resolve([{ name: 'Aucune application trouvée', value: null }]);
           }
           const appChoices = apps.map(app => ({ name: app, value: app }));
           return searchChoices(input, appChoices);
         },
-        filter: (input) => {
+        filter: (input: string, answers: any) => {
             if (!input) return null;
             // Only analyze default models.py if we are NOT in modify mode (or as fallback)
             // But for 'add' mode, we might want it. For 'modify', we will select file explicitly.
-            const info = analyzeAppFile(input);
+            const info = analyzeAppFile(input, answers?.config);
             return { name: input, info };
         }
       },
@@ -232,9 +232,9 @@ const mainGenerator: PlopGeneratorConfig = {
         name: 'selectedFile',
         message: 'Sélectionnez le fichier à modifier :',
         when: (answers) => answers.mode === 'modify' && answers.selectedApp !== null,
-        source: (answers, input) => {
+        source: (answers: any, input) => {
             const appName = answers.selectedApp.name || answers.selectedApp;
-            const files = getAppFiles(appName);
+            const files = getAppFiles(appName, answers.config);
             
             const choices = [];
             if (files.length > 0) {
@@ -254,11 +254,11 @@ const mainGenerator: PlopGeneratorConfig = {
         name: 'targetClass',
         message: 'Sélectionnez la classe à modifier :',
         when: (answers) => answers.mode === 'modify' && answers.selectedFile !== null && answers.selectedFile !== 'help',
-        source: (answers, input) => {
+        source: (answers: any, input) => {
             const appName = answers.selectedApp.name || answers.selectedApp;
             const filePath = answers.selectedFile;
             
-            const info = analyzeFile(appName, filePath);
+            const info = analyzeFile(appName, filePath, answers.config);
             if (!info || !info.classes || info.classes.length === 0) {
                 return Promise.resolve([{ name: 'Aucune classe trouvée (ou fichier vide)', value: null }]);
             }
@@ -277,29 +277,29 @@ const mainGenerator: PlopGeneratorConfig = {
         type: 'list',
         name: 'aiProvider',
         message: 'Sélectionnez le fournisseur IA :',
-        when: (answers) => answers.mode === 'modify' && answers.targetClass !== null && answers.selectedFile !== 'help',
+        when: (answers) => answers.mode === 'modify' && answers.targetClass !== null && answers.selectedFile !== 'help' && !answers.config?.aiProvider,
         choices: AI_PROVIDER_TYPES,
-        default: 'Qwen'
+        default: (answers: any) => answers.config?.aiProvider || 'Qwen'
       },
       {
         type: 'list',
         name: 'temperature',
         message: 'Niveau de créativité :',
-        when: (answers) => answers.mode === 'modify' && answers.targetClass !== null && answers.selectedFile !== 'help',
+        when: (answers) => answers.mode === 'modify' && answers.targetClass !== null && answers.selectedFile !== 'help' && answers.config?.temperature === undefined,
         choices: AI_TEMP_TYPES,
-        default: 0.5
+        default: (answers: any) => answers.config?.temperature !== undefined ? answers.config.temperature : 0.5
       },
       {
         type: 'list',
         name: 'verbosity',
         message: 'Niveau de verbosité :',
-        when: (answers) => answers.mode === 'modify' && answers.targetClass !== null && answers.selectedFile !== 'help',
+        when: (answers) => answers.mode === 'modify' && answers.targetClass !== null && answers.selectedFile !== 'help' && !answers.config?.verbosity,
         choices: [
             { name: 'Minimal (Code seulement)', value: 'minimal' },
             { name: 'Standard (Code + commentaires basiques)', value: 'standard' },
             { name: 'Verbeux (Documentation détaillée)', value: 'verbose' }
         ],
-        default: 'standard'
+        default: (answers: any) => answers.config?.verbosity || 'standard'
       },
       {
         type: 'input',
@@ -325,9 +325,9 @@ const mainGenerator: PlopGeneratorConfig = {
       {
         ...helpGenerator.prompts[0],
         name: 'helpQuery', // Rename to avoid conflict if needed, though 'query' is fine
-        when: (answers) => 
-            answers.mode === 'help' || 
-            answers.componentType === 'help' || 
+        when: (answers) =>
+            answers.mode === 'help' ||
+            answers.componentType === 'help' ||
             answers.selectedFile === 'help'
       }
     ],
@@ -337,7 +337,7 @@ const mainGenerator: PlopGeneratorConfig = {
       // Check for help mode first
       if (data.mode === 'help' || data.componentType === 'help' || data.selectedFile === 'help') {
          // Help actions (empty usually, as interaction is in prompt)
-         return []; 
+         return [];
       }
 
       if (data.mode === 'docs') {
@@ -359,7 +359,7 @@ const mainGenerator: PlopGeneratorConfig = {
         
         if (['page_pair', 'snippet', 'orderable', 'model'].includes(data.componentType)) {
             targetGenerator = wagtailPageGenerator;
-            data.type = data.componentType; 
+            data.type = data.componentType;
         } else if (data.componentType === 'block') {
             targetGenerator = wagtailBlockGenerator;
         } else if (data.componentType === 'view') {
@@ -392,23 +392,15 @@ const mainGenerator: PlopGeneratorConfig = {
         // We need full path for the AI generator.
         const appName = data.app;
         const relativePath = data.selectedFile;
-        // We need to reconstruct absolute path or use analyzeFile to get it again.
-        // Or simply construct it here.
         // We need 'filePath' for aiEnhancer.
-        // Let's use analyzeFile logic or just path.join.
-        // Ideally we should have passed the info object in the prompt but inquirer is tricky with dependent values.
         
-        // Re-analyze or just build path?
-        // Since we are in node environment here, we can use path module.
-        // However, Plop actions run in a context where we might not have 'path' easily unless we import it.
-        // We can use the analyzeFile helper again if needed, or just hardcode construction.
-        // Since we imported analyzeFile, we can use it.
-        const fileInfo = analyzeFile(appName, relativePath);
+        const fileInfo = analyzeFile(appName, relativePath, data.config);
         if (fileInfo) {
             data.filePath = fileInfo.filePath;
         } else {
             // Fallback
-            data.filePath = `app/${appName}/${relativePath}`;
+            const appDirName = data.config?.appDir || 'app';
+            data.filePath = `${appDirName}/${appName}/${relativePath}`;
         }
         
         const targetGenerator = aiEnhancerGenerator;
@@ -426,4 +418,4 @@ export default function (plop: NodePlopAPI) {
     plop.setGenerator('generator', mainGenerator);
     plop.setGenerator('help', helpGenerator);
     plop.setGenerator('docs', docsGenerator);
-}
+}

package/generators/utils/analysis.ts

@@ -1,5 +1,6 @@
 import * as fs from 'fs';
 import * as path from 'path';
+import { findProjectRoot } from './filesystem';
 
 export interface AppFileInfo {
     fileName: string;
@@ -10,10 +11,13 @@ export interface AppFileInfo {
 /**
  * Analyzes the selected application to find the main file (models.py) and extract class definitions.
  * @param appName The name of the application (directory name)
+ * @param config Configuration object
  * @returns AppFileInfo containing filename, absolute path, and list of class names, or null if not found.
  */
-export const analyzeAppFile = (appName: string): AppFileInfo | null => {
-    const appDir = path.join(process.cwd(), 'app', appName);
+export const analyzeAppFile = (appName: string, config?: any): AppFileInfo | null => {
+    const rootDir = findProjectRoot();
+    const appDirName = config?.appDir || 'app';
+    const appDir = path.join(rootDir, appDirName, appName);
     
     // Priority 1: models.py (Standard Django)
     let targetFile = 'models.py';
@@ -38,10 +42,13 @@ export const analyzeAppFile = (appName: string): AppFileInfo | null => {
  * Analyzes a specific file within an application.
  * @param appName The name of the application
  * @param relativeFilePath The relative path of the file from the app root
+ * @param config Configuration object
  * @returns AppFileInfo containing filename, absolute path, and list of class names, or null if not found.
  */
-export const analyzeFile = (appName: string, relativeFilePath: string): AppFileInfo | null => {
-    const appDir = path.join(process.cwd(), 'app', appName);
+export const analyzeFile = (appName: string, relativeFilePath: string, config?: any): AppFileInfo | null => {
+    const rootDir = findProjectRoot();
+    const appDirName = config?.appDir || 'app';
+    const appDir = path.join(rootDir, appDirName, appName);
     const targetPath = path.join(appDir, relativeFilePath);
 
     if (!fs.existsSync(targetPath)) {
@@ -64,6 +71,9 @@ export const analyzeFile = (appName: string, relativeFilePath: string): AppFileI
  * @param content File content
  */
 export const extractClassNames = (content: string): string[] => {
+    // Nettoyer les commentaires pour éviter les faux positifs
+    const cleanContent = content.replace(/#.*$/gm, '');
+    
     // Regex to match "class ClassName"
     // ^\s*class\s+ -> start of line, optional whitespace, "class" keyword, whitespace
     // (?<name>\w+) -> capture group for name
@@ -72,7 +82,7 @@ export const extractClassNames = (content: string): string[] => {
     const classes: string[] = [];
     let match;
 
-    while ((match = classRegex.exec(content)) !== null) {
+    while ((match = classRegex.exec(cleanContent)) !== null) {
         if (match.groups && match.groups.name && match.groups.name !== 'Meta') {
             classes.push(match.groups.name);
         }

package/generators/utils/config.ts

@@ -0,0 +1,43 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { findProjectRoot } from './filesystem';
+
+export interface KaloConfig {
+  aiProvider?: string;
+  temperature?: number;
+  verbosity?: 'minimal' | 'standard' | 'verbose';
+  appDir?: string;
+  [key: string]: any;
+}
+
+/**
+ * Charge la configuration à partir de kalo.config.json ou kalo.config.js
+ */
+export async function loadConfig(): Promise<KaloConfig> {
+  const rootDir = findProjectRoot();
+  const jsonPath = path.join(rootDir, 'kalo.config.json');
+  const jsPath = path.join(rootDir, 'kalo.config.js');
+
+  if (fs.existsSync(jsonPath)) {
+    try {
+      const content = fs.readFileSync(jsonPath, 'utf8');
+      return JSON.parse(content);
+    } catch (e) {
+      console.error(`Erreur lors de la lecture de ${jsonPath}:`, e);
+    }
+  }
+
+  if (fs.existsSync(jsPath)) {
+    try {
+      // Utilisation de import dynamique pour le fichier .js
+      // Note: On utilise un timestamp pour éviter le cache de module si nécessaire en dev,
+      // mais ici un import simple devrait suffire.
+      const module = await import(jsPath);
+      return module.default || module;
+    } catch (e) {
+      console.error(`Erreur lors du chargement de ${jsPath}:`, e);
+    }
+  }
+
+  return {};
+}

package/generators/utils/filesystem.ts

@@ -1,15 +1,55 @@
 import * as fs from 'fs';
 import * as path from 'path';
 
+/**
+ * Recherche le répertoire racine du projet en remontant à partir d'un dossier donné.
+ * Cherche la présence d'un fichier package.json qui n'est pas celui du package kalo-cli lui-même.
+ *
+ * @param startDir - Le dossier de départ pour la recherche.
+ * @returns Le chemin absolu vers la racine du projet.
+ */
+export const findProjectRoot = (startDir: string = process.cwd()): string => {
+  let currentDir = startDir;
+
+  while (currentDir !== path.parse(currentDir).root) {
+    const packageJsonPath = path.join(currentDir, 'package.json');
+    if (fs.existsSync(packageJsonPath)) {
+      try {
+        const pkg = JSON.parse(fs.readFileSync(packageJsonPath, 'utf8'));
+        // Si on trouve un package.json qui n'est pas celui de kalo-cli, c'est probablement la racine du projet utilisateur
+        // Ou si on est dans un projet qui n'a pas encore de kalo-cli installé mais qui a un package.json
+        if (pkg.name !== 'kalo-cli' || currentDir.includes('node_modules')) {
+            // Si on est dans node_modules, on doit continuer à monter car on a trouvé le package.json de kalo-cli
+            if (currentDir.includes('node_modules')) {
+                // On continue de monter
+            } else {
+                return currentDir;
+            }
+        } else {
+            // C'est le package.json de kalo-cli en mode développement local
+            return currentDir;
+        }
+      } catch (e) {
+        // En cas d'erreur de lecture, on continue de monter
+      }
+    }
+    currentDir = path.dirname(currentDir);
+  }
+
+  return startDir; // Fallback sur le dossier de départ
+};
+
 /**
  * Retrieves the list of existing Django applications in the project.
- * Scans the 'app' directory in the current working directory.
+ * Scans the 'app' directory in the project root.
  *
  * @returns {string[]} An array of application names (directory names).
  * @throws {Error} If filesystem access fails (though basic read errors might propagate).
  */
-export const getAppList = (): string[] => {
-  const appDir = path.join(process.cwd(), 'app');
+export const getAppList = (config?: any): string[] => {
+  const rootDir = findProjectRoot();
+  const appDirName = config?.appDir || 'app';
+  const appDir = path.join(rootDir, appDirName);
   if (!fs.existsSync(appDir)) {
     return [];
   }
@@ -21,12 +61,15 @@ export const getAppList = (): string[] => {
 /**
  * Recursively lists files in an application directory with filtering.
  * Excludes test files, __init__.py, and specific directories.
- * 
+ *
  * @param {string} appName - The name of the application.
+ * @param {any} config - Configuration object.
  * @returns {string[]} List of relative file paths from the app root.
  */
-export const getAppFiles = (appName: string): string[] => {
-    const appDir = path.join(process.cwd(), 'app', appName);
+export const getAppFiles = (appName: string, config?: any): string[] => {
+    const rootDir = findProjectRoot();
+    const appDirName = config?.appDir || 'app';
+    const appDir = path.join(rootDir, appDirName, appName);
     if (!fs.existsSync(appDir)) {
         return [];
     }
@@ -49,6 +92,7 @@ export const getAppFiles = (appName: string): string[] => {
                 // Exclude test files and __init__.py
                 if (
                     dirent.name !== '__init__.py' &&
+                    !dirent.name.includes('__pycache__') &&
                     !dirent.name.includes('.test.') &&
                     !dirent.name.includes('.spec.') &&
                     dirent.name.endsWith('.py') // Assume we only care about Python files for now based on context

package/generators/utils/plop-actions.ts

@@ -1,8 +1,9 @@
 import { ActionType } from 'plop';
+import { extractClassNames } from './analysis';
 
 /**
  * Ensures a suffix is present on a name.
- * 
+ *
  * @param {string} name - The name to check.
  * @param {string} suffix - The suffix to ensure.
  * @returns {string} The name with the suffix.
@@ -24,7 +25,7 @@ interface CreateAppendOptions {
 /**
  * Creates a pair of actions: one to ensure the file exists (using a "dumb" template rendering or specific init template),
  * and one to append the actual content.
- * 
+ *
  * @param {CreateAppendOptions} options - Configuration options.
  * @returns {ActionType[]} An array containing the add and append actions.
  */
@@ -52,10 +53,52 @@ export const createAppendActions = ({
     return [
         addAction,
         {
-            type: 'append',
+            type: 'modify',
             path,
-            templateFile,
-            data: appendData,
+            transform: (content, data) => {
+                const className = data.name || data.baseName;
+                if (className) {
+                    const existingClasses = extractClassNames(content);
+                    // Check for exact class name or suffixed versions if relevant
+                    if (existingClasses.includes(className)) {
+                        console.log(`\n[SKIP] Class ${className} already exists in ${path}`);
+                        return content;
+                    }
+                    
+                    // Special case for page_pair which might have multiple classes
+                    if (data.type === 'page_pair' && data.baseName) {
+                        const indexClass = `${data.baseName}IndexPage`;
+                        const detailClass = `${data.baseName}Page`;
+                        if (existingClasses.includes(indexClass) || existingClasses.includes(detailClass)) {
+                             console.log(`\n[SKIP] Wagtail Pages for ${data.baseName} already exist in ${path}`);
+                             return content;
+                        }
+                    }
+                }
+
+                // If not skipping, we append the template
+                // Plop's modify transform doesn't automatically render templates,
+                // but since we are in a generator action, we can use the data.
+                // However, 'append' is better for just adding at the end.
+                // To keep it simple, we use a regex to append at the end of file.
+                // We use projectRoot as base for resolve if path is relative
+                const fs = require('fs');
+                const pathLib = require('path');
+                
+                // We need to find the project root or use a reliable base.
+                // In plop, the configPath usually points to the plopfile.
+                const baseDir = data.plop.getPlopfilePath() ? pathLib.dirname(data.plop.getPlopfilePath()) : process.cwd();
+
+                const fullTemplatePath = pathLib.isAbsolute(templateFile) 
+                    ? templateFile 
+                    : pathLib.resolve(baseDir, templateFile);
+                
+                const template = fs.readFileSync(fullTemplatePath, 'utf8');
+                return content.trimEnd() + '\n\n' + data.plop.renderString(
+                    template,
+                    { ...data, ...appendData }
+                );
+            }
         }
     ];
 };

package/generators/wagtail-admin/index.ts

@@ -33,9 +33,10 @@ export const wagtailAdminGenerator: PlopGeneratorConfig = {
       message: 'Nom de l\'application cible',
     },
   ],
-  actions: (data) => {
+  actions: (data: any) => {
     const actions = [];
-    const appPath = `app/${data.app}`;
+    const appDir = data.config?.appDir || 'app';
+    const appPath = `${appDir}/${data.app}`;
     const isView = data.type === 'view';
 
     // Ensure suffixes
@@ -68,14 +69,14 @@ export const wagtailAdminGenerator: PlopGeneratorConfig = {
             skipIfExists: true,
         });
         
-        // If file existed, we might need to append. 
-        // For simplicity, we just append the registration code. 
+        // If file existed, we might need to append.
+        // For simplicity, we just append the registration code.
         // Ideally we would check for imports, but appending is safer than overwriting.
-        // We use a different template for appending to avoid duplicate imports if possible, 
-        // but for now re-using the file with imports is "okay" in Python (just messy) 
+        // We use a different template for appending to avoid duplicate imports if possible,
+        // but for now re-using the file with imports is "okay" in Python (just messy)
         // or we can rely on user to clean up.
         // BETTER STRATEGY: Create a separate partial for appending without top-level imports if feasible.
-        // But for this MVP, let's just append the same content. 
+        // But for this MVP, let's just append the same content.
         // The user can deduplicate imports.
         
         actions.push({

package/generators/wagtail-block/index.ts

@@ -27,26 +27,23 @@ export const wagtailBlockGenerator: PlopGeneratorConfig = {
       message: 'Nom de l\'application cible',
     },
   ],
-  actions: (data) => {
+  actions: (data: any) => {
     const actions = [];
-    const appPath = data?.app || '';
+    const appDir = data.config?.appDir || 'app';
 
     // Ensure suffix
     data.name = ensureSuffix(data.name, 'Block');
 
-    // This variable blocksFile is not really used by Plop actions directly but was here for calculation
-    // const blocksFile = path.join('app', appPath, 'blocks.py'); 
-
     // 1. Ensure blocks.py exists and Append the block
     actions.push(...createAppendActions({
-        path: `app/${data.app}/blocks.py`,
+        path: `${appDir}/${data.app}/blocks.py`,
         templateFile: 'generators/wagtail-block/templates/block_class.py.hbs'
     }));
 
     // 3. Create the template
     actions.push({
       type: 'add',
-      path: 'app/{{app}}/templates/{{app}}/blocks/{{snakeCase name}}.html',
+      path: `${appDir}/{{app}}/templates/{{app}}/blocks/{{snakeCase name}}.html`,
       templateFile: 'generators/wagtail-block/templates/block_template.html.hbs',
     });
 

package/generators/wagtail-page/actions/model.ts

@@ -9,7 +9,8 @@ import { createAppendActions } from '../../utils/plop-actions';
  * @returns {ActionType[]} An array of Plop actions to create/update model files.
  */
 export const getModelActions = (data: any): ActionType[] => {
-  const appPath = `app/${data.app}`;
+  const appDir = data.config?.appDir || 'app';
+  const appPath = `${appDir}/${data.app}`;
 
   return createAppendActions({
       path: `${appPath}/models/models.py`,

package/generators/wagtail-page/actions/orderable.ts

@@ -10,7 +10,8 @@ import { ensureSuffix, createAppendActions } from '../../utils/plop-actions';
  * @returns {ActionType[]} An array of Plop actions to create/update orderable files.
  */
 export const getOrderableActions = (data: any): ActionType[] => {
-  const appPath = `app/${data.app}`;
+  const appDir = data.config?.appDir || 'app';
+  const appPath = `${appDir}/${data.app}`;
 
   data.name = ensureSuffix(data.name, 'Orderable');
   

package/generators/wagtail-page/actions/page.ts

@@ -11,7 +11,8 @@ import { createAppendActions } from '../../utils/plop-actions';
  */
 export const getPageActions = (data: any): ActionType[] => {
   const actions: ActionType[] = [];
-  const appPath = `app/${data.app}`;
+  const appDir = data.config?.appDir || 'app';
+  const appPath = `${appDir}/${data.app}`;
   
   // Clean base name: Remove 'Page' if present to avoid BlogPagePage
   const baseName = data.name.replace(/Page$/, '');

package/generators/wagtail-page/actions/snippet.ts

@@ -8,7 +8,8 @@ import { createAppendActions, ensureSuffix } from '../../utils/plop-actions';
  * @returns {ActionType[]} An array of Plop actions to create snippet files and tests.
  */
 export const getSnippetActions = (data: any): ActionType[] => {
-  const appPath = `app/${data.app}`;
+  const appDir = data.config?.appDir || 'app';
+  const appPath = `${appDir}/${data.app}`;
   
   data.name = ensureSuffix(data.name, 'Snippet');
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kalo-cli",
-  "version": "0.1.0",
+  "version": "0.1.2",
   "description": "Générateur de code structuré et uniforme pour Django et Wagtail",
   "bin": {
     "kalo": "./bin/kalo.ts"