codeowners-git 1.8.0 → 2.0.0

package/dist/cli.js

@@ -16080,20 +16080,6 @@ var import_cli_table3 = __toESM(require_table(), 1);
 var DEFAULT_COLUMN_WIDTH = 50;
 var MAX_LINE_LENGTH = 80;
 var MAX_PATH_LENGTH = 60;
-var logFileList = (files, owner) => {
-  if (files.length === 0) {
-    log.info("No matching files found");
-    return;
-  }
-  if (owner) {
-    log.header(`Files owned by ${log.owner(owner)}:`);
-  } else {
-    log.header("Changed files:");
-  }
-  for (const file of files) {
-    log.file(file);
-  }
-};
 var log = {
   success: (message) => console.log(source_default.green(`✓ ${message}`)),
   error: (message) => console.error(source_default.red(`✗ ${message}`)),
@@ -16158,15 +16144,15 @@ import { spawn as spawn2 } from "child_process";
 var git = esm_default();
 var getChangedFiles = async () => {
   const status = await git.status();
-  return status.files.filter((file) => file.working_dir !== " ").map((file) => file.path);
+  return status.files.filter((file) => file.index !== " " && file.index !== "?").map((file) => file.path);
 };
-var getStagedFiles = async () => {
+var getUnstagedFiles = async () => {
   const status = await git.status();
-  return status.files.filter((file) => file.index !== " " && file.index !== "?").map((file) => file.path);
+  return status.files.filter((file) => file.working_dir !== " ").map((file) => file.path);
 };
-var hasStagedChanges = async () => {
-  const stagedFiles = await getStagedFiles();
-  return stagedFiles.length > 0;
+var hasUnstagedChanges = async () => {
+  const unstagedFiles = await getUnstagedFiles();
+  return unstagedFiles.length > 0;
 };
 var branchExists = async (branchName) => {
   try {
@@ -16362,6 +16348,50 @@ var extractFilesFromRef = async (ref, files) => {
   }
 };
 
+// src/utils/matcher.ts
+var import_micromatch = __toESM(require_micromatch(), 1);
+var normalizeForMatching = (value) => {
+  return value.replace(/\//g, "");
+};
+var matchOwnerPattern = (owner, patterns) => {
+  if (!patterns || !patterns.trim())
+    return false;
+  const normalizedOwner = normalizeForMatching(owner);
+  const normalizedPatterns = patterns.split(",").map((p) => normalizeForMatching(p.trim())).filter((p) => p.length > 0);
+  return import_micromatch.default.isMatch(normalizedOwner, normalizedPatterns);
+};
+var matchOwners = (owners, patterns) => {
+  if (!patterns || !patterns.trim())
+    return false;
+  const normalizedOwners = owners.map(normalizeForMatching);
+  const normalizedPatterns = patterns.split(",").map((p) => normalizeForMatching(p.trim())).filter((p) => p.length > 0);
+  return import_micromatch.default(normalizedOwners, normalizedPatterns).length > 0;
+};
+var matchOwnersExclusive = (owners, patterns) => {
+  if (!patterns || !patterns.trim())
+    return false;
+  if (owners.length === 0)
+    return false;
+  return owners.every((owner) => matchOwnerPattern(owner, patterns));
+};
+var filterByPathPatterns = (files, pattern) => {
+  if (!pattern || !pattern.trim())
+    return files;
+  let finalPattern = pattern.trim();
+  if (finalPattern === ".") {
+    finalPattern = "**";
+  } else if (finalPattern.endsWith("/")) {
+    finalPattern = `${finalPattern}**`;
+  } else {
+    const lastSegment = finalPattern.split("/").pop() || "";
+    const looksLikeFile = /\.[^*?[\]{}!/]+$/.test(lastSegment);
+    if (!looksLikeFile) {
+      finalPattern = `${finalPattern}/**`;
+    }
+  }
+  return import_micromatch.default(files, [finalPattern], { dot: true });
+};
+
 // src/utils/codeowners.ts
 var codeowners;
 var getCodeownersInstance = () => {
@@ -16381,47 +16411,101 @@ var getOwner = (filePath) => {
   const owner = instance.getOwner(filePath);
   return owner;
 };
-var getOwnerFiles = async (owner, includeUnowned = false) => {
-  const changedFiles = await getChangedFiles();
+var getOwnerFiles = async (ownerPattern, includeUnowned = false, pathPattern, exclusive = false, coOwned = false) => {
+  let changedFiles = await getChangedFiles();
+  changedFiles = filterByPathPatterns(changedFiles, pathPattern);
   return changedFiles.filter((file) => {
     const owners = getOwner(file);
     if (includeUnowned && owners.length === 0) {
       return true;
     }
-    return owners.includes(owner);
-  });
-};
-
-// src/utils/matcher.ts
-var import_micromatch = __toESM(require_micromatch(), 1);
-var matchOwners = (owners, patterns) => {
-  if (!patterns || !patterns.trim())
-    return false;
-  const normalizedOwners = owners.map((owner) => {
-    return owner.replace(/\//g, "");
+    if (coOwned && owners.length < 2) {
+      return false;
+    }
+    if (exclusive) {
+      return matchOwnersExclusive(owners, ownerPattern);
+    }
+    return owners.some((owner) => matchOwnerPattern(owner, ownerPattern));
   });
-  const normalizedPatterns = patterns.replace(/\//g, "").split(",");
-  const matches = import_micromatch.default(normalizedOwners, normalizedPatterns);
-  return matches.length > 0;
 };
 
 // src/commands/list.ts
 var listCodeowners = async (options) => {
   try {
-    if (options.owner) {
-      const files = await getOwnerFiles(options.owner);
-      logFileList(files, options.owner);
-    } else {
-      const changedFiles = await getChangedFiles();
-      const filesWithOwners = changedFiles.map((file) => ({
-        file,
-        owners: getOwner(file)
-      }));
-      let filteredFiles = filesWithOwners;
-      if (options.include) {
-        const patterns = options.include;
-        filteredFiles = filesWithOwners.filter(({ owners }) => matchOwners(owners, patterns));
+    if (await hasUnstagedChanges()) {
+      const unstagedFiles = await getUnstagedFiles();
+      log.warn("Warning: Unstaged changes detected (these will be ignored):");
+      unstagedFiles.forEach((file) => log.warn(`  - ${file}`));
+      log.info(`
+Only staged files will be processed.`);
+      log.info("To stage files: git add <file>");
+      log.info("");
+    }
+    let changedFiles = await getChangedFiles();
+    changedFiles = filterByPathPatterns(changedFiles, options.pathPattern);
+    const filesWithOwners = changedFiles.map((file) => ({
+      file,
+      owners: getOwner(file)
+    }));
+    let filteredFiles = filesWithOwners;
+    if (options.exclusive && !options.include) {
+      filteredFiles = filesWithOwners.filter(({ owners }) => owners.length === 1);
+    }
+    if (options.coOwned && !options.include) {
+      filteredFiles = filesWithOwners.filter(({ owners }) => owners.length > 1);
+    }
+    if (options.include) {
+      const patterns = options.include;
+      const matchFn = options.exclusive ? matchOwnersExclusive : matchOwners;
+      filteredFiles = filesWithOwners.filter(({ owners }) => {
+        if (options.coOwned && owners.length < 2) {
+          return false;
+        }
+        return matchFn(owners, patterns);
+      });
+    }
+    if (options.group) {
+      const ownerGroups = new Map;
+      for (const { file, owners } of filteredFiles) {
+        if (owners.length === 0) {
+          const unownedFiles = ownerGroups.get("(unowned)") || [];
+          unownedFiles.push(file);
+          ownerGroups.set("(unowned)", unownedFiles);
+        } else {
+          for (const owner of owners) {
+            const files = ownerGroups.get(owner) || [];
+            files.push(file);
+            ownerGroups.set(owner, files);
+          }
+        }
+      }
+      const sortedOwners = Array.from(ownerGroups.keys()).sort((a, b) => {
+        if (a === "(unowned)")
+          return 1;
+        if (b === "(unowned)")
+          return -1;
+        return a.localeCompare(b);
+      });
+      for (const owner of sortedOwners) {
+        const files = ownerGroups.get(owner) || [];
+        const tableData = files.map((file, index) => ({
+          No: index + 1,
+          File: file
+        }));
+        log.header(`Files owned by ${log.owner(owner)}:`);
+        log.formattedTable(tableData, [
+          {
+            name: "No",
+            width: 8
+          },
+          {
+            name: "File",
+            width: 100,
+            formatter: (value) => log.smartFile(value)
+          }
+        ]);
       }
+    } else {
       const tableData = filteredFiles.map(({ file, owners }, index) => ({
         No: index + 1,
         File: file,
@@ -16550,6 +16634,9 @@ var createPRWithTemplate = async (title, branchName, options = {}) => {
   });
 };
 
+// src/commands/branch.ts
+var import_cli_table32 = __toESM(require_table(), 1);
+
 // src/utils/state.ts
 import { existsSync, mkdirSync, writeFileSync, readFileSync, readdirSync, unlinkSync } from "fs";
 import { join } from "path";
@@ -16694,8 +16781,9 @@ var branch = async (options) => {
   let pushed = false;
   let operationState = options.operationState || null;
   const isSubOperation = !!options.operationState;
+  let autoRecoverySucceeded = false;
   try {
-    if (!options.branch || !options.message || !options.owner) {
+    if (!options.branch || !options.message || !options.include) {
       throw new Error("Missing required options for branch creation");
     }
     if ((options.pr || options.draftPr) && !options.push) {
@@ -16704,19 +16792,14 @@ var branch = async (options) => {
     if (options.pr && options.draftPr) {
       throw new Error("Cannot use both --pr and --draft-pr options");
     }
-    if (await hasStagedChanges()) {
-      const stagedFiles = await getStagedFiles();
-      log.error("Changes need to be unstaged in order for this to work.");
-      log.info(`
-Staged files detected:`);
-      stagedFiles.forEach((file) => log.info(`  - ${file}`));
-      log.info(`
-To unstage files, run:`);
-      log.info("  git restore --staged .");
+    if (await hasUnstagedChanges()) {
+      const unstagedFiles = await getUnstagedFiles();
+      log.warn("Warning: Unstaged changes detected (these will be ignored):");
+      unstagedFiles.forEach((file) => log.warn(`  - ${file}`));
       log.info(`
-Or to unstage specific files:`);
-      log.info("  git restore --staged <file>");
-      throw new Error("Staged changes detected. Please unstage all changes before running this command.");
+Only staged files will be processed.`);
+      log.info("To stage files: git add <file>");
+      log.info("");
     }
     log.info(options.append ? "Starting branch update process..." : "Starting branch creation process...");
     originalBranch = await getCurrentBranch();
@@ -16733,13 +16816,13 @@ Or to unstage specific files:`);
       });
       log.info(`Operation ID: ${operationState.id}`);
     }
-    filesToCommit = await getOwnerFiles(options.owner, options.isDefaultOwner || false);
+    filesToCommit = await getOwnerFiles(options.include, options.isDefaultOwner || false, options.pathPattern, options.exclusive || false, options.coOwned || false);
     if (filesToCommit.length <= 0) {
-      log.warn(`No files found for ${options.owner}. Skipping branch creation.`);
+      log.warn(`No files found for ${options.include}. Skipping branch creation.`);
       return {
         success: false,
         branchName: options.branch,
-        owner: options.owner,
+        owner: options.include,
         files: [],
         pushed: false,
         error: "No files found for this owner"
@@ -16759,7 +16842,7 @@ Or to unstage specific files:`);
         });
         updateBranchState(operationState.id, options.branch, {
           name: options.branch,
-          owner: options.owner || "",
+          owner: options.include || "",
           files: filesToCommit,
           created: false,
           committed: false,
@@ -16848,15 +16931,30 @@ Or to unstage specific files:`);
       if (operationState && !isSubOperation) {
         completeOperation(operationState.id, true);
       }
-      if (branchAlreadyExists && options.append) {
-        log.success(options.push ? `Changes committed to existing branch "${options.branch}" and pushed to remote.` : `Changes committed to existing branch "${options.branch}".`);
-      } else {
-        log.success(options.push ? `Branch "${options.branch}" created, changes committed, and pushed to remote.` : `Branch "${options.branch}" created and changes committed.`);
+      if (!isSubOperation) {
+        log.header(options.append ? "Branch update summary" : "Branch creation summary");
+        const table = new import_cli_table32.default({
+          head: ["Status", "Owner", "Branch", "Files", "Pushed", "PR"],
+          colWidths: [10, 25, 35, 10, 10, 50],
+          wordWrap: true
+        });
+        table.push([
+          "✓",
+          options.include,
+          options.branch,
+          `${filesToCommit.length} file${filesToCommit.length !== 1 ? "s" : ""}`,
+          pushed ? "✓" : "-",
+          prUrl || "-"
+        ]);
+        console.log(table.toString());
+        console.log(`
+Files committed:`);
+        filesToCommit.forEach((file) => console.log(`  - ${file}`));
       }
       return {
         success: true,
         branchName: options.branch,
-        owner: options.owner,
+        owner: options.include,
         files: filesToCommit,
         pushed,
         prUrl,
@@ -16902,6 +17000,17 @@ Or to unstage specific files:`);
           }
         } catch (cleanupError) {
           log.error(`Error during cleanup: ${cleanupError}`);
+          throw operationError;
+        }
+        autoRecoverySucceeded = true;
+        log.success("Auto-recovery completed successfully");
+        if (operationState && !isSubOperation) {
+          deleteOperationState(operationState.id);
+        }
+      } else {
+        autoRecoverySucceeded = true;
+        if (operationState && !isSubOperation) {
+          deleteOperationState(operationState.id);
         }
       }
       throw operationError;
@@ -16912,7 +17021,7 @@ Or to unstage specific files:`);
       return {
         success: false,
         branchName: options.branch ?? "",
-        owner: options.owner ?? "",
+        owner: options.include ?? "",
         files: filesToCommit,
         pushed,
         prUrl,
@@ -16920,9 +17029,9 @@ Or to unstage specific files:`);
         error: String(err)
       };
     }
-    if (operationState) {
+    if (operationState && !autoRecoverySucceeded) {
       log.info(`
-Recovery options:`);
+Auto-recovery failed. Manual recovery options:`);
       log.info(`  1. Run 'codeowners-git recover --id ${operationState.id}' to clean up and return to original branch`);
       log.info(`  2. Run 'codeowners-git recover --id ${operationState.id} --keep-branches' to return without deleting branches`);
       log.info(`  3. Run 'codeowners-git recover --list' to see all incomplete operations`);
@@ -16943,422 +17052,157 @@ Recovery options:`);
   }
 };
 
-// src/commands/multi-branch.ts
-var import_micromatch2 = __toESM(require_micromatch(), 1);
-var import_cli_table32 = __toESM(require_table(), 1);
-var multiBranch = async (options) => {
-  let operationState = null;
-  try {
-    if (!options.branch || !options.message) {
-      throw new Error("Missing required options for multi-branch creation");
-    }
-    if (options.ignore && options.include) {
-      throw new Error("Cannot use both --ignore and --include options at the same time");
-    }
-    if ((options.pr || options.draftPr) && !options.push) {
-      throw new Error("Pull request creation requires --push option");
-    }
-    if (options.pr && options.draftPr) {
-      throw new Error("Cannot use both --pr and --draft-pr options");
+// 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";
+var isBackspaceKey = (key) => key.name === "backspace";
+var isNumberKey = (key) => "123456789".includes(key.name);
+var isEnterKey = (key) => key.name === "enter" || key.name === "return";
+// node_modules/@inquirer/core/dist/esm/lib/errors.js
+class AbortPromptError extends Error {
+  name = "AbortPromptError";
+  message = "Prompt was aborted";
+  constructor(options) {
+    super();
+    this.cause = options?.cause;
+  }
+}
+
+class CancelPromptError extends Error {
+  name = "CancelPromptError";
+  message = "Prompt was canceled";
+}
+
+class ExitPromptError extends Error {
+  name = "ExitPromptError";
+}
+
+class HookError extends Error {
+  name = "HookError";
+}
+
+class ValidationError extends Error {
+  name = "ValidationError";
+}
+// node_modules/@inquirer/core/dist/esm/lib/use-prefix.js
+import { AsyncResource as AsyncResource2 } from "node:async_hooks";
+
+// node_modules/@inquirer/core/dist/esm/lib/hook-engine.js
+import { AsyncLocalStorage, AsyncResource } from "node:async_hooks";
+var hookStorage = new AsyncLocalStorage;
+function createStore(rl) {
+  const store = {
+    rl,
+    hooks: [],
+    hooksCleanup: [],
+    hooksEffect: [],
+    index: 0,
+    handleChange() {}
+  };
+  return store;
+}
+function withHooks(rl, cb) {
+  const store = createStore(rl);
+  return hookStorage.run(store, () => {
+    function cycle(render) {
+      store.handleChange = () => {
+        store.index = 0;
+        render();
+      };
+      store.handleChange();
     }
-    if (await hasStagedChanges()) {
-      const stagedFiles = await getStagedFiles();
-      log.error("Changes need to be unstaged in order for this to work.");
-      log.info(`
-Staged files detected:`);
-      stagedFiles.forEach((file) => log.info(`  - ${file}`));
-      log.info(`
-To unstage files, run:`);
-      log.info("  git restore --staged .");
-      log.info(`
-Or to unstage specific files:`);
-      log.info("  git restore --staged <file>");
-      throw new Error("Staged changes detected. Please unstage all changes before running this command.");
+    return cb(cycle);
+  });
+}
+function getStore() {
+  const store = hookStorage.getStore();
+  if (!store) {
+    throw new HookError("[Inquirer] Hook functions can only be called from within a prompt");
+  }
+  return store;
+}
+function readline() {
+  return getStore().rl;
+}
+function withUpdates(fn) {
+  const wrapped = (...args) => {
+    const store = getStore();
+    let shouldUpdate = false;
+    const oldHandleChange = store.handleChange;
+    store.handleChange = () => {
+      shouldUpdate = true;
+    };
+    const returnValue = fn(...args);
+    if (shouldUpdate) {
+      oldHandleChange();
     }
-    log.info(options.append ? "Starting multi-branch update process..." : "Starting multi-branch creation process...");
-    const originalBranch = await getCurrentBranch();
-    operationState = createOperationState("multi-branch", originalBranch, {
-      verify: options.verify,
-      push: options.push,
-      remote: options.remote,
-      force: options.force,
-      keepBranchOnFailure: options.keepBranchOnFailure,
-      pr: options.pr,
-      draftPr: options.draftPr
+    store.handleChange = oldHandleChange;
+    return returnValue;
+  };
+  return AsyncResource.bind(wrapped);
+}
+function withPointer(cb) {
+  const store = getStore();
+  const { index } = store;
+  const pointer = {
+    get() {
+      return store.hooks[index];
+    },
+    set(value) {
+      store.hooks[index] = value;
+    },
+    initialized: index in store.hooks
+  };
+  const returnValue = cb(pointer);
+  store.index++;
+  return returnValue;
+}
+function handleChange() {
+  getStore().handleChange();
+}
+var effectScheduler = {
+  queue(cb) {
+    const store = getStore();
+    const { index } = store;
+    store.hooksEffect.push(() => {
+      store.hooksCleanup[index]?.();
+      const cleanFn = cb(readline());
+      if (cleanFn != null && typeof cleanFn !== "function") {
+        throw new ValidationError("useEffect return value must be a cleanup function or nothing.");
+      }
+      store.hooksCleanup[index] = cleanFn;
     });
-    log.info(`Operation ID: ${operationState.id}`);
-    const changedFiles = await getChangedFiles();
-    if (changedFiles.length === 0) {
-      throw new Error("No changed files found in the repository");
-    }
-    const ownerSet = new Set;
-    const filesWithoutOwners = [];
-    for (const file of changedFiles) {
-      const owners = getOwner(file);
-      if (owners.length === 0) {
-        filesWithoutOwners.push(file);
-      } else {
-        for (const owner of owners) {
-          ownerSet.add(owner);
-        }
-      }
-    }
-    let codeowners2 = Array.from(ownerSet);
-    if (filesWithoutOwners.length > 0 && options.defaultOwner) {
-      log.info(`Found ${filesWithoutOwners.length} files without owners. Adding default owner: ${options.defaultOwner}`);
-      codeowners2.push(options.defaultOwner);
-    }
-    if (codeowners2.length === 0) {
-      log.warn("No codeowners found for the changed files");
-      log.info("Continuing without creating any branches (use --default-owner to specify a fallback)");
-      return;
-    } else {
-      log.info(`Found ${codeowners2.length} codeowners: ${codeowners2.join(", ")}`);
-    }
-    if (options.ignore || options.include) {
-      const originalCount = codeowners2.length;
-      if (options.ignore) {
-        const ignorePatterns = options.ignore.split(",").map((p) => p.trim());
-        codeowners2 = codeowners2.filter((owner) => !import_micromatch2.default.isMatch(owner, ignorePatterns));
-        log.info(`Filtered out ${originalCount - codeowners2.length} codeowners using ignore patterns: ${ignorePatterns.join(", ")}`);
-      } else if (options.include) {
-        const includePatterns = options.include.split(",").map((p) => p.trim());
-        codeowners2 = codeowners2.filter((owner) => import_micromatch2.default.isMatch(owner, includePatterns));
-        log.info(`Filtered to ${codeowners2.length} codeowners using include patterns: ${includePatterns.join(", ")}`);
-      }
-      if (codeowners2.length === 0) {
-        log.warn("No codeowners left after filtering");
-        return;
-      }
-      log.info(`Processing ${codeowners2.length} codeowners after filtering: ${codeowners2.join(", ")}`);
-    }
-    const results = [];
-    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}`;
-      log.info(options.append ? `Updating branch for ${owner}...` : `Creating branch for ${owner}...`);
-      const result = await branch({
-        owner,
-        branch: branchName,
-        message: commitMessage,
-        verify: options.verify,
-        push: options.push,
-        remote: options.remote,
-        upstream: options.upstream,
-        force: options.force,
-        keepBranchOnFailure: options.keepBranchOnFailure,
-        isDefaultOwner: owner === options.defaultOwner,
-        append: options.append,
-        pr: options.pr,
-        draftPr: options.draftPr,
-        operationState: operationState || undefined
-      });
-      results.push(result);
-    }
-    const successCount = results.filter((r) => r.success).length;
-    const failureCount = results.filter((r) => !r.success).length;
-    log.header(options.append ? "Multi-branch update summary" : "Multi-branch creation summary");
-    log.info(options.append ? `Successfully updated ${successCount} of ${codeowners2.length} branches` : `Successfully created ${successCount} of ${codeowners2.length} branches`);
-    if (failureCount > 0) {
-      log.error(`Failed: ${failureCount} branches`);
-    }
-    console.log("");
-    const table = new import_cli_table32.default({
-      head: ["Status", "Owner", "Branch", "Files", "Pushed", "PR"],
-      colWidths: [10, 20, 40, 10, 10, 50],
-      wordWrap: true
-    });
-    for (const result of results) {
-      const status = result.success ? "✓" : "✗";
-      const fileCount = result.files.length;
-      const pushedStatus = result.pushed ? "✓" : "-";
-      const prInfo = result.prUrl ? result.prUrl : result.error && result.error.includes("PR creation failed") ? "Failed" : "-";
-      table.push([
-        status,
-        result.owner,
-        result.branchName,
-        `${fileCount} file${fileCount !== 1 ? "s" : ""}`,
-        pushedStatus,
-        prInfo
-      ]);
-    }
-    console.log(table.toString());
-    if (results.length > 0) {
-      console.log(`
-Files by branch:`);
-      for (const result of results) {
-        if (result.success && result.files.length > 0) {
-          console.log(`
-${result.branchName} (${result.owner}):`);
-          result.files.forEach((file) => console.log(`  - ${file}`));
-        }
-      }
-    }
-    const errors = results.filter((r) => r.error);
-    if (errors.length > 0) {
-      console.log(`
-Errors:`);
-      errors.forEach((result) => {
-        console.log(`
-${result.branchName} (${result.owner}):`);
-        console.log(`  ${result.error}`);
-      });
-    }
-    if (operationState) {
-      completeOperation(operationState.id, true);
-    }
-  } catch (err) {
-    log.error(`Multi-branch operation failed: ${err}`);
-    if (operationState) {
-      failOperation(operationState.id, String(err));
-      log.info(`
-Recovery options:`);
-      log.info(`  1. Run 'codeowners-git recover --id ${operationState.id}' to clean up and return to original branch`);
-      log.info(`  2. Run 'codeowners-git recover --id ${operationState.id} --keep-branches' to return without deleting branches`);
-      log.info(`  3. Run 'codeowners-git recover --list' to see all incomplete operations`);
-    }
-    process.exit(1);
-  }
-};
-
-// src/commands/extract.ts
-var import_micromatch3 = __toESM(require_micromatch(), 1);
-var extract = async (options) => {
-  try {
-    if (!options.source) {
-      log.error("Missing required option: --source");
-      log.info(`
-Usage:`);
-      log.info("  cg extract -s <branch-or-commit>");
-      log.info(`
-Examples:`);
-      log.info("  cg extract -s feature/other-branch");
-      log.info("  cg extract -s feature/other-branch -o '@team-*'");
-      log.info("  cg extract -s abc123def --compare-main");
-      process.exit(1);
-    }
-    if (await hasStagedChanges()) {
-      const stagedFiles = await getStagedFiles();
-      log.error("Changes need to be unstaged in order for this to work.");
-      log.info(`
-Staged files detected:`);
-      stagedFiles.forEach((file) => log.info(`  - ${file}`));
-      log.info(`
-To unstage files, run:`);
-      log.info("  git restore --staged .");
-      log.info(`
-Or to unstage specific files:`);
-      log.info("  git restore --staged <file>");
-      process.exit(1);
-    }
-    log.info("Starting file extraction process...");
-    let compareTarget;
-    if (options.compareMain) {
-      compareTarget = await getDefaultBranch();
-      log.info(`Comparing ${options.source} against ${compareTarget}...`);
-    } else {
-      const baseBranch = await getBaseBranch(options.source);
-      compareTarget = baseBranch;
-      log.info(`Detected base branch: ${baseBranch}`);
-      log.info(`Extracting changes from ${options.source}...`);
-    }
-    const changedFiles = await getChangedFilesBetween(options.source, compareTarget);
-    if (changedFiles.length === 0) {
-      log.warn(`No changed files found in ${options.source}`);
-      return;
-    }
-    log.info(`Found ${changedFiles.length} changed file${changedFiles.length !== 1 ? "s" : ""}`);
-    let filesToExtract = changedFiles;
-    if (options.owner) {
-      log.info(`Filtering files by owner pattern: ${options.owner}`);
-      const ownedFiles = [];
-      for (const file of changedFiles) {
-        const owners = await getOwner(file);
-        if (owners.length > 0) {
-          const matchingOwners = import_micromatch3.default(owners, options.owner);
-          if (matchingOwners.length > 0) {
-            ownedFiles.push(file);
-          }
-        }
-      }
-      filesToExtract = ownedFiles;
-      if (filesToExtract.length === 0) {
-        log.warn(`No files match the owner pattern: ${options.owner}`);
-        return;
-      }
-      log.info(`Filtered to ${filesToExtract.length} file${filesToExtract.length !== 1 ? "s" : ""}`);
-    }
-    log.info("Extracting files to working directory...");
-    await extractFilesFromRef(options.source, filesToExtract);
-    log.success(`
-✓ Extracted ${filesToExtract.length} file${filesToExtract.length !== 1 ? "s" : ""} to working directory (unstaged)`);
-    log.info(`
-Extracted files:`);
-    filesToExtract.forEach((file) => log.info(`  - ${file}`));
-    log.info(`
-Next steps:`);
-    log.info("  - Review the extracted files in your working directory");
-    log.info("  - Use 'cg branch' command to create a branch and commit");
-    log.info("  - Example: cg branch -o @my-team -b my-branch -m 'Commit message' -p");
-  } catch (err) {
-    log.error(`
-✗ Extraction failed: ${err}`);
-    process.exit(1);
-  }
-};
-
-// 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";
-var isBackspaceKey = (key) => key.name === "backspace";
-var isNumberKey = (key) => "123456789".includes(key.name);
-var isEnterKey = (key) => key.name === "enter" || key.name === "return";
-// node_modules/@inquirer/core/dist/esm/lib/errors.js
-class AbortPromptError extends Error {
-  name = "AbortPromptError";
-  message = "Prompt was aborted";
-  constructor(options) {
-    super();
-    this.cause = options?.cause;
-  }
-}
-
-class CancelPromptError extends Error {
-  name = "CancelPromptError";
-  message = "Prompt was canceled";
-}
-
-class ExitPromptError extends Error {
-  name = "ExitPromptError";
-}
-
-class HookError extends Error {
-  name = "HookError";
-}
-
-class ValidationError extends Error {
-  name = "ValidationError";
-}
-// node_modules/@inquirer/core/dist/esm/lib/use-prefix.js
-import { AsyncResource as AsyncResource2 } from "node:async_hooks";
-
-// node_modules/@inquirer/core/dist/esm/lib/hook-engine.js
-import { AsyncLocalStorage, AsyncResource } from "node:async_hooks";
-var hookStorage = new AsyncLocalStorage;
-function createStore(rl) {
-  const store = {
-    rl,
-    hooks: [],
-    hooksCleanup: [],
-    hooksEffect: [],
-    index: 0,
-    handleChange() {}
-  };
-  return store;
-}
-function withHooks(rl, cb) {
-  const store = createStore(rl);
-  return hookStorage.run(store, () => {
-    function cycle(render) {
-      store.handleChange = () => {
-        store.index = 0;
-        render();
-      };
-      store.handleChange();
-    }
-    return cb(cycle);
-  });
-}
-function getStore() {
-  const store = hookStorage.getStore();
-  if (!store) {
-    throw new HookError("[Inquirer] Hook functions can only be called from within a prompt");
-  }
-  return store;
-}
-function readline() {
-  return getStore().rl;
-}
-function withUpdates(fn) {
-  const wrapped = (...args) => {
-    const store = getStore();
-    let shouldUpdate = false;
-    const oldHandleChange = store.handleChange;
-    store.handleChange = () => {
-      shouldUpdate = true;
-    };
-    const returnValue = fn(...args);
-    if (shouldUpdate) {
-      oldHandleChange();
-    }
-    store.handleChange = oldHandleChange;
-    return returnValue;
-  };
-  return AsyncResource.bind(wrapped);
-}
-function withPointer(cb) {
-  const store = getStore();
-  const { index } = store;
-  const pointer = {
-    get() {
-      return store.hooks[index];
-    },
-    set(value) {
-      store.hooks[index] = value;
-    },
-    initialized: index in store.hooks
-  };
-  const returnValue = cb(pointer);
-  store.index++;
-  return returnValue;
-}
-function handleChange() {
-  getStore().handleChange();
-}
-var effectScheduler = {
-  queue(cb) {
-    const store = getStore();
-    const { index } = store;
-    store.hooksEffect.push(() => {
-      store.hooksCleanup[index]?.();
-      const cleanFn = cb(readline());
-      if (cleanFn != null && typeof cleanFn !== "function") {
-        throw new ValidationError("useEffect return value must be a cleanup function or nothing.");
-      }
-      store.hooksCleanup[index] = cleanFn;
-    });
-  },
-  run() {
-    const store = getStore();
-    withUpdates(() => {
-      store.hooksEffect.forEach((effect) => {
-        effect();
-      });
-      store.hooksEffect.length = 0;
-    })();
-  },
-  clearAll() {
-    const store = getStore();
-    store.hooksCleanup.forEach((cleanFn) => {
-      cleanFn?.();
-    });
-    store.hooksEffect.length = 0;
-    store.hooksCleanup.length = 0;
-  }
-};
-
-// node_modules/@inquirer/core/dist/esm/lib/use-state.js
-function useState(defaultValue) {
-  return withPointer((pointer) => {
-    const setFn = (newValue) => {
-      if (pointer.get() !== newValue) {
-        pointer.set(newValue);
-        handleChange();
-      }
-    };
-    if (pointer.initialized) {
-      return [pointer.get(), setFn];
+  },
+  run() {
+    const store = getStore();
+    withUpdates(() => {
+      store.hooksEffect.forEach((effect) => {
+        effect();
+      });
+      store.hooksEffect.length = 0;
+    })();
+  },
+  clearAll() {
+    const store = getStore();
+    store.hooksCleanup.forEach((cleanFn) => {
+      cleanFn?.();
+    });
+    store.hooksEffect.length = 0;
+    store.hooksCleanup.length = 0;
+  }
+};
+
+// node_modules/@inquirer/core/dist/esm/lib/use-state.js
+function useState(defaultValue) {
+  return withPointer((pointer) => {
+    const setFn = (newValue) => {
+      if (pointer.get() !== newValue) {
+        pointer.set(newValue);
+        handleChange();
+      }
+    };
+    if (pointer.initialized) {
+      return [pointer.get(), setFn];
     }
     const value = typeof defaultValue === "function" ? defaultValue() : defaultValue;
     pointer.set(value);
@@ -18497,6 +18341,7 @@ Operation ID: ${op.id}`);
 };
 var performRecovery = async (state, keepBranches) => {
   log.header(`Recovering from operation ${state.id}`);
+  let hadWarnings = false;
   const currentBranch = await getCurrentBranch();
   if (currentBranch !== state.originalBranch) {
     try {
@@ -18508,8 +18353,30 @@ var performRecovery = async (state, keepBranches) => {
       log.info(`You may need to manually run: git checkout ${state.originalBranch}`);
       throw error;
     }
-  } else {
-    log.info(`Already on original branch: ${state.originalBranch}`);
+  } else {
+    log.info(`Already on original branch: ${state.originalBranch}`);
+  }
+  if (!keepBranches && state.branches.length > 0) {
+    log.info(`
+Restoring files from branches...`);
+    for (const branch2 of state.branches) {
+      if (branch2.committed && branch2.files && branch2.files.length > 0) {
+        try {
+          const exists2 = await branchExists(branch2.name);
+          if (exists2) {
+            log.info(`Restoring ${branch2.files.length} file(s) from ${branch2.name}...`);
+            await restoreFilesFromBranch(branch2.name, branch2.files);
+          } else {
+            log.warn(`Branch ${branch2.name} no longer exists, cannot restore files`);
+            hadWarnings = true;
+          }
+        } 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`);
+          hadWarnings = true;
+        }
+      }
+    }
   }
   if (!keepBranches && state.branches.length > 0) {
     log.info(`
@@ -18527,6 +18394,7 @@ Cleaning up created branches...`);
         } catch (error) {
           log.error(`Failed to delete branch ${branch2.name}: ${error}`);
           log.info(`You may need to manually run: git branch -D ${branch2.name}`);
+          hadWarnings = true;
         }
       }
     }
@@ -18545,6 +18413,7 @@ Cleaning up state file...`);
   log.success(`State file deleted: ${state.id}`);
   log.success(`
 ✓ Recovery complete!`);
+  return !hadWarnings;
 };
 var recover = async (options) => {
   try {
@@ -18606,8 +18475,311 @@ Operation details:`);
     process.exit(1);
   }
 };
+
+// src/commands/multi-branch.ts
+var import_cli_table33 = __toESM(require_table(), 1);
+var multiBranch = async (options) => {
+  let operationState = null;
+  try {
+    if (!options.branch || !options.message) {
+      throw new Error("Missing required options for multi-branch creation");
+    }
+    if (options.ignore && options.include) {
+      throw new Error("Cannot use both --ignore and --include options at the same time");
+    }
+    if ((options.pr || options.draftPr) && !options.push) {
+      throw new Error("Pull request creation requires --push option");
+    }
+    if (options.pr && options.draftPr) {
+      throw new Error("Cannot use both --pr and --draft-pr options");
+    }
+    if (await hasUnstagedChanges()) {
+      const unstagedFiles = await getUnstagedFiles();
+      log.warn("Warning: Unstaged changes detected (these will be ignored):");
+      unstagedFiles.forEach((file) => log.warn(`  - ${file}`));
+      log.info(`
+Only staged files will be processed.`);
+      log.info("To stage files: git add <file>");
+      log.info("");
+    }
+    log.info(options.append ? "Starting multi-branch update process..." : "Starting multi-branch creation process...");
+    const originalBranch = await getCurrentBranch();
+    operationState = createOperationState("multi-branch", originalBranch, {
+      verify: options.verify,
+      push: options.push,
+      remote: options.remote,
+      force: options.force,
+      keepBranchOnFailure: options.keepBranchOnFailure,
+      pr: options.pr,
+      draftPr: options.draftPr
+    });
+    log.info(`Operation ID: ${operationState.id}`);
+    let changedFiles = await getChangedFiles();
+    changedFiles = filterByPathPatterns(changedFiles, options.pathPattern);
+    if (changedFiles.length === 0) {
+      throw new Error(options.pathPattern ? `No changed files found matching pattern: ${options.pathPattern}` : "No changed files found in the repository");
+    }
+    const ownerSet = new Set;
+    const filesWithoutOwners = [];
+    for (const file of changedFiles) {
+      const owners = getOwner(file);
+      if (owners.length === 0) {
+        filesWithoutOwners.push(file);
+      } else {
+        for (const owner of owners) {
+          ownerSet.add(owner);
+        }
+      }
+    }
+    let codeowners2 = Array.from(ownerSet);
+    if (filesWithoutOwners.length > 0 && options.defaultOwner) {
+      log.info(`Found ${filesWithoutOwners.length} files without owners. Adding default owner: ${options.defaultOwner}`);
+      codeowners2.push(options.defaultOwner);
+    }
+    if (codeowners2.length === 0) {
+      log.warn("No codeowners found for the changed files");
+      log.info("Continuing without creating any branches (use --default-owner to specify a fallback)");
+      return;
+    } else {
+      log.info(`Found ${codeowners2.length} codeowners: ${codeowners2.join(", ")}`);
+    }
+    if (options.ignore || options.include) {
+      const originalCount = codeowners2.length;
+      if (options.ignore) {
+        codeowners2 = codeowners2.filter((owner) => !matchOwnerPattern(owner, options.ignore));
+        log.info(`Filtered out ${originalCount - codeowners2.length} codeowners using ignore patterns: ${options.ignore}`);
+      } else if (options.include) {
+        codeowners2 = codeowners2.filter((owner) => matchOwnerPattern(owner, options.include));
+        log.info(`Filtered to ${codeowners2.length} codeowners using include patterns: ${options.include}`);
+      }
+      if (codeowners2.length === 0) {
+        log.warn("No codeowners left after filtering");
+        return;
+      }
+      log.info(`Processing ${codeowners2.length} codeowners after filtering: ${codeowners2.join(", ")}`);
+    }
+    const results = [];
+    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}`;
+      log.info(options.append ? `Updating branch for ${owner}...` : `Creating branch for ${owner}...`);
+      const result = await branch({
+        include: owner,
+        branch: branchName,
+        message: commitMessage,
+        verify: options.verify,
+        push: options.push,
+        remote: options.remote,
+        upstream: options.upstream,
+        force: options.force,
+        keepBranchOnFailure: options.keepBranchOnFailure,
+        isDefaultOwner: owner === options.defaultOwner,
+        append: options.append,
+        pr: options.pr,
+        draftPr: options.draftPr,
+        operationState: operationState || undefined,
+        pathPattern: options.pathPattern,
+        exclusive: options.exclusive,
+        coOwned: options.coOwned
+      });
+      results.push(result);
+    }
+    const successCount = results.filter((r) => r.success).length;
+    const failureCount = results.filter((r) => !r.success).length;
+    log.header(options.append ? "Multi-branch update summary" : "Multi-branch creation summary");
+    log.info(options.append ? `Successfully updated ${successCount} of ${codeowners2.length} branches` : `Successfully created ${successCount} of ${codeowners2.length} branches`);
+    if (failureCount > 0) {
+      log.error(`Failed: ${failureCount} branches`);
+    }
+    console.log("");
+    const table = new import_cli_table33.default({
+      head: ["Status", "Owner", "Branch", "Files", "Pushed", "PR"],
+      colWidths: [10, 20, 40, 10, 10, 50],
+      wordWrap: true
+    });
+    for (const result of results) {
+      const status = result.success ? "✓" : "✗";
+      const fileCount = result.files.length;
+      const pushedStatus = result.pushed ? "✓" : "-";
+      const prInfo = result.prUrl ? result.prUrl : result.error && result.error.includes("PR creation failed") ? "Failed" : "-";
+      table.push([
+        status,
+        result.owner,
+        result.branchName,
+        `${fileCount} file${fileCount !== 1 ? "s" : ""}`,
+        pushedStatus,
+        prInfo
+      ]);
+    }
+    console.log(table.toString());
+    if (results.length > 0) {
+      console.log(`
+Files by branch:`);
+      for (const result of results) {
+        if (result.success && result.files.length > 0) {
+          console.log(`
+${result.branchName} (${result.owner}):`);
+          result.files.forEach((file) => console.log(`  - ${file}`));
+        }
+      }
+    }
+    const errors2 = results.filter((r) => r.error);
+    if (errors2.length > 0) {
+      console.log(`
+Errors:`);
+      errors2.forEach((result) => {
+        console.log(`
+${result.branchName} (${result.owner}):`);
+        console.log(`  ${result.error}`);
+      });
+    }
+    if (operationState) {
+      if (failureCount === 0) {
+        completeOperation(operationState.id, true);
+      } else {
+        failOperation(operationState.id, `${failureCount} branch(es) failed`);
+        log.info(`
+Note: ${failureCount} branch(es) failed. Files were auto-restored to working directory.`);
+        log.info(`State preserved for reference. Run 'codeowners-git recover --id ${operationState.id}' if needed.`);
+      }
+    }
+  } catch (err) {
+    log.error(`Multi-branch operation failed: ${err}`);
+    if (operationState) {
+      log.info(`
+Attempting auto-recovery...`);
+      const currentState = loadOperationState(operationState.id);
+      if (currentState) {
+        try {
+          const recovered = await performRecovery(currentState, false);
+          if (recovered) {
+            log.success("Auto-recovery completed successfully");
+          } else {
+            log.warn("Auto-recovery completed with warnings");
+          }
+        } catch (recoveryError) {
+          log.error(`Auto-recovery failed: ${recoveryError}`);
+          log.info(`
+Manual recovery options:`);
+          log.info(`  1. Run 'codeowners-git recover --id ${operationState.id}' to clean up`);
+          log.info(`  2. Run 'codeowners-git recover --list' to see all operations`);
+        }
+      }
+    }
+    process.exit(1);
+  }
+};
+
+// src/commands/extract.ts
+var extract = async (options) => {
+  try {
+    if (!options.source) {
+      log.error("Missing required option: --source");
+      log.info(`
+Usage:`);
+      log.info("  cg extract -s <branch-or-commit>");
+      log.info(`
+Examples:`);
+      log.info("  cg extract -s feature/other-branch");
+      log.info("  cg extract -s feature/other-branch -i '@team-*'");
+      log.info("  cg extract -s abc123def --compare-main");
+      process.exit(1);
+    }
+    if (await hasUnstagedChanges()) {
+      const unstagedFiles = await getUnstagedFiles();
+      log.warn("Warning: Unstaged changes detected (these will be ignored):");
+      unstagedFiles.forEach((file) => log.warn(`  - ${file}`));
+      log.info(`
+Only staged files will be processed.`);
+      log.info("To stage files: git add <file>");
+      log.info("");
+    }
+    log.info("Starting file extraction process...");
+    let compareTarget;
+    if (options.compareMain) {
+      compareTarget = await getDefaultBranch();
+      log.info(`Comparing ${options.source} against ${compareTarget}...`);
+    } else {
+      const baseBranch = await getBaseBranch(options.source);
+      compareTarget = baseBranch;
+      log.info(`Detected base branch: ${baseBranch}`);
+      log.info(`Extracting changes from ${options.source}...`);
+    }
+    let changedFiles = await getChangedFilesBetween(options.source, compareTarget);
+    if (changedFiles.length === 0) {
+      log.warn(`No changed files found in ${options.source}`);
+      return;
+    }
+    log.info(`Found ${changedFiles.length} changed file${changedFiles.length !== 1 ? "s" : ""}`);
+    if (options.pathPattern) {
+      changedFiles = filterByPathPatterns(changedFiles, options.pathPattern);
+      log.info(`Filtered to ${changedFiles.length} file${changedFiles.length !== 1 ? "s" : ""} matching pattern: ${options.pathPattern}`);
+      if (changedFiles.length === 0) {
+        log.warn(`No files match the path pattern: ${options.pathPattern}`);
+        return;
+      }
+    }
+    let filesToExtract = changedFiles;
+    if (options.coOwned && !options.include) {
+      log.info("Filtering to co-owned files (2+ owners)");
+      filesToExtract = changedFiles.filter((file) => {
+        const owners = getOwner(file);
+        return owners.length > 1;
+      });
+      if (filesToExtract.length === 0) {
+        log.warn("No co-owned files found");
+        return;
+      }
+      log.info(`Filtered to ${filesToExtract.length} co-owned file${filesToExtract.length !== 1 ? "s" : ""}`);
+    }
+    if (options.include) {
+      log.info(`Filtering files by owner pattern: ${options.include}${options.exclusive ? " (exclusive)" : ""}${options.coOwned ? " (co-owned)" : ""}`);
+      const ownedFiles = [];
+      for (const file of filesToExtract) {
+        const owners = getOwner(file);
+        if (owners.length > 0) {
+          if (options.coOwned && owners.length < 2) {
+            continue;
+          }
+          let matches;
+          if (options.exclusive) {
+            matches = matchOwnersExclusive(owners, options.include);
+          } else {
+            matches = owners.some((owner) => matchOwnerPattern(owner, options.include));
+          }
+          if (matches) {
+            ownedFiles.push(file);
+          }
+        }
+      }
+      filesToExtract = ownedFiles;
+      if (filesToExtract.length === 0) {
+        log.warn(`No files match the owner pattern: ${options.include}`);
+        return;
+      }
+      log.info(`Filtered to ${filesToExtract.length} file${filesToExtract.length !== 1 ? "s" : ""}`);
+    }
+    log.info("Extracting files to working directory...");
+    await extractFilesFromRef(options.source, filesToExtract);
+    log.success(`
+✓ Extracted ${filesToExtract.length} file${filesToExtract.length !== 1 ? "s" : ""} to working directory (unstaged)`);
+    log.info(`
+Extracted files:`);
+    filesToExtract.forEach((file) => log.info(`  - ${file}`));
+    log.info(`
+Next steps:`);
+    log.info("  - Review the extracted files in your working directory");
+    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) {
+    log.error(`
+✗ Extraction failed: ${err}`);
+    process.exit(1);
+  }
+};
 // package.json
-var version = "1.8.0";
+var version = "2.0.0";
 
 // src/commands/version.ts
 function getVersion() {
@@ -18646,9 +18818,45 @@ 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").option("-o, --owner <owner>", "Filter by specific code owner").option("-i, --include <patterns>", "Filter by owner patterns").action(listCodeowners);
-program2.command("branch").description("Create new branch with codeowner changes").requiredOption("-o, --owner <owner>", "Code owner name").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)").action(branch);
-program2.command("multi-branch").description("Create branches for all codeowners").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)").action(multiBranch);
-program2.command("extract").description("Extract file changes from a branch or commit to working directory").requiredOption("-s, --source <source>", "Source branch or commit to extract from").option("-o, --owner <owner>", "Filter extracted files by code owner (supports micromatch patterns)").option("--compare-main", "Compare source against main branch instead of detecting merge-base").action(extract);
+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) => {
+  if (options.exclusive && options.coOwned) {
+    console.error("Error: Cannot use both --exclusive and --co-owned options");
+    process.exit(1);
+  }
+  listCodeowners({
+    ...options,
+    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) => {
+  if (options.exclusive && options.coOwned) {
+    console.error("Error: Cannot use both --exclusive and --co-owned options");
+    process.exit(1);
+  }
+  branch({
+    ...options,
+    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) => {
+  if (options.exclusive && options.coOwned) {
+    console.error("Error: Cannot use both --exclusive and --co-owned options");
+    process.exit(1);
+  }
+  multiBranch({
+    ...options,
+    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) => {
+  if (options.exclusive && options.coOwned) {
+    console.error("Error: Cannot use both --exclusive and --co-owned options");
+    process.exit(1);
+  }
+  extract({
+    ...options,
+    pathPattern: pattern
+  });
+});
 program2.command("recover").description("Recover from failed or incomplete operations").option("--id <operationId>", "Specific operation ID to recover").option("--keep-branches", "Keep created branches instead of deleting them").option("--list", "List all incomplete operations").option("--auto", "Automatically recover most recent operation without prompts").action(recover);
 program2.parse(process.argv);