generator-folklore 3.0.60 → 3.0.61

package/lib/generators/agents/index.js

@@ -5,9 +5,57 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _chalk = _interopRequireDefault(require("chalk"));
+var _child_process = require("child_process");
 var _generator = _interopRequireDefault(require("../../lib/generator"));
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const launchArgs = {
+  laravel: ['run', 'server', '--', '--no-open'],
+  html: ['run', 'server', '--', '--server', 'http', '--no-open']
+};
+const defaultUrls = {
+  laravel: 'https://localhost:8080',
+  html: 'http://localhost:8080'
+};
 class AgentsGenerator extends _generator.default {
+  constructor(...args) {
+    super(...args);
+    this.option('git-host', {
+      type: String,
+      desc: 'Git host of the repository: github or gitlab (defaults to the host of the origin remote, or github)'
+    });
+    this.option('claude', {
+      type: Boolean,
+      desc: 'Write the Claude Code files: CLAUDE.md, .claude/settings.json and .claude/launch.json (--no-claude to skip them)',
+      defaults: true
+    });
+    this.option('type', {
+      type: String,
+      desc: 'Project type for the Claude Code browser preview: laravel (served through its .test domain) or html (served on localhost). Defaults to laravel when composer.json exists'
+    });
+    this.option('url', {
+      type: String,
+      desc: 'Url opened by the Claude Code browser preview (defaults to the dev server url)'
+    });
+  }
+  getGitHost() {
+    const {
+      'git-host': gitHost = null
+    } = this.options;
+    if (gitHost !== null) {
+      return gitHost === 'gitlab' ? 'gitlab' : 'github';
+    }
+    try {
+      const remoteUrl = (0, _child_process.execFileSync)('git', ['remote', 'get-url', 'origin'], {
+        cwd: this.destinationRoot(),
+        encoding: 'utf8',
+        stdio: ['ignore', 'pipe', 'ignore']
+      });
+      return remoteUrl.includes('gitlab') ? 'gitlab' : 'github';
+    } catch {
+      // No git repository or no origin remote yet
+      return 'github';
+    }
+  }
   prompting() {
     if (this.options.quiet) {
       return;
@@ -16,15 +64,51 @@ class AgentsGenerator extends _generator.default {
     console.log('AGENTS.md Generator');
     console.log(_chalk.default.yellow('----------------------\n'));
   }
-  writing() {
-    const destPath = this.destinationPath('AGENTS.md');
-    const hasComposerJson = this.fs.exists(this.destinationPath('composer.json'));
-    const hasPackageJson = this.fs.exists(this.destinationPath('package.json'));
-    const existingContent = this.fs.exists(destPath) ? this.fs.read(destPath) : '';
-    const separator = '\n\n---\n\n';
-    const parts = [this.fs.read(this.templatePath('general.md')), this.fs.read(this.templatePath('workflow.md')), hasComposerJson ? this.fs.read(this.templatePath('laravel.md')) : null, hasPackageJson ? this.fs.read(this.templatePath('frontend.md')) : null, hasComposerJson ? this.fs.read(this.templatePath('serve-laravel.md')) : null, !hasComposerJson && hasPackageJson ? this.fs.read(this.templatePath('serve-html.md')) : null, this.fs.read(this.templatePath('after.md'))].filter(it => it !== null).join(separator);
-    const newContent = existingContent.length > 0 ? `${existingContent}${separator}${parts}` : parts;
-    this.fs.write(destPath, newContent);
+  get writing() {
+    return {
+      agents() {
+        const destPath = this.destinationPath('AGENTS.md');
+        const hasComposerJson = this.fs.exists(this.destinationPath('composer.json'));
+        const hasPackageJson = this.fs.exists(this.destinationPath('package.json'));
+        const existingContent = this.fs.exists(destPath) ? this.fs.read(destPath) : '';
+        const separator = '\n\n---\n\n';
+        const parts = [this.fs.read(this.templatePath('general.md')), this.fs.read(this.templatePath(`workflow-${this.getGitHost()}.md`)), hasComposerJson ? this.fs.read(this.templatePath('laravel.md')) : null, hasPackageJson ? this.fs.read(this.templatePath('frontend.md')) : null, hasComposerJson ? this.fs.read(this.templatePath('serve-laravel.md')) : null, !hasComposerJson && hasPackageJson ? this.fs.read(this.templatePath('serve-html.md')) : null, this.fs.read(this.templatePath('after.md'))].filter(it => it !== null).join(separator);
+        const newContent = existingContent.length > 0 ? `${existingContent}${separator}${parts}` : parts;
+        this.fs.write(destPath, newContent);
+      },
+      claude() {
+        if (!this.options.claude) {
+          return;
+        }
+
+        // Claude Code reads CLAUDE.md, not AGENTS.md: import AGENTS.md from it
+        const claudePath = this.destinationPath('CLAUDE.md');
+        const claudeImport = '@AGENTS.md';
+        const existingClaudeContent = this.fs.exists(claudePath) ? this.fs.read(claudePath) : '';
+        const hasClaudeImport = existingClaudeContent.split('\n').some(line => line.trim() === claudeImport);
+        if (!hasClaudeImport) {
+          this.fs.write(claudePath, existingClaudeContent.length > 0 ? `${claudeImport}\n\n${existingClaudeContent}` : `${claudeImport}\n`);
+        }
+        const {
+          type: typeOption = null,
+          url: urlOption = null
+        } = this.options;
+        const detectedType = this.fs.exists(this.destinationPath('composer.json')) ? 'laravel' : 'html';
+        const type = (typeOption || detectedType) === 'laravel' ? 'laravel' : 'html';
+        const url = (urlOption || defaultUrls[type]).replace(/\/$/, '');
+        this.fs.writeJSON(this.destinationPath('.claude/launch.json'), {
+          version: '0.0.1',
+          configurations: [{
+            name: 'dev',
+            runtimeExecutable: 'npm',
+            runtimeArgs: launchArgs[type],
+            port: 8080,
+            url
+          }]
+        }, null, 4);
+        this.fs.copy(this.templatePath(`settings-${type}.json`), this.destinationPath('.claude/settings.json'));
+      }
+    };
   }
 }
 exports.default = AgentsGenerator;

package/lib/generators/agents/templates/general.md

@@ -8,7 +8,7 @@ This file defines how coding agents should work in this repository.
 
 ## Language Rules
 
-- Everything written for people is in French: conversations, GitHub issues and their comments, pull request titles, bodies and review comments.
+- Everything written for people is in French: conversations, issues and their comments, pull or merge request titles, descriptions and review comments.
 - Code is always in English: identifiers, comments, file names, and commit messages.
 
 ## Editing Guidelines

package/lib/generators/agents/templates/{workflow.md → workflow-github.md}

@@ -8,7 +8,7 @@ On GitHub, `develop` is the default branch (so PRs target it and `Closes #<numbe
 
 - Small changes asked for directly in conversation: fixes, style or copy tweaks, translations, content.
 - Documentation, comments and config with no runtime effect.
-- Run the checks , then stop and leave the changes uncommitted: the maintainer reviews them before they land. Commit only when explicitly asked to. Never push unless asked.
+- Run the checks, then stop and leave the changes uncommitted: the maintainer reviews them before they land. Commit only when explicitly asked to. Never push unless asked.
 
 ### Use an issue and a PR
 

package/lib/generators/agents/templates/workflow-gitlab.md

@@ -0,0 +1,43 @@
+## Development Workflow
+
+Branching follows Gitflow, kept light. `develop` is where development happens: every commit and every merge lands there first. `main` is production: it only receives `develop` when deploying to prod. The backlog is the repository's GitLab issues; merge requests are where reviewed work lands. Most day-to-day work skips both: the issue/MR flow exists to run work in parallel and to review what deserves it, not to slow down small changes.
+
+Use `glab` for every GitLab operation (read `.agents/skills/glab/SKILL.md` first when it exists). On GitLab, `develop` is the default branch (so MRs target it and `Closes #<iid>` closes issues on merge), and the `bug`, `feature` and `in-progress` labels exist.
+
+### Work straight on `develop` (default)
+
+- Small changes asked for directly in conversation: fixes, style or copy tweaks, translations, content.
+- Documentation, comments and config with no runtime effect.
+- Run the checks, then stop and leave the changes uncommitted: the maintainer reviews them before they land. Commit only when explicitly asked to. Never push unless asked.
+
+### Use an issue and an MR
+
+- A feature or a chunk of work that spans several sessions, or needs a written plan.
+- Work meant to run in parallel with other sessions.
+- Risky or broad changes: migrations, refactors, dependencies, routing, or any diff the maintainer would want to read.
+- Anything started from an existing issue.
+
+What decides the flow is where the request came from and what it touches, not the size of the diff. When unsure, ask.
+
+### Working an issue
+
+1. Read the issue and its comments first; they may change the plan.
+2. Assign yourself and add the `in-progress` label before starting: it stops a second session from picking the same issue. Remove it if the work is abandoned.
+3. For a `feature`, write a short plan in the issue description before coding. `bug` issues skip the plan.
+4. One branch per issue, prefixed by its type: `feature/<iid>-<slug>` for a `feature`, `bug/<iid>-<slug>` for a `bug` (other types follow the same pattern, e.g. `docs/`, `refactor/`). Branch from an up-to-date `develop`, in its own worktree under `.claude/worktrees/<iid>-<slug>` so parallel sessions don't share a checkout.
+5. Commit on the issue branch as the work progresses, without asking: the MR is where the review happens. Run the checks, push and open the MR against `develop` with `Closes #<iid>` in its description, without asking. If the change couldn't be verified in the session, list the test scenario as a checkbox list in the MR description.
+6. The issue closes when the MR merges into `develop`, never just because code was pushed. Remove the worktree (`git worktree remove`) once merged.
+
+Something out of scope noticed along the way becomes a new issue (title, context, files involved) rather than growing the current change. Every issue carries a type label: `bug` or `feature`.
+
+### Releasing to production
+
+When deploying, merge `develop` into `main` (only when asked). An urgent fix for prod goes on a `hotfix/<slug>` branch from `main`, merged into `main` and then into `develop` so the two don't diverge.
+
+### Checks
+
+Run the project's lint, format, typecheck and test scripts (see `package.json` and `composer.json`) on what changed. When the codebase has pre-existing errors, a check passes when it reports nothing new in the files touched.
+
+### Rules live in this file
+
+Rules that always apply to this project (workflow, conventions, setup) are written here, not in an agent's private memory, so every session and every teammate shares them.

package/lib/generators/html-project/index.js

@@ -152,9 +152,6 @@ class HTMLProjectGenerator extends _generator.default {
     }
     this.composeWith('folklore:agents', {
       'src-path': srcPath,
-      quiet: true
-    });
-    this.composeWith('folklore:claude', {
       type: 'html',
       quiet: true
     });

package/lib/generators/laravel-project/index.js

@@ -249,14 +249,6 @@ class LaravelProjectGenerator extends _generator.default {
       quiet: true,
       'skip-install': true
     });
-    this.composeWith('folklore:claude', {
-      type: 'laravel',
-      url: _lodashEs.default.template(_lodashEs.default.get(this.options, 'local-url'))({
-        project_host: this.options['project-host'],
-        project_name: this.options['project-name']
-      }),
-      quiet: true
-    });
     if (this.options.mediatheque) {
       this.composeWith('folklore:laravel-mediatheque', {
         'project-name': this.options['project-name'],
@@ -274,6 +266,11 @@ class LaravelProjectGenerator extends _generator.default {
 
     // Composed last so its writing runs once composer.json and package.json exist
     this.composeWith('folklore:agents', {
+      type: 'laravel',
+      url: _lodashEs.default.template(_lodashEs.default.get(this.options, 'local-url'))({
+        project_host: this.options['project-host'],
+        project_name: this.options['project-name']
+      }),
       quiet: true
     });
   }

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "generator-folklore",
-    "version": "3.0.60",
+    "version": "3.0.61",
     "description": "Yeoman generator for projects at Folklore",
     "keywords": [
         "yeoman-generator"
@@ -40,5 +40,5 @@
         "yeoman-generator": "5.9.0",
         "yeoman-remote": "^1.0.1"
     },
-    "gitHead": "c54cd91bc3627c29fa1c97ff240e7a70d22e7bf3"
+    "gitHead": "34d318239aff6543bdac6e2ec9c9d5f39fdd6e6e"
 }

package/lib/generators/claude/index.js

@@ -1,55 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.default = void 0;
-var _chalk = _interopRequireDefault(require("chalk"));
-var _generator = _interopRequireDefault(require("../../lib/generator"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
-const launchArgs = {
-  laravel: ['run', 'server', '--', '--no-open'],
-  html: ['run', 'server', '--', '--server', 'http', '--no-open']
-};
-const defaultUrls = {
-  laravel: 'https://localhost:8080',
-  html: 'http://localhost:8080'
-};
-class ClaudeGenerator extends _generator.default {
-  constructor(...args) {
-    super(...args);
-    this.option('type', {
-      type: String,
-      desc: 'Project type: laravel (served through its .test domain) or html (served on localhost)',
-      defaults: 'html'
-    });
-    this.option('url', {
-      type: String,
-      desc: 'Url opened by the browser preview (defaults to the dev server url)'
-    });
-  }
-  prompting() {
-    if (this.options.quiet) {
-      return;
-    }
-    console.log(_chalk.default.yellow('\n----------------------'));
-    console.log('Claude Code Generator');
-    console.log(_chalk.default.yellow('----------------------\n'));
-  }
-  writing() {
-    const type = this.options.type === 'laravel' ? 'laravel' : 'html';
-    const url = (this.options.url || defaultUrls[type]).replace(/\/$/, '');
-    this.fs.writeJSON(this.destinationPath('.claude/launch.json'), {
-      version: '0.0.1',
-      configurations: [{
-        name: 'dev',
-        runtimeExecutable: 'npm',
-        runtimeArgs: launchArgs[type],
-        port: 8080,
-        url
-      }]
-    }, null, 4);
-    this.fs.copy(this.templatePath(`settings-${type}.json`), this.destinationPath('.claude/settings.json'));
-  }
-}
-exports.default = ClaudeGenerator;