Merge pull request #6 from Chimp-Stack/release-chimp/feat/ci-flag-support

chore(release-chimp): add CI mode flag for skipping changelog, git, and package.json

Author: MarkRabey

.chimprc

@@ -0,0 +1,14 @@
+{
+  "releaseChimp": {
+    "bumpType": "patch",
+    "dryRun": false,
+    "noPackageJson": false,
+    "noChangelog": false,
+    "noGit": false,
+    "changelog": {
+      "path": "CHANGELOG.md",
+      "useAI": false
+    }
+  },
+  "tagFormat": "${name}@${version}"
+}

packages/chimp-core/src/cli/changelog.ts

@@ -1,11 +1,14 @@
 import { simpleGit } from 'simple-git';
+import fs from 'node:fs';
 import { Command } from 'commander';
 import {
+  extractTagPrefixFromFormat,
   generateSemanticChangelog,
   logError,
   logSuccess,
   writeChangelogToFile,
 } from '../utils';
+import { loadChimpConfig } from 'src/config';
 
 export function addChangelogCommand(
   program: Command,
@@ -18,23 +21,50 @@ export function addChangelogCommand(
     .option('--to <tag>', 'End tag or commit (default: HEAD)')
     .option('--output <file>', 'Output file to append changelog')
     .option('--ai', 'Use AI to generate a summary section')
+    .option(
+      '--latest',
+      'Generate changelog between the last two tags'
+    )
     .action(
       async (options: {
         from?: string;
         to?: string;
         output?: string;
         ai?: boolean;
+        latest?: boolean;
       }) => {
-        const { from, to, output, ai } = options;
+        const config = loadChimpConfig(toolName);
+        const tagFormat = config.tagFormat || '';
+        const { from, to, output, ai, latest } = options;
 
-        const start = from ?? (await getLatestTag()) ?? '0.0.0';
-        const end = to ?? 'HEAD';
+        let start = from;
+        let end = to ?? 'HEAD';
 
-        if (!start) {
-          logError(
-            '❌ No tags found to use as a starting point. Use --from manually.'
+        if (latest) {
+          const pkgJson = JSON.parse(
+            fs.readFileSync('package.json', 'utf8')
           );
-          process.exit(1);
+          const name = pkgJson.name;
+          const tags = await getSortedTags(tagFormat, name);
+          if (tags.length === 0) {
+            logError('❌ No tags found in this repository.');
+            process.exit(1);
+          }
+
+          end = tags[0];
+          start = tags[1] ?? '0.0.0';
+
+          console.log(
+            `🪵 Generating changelog from ${start} → ${end}`
+          );
+        }
+
+        if (!start) {
+          start = (await getLatestTag()) ?? '0.0.0';
+          if (!start) {
+            logError('❌ No starting tag or commit specified.');
+            process.exit(1);
+          }
         }
 
         const changelog = await generateSemanticChangelog({
@@ -64,3 +94,28 @@ async function getLatestTag(): Promise<string | null> {
   const tags = await git.tags();
   return tags.latest ?? null;
 }
+
+async function getSortedTags(
+  tagPrefix?: string,
+  name?: string
+): Promise<string[]> {
+  const git = simpleGit();
+  const tags = await git.tags();
+
+  let prefix = '';
+  if (tagPrefix && name) {
+    prefix = extractTagPrefixFromFormat(tagPrefix, name);
+  }
+
+  const filtered = tagPrefix
+    ? tags.all.filter((tag) => tag.startsWith(prefix))
+    : tags.all;
+
+  return filtered.sort((a, b) => {
+    // fallback to semantic sort
+    return b.localeCompare(a, undefined, {
+      numeric: true,
+      sensitivity: 'base',
+    });
+  });
+}

packages/chimp-core/src/config.ts

@@ -6,31 +6,47 @@ import { ChimpConfig } from './types/config';
 const CONFIG_FILENAME = '.chimprc';
 
 export function loadChimpConfig(scope?: string): ChimpConfig {
-  const locations = [
-    path.join(process.cwd(), CONFIG_FILENAME),
-    path.join(os.homedir(), CONFIG_FILENAME),
-  ];
-
-  for (const loc of locations) {
-    if (fs.existsSync(loc)) {
-      const data = JSON.parse(fs.readFileSync(loc, 'utf-8'));
-
-      if (scope) {
-        // Merge top-level keys into the scoped config
-        const { [scope]: scoped = {}, ...topLevel } = data;
-        const globalKeys = Object.fromEntries(
-          Object.entries(topLevel).filter(([k]) =>
-            ['openaiApiKey', 'githubToken'].includes(k)
-          )
-        );
-        return { ...globalKeys, ...scoped };
-      }
-
-      return data;
-    }
+  const globalPath = path.join(os.homedir(), CONFIG_FILENAME);
+  const localPath = path.join(process.cwd(), CONFIG_FILENAME);
+
+  const globalConfig = fs.existsSync(globalPath)
+    ? JSON.parse(fs.readFileSync(globalPath, 'utf-8'))
+    : {};
+
+  const localConfig = fs.existsSync(localPath)
+    ? JSON.parse(fs.readFileSync(localPath, 'utf-8'))
+    : {};
+
+  if (scope) {
+    const { [scope]: globalScoped = {}, ...globalTopLevel } =
+      globalConfig;
+
+    const { [scope]: localScoped = {}, ...localTopLevel } =
+      localConfig;
+
+    const globalGlobals = extractGlobals(globalTopLevel);
+    const localGlobals = extractGlobals(localTopLevel);
+
+    return {
+      ...globalGlobals,
+      ...localGlobals,
+      ...globalScoped,
+      ...localScoped,
+    };
   }
 
-  return {};
+  // Unscoped: merge all
+  return {
+    ...globalConfig,
+    ...localConfig,
+  };
+}
+
+function extractGlobals(obj: Record<string, any>) {
+  const allowed = ['openaiApiKey', 'githubToken', 'tagFormat'];
+  return Object.fromEntries(
+    Object.entries(obj).filter(([k]) => allowed.includes(k))
+  );
 }
 
 export function writeChimpConfig(

packages/chimp-core/src/prompts/releaseChimp.ts

@@ -22,12 +22,6 @@ export async function askReleaseChimpQuestions(): Promise<ReleaseChimpConfig> {
     default: false,
   });
 
-  const tagFormat = await input({
-    message:
-      'Custom git tag format (e.g., v{version}, @scope/pkg@{version})',
-    default: 'v{version}',
-  });
-
   const changelogPath = await input({
     message: 'Path to changelog file (e.g., CHANGELOG.md)',
     default: 'CHANGELOG.md',
@@ -61,7 +55,6 @@ export async function askReleaseChimpQuestions(): Promise<ReleaseChimpConfig> {
   return {
     bumpType,
     dryRun,
-    tagFormat,
     noPackageJson,
     noChangelog,
     noGit,

packages/chimp-core/src/prompts/shared.ts

@@ -15,5 +15,11 @@ export async function askSharedQuestions(
     message: 'GitHub Token (optional)',
   });
 
+  answers.tagFormat = await input({
+    message:
+      'Custom git tag format (e.g., v{version}, @scope/pkg@{version})',
+    default: '${name}@${version}',
+  });
+
   return answers;
 }

packages/chimp-core/src/types/config.ts

@@ -1,6 +1,7 @@
 export type ChimpConfig = {
   openaiApiKey?: string;
   githubToken?: string;
+  tagFormat?: string;
   [key: string]: any;
 };
 
@@ -33,7 +34,6 @@ export type DocChimpConfig = ChimpConfig & {
 
 export type ReleaseChimpConfig = ChimpConfig & {
   bumpType?: 'major' | 'minor' | 'patch';
-  tagFormat?: string;
   changelog?: {
     path?: string; // Default: 'CHANGELOG.md'
     useAI?: boolean;

packages/chimp-core/src/utils/changelog/changelog.ts

@@ -79,6 +79,8 @@ export async function generateSemanticChangelog({
     'chore',
   ];
 
+  console.log({ commits, groupOrder });
+
   for (const type of groupOrder) {
     if (semanticGroups[type]?.length) {
       output += `### ${getSectionTitle(type)}\n`;

packages/chimp-core/src/utils/git/tagFormat.ts

@@ -7,3 +7,12 @@ export function applyTagFormat(
     .replace(/\$\{name\}/g, name)
     .replace(/\$\{version\}/g, version);
 }
+
+export function extractTagPrefixFromFormat(
+  format: string,
+  name: string
+): string {
+  return format
+    .replace(/\$\{name\}/g, name)
+    .replace(/\$\{version\}/g, '');
+}

packages/release-chimp/src/commands/bump.ts

@@ -20,28 +20,39 @@ export async function handleBump(
   cliPart: string,
   cliOptions: Command & {
     ai?: boolean;
+    ci?: boolean;
     dryRun?: boolean;
     noPackageJson?: boolean;
     noChangelog?: boolean;
     noGit?: boolean;
+    output?: string;
   }
 ) {
   const config = loadChimpConfig(
     'releaseChimp'
   ) as ReleaseChimpConfig;
 
-  const part = cliPart || config.bumpType || 'patch';
   const dryRun = cliOptions.dryRun ?? config.dryRun ?? false;
+  const part = cliPart || config.bumpType || 'patch';
+  const inferVersionOnly = cliPart === undefined && !dryRun;
+  const isCI = cliOptions.ci ?? false;
+
+  if (isCI) {
+    console.log(
+      '🤖 CI mode enabled: Skipping package.json, changelog, and git.'
+    );
+  }
+
   const noPackageJson =
     cliOptions.noPackageJson ?? config.noPackageJson ?? false;
   const noChangelog =
-    cliOptions.noChangelog ?? config.noChangelog ?? false;
-  const noGit = cliOptions.noGit ?? config.noGit ?? false;
+    isCI || (cliOptions.noChangelog ?? config.noChangelog ?? false);
+  const noGit = isCI || (cliOptions.noGit ?? config.noGit ?? false);
+  const useAI = cliOptions.ai ?? config.changelog?.useAI ?? false;
+  const outputFormat = cliOptions.output ?? 'text';
 
   const validParts = ['major', 'minor', 'patch'] as const;
 
-  const useAI = cliOptions.ai ?? config.changelog?.useAI ?? false;
-
   if (!validParts.includes(part as any)) {
     console.error(
       `❌ Invalid bump type: '${part}'. Must be one of: ${validParts.join(', ')}`
@@ -54,11 +65,17 @@ export async function handleBump(
   });
 
   const rawVersion = extractVersionFromTag(current);
-  const next = bumpVersion(rawVersion, part as any);
+  const next = inferVersionOnly
+    ? rawVersion
+    : bumpVersion(rawVersion, part as any);
 
   console.log(`🐵 Current version: ${current}`);
   console.log(`🍌 Next version:    ${next}`);
 
+  if (inferVersionOnly) {
+    console.log(`🔄 Inferring version from latest tag`);
+  }
+
   if (dryRun) {
     const changelog = noChangelog
       ? '_Changelog generation skipped (dry run)._'
@@ -87,7 +104,7 @@ export async function handleBump(
     return;
   }
 
-  // Write package.json version bump unless opted out
+  // Update package.json version
   if (!noPackageJson) {
     const packageJsonPath = path.resolve(
       process.cwd(),
@@ -113,7 +130,7 @@ export async function handleBump(
     console.log('📦 Skipping package.json update');
   }
 
-  // Generate and write changelog unless opted out
+  // Generate
   if (!noChangelog) {
     const changelog = await generateSemanticChangelog({
       from: isGitRef ? current : undefined,
@@ -140,4 +157,10 @@ export async function handleBump(
   } else {
     console.log('🚀 Skipping git commit, tag, and push');
   }
+
+  if (outputFormat === 'json') {
+    console.log(JSON.stringify({ next }, null, 2));
+  } else {
+    console.log(next);
+  }
 }

packages/release-chimp/src/commands/index.ts

@@ -23,8 +23,9 @@ export function runCLI() {
   addChangelogCommand(program, 'releaseChimp');
 
   program
-    .command('bump <part>')
+    .command('bump [part]')
     .description('Bump version: patch, minor, or major')
+    .option('--ci', 'CI mode: skips changelog, git, and package.json')
     .option(
       '--dry-run',
       'Preview changes without writing files or committing'
@@ -33,6 +34,11 @@ export function runCLI() {
     .option('--no-package-json', 'Skip updating package.json version')
     .option('--no-changelog', 'Skip generating and writing changelog')
     .option('--no-git', 'Skip git commit, tag, and push')
+    .option(
+      '--output <format>',
+      'Output format: json or text',
+      'text'
+    )
     .action(handleBump);
 
   program.parse(process.argv);