codeowners-git 2.0.2 → 2.2.0

package/dist/cli.js

@@ -5,15 +5,29 @@ var __getProtoOf = Object.getPrototypeOf;
 var __defProp = Object.defineProperty;
 var __getOwnPropNames = Object.getOwnPropertyNames;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
+function __accessProp(key) {
+  return this[key];
+}
+var __toESMCache_node;
+var __toESMCache_esm;
 var __toESM = (mod, isNodeMode, target) => {
+  var canCache = mod != null && typeof mod === "object";
+  if (canCache) {
+    var cache = isNodeMode ? __toESMCache_node ??= new WeakMap : __toESMCache_esm ??= new WeakMap;
+    var cached = cache.get(mod);
+    if (cached)
+      return cached;
+  }
   target = mod != null ? __create(__getProtoOf(mod)) : {};
   const to = isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target;
   for (let key of __getOwnPropNames(mod))
     if (!__hasOwnProp.call(to, key))
       __defProp(to, key, {
-        get: () => mod[key],
+        get: __accessProp.bind(mod, key),
         enumerable: true
       });
+  if (canCache)
+    cache.set(mod, to);
   return to;
 };
 var __commonJS = (cb, mod) => () => (mod || cb((mod = { exports: {} }).exports, mod), mod.exports);
@@ -2287,7 +2301,7 @@ var require_ignore = __commonJS((exports, module) => {
       }
     }, {
       key: "filter",
-      value: function filter(paths) {
+      value: function filter2(paths) {
         var _this = this;
         return make_array(paths).filter(function(path) {
           return _this._filter(path);
@@ -2438,7 +2452,7 @@ var require_ignore = __commonJS((exports, module) => {
   }
   if (typeof process !== "undefined" && (process.env && process.env.IGNORE_TEST_WIN32 || process.platform === "win32")) {
     filter = IgnoreBase.prototype._filter;
-    make_posix = function make_posix(str) {
+    make_posix = function make_posix2(str) {
       return /^\\\\\?\\/.test(str) || /[^\x00-\x80]+/.test(str) ? str : str.replace(/\\/g, "/");
     };
     IgnoreBase.prototype._filter = function(path, slices) {
@@ -3039,25 +3053,25 @@ var require_minimatch = __commonJS((exports, module) => {
       return minimatch;
     }
     var orig = minimatch;
-    var m = function minimatch(p, pattern, options) {
+    var m = function minimatch2(p, pattern, options) {
       return orig(p, pattern, ext(def, options));
     };
-    m.Minimatch = function Minimatch(pattern, options) {
+    m.Minimatch = function Minimatch2(pattern, options) {
       return new orig.Minimatch(pattern, ext(def, options));
     };
     m.Minimatch.defaults = function defaults(options) {
       return orig.defaults(ext(def, options)).Minimatch;
     };
-    m.filter = function filter(pattern, options) {
+    m.filter = function filter2(pattern, options) {
       return orig.filter(pattern, ext(def, options));
     };
     m.defaults = function defaults(options) {
       return orig.defaults(ext(def, options));
     };
-    m.makeRe = function makeRe(pattern, options) {
+    m.makeRe = function makeRe2(pattern, options) {
       return orig.makeRe(pattern, ext(def, options));
     };
-    m.braceExpand = function braceExpand(pattern, options) {
+    m.braceExpand = function braceExpand2(pattern, options) {
       return orig.braceExpand(pattern, ext(def, options));
     };
     m.match = function(list, pattern, options) {
@@ -6584,7 +6598,7 @@ var require_colors = __commonJS((exports, module) => {
   colors.stripColors = colors.strip = function(str) {
     return ("" + str).replace(/\x1B\[\d+m/g, "");
   };
-  var stylize = colors.stylize = function stylize(str, style) {
+  var stylize = colors.stylize = function stylize2(str, style) {
     if (!colors.enabled) {
       return str + "";
     }
@@ -6602,8 +6616,8 @@ var require_colors = __commonJS((exports, module) => {
     return str.replace(matchOperatorsRe, "\\$&");
   };
   function build(_styles) {
-    var builder = function builder() {
-      return applyStyle2.apply(builder, arguments);
+    var builder = function builder2() {
+      return applyStyle2.apply(builder2, arguments);
     };
     builder._styles = _styles;
     builder.__proto__ = proto2;
@@ -6622,7 +6636,7 @@ var require_colors = __commonJS((exports, module) => {
     });
     return ret;
   }();
-  var proto2 = defineProps(function colors() {}, styles3);
+  var proto2 = defineProps(function colors2() {}, styles3);
   function applyStyle2() {
     var args = Array.prototype.slice.call(arguments);
     var str = args.map(function(arg) {
@@ -6681,7 +6695,7 @@ var require_colors = __commonJS((exports, module) => {
     });
     return ret;
   }
-  var sequencer = function sequencer(map2, str) {
+  var sequencer = function sequencer2(map2, str) {
     var exploded = str.split("");
     exploded = exploded.map(map2);
     return exploded.join("");
@@ -11612,7 +11626,7 @@ var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __esm = (fn, res) => function __init() {
   return fn && (res = (0, fn[__getOwnPropNames2(fn)[0]])(fn = 0)), res;
 };
-var __commonJS2 = (cb, mod) => function __require() {
+var __commonJS2 = (cb, mod) => function __require2() {
   return mod || (0, cb[__getOwnPropNames2(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
 };
 var __export = (target, all) => {
@@ -16080,6 +16094,26 @@ var import_cli_table3 = __toESM(require_table(), 1);
 var DEFAULT_COLUMN_WIDTH = 50;
 var MAX_LINE_LENGTH = 80;
 var MAX_PATH_LENGTH = 60;
+var _silent = false;
+var _origConsoleLog = console.log;
+var _origConsoleWarn = console.warn;
+var _origConsoleError = console.error;
+var noop = () => {};
+var setSilent = (silent) => {
+  _silent = silent;
+  if (silent) {
+    console.log = noop;
+    console.warn = noop;
+    console.error = noop;
+  } else {
+    console.log = _origConsoleLog;
+    console.warn = _origConsoleWarn;
+    console.error = _origConsoleError;
+  }
+};
+var outputJson = (data) => {
+  _origConsoleLog(JSON.stringify(data, null, 2));
+};
 var log = {
   success: (message) => console.log(source_default.green(`✓ ${message}`)),
   error: (message) => console.error(source_default.red(`✗ ${message}`)),
@@ -16154,6 +16188,14 @@ var hasUnstagedChanges = async () => {
   const unstagedFiles = await getUnstagedFiles();
   return unstagedFiles.length > 0;
 };
+var getStagedFiles = async () => {
+  const status = await git.status();
+  return status.files.filter((file) => file.index !== " " && file.index !== "?").map((file) => file.path);
+};
+var hasStagedChanges = async () => {
+  const stagedFiles = await getStagedFiles();
+  return stagedFiles.length > 0;
+};
 var branchExists = async (branchName) => {
   try {
     const branches = await git.branch();
@@ -16240,7 +16282,8 @@ var pushBranch = async (branchName, {
   remote = "origin",
   upstream,
   force = false,
-  noVerify = false
+  noVerify = false,
+  silent = false
 } = {}) => {
   const targetUpstream = upstream || branchName;
   log.info(`Pushing branch "${branchName}" to ${remote}/${targetUpstream}...`);
@@ -16253,8 +16296,9 @@ var pushBranch = async (branchName, {
     if (noVerify) {
       pushArgs.push("--no-verify");
     }
+    const stdioOption = silent ? ["pipe", "pipe", "pipe"] : ["inherit", "inherit", "inherit"];
     const gitProcess = spawn2("git", ["push", ...pushArgs], {
-      stdio: ["inherit", "inherit", "inherit"]
+      stdio: stdioOption
     });
     return new Promise((resolve, reject) => {
       gitProcess.on("close", (code) => {
@@ -16328,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) {
@@ -16430,6 +16484,9 @@ var getOwnerFiles = async (ownerPattern, includeUnowned = false, pathPattern, ex
 // src/commands/list.ts
 var listCodeowners = async (options) => {
   try {
+    if (options.json) {
+      setSilent(true);
+    }
     if (await hasUnstagedChanges()) {
       const unstagedFiles = await getUnstagedFiles();
       log.warn("Warning: Unstaged changes detected (these will be ignored):");
@@ -16462,6 +16519,34 @@ Only staged files will be processed.`);
         return matchFn(owners, patterns);
       });
     }
+    if (options.json) {
+      let grouped;
+      if (options.group) {
+        grouped = {};
+        for (const { file, owners } of filteredFiles) {
+          if (owners.length === 0) {
+            grouped["(unowned)"] = grouped["(unowned)"] || [];
+            grouped["(unowned)"].push(file);
+          } else {
+            for (const owner of owners) {
+              grouped[owner] = grouped[owner] || [];
+              grouped[owner].push(file);
+            }
+          }
+        }
+      }
+      outputJson({
+        command: "list",
+        ...grouped ? { grouped } : { files: filteredFiles.map(({ file, owners }) => ({ file, owners })) },
+        filters: {
+          include: options.include || null,
+          pathPattern: options.pathPattern || null,
+          exclusive: options.exclusive || false,
+          coOwned: options.coOwned || false
+        }
+      });
+      return;
+    }
     if (options.group) {
       const ownerGroups = new Map;
       for (const { file, owners } of filteredFiles) {
@@ -16528,6 +16613,10 @@ Only staged files will be processed.`);
       ]);
     }
   } catch (err) {
+    if (options.json) {
+      outputJson({ command: "list", error: String(err) });
+      process.exit(1);
+    }
     log.error(err);
     process.exit(1);
   }
@@ -16617,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,
@@ -16780,6 +16874,11 @@ 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);
+  }
   try {
     if (!options.branch || !options.message || !options.include) {
       throw new Error("Missing required options for branch creation");
@@ -16790,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}`));
@@ -16829,6 +16958,93 @@ Only staged files will be processed.`);
     log.file(`Files to be committed:
   ${filesToCommit.join(`
   `)}`);
+    if (options.dryRun) {
+      const allStagedFiles = await getChangedFiles();
+      const excludedFiles = allStagedFiles.filter((f) => !filesToCommit.includes(f));
+      const branchAlreadyExistsDry = await branchExists(options.branch);
+      if (options.json && !isSubOperation) {
+        outputJson({
+          command: "branch",
+          dryRun: true,
+          owner: options.include,
+          branch: options.branch,
+          branchExists: branchAlreadyExistsDry,
+          message: options.message,
+          files: filesToCommit,
+          excludedFiles,
+          options: {
+            push: options.push || false,
+            remote: options.remote || "origin",
+            force: options.force || false,
+            pr: options.pr || false,
+            draftPr: options.draftPr || false,
+            noVerify: !options.verify,
+            append: options.append || false,
+            exclusive: options.exclusive || false,
+            coOwned: options.coOwned || false,
+            pathPattern: options.pathPattern || null
+          }
+        });
+        return {
+          success: true,
+          branchName: options.branch,
+          owner: options.include,
+          files: filesToCommit,
+          pushed: false
+        };
+      }
+      if (!isSubOperation) {
+        log.header("Dry Run Preview — branch");
+        console.log("");
+      }
+      const detailsTable = new import_cli_table32.default({
+        style: { head: ["cyan"] },
+        wordWrap: true
+      });
+      detailsTable.push({ [source_default.bold("Owner pattern")]: options.include }, { [source_default.bold("Branch name")]: options.branch }, {
+        [source_default.bold("Branch exists")]: branchAlreadyExistsDry ? options.append ? "Yes (--append: will add commit)" : "Yes (will fail without --append)" : "No (will be created)"
+      }, { [source_default.bold("Commit message")]: options.message }, {
+        [source_default.bold("Files matched")]: `${filesToCommit.length} file${filesToCommit.length !== 1 ? "s" : ""}`
+      }, {
+        [source_default.bold("Files excluded")]: `${excludedFiles.length} staged file${excludedFiles.length !== 1 ? "s" : ""} not matching`
+      }, { [source_default.bold("No-verify")]: !options.verify ? "Yes" : "No" }, {
+        [source_default.bold("Push")]: options.push ? `Yes → ${options.remote || "origin"}${options.force ? " (force)" : ""}` : "No"
+      }, {
+        [source_default.bold("Pull request")]: options.pr ? "Yes" : options.draftPr ? "Yes (draft)" : "No"
+      });
+      if (options.pathPattern) {
+        detailsTable.push({
+          [source_default.bold("Path filter")]: options.pathPattern
+        });
+      }
+      if (options.exclusive) {
+        detailsTable.push({
+          [source_default.bold("Exclusive mode")]: "Yes (only files solely owned by this owner)"
+        });
+      }
+      if (options.coOwned) {
+        detailsTable.push({
+          [source_default.bold("Co-owned mode")]: "Yes (only files with multiple owners)"
+        });
+      }
+      console.log(detailsTable.toString());
+      console.log(source_default.bold.green(`
+Files to be committed (${filesToCommit.length}):`));
+      filesToCommit.forEach((file) => console.log(`  ${source_default.green("+")} ${file}`));
+      if (excludedFiles.length > 0) {
+        console.log(source_default.bold.dim(`
+Excluded staged files (${excludedFiles.length}):`));
+        excludedFiles.forEach((file) => console.log(`  ${source_default.dim("-")} ${source_default.dim(file)}`));
+      }
+      console.log("");
+      return {
+        success: true,
+        branchName: options.branch,
+        owner: options.include,
+        files: filesToCommit,
+        pushed: false
+      };
+    }
     const branchAlreadyExists = await branchExists(options.branch);
     if (branchAlreadyExists && !options.append) {
       throw new Error(`Branch "${options.branch}" already exists. Use --append to add commits to it, or use a different name.`);
@@ -16883,7 +17099,8 @@ Only staged files will be processed.`);
           remote: options.remote,
           upstream: options.upstream,
           force: options.force,
-          noVerify: !options.verify
+          noVerify: !options.verify,
+          silent: !!options.json
         });
         pushed = true;
         if (operationState) {
@@ -16902,7 +17119,8 @@ Only staged files will be processed.`);
           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;
@@ -16949,7 +17167,7 @@ Only staged files will be processed.`);
 Files committed:`);
         filesToCommit.forEach((file) => console.log(`  - ${file}`));
       }
-      return {
+      const result = {
         success: true,
         branchName: options.branch,
         owner: options.include,
@@ -16958,6 +17176,15 @@ Files committed:`);
         prUrl,
         prNumber
       };
+      if (options.json && !isSubOperation) {
+        outputJson({
+          command: "branch",
+          dryRun: false,
+          ...result,
+          error: null
+        });
+      }
+      return result;
     } catch (operationError) {
       log.error(`Operation failed: ${operationError}`);
       if (operationState && !isSubOperation) {
@@ -17027,6 +17254,21 @@ Files committed:`);
         error: String(err)
       };
     }
+    if (options.json && !isSubOperation) {
+      outputJson({
+        command: "branch",
+        dryRun: false,
+        success: false,
+        branchName: options.branch ?? "",
+        owner: options.include ?? "",
+        files: filesToCommit,
+        pushed,
+        prUrl: prUrl || null,
+        prNumber: prNumber || null,
+        error: String(err)
+      });
+      process.exit(1);
+    }
     if (operationState && !autoRecoverySucceeded) {
       log.info(`
 Auto-recovery failed. Manual recovery options:`);
@@ -17037,19 +17279,33 @@ 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}`);
+      }
     }
   }
 };
-
 // node_modules/@inquirer/core/dist/esm/lib/key.js
 var isUpKey = (key) => key.name === "up" || key.name === "k" || key.ctrl && key.name === "p";
 var isDownKey = (key) => key.name === "down" || key.name === "j" || key.ctrl && key.name === "n";
@@ -18337,9 +18593,21 @@ Operation ID: ${op.id}`);
     log.info(formatBranchState(op));
   }
 };
-var performRecovery = async (state, keepBranches) => {
+var performRecovery = async (state, keepBranches, options) => {
   log.header(`Recovering from operation ${state.id}`);
   let hadWarnings = false;
+  if (!options?.skipDirtyCheck) {
+    const hasUnstaged = await hasUnstagedChanges();
+    const hasStaged = await hasStagedChanges();
+    if (hasUnstaged || hasStaged) {
+      log.warn("Working directory has uncommitted changes.");
+      log.warn("Recovery may overwrite files in your working directory.");
+      log.info("Consider committing or stashing your changes first:");
+      log.info("  git stash push -m 'before recovery'");
+      throw new Error("Working directory is not clean. Commit or stash changes before recovering.");
+    }
+  }
+  const branchesWithRestoreFailure = new Set;
   const currentBranch = await getCurrentBranch();
   if (currentBranch !== state.originalBranch) {
     try {
@@ -18370,7 +18638,8 @@ Restoring files from branches...`);
           }
         } catch (error) {
           log.error(`Failed to restore files from ${branch2.name}: ${error}`);
-          log.info(`Files may still be accessible from the branch if it exists`);
+          log.warn(`Branch ${branch2.name} will be kept to prevent data loss`);
+          branchesWithRestoreFailure.add(branch2.name);
           hadWarnings = true;
         }
       }
@@ -18381,6 +18650,12 @@ Restoring files from branches...`);
 Cleaning up created branches...`);
     for (const branch2 of state.branches) {
       if (branch2.created) {
+        if (branchesWithRestoreFailure.has(branch2.name)) {
+          log.warn(`Skipping deletion of ${branch2.name} — file restoration failed, branch preserved to prevent data loss`);
+          log.info(`  To recover files manually: git checkout ${branch2.name} -- <file>`);
+          log.info(`  To delete manually when done: git branch -D ${branch2.name}`);
+          continue;
+        }
         try {
           const exists2 = await branchExists(branch2.name);
           if (exists2) {
@@ -18478,6 +18753,11 @@ 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);
+  }
   try {
     if (!options.branch || !options.message) {
       throw new Error("Missing required options for multi-branch creation");
@@ -18491,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}`));
@@ -18556,6 +18866,137 @@ Only staged files will be processed.`);
       }
       log.info(`Processing ${codeowners2.length} codeowners after filtering: ${codeowners2.join(", ")}`);
     }
+    if (options.dryRun) {
+      const previews = [];
+      const allCoveredFiles = new Set;
+      for (const owner of codeowners2) {
+        const sanitizedOwner = owner.replace(/[^a-zA-Z0-9-_@]/g, "-").replace(/^@/, "");
+        const branchName = `${options.branch}/${sanitizedOwner}`;
+        const commitMessage = `${options.message} - ${owner}`;
+        const ownerFiles = await getOwnerFiles(owner, owner === options.defaultOwner, options.pathPattern, options.exclusive || false, options.coOwned || false);
+        for (const f of ownerFiles)
+          allCoveredFiles.add(f);
+        previews.push({
+          owner,
+          branchName,
+          commitMessage,
+          files: ownerFiles
+        });
+      }
+      const uncoveredFiles = changedFiles.filter((f) => !allCoveredFiles.has(f));
+      if (options.json) {
+        outputJson({
+          command: "multi-branch",
+          dryRun: true,
+          owners: previews.map((p) => ({
+            owner: p.owner,
+            branch: p.branchName,
+            message: p.commitMessage,
+            files: p.files
+          })),
+          uncoveredFiles,
+          filesWithoutOwners: options.defaultOwner ? [] : filesWithoutOwners,
+          totalFiles: changedFiles.length,
+          coveredFiles: allCoveredFiles.size,
+          options: {
+            baseBranch: options.branch,
+            baseMessage: options.message,
+            push: options.push || false,
+            remote: options.remote || "origin",
+            force: options.force || false,
+            pr: options.pr || false,
+            draftPr: options.draftPr || false,
+            noVerify: !options.verify,
+            append: options.append || false,
+            exclusive: options.exclusive || false,
+            coOwned: options.coOwned || false,
+            pathPattern: options.pathPattern || null,
+            defaultOwner: options.defaultOwner || null
+          }
+        });
+        return;
+      }
+      log.header("Dry Run Preview — multi-branch");
+      console.log("");
+      const settingsTable = new import_cli_table33.default({
+        style: { head: ["cyan"] },
+        wordWrap: true
+      });
+      settingsTable.push({ [source_default.bold("Base branch name")]: options.branch }, { [source_default.bold("Base commit message")]: options.message }, { [source_default.bold("Total codeowners")]: `${codeowners2.length}` }, { [source_default.bold("No-verify")]: !options.verify ? "Yes" : "No" }, {
+        [source_default.bold("Push")]: options.push ? `Yes → ${options.remote || "origin"}${options.force ? " (force)" : ""}` : "No"
+      }, {
+        [source_default.bold("Pull request")]: options.pr ? "Yes" : options.draftPr ? "Yes (draft)" : "No"
+      }, { [source_default.bold("Append mode")]: options.append ? "Yes" : "No" });
+      if (options.pathPattern) {
+        settingsTable.push({
+          [source_default.bold("Path filter")]: options.pathPattern
+        });
+      }
+      if (options.exclusive) {
+        settingsTable.push({
+          [source_default.bold("Exclusive mode")]: "Yes (only files solely owned by each owner)"
+        });
+      }
+      if (options.coOwned) {
+        settingsTable.push({
+          [source_default.bold("Co-owned mode")]: "Yes (only files with multiple owners)"
+        });
+      }
+      if (options.defaultOwner) {
+        settingsTable.push({
+          [source_default.bold("Default owner")]: options.defaultOwner
+        });
+      }
+      console.log(settingsTable.toString());
+      console.log("");
+      const summaryTable = new import_cli_table33.default({
+        head: ["Owner", "Branch", "Files", "Commit Message"],
+        colWidths: [22, 35, 8, 45],
+        wordWrap: true,
+        style: { head: ["cyan"] }
+      });
+      for (const p of previews) {
+        summaryTable.push([
+          p.owner,
+          p.branchName,
+          `${p.files.length}`,
+          p.commitMessage
+        ]);
+      }
+      console.log(summaryTable.toString());
+      console.log(source_default.bold.cyan(`
+Files by branch:`));
+      for (const p of previews) {
+        if (p.files.length > 0) {
+          console.log(`
+${source_default.bold(p.branchName)} ${source_default.dim(`(${p.owner})`)} — ${p.files.length} file${p.files.length !== 1 ? "s" : ""}:`);
+          p.files.forEach((file) => console.log(`  ${source_default.green("+")} ${file}`));
+        } else {
+          console.log(`
+${source_default.bold(p.branchName)} ${source_default.dim(`(${p.owner})`)} — ${source_default.yellow("0 files (branch will be skipped)")}`);
+        }
+      }
+      if (uncoveredFiles.length > 0) {
+        console.log(source_default.bold.yellow(`
+Uncovered staged files (${uncoveredFiles.length}) — not included in any branch:`));
+        uncoveredFiles.forEach((file) => console.log(`  ${source_default.yellow("!")} ${file}`));
+      }
+      if (filesWithoutOwners.length > 0 && !options.defaultOwner) {
+        console.log(source_default.bold.yellow(`
+Files without CODEOWNERS (${filesWithoutOwners.length}):`));
+        filesWithoutOwners.forEach((file) => console.log(`  ${source_default.yellow("?")} ${file}`));
+        console.log(source_default.dim("  Tip: Use --default-owner <owner> to assign these files"));
+      }
+      console.log(source_default.bold.cyan(`
+Summary:`));
+      console.log(`  Branches to create: ${source_default.bold(`${previews.length}`)}`);
+      console.log(`  Total files covered: ${source_default.bold(`${allCoveredFiles.size}`)} of ${changedFiles.length} staged`);
+      if (uncoveredFiles.length > 0) {
+        console.log(`  Uncovered files:     ${source_default.yellow(`${uncoveredFiles.length}`)}`);
+      }
+      console.log("");
+      return;
+    }
     const results = [];
     for (const owner of codeowners2) {
       const sanitizedOwner = owner.replace(/[^a-zA-Z0-9-_@]/g, "-").replace(/^@/, "");
@@ -18579,7 +19020,9 @@ Only staged files will be processed.`);
         operationState: operationState || undefined,
         pathPattern: options.pathPattern,
         exclusive: options.exclusive,
-        coOwned: options.coOwned
+        coOwned: options.coOwned,
+        json: options.json,
+        prBody: options.prBody
       });
       results.push(result);
     }
@@ -18642,7 +19085,36 @@ Note: ${failureCount} branch(es) failed. Files were auto-restored to working dir
         log.info(`State preserved for reference. Run 'codeowners-git recover --id ${operationState.id}' if needed.`);
       }
     }
+    if (options.json) {
+      outputJson({
+        command: "multi-branch",
+        dryRun: false,
+        success: failureCount === 0,
+        totalOwners: codeowners2.length,
+        successCount,
+        failureCount,
+        results: results.map((r) => ({
+          owner: r.owner,
+          branch: r.branchName,
+          success: r.success,
+          files: r.files,
+          pushed: r.pushed,
+          prUrl: r.prUrl || null,
+          prNumber: r.prNumber || null,
+          error: r.error || null
+        }))
+      });
+    }
   } catch (err) {
+    if (options.json) {
+      outputJson({
+        command: "multi-branch",
+        dryRun: false,
+        success: false,
+        error: String(err)
+      });
+      process.exit(1);
+    }
     log.error(`Multi-branch operation failed: ${err}`);
     if (operationState) {
       log.info(`
@@ -18650,7 +19122,7 @@ Attempting auto-recovery...`);
       const currentState = loadOperationState(operationState.id);
       if (currentState) {
         try {
-          const recovered = await performRecovery(currentState, false);
+          const recovered = await performRecovery(currentState, false, { skipDirtyCheck: true });
           if (recovered) {
             log.success("Auto-recovery completed successfully");
           } else {
@@ -18666,11 +19138,32 @@ 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}`);
+      }
+    }
   }
 };
 
 // src/commands/extract.ts
+var import_cli_table34 = __toESM(require_table(), 1);
 var extract = async (options) => {
+  if (options.json) {
+    setSilent(true);
+  }
   try {
     if (!options.source) {
       log.error("Missing required option: --source");
@@ -18758,8 +19251,82 @@ Only staged files will be processed.`);
       }
       log.info(`Filtered to ${filesToExtract.length} file${filesToExtract.length !== 1 ? "s" : ""}`);
     }
+    if (options.dryRun) {
+      const excludedFiles = changedFiles.filter((f) => !filesToExtract.includes(f));
+      if (options.json) {
+        outputJson({
+          command: "extract",
+          dryRun: true,
+          source: options.source,
+          compareTarget: compareTarget || null,
+          files: filesToExtract,
+          excludedFiles,
+          totalChanged: changedFiles.length,
+          options: {
+            include: options.include || null,
+            pathPattern: options.pathPattern || null,
+            exclusive: options.exclusive || false,
+            coOwned: options.coOwned || false,
+            compareMain: options.compareMain || false
+          }
+        });
+        return;
+      }
+      log.header("Dry Run Preview — extract");
+      console.log("");
+      const detailsTable = new import_cli_table34.default({
+        style: { head: ["cyan"] },
+        wordWrap: true
+      });
+      detailsTable.push({ [source_default.bold("Source")]: options.source }, {
+        [source_default.bold("Compare target")]: compareTarget || "auto-detected"
+      }, {
+        [source_default.bold("Files in source")]: `${changedFiles.length} changed file${changedFiles.length !== 1 ? "s" : ""}`
+      }, {
+        [source_default.bold("Files to extract")]: `${filesToExtract.length} file${filesToExtract.length !== 1 ? "s" : ""}`
+      }, {
+        [source_default.bold("Files excluded")]: `${excludedFiles.length} file${excludedFiles.length !== 1 ? "s" : ""} (filtered out)`
+      });
+      if (options.include) {
+        detailsTable.push({
+          [source_default.bold("Owner filter")]: `${options.include}${options.exclusive ? " (exclusive)" : ""}`
+        });
+      }
+      if (options.pathPattern) {
+        detailsTable.push({
+          [source_default.bold("Path filter")]: options.pathPattern
+        });
+      }
+      if (options.coOwned) {
+        detailsTable.push({
+          [source_default.bold("Co-owned mode")]: "Yes (only files with multiple owners)"
+        });
+      }
+      console.log(detailsTable.toString());
+      console.log(source_default.bold.green(`
+Files to be extracted (${filesToExtract.length}):`));
+      filesToExtract.forEach((file) => console.log(`  ${source_default.green("+")} ${file}`));
+      if (excludedFiles.length > 0) {
+        console.log(source_default.bold.dim(`
+Excluded files (${excludedFiles.length}):`));
+        excludedFiles.forEach((file) => console.log(`  ${source_default.dim("-")} ${source_default.dim(file)}`));
+      }
+      console.log("");
+      return;
+    }
     log.info("Extracting files to working directory...");
     await extractFilesFromRef(options.source, filesToExtract);
+    if (options.json) {
+      outputJson({
+        command: "extract",
+        dryRun: false,
+        source: options.source,
+        compareTarget: compareTarget || null,
+        files: filesToExtract,
+        totalChanged: changedFiles.length
+      });
+      return;
+    }
     log.success(`
 ✓ Extracted ${filesToExtract.length} file${filesToExtract.length !== 1 ? "s" : ""} to working directory (unstaged)`);
     log.info(`
@@ -18771,13 +19338,17 @@ Next steps:`);
     log.info("  - Use 'cg branch' command to create a branch and commit");
     log.info("  - Example: cg branch -i @my-team -b my-branch -m 'Commit message' -p");
   } catch (err) {
+    if (options.json) {
+      outputJson({ command: "extract", error: String(err) });
+      process.exit(1);
+    }
     log.error(`
 ✗ Extraction failed: ${err}`);
     process.exit(1);
   }
 };
 // package.json
-var version = "2.0.2";
+var version = "2.2.0";
 
 // src/commands/version.ts
 function getVersion() {
@@ -18798,15 +19369,28 @@ Force exiting...`);
 
 Received ${signal}. Gracefully shutting down...`);
     const incompleteOps = getIncompleteOperations();
-    if (incompleteOps.length > 0) {
-      log.warn(`Found ${incompleteOps.length} incomplete operation(s).`);
+    if (incompleteOps.length === 0) {
+      process.exit(130);
+      return;
+    }
+    const mostRecent = incompleteOps[0];
+    log.warn(`Found ${incompleteOps.length} incomplete operation(s).`);
+    getCurrentBranch().then((currentBranch) => {
+      if (currentBranch !== mostRecent.originalBranch) {
+        log.info(`Returning to original branch: ${mostRecent.originalBranch}...`);
+        return checkout(mostRecent.originalBranch).then(() => {
+          log.success(`Returned to ${mostRecent.originalBranch}`);
+        });
+      }
+    }).catch(() => {
+      log.warn("Could not return to original branch automatically.");
+    }).finally(() => {
       log.info(`
-To recover from incomplete operations, run:`);
-      log.info("  codeowners-git recover --list    # List all incomplete operations");
+To fully recover from incomplete operations, run:`);
       log.info("  codeowners-git recover --auto    # Auto-recover most recent operation");
-      log.info("  codeowners-git recover --id <id> # Recover specific operation");
-    }
-    process.exit(130);
+      log.info("  codeowners-git recover --list    # List all incomplete operations");
+      process.exit(130);
+    });
   };
   process.on("SIGINT", () => handleShutdown("SIGINT"));
   process.on("SIGTERM", () => handleShutdown("SIGTERM"));
@@ -18816,7 +19400,7 @@ To recover from incomplete operations, run:`);
 setupSignalHandlers();
 var program2 = new Command;
 program2.name("codeowners-git (cg)").description("CLI tool for grouping and managing staged files by CODEOWNERS").version(getVersion());
-program2.command("list").description("Lists all git changed files by CODEOWNER").argument("[pattern]", "Path pattern to filter files (micromatch syntax, comma-separated)").option("-i, --include <patterns>", "Filter by owner patterns").option("-g, --group", "Group files by code owner").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)").action((pattern, options) => {
+program2.command("list").description("Lists all git changed files by CODEOWNER").argument("[pattern]", "Path pattern to filter files (micromatch syntax, comma-separated)").option("-i, --include <patterns>", "Filter by owner patterns").option("-g, --group", "Group files by code owner").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("--json", "Output results as JSON (suppresses all other output)").action((pattern, options) => {
   if (options.exclusive && options.coOwned) {
     console.error("Error: Cannot use both --exclusive and --co-owned options");
     process.exit(1);
@@ -18826,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)").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);
@@ -18836,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)").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);
@@ -18846,7 +19430,7 @@ program2.command("multi-branch").description("Create branches for all codeowners
     pathPattern: pattern
   });
 });
-program2.command("extract").description("Extract file changes from a branch or commit to working directory").argument("[pattern]", "Path pattern to filter files (micromatch syntax, comma-separated)").requiredOption("-s, --source <source>", "Source branch or commit to extract from").option("-i, --include <patterns>", "Filter extracted files by code owner pattern").option("--compare-main", "Compare source against main branch instead of detecting merge-base").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)").action((pattern, options) => {
+program2.command("extract").description("Extract file changes from a branch or commit to working directory").argument("[pattern]", "Path pattern to filter files (micromatch syntax, comma-separated)").requiredOption("-s, --source <source>", "Source branch or commit to extract from").option("-i, --include <patterns>", "Filter extracted files by code owner pattern").option("--compare-main", "Compare source against main branch instead of detecting merge-base").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) => {
   if (options.exclusive && options.coOwned) {
     console.error("Error: Cannot use both --exclusive and --co-owned options");
     process.exit(1);