@promptbook/cli 0.114.0-0 → 0.114.0-10

package/src/cli/cli-commands/agents-server/buildAgentsServer/createAgentsServerRuntimeEnvironment.ts

@@ -22,6 +22,14 @@ export const PTBK_AGENTS_SERVER_BUILD_WORKER_COUNT_ENV = 'PTBK_AGENTS_SERVER_BUI
  */
 export const PTBK_AGENTS_SERVER_IGNORE_NEXT_VALIDATION_ENV = 'PTBK_AGENTS_SERVER_IGNORE_NEXT_VALIDATION';
 
+/**
+ * Environment variable that disables throwaway webpack filesystem caches for CLI-owned production builds.
+ *
+ * @private internal constant of `buildAgentsServer`
+ */
+export const PTBK_AGENTS_SERVER_DISABLE_WEBPACK_FILESYSTEM_CACHE_ENV =
+    'PTBK_AGENTS_SERVER_DISABLE_WEBPACK_FILESYSTEM_CACHE';
+
 /**
  * Conservative Next.js build worker count used by CLI-owned Agents Server production builds.
  *
@@ -41,6 +49,7 @@ export function createAgentsServerRuntimeEnvironment(
     nodeModulesPath: string,
     options: {
         readonly isNextValidationIgnored?: boolean;
+        readonly isWebpackFilesystemCacheDisabled?: boolean;
     } = {},
 ): NodeJS.ProcessEnv {
     return {
@@ -54,6 +63,11 @@ export function createAgentsServerRuntimeEnvironment(
                   [PTBK_AGENTS_SERVER_IGNORE_NEXT_VALIDATION_ENV]: 'true',
               }
             : {}),
+        ...(options.isWebpackFilesystemCacheDisabled
+            ? {
+                  [PTBK_AGENTS_SERVER_DISABLE_WEBPACK_FILESYSTEM_CACHE_ENV]: 'true',
+              }
+            : {}),
     };
 }
 

package/src/cli/cli-commands/agents-server/buildAgentsServer/ensureAgentsServerBuild.ts

@@ -30,6 +30,7 @@ export async function ensureAgentsServerBuild(
     });
     const buildEnvironment = createAgentsServerRuntimeEnvironment(environment, preparedRuntime.nodeModulesPath, {
         isNextValidationIgnored: preparedRuntime.isAppPathMaterialized,
+        isWebpackFilesystemCacheDisabled: true,
     });
 
     if (

package/src/cli/cli-commands/agents-server/startAgentsServer/createLocalAgentRunOptions.ts

@@ -25,5 +25,6 @@ export function createLocalAgentRunOptions(
         autoClone: false,
         maxMessageProcessingFailures: localAgentRunnerLimits.maxFailedAttempts,
         maxParallelMessages: localAgentRunnerLimits.maxParallelMessages,
+        isMachineReadableProgressEnabled: true,
     };
 }

package/src/cli/cli-commands/coder/add.ts

@@ -4,12 +4,18 @@ import type {
 } from 'commander';
 import { mkdirSync, writeFileSync } from 'fs';
 import { join } from 'path';
-import prompts from 'prompts';
 import { spaceTrim } from 'spacetrim';
 import { NotAllowed } from '../../../errors/NotAllowed';
 import { ParseError } from '../../../errors/ParseError';
 import { normalizeToKebabCase } from '../../../utils/normalization/normalize-to-kebab-case';
 import type { $side_effect } from '../../../utils/organization/$side_effect';
+import { loadPromptsModule } from '../../common/loadPromptsModule';
+import type { CoderGitSyncCliOptions } from '../common/coderGitSyncCliOptions';
+import {
+    addCoderGitSyncOptions,
+    CODER_GIT_SYNC_DESCRIPTION,
+    normalizeCoderGitSyncCliOptions,
+} from '../common/coderGitSyncCliOptions';
 import { handleActionErrors } from '../common/handleActionErrors';
 import {
     buildCoderPromptSection,
@@ -49,15 +55,19 @@ const FALLBACK_PROMPT_SLUG = 'prompt';
 export function $initializeCoderAddCommand(program: Program): $side_effect {
     const command = program.command('add');
     command.description(
-        spaceTrim(`
-            Add one ready-to-run prompt file to the queue
+        spaceTrim(
+            (block) => `
+                Add one ready-to-run prompt file to the queue
 
-            Provide the description as an argument, pipe it through stdin, or run without arguments to type it interactively:
-            - \`ptbk coder add "some new feature"\`
-            - \`ptbk coder add --priority 1 "some new feature"\`
-            - \`ptbk coder add <<EOF ... EOF\`
-            - \`ptbk coder add\`
-        `),
+                Provide the description as an argument, pipe it through stdin, or run without arguments to type it interactively:
+                - \`ptbk coder add "some new feature"\`
+                - \`ptbk coder add --priority 1 "some new feature"\`
+                - \`ptbk coder add <<EOF ... EOF\`
+                - \`ptbk coder add\`
+
+                ${block(CODER_GIT_SYNC_DESCRIPTION)}
+            `,
+        ),
     );
 
     command.argument('[description]', 'Plain-language description of the feature or task to implement');
@@ -77,22 +87,39 @@ export function $initializeCoderAddCommand(program: Program): $side_effect {
                 .join(', ')}) or a markdown file path relative to the current project root.
         `),
     );
+    addCoderGitSyncOptions(command);
 
     command.action(
         handleActionErrors(async (descriptionArgument: string | undefined, cliOptions) => {
             const { priority, template: templateOption } = cliOptions as {
                 readonly priority: number;
                 readonly template?: string;
-            };
+            } & CoderGitSyncCliOptions;
+
+            const gitSync = normalizeCoderGitSyncCliOptions(cliOptions as CoderGitSyncCliOptions);
+            const projectPath = process.cwd();
 
             const description = await resolveCoderPromptDescription(descriptionArgument);
 
-            await addCoderPrompt({
-                projectPath: process.cwd(),
+            // Note: Import the git synchronization dynamically to keep the CLI fast for runs without `--commit`
+            const { $commitCoderChanges, $startCoderGitSync } = await import(
+                '../../../../scripts/run-codex-prompts/git/coderGitSync'
+            );
+
+            const commitScope = await $startCoderGitSync({ gitSync, projectPath });
+
+            const { /* filePath,*/ emojiTag } = await addCoderPrompt({
+                projectPath,
                 description,
                 priority,
                 templateOption,
             });
+
+            await $commitCoderChanges({
+                gitSync,
+                commitScope,
+                commitMessage: `${emojiTag} Add prompt`,
+            });
         }),
     );
 }
@@ -216,6 +243,7 @@ async function resolveCoderPromptDescription(descriptionArgument: string | undef
         return standardInputDescription;
     }
 
+    const { default: prompts } = await loadPromptsModule();
     const response = await prompts({
         type: 'text',
         name: 'description',

package/src/cli/cli-commands/coder/agentCodingFile.ts

@@ -1,13 +1,5 @@
 import { spaceTrim } from 'spacetrim';
-import { AGENTS_FILE_PATH } from './agentsFile';
-import {
-    getDefaultCoderProjectPromptTemplateDefinitions,
-    getDefaultCoderPromptTemplateDefinitions,
-    PROMPTS_DIRECTORY_PATH,
-    PROMPTS_DONE_DIRECTORY_PATH,
-    PROMPTS_TEMPLATES_DIRECTORY_PATH,
-} from './boilerplateTemplates';
-import { formatDisplayPath } from './formatDisplayPath';
+import { string_markdown } from '../../../types/typeAliases';
 
 /**
  * Relative path to the Promptbook Coder quick-reference file initialized in project roots.
@@ -21,127 +13,12 @@ export const AGENT_CODING_FILE_PATH = 'AGENT_CODING.md';
  *
  * @private internal utility of `ptbk coder`
  */
-export function getDefaultCoderAgentCodingFileContent({
-    packageJsonScripts,
-}: {
-    readonly packageJsonScripts: Readonly<Record<string, string>>;
-}): string {
-    return spaceTrim(
-        (block) => `
-            # Promptbook Coder quick reference
+export function getDefaultCoderAgentCodingFileContent(): string_markdown {
+    return spaceTrim(`
+        # ✨ Promptbook Coder agent coding
 
-            This project is prepared for the \`ptbk coder\` workflow. Promptbook Coder does not create a new model on its own; it orchestrates coding agents such as GitHub Copilot, OpenAI Codex, Claude Code, Opencode, Cline, and Gemini CLI through prompt files in \`${formatDisplayPath(
-                PROMPTS_DIRECTORY_PATH,
-            )}/\`.
-
-            ## Workflow
-            1. Put repository-wide coding rules into \`${AGENTS_FILE_PATH}\`. The default \`npm run coder:run\` script already passes \`--context ${AGENTS_FILE_PATH}\`.
-            2. Create or customize prompt templates in \`${formatDisplayPath(
-                PROMPTS_TEMPLATES_DIRECTORY_PATH,
-            )}/\`. ${buildStarterTemplateSentence()}
-            3. Generate prompt files with \`npm run coder:generate-boilerplates\` or \`ptbk coder generate-boilerplates --template <template> --count <count>\`. To append a single ready-to-run prompt straight from a description, use \`npm run coder:add\` or \`ptbk coder add "some new feature"\`.
-            4. Replace every \`@@@\`, keep drafts as \`[-]\`, and switch prompts to \`[ ]\` when they are ready to run. Completed prompts are marked \`[x]\`.
-            5. Run \`npm run coder:run\` to execute the next ready prompt with the configured coding agent.
-            6. Use \`npm run coder:verify\` to archive finished prompts into \`${formatDisplayPath(
-                PROMPTS_DONE_DIRECTORY_PATH,
-            )}/\` and append repair follow-up prompts when more work is needed.
-            7. Use \`ptbk coder find-refactor-candidates\` when you want Promptbook to suggest refactor prompts automatically.
-
-            ## Templates
-            -   Project-owned templates created by \`ptbk coder init\`: ${formatInlineCodeList(
-                getDefaultCoderProjectPromptTemplateDefinitions().map(({ relativeFilePath }) =>
-                    formatDisplayPath(relativeFilePath),
-                ),
-            )}
-            -   Built-in \`--template\` aliases: ${formatInlineCodeList(
-                getDefaultCoderPromptTemplateDefinitions().map(({ id }) => id),
-            )}
-            -   To add a custom template, create a markdown file such as \`${formatDisplayPath(
-                PROMPTS_TEMPLATES_DIRECTORY_PATH,
-            )}/backend.md\`.
-            -   To use a project template, run \`ptbk coder generate-boilerplates --template ${formatDisplayPath(
-                PROMPTS_TEMPLATES_DIRECTORY_PATH,
-            )}/backend.md\`.
-            -   Keep shared repository rules in \`${AGENTS_FILE_PATH}\` and recurring task-family rules in template files so individual prompt files stay focused on the actual task.
-
-            ## Created npm scripts
-            | Script | Purpose |
-            | --- | --- |
-            ${block(buildPackageJsonScriptTableLines(packageJsonScripts).join('\n'))}
-
-            ## Customizing the workflow
-            -   Edit \`package.json\` if you want \`npm run coder:run\` to use another coding agent, model, thinking level, context file, or wait mode.
-            -   Use direct CLI commands when you need one-off flags such as \`--min-priority\`, \`--max-priority\`, \`--ignore-git-changes\`, \`--no-commit\`, \`--dry-run\`, \`--test\`, \`--allow-credits\`, or \`--auto-migrate\`.
-            -   Use \`ptbk coder --help\` and \`ptbk coder <command> --help\` for the full CLI reference.
-        `,
-    );
-}
-
-/**
- * Builds the sentence describing the starter templates created during initialization.
- */
-function buildStarterTemplateSentence(): string {
-    const starterTemplatePaths = getDefaultCoderProjectPromptTemplateDefinitions().map(({ relativeFilePath }) =>
-        formatDisplayPath(relativeFilePath),
-    );
-
-    if (starterTemplatePaths.length === 1) {
-        return `The starter project template created by \`ptbk coder init\` is \`${starterTemplatePaths[0]}\`.`;
-    }
-
-    return `The starter project templates created by \`ptbk coder init\` are ${formatInlineCodeList(
-        starterTemplatePaths,
-    )}.`;
-}
-
-/**
- * Builds the markdown table rows describing the initialized npm scripts.
- */
-function buildPackageJsonScriptTableLines(packageJsonScripts: Readonly<Record<string, string>>): Array<string> {
-    return Object.entries(packageJsonScripts).map(
-        ([scriptName, scriptCommand]) =>
-            `| \`npm run ${scriptName}\` | ${describeDefaultCoderPackageJsonScript(scriptName, scriptCommand)} |`,
-    );
-}
-
-/**
- * Describes one initialized npm script in human-readable terms.
- */
-function describeDefaultCoderPackageJsonScript(scriptName: string, scriptCommand: string): string {
-    if (scriptName === 'coder:generate-boilerplates') {
-        return `Runs \`${scriptCommand}\` to create new prompt files in \`${formatDisplayPath(
-            PROMPTS_DIRECTORY_PATH,
-        )}/\`.`;
-    }
-
-    if (scriptName === 'coder:add') {
-        return `Runs \`${scriptCommand}\` to add one ready-to-run prompt file to \`${formatDisplayPath(
-            PROMPTS_DIRECTORY_PATH,
-        )}/\` from a plain-language description.`;
-    }
-
-    if (scriptName === 'coder:run') {
-        return `Runs \`${scriptCommand}\` to execute the next ready prompt with shared repository context from \`${AGENTS_FILE_PATH}\`.`;
-    }
-
-    if (scriptName === 'coder:find-refactor-candidates') {
-        return `Runs \`${scriptCommand}\` to generate prompt candidates for large or crowded files.`;
-    }
-
-    if (scriptName === 'coder:verify') {
-        return `Runs \`${scriptCommand}\` to archive verified prompts into \`${formatDisplayPath(
-            PROMPTS_DONE_DIRECTORY_PATH,
-        )}/\` and append repair prompts when needed.`;
-    }
-
-    return `Runs \`${scriptCommand}\`.`;
-}
-
-/**
- * Formats one inline code list for human-readable markdown.
- */
-function formatInlineCodeList(values: ReadonlyArray<string>): string {
-    return values.map((value) => `\`${value}\``).join(', ');
+        This project is using [Promptbook Coder](https://coder.ptbk.io) or run \`ptbk coder\`!
+    `);
 }
 
 // Note: [🟡] Code for coder AGENT_CODING file boilerplate [agentCodingFile](src/cli/cli-commands/coder/agentCodingFile.ts) should never be published outside of `@promptbook/cli`

package/src/cli/cli-commands/coder/boilerplateCount.ts

@@ -0,0 +1,139 @@
+import { spaceTrim } from 'spacetrim';
+import { NotAllowed } from '../../../errors/NotAllowed';
+
+/**
+ * Separator between the number of generated files and the number of prompts in each of them,
+ * for example `10*7`.
+ *
+ * @private internal utility of `ptbk coder`
+ */
+const BOILERPLATE_COUNT_SEPARATOR = '*';
+
+/**
+ * Pattern of the `--count` option value, either `N` or `N*M`.
+ */
+const BOILERPLATE_COUNT_PATTERN = /^(?<filesCount>\d+)(?:\s*\*\s*(?<promptsPerFileCount>\d+))?$/u;
+
+/**
+ * How many prompt boilerplate files are generated and how many prompts each of them contains.
+ *
+ * @private internal utility of `ptbk coder`
+ */
+export type BoilerplateCount = {
+    /**
+     * Number of generated prompt boilerplate files.
+     */
+    readonly filesCount: number;
+
+    /**
+     * Number of prompts written into each generated file.
+     *
+     * Note: More than one prompt per file is an advanced option - each prompt is one separate
+     *       coding task separated by `---`, with all prompts in the file sharing its fresh emoji tag.
+     */
+    readonly promptsPerFileCount: number;
+};
+
+/**
+ * Number of prompt boilerplate files and prompts per file used when `--count` is not provided.
+ *
+ * @private internal utility of `ptbk coder`
+ */
+export const DEFAULT_BOILERPLATE_COUNT: BoilerplateCount = {
+    filesCount: 5,
+    promptsPerFileCount: 1,
+};
+
+/**
+ * Formats one boilerplate count back into the `N*M` notation of the `--count` option.
+ *
+ * @private internal utility of `ptbk coder`
+ */
+export function formatBoilerplateCount({ filesCount, promptsPerFileCount }: BoilerplateCount): string {
+    return `${filesCount}${BOILERPLATE_COUNT_SEPARATOR}${promptsPerFileCount}`;
+}
+
+/**
+ * Default value of the `--count` option rendered in the `N*M` notation, for example `5*1`.
+ *
+ * @private internal utility of `ptbk coder`
+ */
+export const DEFAULT_BOILERPLATE_COUNT_OPTION_VALUE = formatBoilerplateCount(DEFAULT_BOILERPLATE_COUNT);
+
+/**
+ * Description of the `--count` option shared by all commands which generate prompt boilerplates.
+ *
+ * @private internal utility of `ptbk coder`
+ */
+export const BOILERPLATE_COUNT_OPTION_DESCRIPTION = spaceTrim(`
+    Number of generated prompt boilerplate files, optionally with the number of prompts in each of them.
+
+    Use \`N\` (or \`N*1\`) for N files with one prompt each,
+    or the advanced \`N*M\` notation for N files with M prompts each, for example \`10*7\`.
+`);
+
+/**
+ * Parses the `--count` option value into the number of files and the number of prompts in each of them.
+ *
+ * Both notations are supported:
+ * - `N` and `N*1` => N files with one prompt each
+ * - `N*M` => N files with M prompts each
+ *
+ * @private internal utility of `ptbk coder`
+ */
+export function parseBoilerplateCount(countOption: string): BoilerplateCount {
+    const normalizedCountOption = countOption.trim();
+    const match = BOILERPLATE_COUNT_PATTERN.exec(normalizedCountOption);
+
+    if (match === null) {
+        throw new NotAllowed(
+            spaceTrim(`
+                Invalid value for \`--count\`: \`${countOption}\`.
+
+                Use either \`N\` for N files with one prompt each,
+                or the advanced \`N*M\` notation for N files with M prompts each:
+
+                - \`--count 5\`
+                - \`--count 5*1\`
+                - \`--count 10*7\`
+            `),
+        );
+    }
+
+    const filesCount = Number(match.groups?.filesCount);
+    const promptsPerFileCount =
+        match.groups?.promptsPerFileCount === undefined
+            ? DEFAULT_BOILERPLATE_COUNT.promptsPerFileCount
+            : Number(match.groups.promptsPerFileCount);
+
+    assertsPositiveBoilerplateCountPart(filesCount, countOption, 'number of generated files');
+    assertsPositiveBoilerplateCountPart(promptsPerFileCount, countOption, 'number of prompts in each file');
+
+    return { filesCount, promptsPerFileCount };
+}
+
+/**
+ * Asserts that one part of the `--count` option value is a positive integer.
+ *
+ * @private internal utility of `parseBoilerplateCount`
+ */
+function assertsPositiveBoilerplateCountPart(
+    countPart: number,
+    countOption: string,
+    countPartDescription: string,
+): void {
+    if (Number.isInteger(countPart) && countPart > 0) {
+        return;
+    }
+
+    throw new NotAllowed(
+        spaceTrim(`
+            Invalid value for \`--count\`: \`${countOption}\`.
+
+            The ${countPartDescription} must be **a positive integer**, for example \`--count 10*7\`.
+        `),
+    );
+}
+
+// Note: [🟡] Code for coder boilerplate count [boilerplateCount](src/cli/cli-commands/coder/boilerplateCount.ts) should never be published outside of `@promptbook/cli`
+// Note: [💞] Ignore a discrepancy between file name and exported helper names

package/src/cli/cli-commands/coder/generate-boilerplates.ts

@@ -6,7 +6,20 @@ import { mkdirSync, writeFileSync } from 'fs';
 import { join } from 'path';
 import { spaceTrim } from 'spacetrim';
 import type { $side_effect } from '../../../utils/organization/$side_effect';
+import type { CoderGitSyncCliOptions } from '../common/coderGitSyncCliOptions';
+import {
+    addCoderGitSyncOptions,
+    CODER_GIT_SYNC_DESCRIPTION,
+    normalizeCoderGitSyncCliOptions,
+} from '../common/coderGitSyncCliOptions';
 import { handleActionErrors } from '../common/handleActionErrors';
+import type { BoilerplateCount } from './boilerplateCount';
+import {
+    BOILERPLATE_COUNT_OPTION_DESCRIPTION,
+    DEFAULT_BOILERPLATE_COUNT_OPTION_VALUE,
+    formatBoilerplateCount,
+    parseBoilerplateCount,
+} from './boilerplateCount';
 import {
     buildCoderPromptSection,
     getDefaultCoderPromptTemplateDefinitions,
@@ -24,12 +37,16 @@ import {
 export function $initializeCoderGenerateBoilerplatesCommand(program: Program): $side_effect {
     const command = program.command('generate-boilerplates');
     command.description(
-        spaceTrim(`
-            Generate prompt boilerplate files with unique emoji tags
-        `),
+        spaceTrim(
+            (block) => `
+                Generate prompt boilerplate files with one unique emoji tag per file
+
+                ${block(CODER_GIT_SYNC_DESCRIPTION)}
+            `,
+        ),
     );
 
-    command.option('--count <count>', `Number of prompt boilerplate files to generate`, '5');
+    command.option('--count <count>', BOILERPLATE_COUNT_OPTION_DESCRIPTION, DEFAULT_BOILERPLATE_COUNT_OPTION_VALUE);
     command.option(
         '--template <template>',
         spaceTrim(`
@@ -40,41 +57,59 @@ export function $initializeCoderGenerateBoilerplatesCommand(program: Program): $
                 .join(', ')}) or a markdown file path relative to the current project root.
         `),
     );
+    addCoderGitSyncOptions(command);
 
     command.action(
         handleActionErrors(async (cliOptions) => {
             const { count: countOption, template: templateOption } = cliOptions as {
                 readonly count: string;
                 readonly template?: string;
-            };
+            } & CoderGitSyncCliOptions;
+
+            const boilerplateCount = parseBoilerplateCount(countOption);
+            const gitSync = normalizeCoderGitSyncCliOptions(cliOptions as CoderGitSyncCliOptions);
+            const projectPath = process.cwd();
+
+            // Note: Import the git synchronization dynamically to keep the CLI fast for runs without `--commit`
+            const { $commitCoderChanges, $startCoderGitSync } = await import(
+                '../../../../scripts/run-codex-prompts/git/coderGitSync'
+            );
 
-            const filesCount = parseFilesCount(countOption);
+            const commitScope = await $startCoderGitSync({ gitSync, projectPath });
 
             await generatePromptBoilerplate({
-                projectPath: process.cwd(),
-                filesCount,
+                projectPath,
+                boilerplateCount,
                 templateOption,
             });
 
+            await $commitCoderChanges({
+                gitSync,
+                commitScope,
+                commitMessage: `Prompts ${formatBoilerplateCount(boilerplateCount)}`,
+            });
+
             return process.exit(0);
         }),
     );
 }
 
 /**
- * Generates boilerplate prompt files with unique emoji tags.
+ * Generates boilerplate prompt files with one unique emoji tag per file.
  *
  * @private internal function of `generatePromptBoilerplate` command
  */
 export async function generatePromptBoilerplate({
     projectPath,
-    filesCount,
+    boilerplateCount,
     templateOption,
 }: {
     readonly projectPath: string;
-    readonly filesCount: number;
+    readonly boilerplateCount: BoilerplateCount;
     readonly templateOption?: string;
 }): Promise<void> {
+    const { filesCount, promptsPerFileCount } = boilerplateCount;
+
     // Note: Import these dynamically to avoid circular dependencies and keep CLI fast
     const { buildPromptFilename, getPromptNumbering } = await import(
         '../../../../scripts/utils/prompts/getPromptNumbering'
@@ -99,7 +134,9 @@ export async function generatePromptBoilerplate({
         colors.blue(`Highest existing number for ${promptNumbering.datePrefix} found: ${highestNumberFormatted}`),
     );
 
+    const promptsCount = filesCount * promptsPerFileCount;
     const { availableCount, selectedEmojis } = await getFreshPromptEmojiTags({
+        // Note: Each generated file reserves one fresh emoji tag shared by all of its prompt sections
         count: filesCount,
         rootDir: projectPath,
     });
@@ -117,7 +154,7 @@ export async function generatePromptBoilerplate({
     for (let i = 0; i < filesCount; i++) {
         const number = promptNumbering.startNumber + i * promptNumbering.step;
         const title = titles[i % titles.length]!;
-        const emoji = selectedEmojis[i]!;
+        const emojiTag = formatPromptEmojiTag(selectedEmojis[i]!);
         const filename = buildPromptFilename(
             promptNumbering.datePrefix,
             number,
@@ -125,39 +162,19 @@ export async function generatePromptBoilerplate({
         );
         const filepath = join(PROMPTS_DIRECTORY_PATH, filename);
         const absoluteFilepath = join(projectPath, filepath);
-        const emojiTag = formatPromptEmojiTag(emoji);
-        const one = buildCoderPromptSection({
-            statusLine: '[-]',
+        const content = buildBoilerplatePromptFileContent({
             emojiTag,
+            promptsPerFileCount,
             title,
             body: promptTemplate.content,
         });
-        const content = spaceTrim(
-            (block) => `
-
-                ${block(one)}
-
-                ---
-
-                ${block(one)}
-
-                ---
-
-                ${block(one)}
-
-                ---
-
-                ${block(one)}
-
-            `,
-        );
 
         filesToCreate.push({
             filepath,
             absoluteFilepath,
             filename,
             content,
-            emoji,
+            emojiTag,
             number,
         });
     }
@@ -167,26 +184,43 @@ export async function generatePromptBoilerplate({
 
     for (const file of filesToCreate) {
         writeFileSync(file.absoluteFilepath, file.content, 'utf-8');
-        console.info(colors.green(`✓ Created: ${file.filename} with ${formatPromptEmojiTag(file.emoji!)}`));
+        console.info(colors.green(`✓ Created: ${file.filename} with ${file.emojiTag}`));
     }
 
-    console.info(colors.bgGreen(` Successfully created ${filesToCreate.length} prompt boilerplate files! `));
+    console.info(
+        colors.bgGreen(
+            ` Successfully created ${promptsCount} prompts in ${filesToCreate.length} prompt boilerplate files! `,
+        ),
+    );
 }
 
 /**
- * Parses and validates the count of boilerplate files to create.
+ * Builds the markdown content of one generated prompt file with one prompt section per prompt.
+ *
+ * Multiple prompts in one file share the file emoji tag and are separated by the `---` separator,
+ * exactly like the prompt runner expects them.
  *
  * @private internal utility of `generatePromptBoilerplate` command
  */
-function parseFilesCount(countOption: string): number {
-    const filesCount = Number(countOption);
-
-    if (!Number.isFinite(filesCount) || filesCount <= 0) {
-        console.info(colors.yellow(`Invalid --count '${countOption}'. Falling back to default 5.`));
-        return 5;
-    }
-
-    return Math.floor(filesCount);
+function buildBoilerplatePromptFileContent({
+    emojiTag,
+    promptsPerFileCount,
+    title,
+    body,
+}: {
+    readonly emojiTag: string;
+    readonly promptsPerFileCount: number;
+    readonly title: string;
+    readonly body: string;
+}): string {
+    return Array.from({ length: promptsPerFileCount }, () =>
+        buildCoderPromptSection({
+            statusLine: '[-]',
+            emojiTag,
+            title,
+            body,
+        }),
+    ).join('\n\n---\n\n');
 }
 
 /**