codeowners-git 2.1.0 → 2.2.0

package/README.md

@@ -15,7 +15,7 @@ Managing large-scale migrations in big monorepos with multiple codeowners can be
 - **Dry-run previews** to see exactly what will happen before committing.
 - **JSON output** for piping to other tools, scripts, and agent workflows.
 
-> ❗❗ ❗ **Note:** Starting from v2.0.0, this tool works with **staged files**. Stage your changes with `git add` before running commands.
+> ❗❗ ❗ **Note:** Starting from v2.0.0, this tool works with **staged files**. Stage your changes with `git add` before running commands. Alternatively, use `multi-branch --source <branch>` to split directly from an existing branch or PR without staging.
 
 https://github.com/user-attachments/assets/7cc0a924-f03e-47f3-baad-63eca9e8e4a8
 
@@ -221,11 +221,16 @@ Options:
 - `--append` Add commits to existing branch instead of creating a new one
 - `--pr` Create a pull request after pushing (requires `--push` and GitHub CLI)
 - `--draft-pr` Create a draft pull request after pushing (requires `--push` and GitHub CLI)
+- `--pr-body` Custom PR body text (overrides the repo's PR template). Requires `--pr` or `--draft-pr`.
 - `--exclusive, -e` Only include files where the owner is the sole owner (no co-owned files)
 - `--co-owned, -c` Only include files with multiple owners (co-owned files)
+- `--source, -s` Source branch or commit to extract changes from (creates a temp branch from the default branch). No staging required.
+- `--compare-main` Compare source against main branch instead of detecting merge-base (use with `--source`)
 - `--dry-run` Preview the operation without making any changes
 - `--json` Output results as JSON (suppresses all other output)
 
+> **Note:** `--source` cannot be used when there are staged changes.
+
 Example:
 
 ```bash
@@ -273,6 +278,19 @@ cg branch -i @myteam -b "feature/new" -m "Add feature" --dry-run --json
 
 # Normal execution with JSON output
 cg branch -i @myteam -b "feature/new" -m "Add feature" -p --json
+
+# Create a PR with a custom body (overrides repo PR template)
+cg branch -i @myteam -b "feature/new" -m "Add feature" -p --pr --pr-body "## Summary
+Migrated files owned by @myteam.
+
+## Reviewer Notes
+Auto-generated PR from codeowners-git."
+
+# Extract a single team's files from an existing branch
+cg branch -s feature/big-migration -i @myteam -b "feature/myteam-migration" -m "Migrate" -p --pr
+
+# Preview what would be extracted from a source branch
+cg branch -s origin/feature/big-migration -i @myteam -b "feature/myteam" -m "Migrate" --dry-run
 ```
 
 ### `multi-branch`
@@ -307,12 +325,15 @@ Options:
 - `--append` Add commits to existing branches instead of creating new ones
 - `--pr` Create pull requests after pushing (requires `--push` and GitHub CLI)
 - `--draft-pr` Create draft pull requests after pushing (requires `--push` and GitHub CLI)
+- `--pr-body` Custom PR body text (overrides the repo's PR template). Requires `--pr` or `--draft-pr`. The same body is used for all branches.
 - `--exclusive, -e` Only include files where each owner is the sole owner (no co-owned files)
 - `--co-owned, -c` Only include files with multiple owners (co-owned files)
+- `--source, -s` Source branch or commit to split (extracts changes onto a temp branch from the default branch). No staging required — the tool handles extraction automatically.
+- `--compare-main` Compare source against main branch instead of detecting merge-base (use with `--source`)
 - `--dry-run` Preview the operation without making any changes
 - `--json` Output results as JSON (suppresses all other output)
 
-> **Note:** You cannot use both `--ignore` and `--include` options at the same time. You also cannot use both `--exclusive` and `--co-owned` options at the same time.
+> **Note:** You cannot use both `--ignore` and `--include` options at the same time. You also cannot use both `--exclusive` and `--co-owned` options at the same time. `--source` cannot be used when there are staged changes.
 
 Example:
 
@@ -370,11 +391,27 @@ cg multi-branch -b "mig" -m "Fix" --dry-run --json | jq '.owners[] | select(.fil
 
 # Normal execution with JSON output
 cg multi-branch -b "feature/migration" -m "Migrate" -p --json
+
+# Split an existing branch (e.g., from a PR) into per-team branches
+cg multi-branch -s feature/big-migration -b "migration" -m "Migrate" -p --pr
+
+# Split from a remote ref
+cg multi-branch -s origin/feature/big-migration -b "migration" -m "Migrate" -p
+
+# Preview a source split with dry-run
+cg multi-branch -s feature/big-migration -b "migration" -m "Migrate" --dry-run
+
+# Combine --source with path filtering
+cg multi-branch -s feature/big-migration "src/services/**" -b "migration" -m "Migrate services" -p
+
+# Use a custom PR body for all generated PRs
+cg multi-branch -b "migration" -m "Migrate" -p --draft-pr --pr-body "## Summary
+Auto-split migration PR by codeowner."
 ```
 
 This will:
 
-1. Find all codeowners for the staged files
+1. Find all codeowners for the staged files (or from `--source` ref if provided)
 2. Apply any ignore/include filters if specified
 3. For each codeowner (e.g., @team-a, @team-b):
    - Create a branch like `feature/new-feature/team-a`
@@ -382,6 +419,13 @@ This will:
    - Add a commit message like "Add new feature - @team-a"
    - Push each branch to the remote if the `-p` flag is provided
 
+When `--source` is provided, the tool automatically:
+
+1. Creates a temporary branch from the default branch (main/master)
+2. Extracts the changed files from the source ref
+3. Stages them and runs the normal split logic
+4. Cleans up the temporary branch and returns to your original branch
+
 ### `extract`
 
 Extract file changes from a source branch or commit to your working directory. This is useful when you want to copy changes from another branch to review and then stage them for committing using the `branch` command.

package/dist/cli.js

@@ -16372,6 +16372,16 @@ var getChangedFilesBetween = async (source, target) => {
     throw new Error(`Failed to get changed files between ${source} and ${target || "base"}: ${error}`);
   }
 };
+var stageFiles = async (files) => {
+  if (files.length === 0)
+    return;
+  try {
+    await git.add(files);
+    log.info(`Staged ${files.length} file${files.length !== 1 ? "s" : ""}`);
+  } catch (error) {
+    throw new Error(`Failed to stage files: ${error}`);
+  }
+};
 var extractFilesFromRef = async (ref, files) => {
   try {
     for (const file of files) {
@@ -16696,11 +16706,16 @@ var createPullRequest = async (options) => {
   });
 };
 var createPRWithTemplate = async (title, branchName, options = {}) => {
-  const template = await findPRTemplate();
   let body = "";
-  if (template) {
-    body = template.content;
-    log.info("Using PR template for pull request body");
+  if (options.prBody) {
+    body = options.prBody;
+    log.info("Using provided PR body");
+  } else {
+    const template = await findPRTemplate();
+    if (template) {
+      body = template.content;
+      log.info("Using PR template for pull request body");
+    }
   }
   return createPullRequest({
     title,
@@ -16859,6 +16874,8 @@ var branch = async (options) => {
   let operationState = options.operationState || null;
   const isSubOperation = !!options.operationState;
   let autoRecoverySucceeded = false;
+  let tempBranch = null;
+  let sourceOriginalBranch = null;
   if (options.json && !isSubOperation) {
     setSilent(true);
   }
@@ -16872,7 +16889,37 @@ var branch = async (options) => {
     if (options.pr && options.draftPr) {
       throw new Error("Cannot use both --pr and --draft-pr options");
     }
-    if (await hasUnstagedChanges()) {
+    if (options.source && !isSubOperation) {
+      if (await hasStagedChanges()) {
+        throw new Error("Cannot use --source when there are staged changes. " + "Either commit/unstage your changes first, or omit --source to use staged files.");
+      }
+      sourceOriginalBranch = await getCurrentBranch();
+      log.info(`Extracting changes from source: ${options.source}`);
+      const defaultBranch = await getDefaultBranch();
+      const compareTarget = options.compareMain ? defaultBranch : undefined;
+      if (compareTarget) {
+        log.info(`Comparing ${options.source} against ${compareTarget}...`);
+      }
+      let sourceFiles = await getChangedFilesBetween(options.source, compareTarget);
+      if (sourceFiles.length === 0) {
+        throw new Error(`No changed files found in ${options.source}`);
+      }
+      sourceFiles = filterByPathPatterns(sourceFiles, options.pathPattern);
+      if (sourceFiles.length === 0) {
+        throw new Error(options.pathPattern ? `No changed files found matching pattern: ${options.pathPattern}` : `No changed files found in ${options.source}`);
+      }
+      log.info(`Found ${sourceFiles.length} changed file${sourceFiles.length !== 1 ? "s" : ""} in source`);
+      tempBranch = `cg-temp-${Date.now()}`;
+      log.info(`Creating temporary branch "${tempBranch}" from "${defaultBranch}"...`);
+      await checkout(defaultBranch);
+      await createBranch(tempBranch);
+      log.info("Extracting files from source...");
+      await extractFilesFromRef(options.source, sourceFiles);
+      await stageFiles(sourceFiles);
+      log.info(`Files extracted and staged on temporary branch. Proceeding with branch creation...
+`);
+    }
+    if (!(options.source && !isSubOperation) && await hasUnstagedChanges()) {
       const unstagedFiles = await getUnstagedFiles();
       log.warn("Warning: Unstaged changes detected (these will be ignored):");
       unstagedFiles.forEach((file) => log.warn(`  - ${file}`));
@@ -17072,7 +17119,8 @@ Excluded staged files (${excludedFiles.length}):`));
           const defaultBranch = await getDefaultBranch();
           const prResult = await createPRWithTemplate(options.message, options.branch, {
             draft: options.draftPr,
-            base: defaultBranch
+            base: defaultBranch,
+            prBody: options.prBody
           });
           if (prResult) {
             prUrl = prResult.url;
@@ -17231,15 +17279,30 @@ Auto-recovery failed. Manual recovery options:`);
     process.exit(1);
   } finally {
     try {
-      if (originalBranch) {
-        const currentBranch = await getCurrentBranch();
-        if (currentBranch !== originalBranch) {
-          await checkout(originalBranch);
+      if (tempBranch) {
+        if (sourceOriginalBranch) {
+          const currentBranch = await getCurrentBranch();
+          if (currentBranch !== sourceOriginalBranch) {
+            log.info(`Returning to original branch "${sourceOriginalBranch}"...`);
+            await checkout(sourceOriginalBranch);
+          }
+        }
+        log.info(`Cleaning up temporary branch "${tempBranch}"...`);
+        await deleteBranch(tempBranch, true);
+      } else {
+        if (originalBranch) {
+          const currentBranch = await getCurrentBranch();
+          if (currentBranch !== originalBranch) {
+            await checkout(originalBranch);
+          }
         }
       }
     } catch (finalError) {
       log.error(`Error during final cleanup: ${finalError}`);
       log.info("Some manual cleanup may be required.");
+      if (tempBranch) {
+        log.info(`You can manually delete the temp branch with: git branch -D ${tempBranch}`);
+      }
     }
   }
 };
@@ -18690,6 +18753,8 @@ Operation details:`);
 var import_cli_table33 = __toESM(require_table(), 1);
 var multiBranch = async (options) => {
   let operationState = null;
+  let tempBranch = null;
+  let sourceOriginalBranch = null;
   if (options.json) {
     setSilent(true);
   }
@@ -18706,7 +18771,37 @@ var multiBranch = async (options) => {
     if (options.pr && options.draftPr) {
       throw new Error("Cannot use both --pr and --draft-pr options");
     }
-    if (await hasUnstagedChanges()) {
+    if (options.source) {
+      if (await hasStagedChanges()) {
+        throw new Error("Cannot use --source when there are staged changes. " + "Either commit/unstage your changes first, or omit --source to use staged files.");
+      }
+      sourceOriginalBranch = await getCurrentBranch();
+      log.info(`Extracting changes from source: ${options.source}`);
+      const defaultBranch = await getDefaultBranch();
+      const compareTarget = options.compareMain ? defaultBranch : undefined;
+      if (compareTarget) {
+        log.info(`Comparing ${options.source} against ${compareTarget}...`);
+      }
+      let sourceFiles = await getChangedFilesBetween(options.source, compareTarget);
+      if (sourceFiles.length === 0) {
+        throw new Error(`No changed files found in ${options.source}`);
+      }
+      sourceFiles = filterByPathPatterns(sourceFiles, options.pathPattern);
+      if (sourceFiles.length === 0) {
+        throw new Error(options.pathPattern ? `No changed files found matching pattern: ${options.pathPattern}` : `No changed files found in ${options.source}`);
+      }
+      log.info(`Found ${sourceFiles.length} changed file${sourceFiles.length !== 1 ? "s" : ""} in source`);
+      tempBranch = `cg-temp-${Date.now()}`;
+      log.info(`Creating temporary branch "${tempBranch}" from "${defaultBranch}"...`);
+      await checkout(defaultBranch);
+      await createBranch(tempBranch);
+      log.info("Extracting files from source...");
+      await extractFilesFromRef(options.source, sourceFiles);
+      await stageFiles(sourceFiles);
+      log.info(`Files extracted and staged on temporary branch. Proceeding with multi-branch split...
+`);
+    }
+    if (!options.source && await hasUnstagedChanges()) {
       const unstagedFiles = await getUnstagedFiles();
       log.warn("Warning: Unstaged changes detected (these will be ignored):");
       unstagedFiles.forEach((file) => log.warn(`  - ${file}`));
@@ -18926,7 +19021,8 @@ Summary:`));
         pathPattern: options.pathPattern,
         exclusive: options.exclusive,
         coOwned: options.coOwned,
-        json: options.json
+        json: options.json,
+        prBody: options.prBody
       });
       results.push(result);
     }
@@ -19042,6 +19138,23 @@ Manual recovery options:`);
       }
     }
     process.exit(1);
+  } finally {
+    if (tempBranch) {
+      try {
+        if (sourceOriginalBranch) {
+          const currentBranch = await getCurrentBranch();
+          if (currentBranch !== sourceOriginalBranch) {
+            log.info(`Returning to original branch "${sourceOriginalBranch}"...`);
+            await checkout(sourceOriginalBranch);
+          }
+        }
+        log.info(`Cleaning up temporary branch "${tempBranch}"...`);
+        await deleteBranch(tempBranch, true);
+      } catch (cleanupError) {
+        log.warn(`Failed to clean up temporary branch "${tempBranch}": ${cleanupError}`);
+        log.info(`You can manually delete it with: git branch -D ${tempBranch}`);
+      }
+    }
   }
 };
 
@@ -19235,7 +19348,7 @@ Next steps:`);
   }
 };
 // package.json
-var version = "2.1.0";
+var version = "2.2.0";
 
 // src/commands/version.ts
 function getVersion() {
@@ -19297,7 +19410,7 @@ program2.command("list").description("Lists all git changed files by CODEOWNER")
     pathPattern: pattern
   });
 });
-program2.command("branch").description("Create new branch with codeowner changes").argument("[pattern]", "Path pattern to filter files (micromatch syntax, comma-separated)").requiredOption("-i, --include <patterns>", "Code owner pattern to filter files").requiredOption("-b, --branch <branch>", "Branch name").requiredOption("-m, --message <message>", "Commit message").option("-n, --no-verify", "Skip lint-staged or any other ci checks").option("-p, --push", "Push branch to remote after commit").option("-r, --remote <remote>", "Remote name to push to", "origin").option("-u, --upstream <upstream>", "Upstream branch name (defaults to local branch name)").option("-f, --force", "Force push to remote").option("-k, --keep-branch-on-failure", "Keep the created branch even if operation fails").option("--append", "Add commits to existing branch instead of creating a new one").option("--pr", "Create a pull request after pushing (requires --push)").option("--draft-pr", "Create a draft pull request after pushing (requires --push)").option("-e, --exclusive", "Only include files where the owner is the sole owner (no co-owners)").option("-c, --co-owned", "Only include files with multiple owners (co-owned files)").option("--dry-run", "Preview the operation without making any changes").option("--json", "Output results as JSON (suppresses all other output)").action((pattern, options) => {
+program2.command("branch").description("Create new branch with codeowner changes").argument("[pattern]", "Path pattern to filter files (micromatch syntax, comma-separated)").requiredOption("-i, --include <patterns>", "Code owner pattern to filter files").requiredOption("-b, --branch <branch>", "Branch name").requiredOption("-m, --message <message>", "Commit message").option("-n, --no-verify", "Skip lint-staged or any other ci checks").option("-p, --push", "Push branch to remote after commit").option("-r, --remote <remote>", "Remote name to push to", "origin").option("-u, --upstream <upstream>", "Upstream branch name (defaults to local branch name)").option("-f, --force", "Force push to remote").option("-k, --keep-branch-on-failure", "Keep the created branch even if operation fails").option("--append", "Add commits to existing branch instead of creating a new one").option("--pr", "Create a pull request after pushing (requires --push)").option("--draft-pr", "Create a draft pull request after pushing (requires --push)").option("--pr-body <body>", "Custom PR body text (overrides repo PR template, requires --pr or --draft-pr)").option("-e, --exclusive", "Only include files where the owner is the sole owner (no co-owners)").option("-c, --co-owned", "Only include files with multiple owners (co-owned files)").option("--dry-run", "Preview the operation without making any changes").option("--json", "Output results as JSON (suppresses all other output)").option("-s, --source <source>", "Source branch or commit to extract changes from (creates a temp branch from the default branch)").option("--compare-main", "Compare source against main branch instead of detecting merge-base (use with --source)").action((pattern, options) => {
   if (options.exclusive && options.coOwned) {
     console.error("Error: Cannot use both --exclusive and --co-owned options");
     process.exit(1);
@@ -19307,7 +19420,7 @@ program2.command("branch").description("Create new branch with codeowner changes
     pathPattern: pattern
   });
 });
-program2.command("multi-branch").description("Create branches for all codeowners").argument("[pattern]", "Path pattern to filter files (micromatch syntax, comma-separated)").requiredOption("-b, --branch <branch>", "Base branch name (will be suffixed with codeowner name)").requiredOption("-m, --message <message>", "Base commit message (will be suffixed with codeowner name)").option("-n, --no-verify", "Skip lint-staged or any other ci checks").option("-p, --push", "Push branches to remote after commit").option("-r, --remote <remote>", "Remote name to push to", "origin").option("-u, --upstream <upstream>", "Upstream branch name pattern (defaults to local branch name)").option("-f, --force", "Force push to remote").option("-k, --keep-branch-on-failure", "Keep created branches even if operation fails").option("-d, --default-owner <defaultOwner>", "Default owner to use when no codeowners are found for changed files").option("--ignore <patterns>", "Comma-separated patterns to exclude codeowners (e.g., 'team-a,team-b')").option("--include <patterns>", "Comma-separated patterns to include codeowners (e.g., 'team-*,@org/*')").option("--append", "Add commits to existing branches instead of creating new ones").option("--pr", "Create pull requests after pushing (requires --push)").option("--draft-pr", "Create draft pull requests after pushing (requires --push)").option("-e, --exclusive", "Only include files where each owner is the sole owner (no co-owners)").option("-c, --co-owned", "Only include files with multiple owners (co-owned files)").option("--dry-run", "Preview the operation without making any changes").option("--json", "Output results as JSON (suppresses all other output)").action((pattern, options) => {
+program2.command("multi-branch").description("Create branches for all codeowners").argument("[pattern]", "Path pattern to filter files (micromatch syntax, comma-separated)").requiredOption("-b, --branch <branch>", "Base branch name (will be suffixed with codeowner name)").requiredOption("-m, --message <message>", "Base commit message (will be suffixed with codeowner name)").option("-n, --no-verify", "Skip lint-staged or any other ci checks").option("-p, --push", "Push branches to remote after commit").option("-r, --remote <remote>", "Remote name to push to", "origin").option("-u, --upstream <upstream>", "Upstream branch name pattern (defaults to local branch name)").option("-f, --force", "Force push to remote").option("-k, --keep-branch-on-failure", "Keep created branches even if operation fails").option("-d, --default-owner <defaultOwner>", "Default owner to use when no codeowners are found for changed files").option("--ignore <patterns>", "Comma-separated patterns to exclude codeowners (e.g., 'team-a,team-b')").option("--include <patterns>", "Comma-separated patterns to include codeowners (e.g., 'team-*,@org/*')").option("--append", "Add commits to existing branches instead of creating new ones").option("--pr", "Create pull requests after pushing (requires --push)").option("--draft-pr", "Create draft pull requests after pushing (requires --push)").option("--pr-body <body>", "Custom PR body text (overrides repo PR template, requires --pr or --draft-pr)").option("-e, --exclusive", "Only include files where each owner is the sole owner (no co-owners)").option("-c, --co-owned", "Only include files with multiple owners (co-owned files)").option("--dry-run", "Preview the operation without making any changes").option("--json", "Output results as JSON (suppresses all other output)").option("-s, --source <source>", "Source branch or commit to split (extracts changes onto a temp branch from the default branch)").option("--compare-main", "Compare source against main branch instead of detecting merge-base (use with --source)").action((pattern, options) => {
   if (options.exclusive && options.coOwned) {
     console.error("Error: Cannot use both --exclusive and --co-owned options");
     process.exit(1);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "codeowners-git",
-  "version": "2.1.0",
+  "version": "2.2.0",
   "module": "src/cli.ts",
   "type": "module",
   "private": false,