feat: --no-file-summary now also suppresses generationHeader; doesn't suppress headerText (yamadashy#554)

Author: joshwand

src/core/output/outputGenerate.ts

@@ -57,22 +57,19 @@ const generateParsableXmlOutput = async (renderContext: RenderContext): Promise<
   const xmlBuilder = new XMLBuilder({ ignoreAttributes: false });
   const xmlDocument = {
     repomix: {
-      '#text': renderContext.generationHeader,
       file_summary: renderContext.fileSummaryEnabled
         ? {
-            '#text': 'This section contains a summary of this file.',
+            '#text': renderContext.generationHeader,
             purpose: renderContext.summaryPurpose,
             file_format: `${renderContext.summaryFileFormat}
 4. Repository files, each consisting of:
   - File path as an attribute
   - Full contents of the file`,
             usage_guidelines: renderContext.summaryUsageGuidelines,
             notes: renderContext.summaryNotes,
-            additional_info: {
-              user_provided_header: renderContext.headerText,
-            },
           }
         : undefined,
+      user_provided_header: renderContext.headerText,
       directory_structure: renderContext.directoryStructureEnabled ? renderContext.treeString : undefined,
       files: renderContext.filesEnabled
         ? {

src/core/output/outputStyles/markdownStyle.ts

@@ -2,9 +2,10 @@ import Handlebars from 'handlebars';
 
 export const getMarkdownTemplate = () => {
   return /* md */ `
-{{{generationHeader}}}
 
 {{#if fileSummaryEnabled}}
+{{{generationHeader}}}
+
 # File Summary
 
 ## Purpose
@@ -23,10 +24,6 @@ export const getMarkdownTemplate = () => {
 {{{summaryNotes}}}
 
 ## Additional Info
-{{#if headerText}}
-### User Provided Header
-{{{headerText}}}
-{{/if}}
 
 {{/if}}
 {{#if directoryStructureEnabled}}
@@ -36,6 +33,13 @@ export const getMarkdownTemplate = () => {
 \`\`\`
 
 {{/if}}
+
+{{#if headerText}}
+### User Provided Header
+{{{headerText}}}
+{{/if}}
+
+
 {{#if filesEnabled}}
 # Files
 

src/core/output/outputStyles/plainStyle.ts

@@ -3,9 +3,9 @@ const PLAIN_LONG_SEPARATOR = '='.repeat(64);
 
 export const getPlainTemplate = () => {
   return `
+{{#if fileSummaryEnabled}}
 {{{generationHeader}}}
 
-{{#if fileSummaryEnabled}}
 ${PLAIN_LONG_SEPARATOR}
 File Summary
 ${PLAIN_LONG_SEPARATOR}
@@ -34,13 +34,13 @@ Notes:
 
 Additional Info:
 ----------------
+{{/if}}
 {{#if headerText}}
 User Provided Header:
 -----------------------
 {{{headerText}}}
 {{/if}}
 
-{{/if}}
 {{#if directoryStructureEnabled}}
 ${PLAIN_LONG_SEPARATOR}
 Directory Structure

src/core/output/outputStyles/xmlStyle.ts

@@ -1,8 +1,9 @@
 export const getXmlTemplate = () => {
   return /* xml */ `
-{{{generationHeader}}}
 
 {{#if fileSummaryEnabled}}
+{{{generationHeader}}}
+
 <file_summary>
 This section contains a summary of this file.
 
@@ -26,17 +27,18 @@ This section contains a summary of this file.
 </notes>
 
 <additional_info>
+</additional_info>
+
+</file_summary>
+
+{{/if}}
+
 {{#if headerText}}
 <user_provided_header>
 {{{headerText}}}
 </user_provided_header>
 {{/if}}
 
-</additional_info>
-
-</file_summary>
-
-{{/if}}
 {{#if directoryStructureEnabled}}
 <directory_structure>
 {{{treeString}}}

tests/core/output/outputGenerate.test.ts

@@ -138,4 +138,53 @@ describe('outputGenerate', () => {
     expect(output).toContain('## File: dir/file2.txt');
     expect(output).toContain('````\n```\ncontent2\n```\n````');
   });
+
+  test('generateOutput should omit generationHeader when fileSummaryEnabled is false, but always include headerText if provided', async () => {
+    const mockConfig = createMockConfig({
+      output: {
+        filePath: 'output.txt',
+        style: 'plain',
+        fileSummary: false,
+        headerText: 'ALWAYS SHOW THIS HEADER',
+      },
+    });
+    const mockProcessedFiles: ProcessedFile[] = [{ path: 'file1.txt', content: 'content1' }];
+    const output = await generateOutput([process.cwd()], mockConfig, mockProcessedFiles, []);
+    expect(output).not.toContain('This file is a merged representation'); // generationHeader
+    expect(output).toContain('ALWAYS SHOW THIS HEADER');
+  });
+
+  test('generateOutput (xml) omits generationHeader when fileSummaryEnabled is false, but always includes headerText', async () => {
+    const mockConfig = createMockConfig({
+      output: {
+        filePath: 'output.xml',
+        style: 'xml',
+        fileSummary: false,
+        headerText: 'XML HEADER',
+        parsableStyle: true,
+      },
+    });
+    const mockProcessedFiles: ProcessedFile[] = [{ path: 'file1.txt', content: '<div>foo</div>' }];
+    const output = await generateOutput([process.cwd()], mockConfig, mockProcessedFiles, []);
+    const parser = new XMLParser({ ignoreAttributes: false });
+    const parsedOutput = parser.parse(output);
+    expect(parsedOutput.repomix['#text']).toBeUndefined();
+    expect(parsedOutput.repomix.user_provided_header).toBe('XML HEADER');
+  });
+
+  test('generateOutput (markdown) omits generationHeader when fileSummaryEnabled is false, but always includes headerText', async () => {
+    const mockConfig = createMockConfig({
+      output: {
+        filePath: 'output.md',
+        style: 'markdown',
+        fileSummary: false,
+        headerText: 'MARKDOWN HEADER',
+        parsableStyle: false,
+      },
+    });
+    const mockProcessedFiles: ProcessedFile[] = [{ path: 'file1.txt', content: 'content1' }];
+    const output = await generateOutput([process.cwd()], mockConfig, mockProcessedFiles, []);
+    expect(output).not.toContain('This file is a merged representation');
+    expect(output).toContain('MARKDOWN HEADER');
+  });
 });

tests/core/output/outputStyles/markdownStyle.test.ts

@@ -1,6 +1,8 @@
 import Handlebars from 'handlebars';
 import { describe, expect, test } from 'vitest';
+import { generateOutput } from '../../../../src/core/output/outputGenerate.js';
 import { getMarkdownTemplate } from '../../../../src/core/output/outputStyles/markdownStyle.js';
+import { createMockConfig } from '../../../testing/testUtils.js';
 
 describe('markdownStyle', () => {
   describe('getMarkdownTemplate', () => {
@@ -92,6 +94,35 @@ describe('markdownStyle', () => {
       expect(result).toContain('# Instruction');
       expect(result).toContain('Custom Instruction Text');
     });
+
+    test('should display headerText if specified even if fileSummary is disabled', () => {
+      const template = getMarkdownTemplate();
+      const compiledTemplate = Handlebars.compile(template);
+      const data = {
+        headerText: 'MARKDOWN HEADER',
+        fileSummaryEnabled: false,
+        directoryStructureEnabled: true,
+        processedFiles: [],
+      };
+      const result = compiledTemplate(data);
+      expect(result).not.toContain('This file is a merged representation');
+      expect(result).toContain('MARKDOWN HEADER');
+    });
+
+    test('should not display generationHeader if fileSummary is disabled', () => {
+      const template = getMarkdownTemplate();
+      const compiledTemplate = Handlebars.compile(template);
+      const data = {
+        generationHeader: 'Generated Test Header',
+        fileSummaryEnabled: false,
+        directoryStructureEnabled: true,
+        processedFiles: [],
+      };
+      const result = compiledTemplate(data);
+      expect(result).not.toContain('This file is a merged representation');
+      expect(result).not.toContain('Generated Test Header');
+      expect(result).toContain('# Directory Structure');
+    });
   });
 
   describe('getFileExtension helper', () => {

tests/core/output/outputStyles/plainStyle.test.ts

@@ -30,4 +30,18 @@ describe('plainStyle', () => {
     expect(output).toContain('Custom header text');
     expect(output).toContain('Files');
   });
+
+  test('plain style: headerText always present, generationHeader only if fileSummaryEnabled', async () => {
+    const mockConfig = createMockConfig({
+      output: {
+        filePath: 'output.txt',
+        style: 'plain',
+        fileSummary: false,
+        headerText: 'PLAIN HEADER',
+      },
+    });
+    const output = await generateOutput([process.cwd()], mockConfig, [], []);
+    expect(output).not.toContain('This file is a merged representation');
+    expect(output).toContain('PLAIN HEADER');
+  });
 });

tests/core/output/outputStyles/xmlStyle.test.ts

@@ -30,4 +30,19 @@ describe('xmlStyle', () => {
     expect(output).toContain('Custom header text');
     expect(output).toContain('files');
   });
+
+  test('xml style: headerText always present, generationHeader only if fileSummaryEnabled', async () => {
+    const mockConfig = createMockConfig({
+      output: {
+        filePath: 'output.xml',
+        style: 'xml',
+        fileSummary: false,
+        headerText: 'XML HEADER',
+        parsableStyle: false,
+      },
+    });
+    const output = await generateOutput([process.cwd()], mockConfig, [], []);
+    expect(output).not.toContain('This file is a merged representation');
+    expect(output).toContain('XML HEADER');
+  });
 });