@fern-api/fern-api-dev 5.23.3-214-g5b9a7373966 → 5.23.3-217-g91ea20d5077

package/cli.cjs

@@ -6865,14 +6865,14 @@ var init_RequireInTheMiddleSingleton = __esm({
           { internals: true },
           (exports2, name2, basedir) => {
             const normalizedModuleName = normalizePathSeparators(name2);
-            const matches = this._moduleNameTrie.search(normalizedModuleName, {
+            const matches2 = this._moduleNameTrie.search(normalizedModuleName, {
               maintainInsertionOrder: true,
               // For core modules (e.g. `fs`), do not match on sub-paths (e.g. `fs/promises').
               // This matches the behavior of `require-in-the-middle`.
               // `basedir` is always `undefined` for core modules.
               fullOnly: basedir === void 0
             });
-            for (const { onRequire } of matches) {
+            for (const { onRequire } of matches2) {
               exports2 = onRequire(exports2, name2, basedir);
             }
             return exports2;
@@ -7939,12 +7939,12 @@ var require_utils = __commonJS({
       if (requestOptions.hostname && requestOptions.port) {
         return { hostname: requestOptions.hostname, port: requestOptions.port };
       }
-      const matches = requestOptions.host?.match(/^([^:/ ]+)(:\d{1,5})?/) || null;
-      const hostname4 = requestOptions.hostname || (matches === null ? "localhost" : matches[1]);
+      const matches2 = requestOptions.host?.match(/^([^:/ ]+)(:\d{1,5})?/) || null;
+      const hostname4 = requestOptions.hostname || (matches2 === null ? "localhost" : matches2[1]);
       let port = requestOptions.port;
       if (!port) {
-        if (matches && matches[2]) {
-          port = matches[2].substring(1);
+        if (matches2 && matches2[2]) {
+          port = matches2[2].substring(1);
         } else {
           port = requestOptions.protocol === "https:" ? "443" : "80";
         }
@@ -10249,14 +10249,14 @@ var init_RequireInTheMiddleSingleton2 = __esm({
           { internals: true },
           (exports2, name2, basedir) => {
             const normalizedModuleName = normalizePathSeparators2(name2);
-            const matches = this._moduleNameTrie.search(normalizedModuleName, {
+            const matches2 = this._moduleNameTrie.search(normalizedModuleName, {
               maintainInsertionOrder: true,
               // For core modules (e.g. `fs`), do not match on sub-paths (e.g. `fs/promises').
               // This matches the behavior of `require-in-the-middle`.
               // `basedir` is always `undefined` for core modules.
               fullOnly: basedir === void 0
             });
-            for (const { onRequire } of matches) {
+            for (const { onRequire } of matches2) {
               exports2 = onRequire(exports2, name2, basedir);
             }
             return exports2;
@@ -32977,18 +32977,18 @@ var require_ua_parser = __commonJS({
         }
       };
       var rgxMapper = function(ua7, arrays) {
-        var i9 = 0, j7, k5, p14, q6, matches, match3;
-        while (i9 < arrays.length && !matches) {
+        var i9 = 0, j7, k5, p14, q6, matches2, match3;
+        while (i9 < arrays.length && !matches2) {
           var regex5 = arrays[i9], props = arrays[i9 + 1];
           j7 = k5 = 0;
-          while (j7 < regex5.length && !matches) {
+          while (j7 < regex5.length && !matches2) {
             if (!regex5[j7]) {
               break;
             }
-            matches = regex5[j7++].exec(ua7);
-            if (!!matches) {
+            matches2 = regex5[j7++].exec(ua7);
+            if (!!matches2) {
               for (p14 = 0; p14 < props.length; p14++) {
-                match3 = matches[++k5];
+                match3 = matches2[++k5];
                 q6 = props[p14];
                 if (typeof q6 === OBJ_TYPE && q6.length > 0) {
                   if (q6.length === 2) {
@@ -39983,11 +39983,11 @@ var require_validate = __commonJS({
         jsonPointer = $data;
         data2 = names_1.default.rootData;
       } else {
-        const matches = RELATIVE_JSON_POINTER.exec($data);
-        if (!matches)
+        const matches2 = RELATIVE_JSON_POINTER.exec($data);
+        if (!matches2)
           throw new Error(`Invalid JSON-pointer: ${$data}`);
-        const up4 = +matches[1];
-        jsonPointer = matches[2];
+        const up4 = +matches2[1];
+        jsonPointer = matches2[2];
         if (jsonPointer === "#") {
           if (up4 >= dataLevel)
             throw new Error(errorMsg("property/index", up4));
@@ -40684,11 +40684,11 @@ var require_schemes = __commonJS({
         urnComponent.error = "URN can not be parsed";
         return urnComponent;
       }
-      const matches = urnComponent.path.match(URN_REG);
-      if (matches) {
+      const matches2 = urnComponent.path.match(URN_REG);
+      if (matches2) {
         const scheme = options2.scheme || urnComponent.scheme || "urn";
-        urnComponent.nid = matches[1].toLowerCase();
-        urnComponent.nss = matches[2];
+        urnComponent.nid = matches2[1].toLowerCase();
+        urnComponent.nss = matches2[2];
         const urnScheme = `${scheme}:${options2.nid || urnComponent.nid}`;
         const schemeHandler = getSchemeHandler(urnScheme);
         urnComponent.path = void 0;
@@ -40958,8 +40958,8 @@ var require_fast_uri = __commonJS({
       return uriTokens.join("");
     }
     var URI_PARSE = /^(?:([^#/:?]+):)?(?:\/\/((?:([^#/?@]*)@)?(\[[^#/?\]]+\]|[^#/:?]*)(?::(\d*))?))?([^#?]*)(?:\?([^#]*))?(?:#((?:.|[\n\r])*))?/u;
-    function getParseError(parsed, matches) {
-      if (matches[2] !== void 0 && parsed.path && parsed.path[0] !== "/") {
+    function getParseError(parsed, matches2) {
+      if (matches2[2] !== void 0 && parsed.path && parsed.path[0] !== "/") {
         return 'URI path must start with "/" when authority is present.';
       }
       if (typeof parsed.port === "number" && (parsed.port < 0 || parsed.port > 65535)) {
@@ -40987,19 +40987,19 @@ var require_fast_uri = __commonJS({
           uri = "//" + uri;
         }
       }
-      const matches = uri.match(URI_PARSE);
-      if (matches) {
-        parsed.scheme = matches[1];
-        parsed.userinfo = matches[3];
-        parsed.host = matches[4];
-        parsed.port = parseInt(matches[5], 10);
-        parsed.path = matches[6] || "";
-        parsed.query = matches[7];
-        parsed.fragment = matches[8];
+      const matches2 = uri.match(URI_PARSE);
+      if (matches2) {
+        parsed.scheme = matches2[1];
+        parsed.userinfo = matches2[3];
+        parsed.host = matches2[4];
+        parsed.port = parseInt(matches2[5], 10);
+        parsed.path = matches2[6] || "";
+        parsed.query = matches2[7];
+        parsed.fragment = matches2[8];
         if (isNaN(parsed.port)) {
-          parsed.port = matches[5];
+          parsed.port = matches2[5];
         }
-        const parseError = getParseError(parsed, matches);
+        const parseError = getParseError(parsed, matches2);
         if (parseError !== void 0) {
           parsed.error = parsed.error || parseError;
           malformedAuthorityOrPort = true;
@@ -58243,6 +58243,11 @@ var init_ClonedRepository = __esm({
         }
         await this.git.raw([...args, ...Array.isArray(files) ? files : [files]]);
       }
+      async listTrackedFiles() {
+        await this.git.cwd(this.clonePath);
+        const result = await this.git.raw(["ls-tree", "-r", "HEAD", "--name-only"]);
+        return result.split("\n").filter((line) => line.length > 0);
+      }
       async restoreFilesFromCommit(commitSha, files) {
         await this.git.cwd(this.clonePath);
         const fileList = Array.isArray(files) ? files : [files];
@@ -58767,6 +58772,25 @@ var init_deleteBranch = __esm({
   }
 });
 
+// ../../commons/github/lib/expandFernignorePatterns.js
+function expandFernignorePatterns(fernignoreContent, candidatePaths) {
+  const patterns = fernignoreContent.split("\n").map((line) => line.trim()).filter((line) => line.length > 0 && !line.startsWith("#"));
+  return candidatePaths.filter((candidate) => patterns.some((pattern) => matches(candidate, pattern)));
+}
+function matches(candidate, pattern) {
+  const normalized = pattern.endsWith("/") ? pattern.slice(0, -1) : pattern;
+  if (minimatch(candidate, normalized, { dot: true, nonegate: true })) {
+    return true;
+  }
+  return candidate === normalized || candidate.startsWith(normalized + "/");
+}
+var init_expandFernignorePatterns = __esm({
+  "../../commons/github/lib/expandFernignorePatterns.js"() {
+    "use strict";
+    init_esm11();
+  }
+});
+
 // ../../../node_modules/.pnpm/universal-user-agent@7.0.3/node_modules/universal-user-agent/index.js
 function getUserAgent() {
   if (typeof navigator === "object" && "userAgent" in navigator) {
@@ -58989,11 +59013,11 @@ function removeNonChars(variableName) {
   return variableName.replace(/(?:^\W+)|(?:(?<!\W)\W+$)/g, "").split(/,/);
 }
 function extractUrlVariableNames(url3) {
-  const matches = url3.match(urlVariableRegex);
-  if (!matches) {
+  const matches2 = url3.match(urlVariableRegex);
+  if (!matches2) {
     return [];
   }
-  return matches.map(removeNonChars).reduce((a3, b8) => a3.concat(b8), []);
+  return matches2.map(removeNonChars).reduce((a3, b8) => a3.concat(b8), []);
 }
 function omit2(object23, keysToOmit) {
   const result = { __proto__: null };
@@ -59446,8 +59470,8 @@ async function fetchWrapper(requestOptions) {
     data: ""
   };
   if ("deprecation" in responseHeaders) {
-    const matches = responseHeaders.link && responseHeaders.link.match(/<([^<>]+)>; rel="deprecation"/);
-    const deprecationLink = matches && matches.pop();
+    const matches2 = responseHeaders.link && responseHeaders.link.match(/<([^<>]+)>; rel="deprecation"/);
+    const deprecationLink = matches2 && matches2.pop();
     log4.warn(
       `[@octokit/request] "${requestOptions.method} ${requestOptions.url}" is deprecated. It is scheduled to be removed on ${responseHeaders.sunset}${deprecationLink ? `. See ${deprecationLink}` : ""}`
     );
@@ -67050,6 +67074,7 @@ __export(lib_exports5, {
   cloneRepository: () => cloneRepository,
   createOrUpdatePullRequest: () => createOrUpdatePullRequest,
   deleteBranch: () => deleteBranch,
+  expandFernignorePatterns: () => expandFernignorePatterns,
   getFileContent: () => getFileContent,
   getGithubApiBaseUrl: () => getGithubApiBaseUrl,
   getLatestRelease: () => getLatestRelease,
@@ -67063,6 +67088,7 @@ var init_lib9 = __esm({
     init_cloneRepository();
     init_createOrUpdatePullRequest();
     init_deleteBranch();
+    init_expandFernignorePatterns();
     init_getFileContent();
     init_getGithubApiBaseUrl();
     init_getLatestRelease();
@@ -88676,11 +88702,11 @@ var require_validate2 = __commonJS({
         jsonPointer = $data;
         data2 = names_1.default.rootData;
       } else {
-        const matches = RELATIVE_JSON_POINTER.exec($data);
-        if (!matches)
+        const matches2 = RELATIVE_JSON_POINTER.exec($data);
+        if (!matches2)
           throw new Error(`Invalid JSON-pointer: ${$data}`);
-        const up4 = +matches[1];
-        jsonPointer = matches[2];
+        const up4 = +matches2[1];
+        jsonPointer = matches2[2];
         if (jsonPointer === "#") {
           if (up4 >= dataLevel)
             throw new Error(errorMsg("property/index", up4));
@@ -96478,8 +96504,8 @@ var require_utils21 = __commonJS({
       }
     }
     function regexFromString(input3) {
-      const matches = input3.match(/^\/(.*)\/(.*)|(.*)/);
-      return matches && new RegExp(matches[1] || matches[3], matches[2]);
+      const matches2 = input3.match(/^\/(.*)\/(.*)|(.*)/);
+      return matches2 && new RegExp(matches2[1] || matches2[3], matches2[2]);
     }
   }
 });
@@ -98164,8 +98190,8 @@ var require_path_excludes_patterns = __commonJS({
             throw new Error(`Parameter "patterns" is not provided for "path-excludes-patterns" rule`);
           const pathKey = key2.toString();
           if (pathKey.startsWith("/")) {
-            const matches = patterns.filter((pattern) => pathKey.match(pattern));
-            for (const match3 of matches) {
+            const matches2 = patterns.filter((pattern) => pathKey.match(pattern));
+            for (const match3 of matches2) {
               report({
                 message: `path \`${pathKey}\` should not match regex pattern: \`${match3}\``,
                 location: location2.key()
@@ -257632,13 +257658,13 @@ var require_templates = __commonJS({
     function parseArguments(name2, arguments_) {
       const results = [];
       const chunks = arguments_.trim().split(/\s*,\s*/g);
-      let matches;
+      let matches2;
       for (const chunk2 of chunks) {
         const number26 = Number(chunk2);
         if (!Number.isNaN(number26)) {
           results.push(number26);
-        } else if (matches = chunk2.match(STRING_REGEX)) {
-          results.push(matches[2].replace(ESCAPE_REGEX3, (m7, escape6, character) => escape6 ? unescape3(escape6) : character));
+        } else if (matches2 = chunk2.match(STRING_REGEX)) {
+          results.push(matches2[2].replace(ESCAPE_REGEX3, (m7, escape6, character) => escape6 ? unescape3(escape6) : character));
         } else {
           throw new Error(`Invalid Chalk template style argument: ${chunk2} (in style '${name2}')`);
         }
@@ -257648,11 +257674,11 @@ var require_templates = __commonJS({
     function parseStyle2(style2) {
       STYLE_REGEX.lastIndex = 0;
       const results = [];
-      let matches;
-      while ((matches = STYLE_REGEX.exec(style2)) !== null) {
-        const name2 = matches[1];
-        if (matches[2]) {
-          const args = parseArguments(name2, matches[2]);
+      let matches2;
+      while ((matches2 = STYLE_REGEX.exec(style2)) !== null) {
+        const name2 = matches2[1];
+        if (matches2[2]) {
+          const args = parseArguments(name2, matches2[2]);
           results.push([name2].concat(args));
         } else {
           results.push([name2]);
@@ -264570,8 +264596,8 @@ var require_lib9 = __commonJS({
       new ascii_1.default()
     ];
     var detect2 = (buffer) => {
-      const matches = (0, exports2.analyse)(buffer);
-      return matches.length > 0 ? matches[0].name : null;
+      const matches2 = (0, exports2.analyse)(buffer);
+      return matches2.length > 0 ? matches2[0].name : null;
     };
     exports2.detect = detect2;
     var analyse = (buffer) => {
@@ -264598,14 +264624,14 @@ var require_lib9 = __commonJS({
         inputBytes: buffer,
         inputLen: buffer.length
       };
-      const matches = recognisers.map((rec) => {
+      const matches2 = recognisers.map((rec) => {
         return rec.match(context3);
       }).filter((match3) => {
         return !!match3;
       }).sort((a3, b8) => {
         return b8.confidence - a3.confidence;
       });
-      return matches;
+      return matches2;
     };
     exports2.analyse = analyse;
     var detectFile = (filepath, opts = {}) => new Promise((resolve15, reject) => {
@@ -328683,9 +328709,9 @@ var require_fresh = __commonJS({
           return false;
         }
         var etagStale = true;
-        var matches = parseTokenList(noneMatch);
-        for (var i9 = 0; i9 < matches.length; i9++) {
-          var match3 = matches[i9];
+        var matches2 = parseTokenList(noneMatch);
+        for (var i9 = 0; i9 < matches2.length; i9++) {
+          var match3 = matches2[i9];
           if (match3 === etag || match3 === "W/" + etag || "W/" + match3 === etag) {
             etagStale = false;
             break;
@@ -360366,9 +360392,9 @@ var require_diff3 = __commonJS({
   }
 });
 
-// ../../../node_modules/.pnpm/@fern-api+replay@0.16.1/node_modules/@fern-api/replay/dist/index.cjs
+// ../../../node_modules/.pnpm/@fern-api+replay@0.16.2/node_modules/@fern-api/replay/dist/index.cjs
 var require_dist14 = __commonJS({
-  "../../../node_modules/.pnpm/@fern-api+replay@0.16.1/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
+  "../../../node_modules/.pnpm/@fern-api+replay@0.16.2/node_modules/@fern-api/replay/dist/index.cjs"(exports2, module4) {
     "use strict";
     var __defProp4 = Object.defineProperty;
     var __getOwnPropDesc4 = Object.getOwnPropertyDescriptor;
@@ -360885,13 +360911,13 @@ var require_dist14 = __commonJS({
       return SENSITIVE_FILE_PATTERNS.some((re10) => re10.test(filePath));
     }
     function scanForCredentials(content5) {
-      const matches = [];
+      const matches2 = [];
       for (const { name: name2, re: re10 } of CREDENTIAL_PATTERNS) {
         if (re10.test(content5)) {
-          matches.push(name2);
+          matches2.push(name2);
         }
       }
-      return matches;
+      return matches2;
     }
     init_GitClient();
     var FERN_BOT_NAME = "fern-api";
@@ -360936,7 +360962,7 @@ var require_dist14 = __commonJS({
     }
     var import_node_fs32 = require("fs");
     var import_node_path42 = require("path");
-    var import_minimatch8 = require_commonjs3();
+    var import_minimatch9 = require_commonjs3();
     var import_yaml18 = require_dist11();
     var LOCKFILE_HEADER = "# DO NOT EDIT MANUALLY - Managed by Fern Replay\n";
     var LockfileNotFoundError = class extends Error {
@@ -361034,7 +361060,7 @@ var require_dist14 = __commonJS({
               reasons.push(`sensitive files: ${sensitiveFiles.join(", ")}`);
             }
             const allProtected = patch5.files.length > 0 && patch5.files.every(
-              (f4) => this.fernignorePatterns.some((p14) => f4 === p14 || (0, import_minimatch8.minimatch)(f4, p14))
+              (f4) => this.fernignorePatterns.some((p14) => f4 === p14 || (0, import_minimatch9.minimatch)(f4, p14))
             );
             if (!allProtected) {
               this.warnings.push(
@@ -361147,6 +361173,7 @@ var require_dist14 = __commonJS({
       }
     };
     var import_node_crypto7 = require("crypto");
+    var import_minimatch22 = require_commonjs3();
     var import_node_path210 = require("path");
     var BINARY_EXTENSIONS2 = /* @__PURE__ */ new Set([
       ".png",
@@ -361202,6 +361229,15 @@ var require_dist14 = __commonJS({
       return BINARY_EXTENSIONS2.has(ext2);
     }
     var INFRASTRUCTURE_FILES = /* @__PURE__ */ new Set([".fernignore"]);
+    function matchesFernignorePattern(filePath, patterns) {
+      if (patterns.length === 0) return false;
+      return patterns.some((p14) => {
+        if (filePath === p14) return true;
+        if ((0, import_minimatch22.minimatch)(filePath, p14)) return true;
+        if (!p14.includes("*") && !p14.includes("?") && filePath.startsWith(p14 + "/")) return true;
+        return false;
+      });
+    }
     function parsePatchFileHeaders(patchContent) {
       const results = [];
       let currentPath = null;
@@ -361242,21 +361278,25 @@ var require_dist14 = __commonJS({
       }
       return snapshot;
     }
-    function filterInfrastructureAndSensitiveFiles(rawFilesOutput) {
+    function filterInfrastructureAndSensitiveFiles(rawFilesOutput, fernignorePatterns) {
       const allFiles = rawFilesOutput.trim().split("\n").filter(Boolean).filter((f4) => !INFRASTRUCTURE_FILES.has(f4)).filter((f4) => !f4.startsWith(".fern/"));
       const sensitiveFiles = allFiles.filter((f4) => isSensitiveFile(f4));
-      const files = allFiles.filter((f4) => !isSensitiveFile(f4));
-      return { files, sensitiveFiles };
+      const nonSensitive = allFiles.filter((f4) => !isSensitiveFile(f4));
+      const fernignoredFiles = nonSensitive.filter((f4) => matchesFernignorePattern(f4, fernignorePatterns));
+      const files = nonSensitive.filter((f4) => !matchesFernignorePattern(f4, fernignorePatterns));
+      return { files, sensitiveFiles, fernignoredFiles };
     }
     var ReplayDetector = class {
       git;
       lockManager;
       sdkOutputDir;
+      fernignorePatterns;
       warnings = [];
-      constructor(git, lockManager, sdkOutputDir) {
+      constructor(git, lockManager, sdkOutputDir, fernignorePatterns = []) {
         this.git = git;
         this.lockManager = lockManager;
         this.sdkOutputDir = sdkOutputDir;
+        this.fernignorePatterns = fernignorePatterns;
       }
       /**
        * Derive the previous-generation SHA from git history instead of trusting
@@ -361363,22 +361403,30 @@ var require_dist14 = __commonJS({
             continue;
           }
           const filesOutput = await this.git.exec(["diff-tree", "--no-commit-id", "--name-only", "-r", commit.sha]);
-          const { files, sensitiveFiles } = filterInfrastructureAndSensitiveFiles(filesOutput);
+          const { files, sensitiveFiles, fernignoredFiles } = filterInfrastructureAndSensitiveFiles(
+            filesOutput,
+            this.fernignorePatterns
+          );
           if (sensitiveFiles.length > 0) {
             this.warnings.push(
               `Sensitive file(s) excluded from patch for commit ${commit.sha.slice(0, 7)}: ${sensitiveFiles.join(", ")}. These files will not be tracked by replay.`
             );
-            if (files.length > 0) {
-              const parentSha = parents[0];
-              if (parentSha) {
-                try {
-                  patchContent = await this.git.exec(["diff", parentSha, commit.sha, "--", ...files]);
-                } catch {
-                  continue;
-                }
-                if (!patchContent.trim()) continue;
-                contentHash = this.computeContentHash(patchContent);
+          }
+          if (fernignoredFiles.length > 0) {
+            this.warnings.push(
+              `.fernignore-protected file(s) excluded from patch for commit ${commit.sha.slice(0, 7)}: ${fernignoredFiles.join(", ")}. These files are managed by .fernignore, not Replay.`
+            );
+          }
+          if ((sensitiveFiles.length > 0 || fernignoredFiles.length > 0) && files.length > 0) {
+            const parentSha = parents[0];
+            if (parentSha) {
+              try {
+                patchContent = await this.git.exec(["diff", parentSha, commit.sha, "--", ...files]);
+              } catch {
+                continue;
               }
+              if (!patchContent.trim()) continue;
+              contentHash = this.computeContentHash(patchContent);
             }
           }
           if (files.length === 0) {
@@ -361577,12 +361625,20 @@ var require_dist14 = __commonJS({
           resolvedBaseGeneration = fallback2;
         }
         const filesOutput = await this.git.exec(["diff", "--name-only", diffBase, "HEAD"]);
-        const { files, sensitiveFiles } = filterInfrastructureAndSensitiveFiles(filesOutput);
+        const { files, sensitiveFiles, fernignoredFiles } = filterInfrastructureAndSensitiveFiles(
+          filesOutput,
+          this.fernignorePatterns
+        );
         if (sensitiveFiles.length > 0) {
           this.warnings.push(
             `Sensitive file(s) excluded from composite patch: ${sensitiveFiles.join(", ")}. These files will not be tracked by replay.`
           );
         }
+        if (fernignoredFiles.length > 0) {
+          this.warnings.push(
+            `.fernignore-protected file(s) excluded from composite patch: ${fernignoredFiles.join(", ")}. These files are managed by .fernignore, not Replay.`
+          );
+        }
         if (files.length === 0) return { patches: [], revertedPatchIds: [] };
         const diff2 = await this.git.exec(["diff", diffBase, "HEAD", "--", ...files]);
         if (!diff2.trim()) return { patches: [], revertedPatchIds: [] };
@@ -361665,23 +361721,31 @@ var require_dist14 = __commonJS({
             continue;
           }
           const filesOutput = await this.git.exec(["diff-tree", "--no-commit-id", "--name-only", "-r", commit.sha]);
-          const { files, sensitiveFiles } = filterInfrastructureAndSensitiveFiles(filesOutput);
+          const { files, sensitiveFiles, fernignoredFiles } = filterInfrastructureAndSensitiveFiles(
+            filesOutput,
+            this.fernignorePatterns
+          );
           if (sensitiveFiles.length > 0) {
             this.warnings.push(
               `Sensitive file(s) excluded from patch for commit ${commit.sha.slice(0, 7)}: ${sensitiveFiles.join(", ")}. These files will not be tracked by replay.`
             );
-            if (files.length > 0) {
-              if (parents.length === 0) {
-                continue;
-              }
-              try {
-                patchContent = await this.git.exec(["diff", parents[0], commit.sha, "--", ...files]);
-              } catch {
-                continue;
-              }
-              if (!patchContent.trim()) continue;
-              contentHash = this.computeContentHash(patchContent);
+          }
+          if (fernignoredFiles.length > 0) {
+            this.warnings.push(
+              `.fernignore-protected file(s) excluded from patch for commit ${commit.sha.slice(0, 7)}: ${fernignoredFiles.join(", ")}. These files are managed by .fernignore, not Replay.`
+            );
+          }
+          if ((sensitiveFiles.length > 0 || fernignoredFiles.length > 0) && files.length > 0) {
+            if (parents.length === 0) {
+              continue;
+            }
+            try {
+              patchContent = await this.git.exec(["diff", parents[0], commit.sha, "--", ...files]);
+            } catch {
+              continue;
             }
+            if (!patchContent.trim()) continue;
+            contentHash = this.computeContentHash(patchContent);
           }
           if (files.length === 0) {
             continue;
@@ -361913,7 +361977,7 @@ var require_dist14 = __commonJS({
     var import_promises310 = require("fs/promises");
     var import_node_os15 = require("os");
     var import_node_path52 = require("path");
-    var import_minimatch22 = require_commonjs3();
+    var import_minimatch32 = require_commonjs3();
     var MergeAccumulator = class {
       constructor(mode, sharedFiles) {
         this.mode = mode;
@@ -362617,13 +362681,13 @@ var require_dist14 = __commonJS({
       isExcluded(patch5) {
         const config5 = this.lockManager.getCustomizationsConfig();
         if (!config5.exclude) return false;
-        return patch5.files.some((file4) => config5.exclude.some((pattern) => (0, import_minimatch22.minimatch)(file4, pattern)));
+        return patch5.files.some((file4) => config5.exclude.some((pattern) => (0, import_minimatch32.minimatch)(file4, pattern)));
       }
       async resolveFilePath(filePath, baseTreeHash, currentTreeHash) {
         const config5 = this.lockManager.getCustomizationsConfig();
         if (config5.moves) {
           for (const move of config5.moves) {
-            if ((0, import_minimatch22.minimatch)(filePath, move.from) || filePath === move.from) {
+            if ((0, import_minimatch32.minimatch)(filePath, move.from) || filePath === move.from) {
               if (filePath === move.from) {
                 return move.to;
               }
@@ -362910,7 +362974,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
     var import_node_fs210 = require("fs");
     var import_promises610 = require("fs/promises");
     var import_node_path82 = require("path");
-    var import_minimatch42 = require_commonjs3();
+    var import_minimatch52 = require_commonjs3();
     init_GitClient();
     var import_promises410 = require("fs/promises");
     var import_node_os22 = require("os");
@@ -363213,7 +363277,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
       const trailer = hasTrailingNewline ? "" : "\n\";
       return header + "\n" + body + trailer + "\n";
     }
-    var import_minimatch32 = require_commonjs3();
+    var import_minimatch42 = require_commonjs3();
     var FileOwnership = class {
       constructor(git) {
         this.git = git;
@@ -363237,7 +363301,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         const { file: file4, originalFileName, patch: patch5, currentGenSha, fernignorePatterns, warnedGens, warnings } = ctx;
         if (patch5.user_owned) return true;
         if (file4 === ".fernignore") return true;
-        if (fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch32.minimatch)(file4, p14))) return true;
+        if (fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch42.minimatch)(file4, p14))) return true;
         if (fileIsCreationInPatchContent(patch5.patch_content, originalFileName ?? file4)) {
           return true;
         }
@@ -363733,7 +363797,8 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
         this.git = git;
         this.outputDir = outputDir;
         this.lockManager = new LockfileManager(outputDir);
-        this.detector = new ReplayDetector(git, this.lockManager, outputDir);
+        const fernignorePatterns = this.readFernignorePatterns();
+        this.detector = new ReplayDetector(git, this.lockManager, outputDir, fernignorePatterns);
         this.applicator = new ReplayApplicator(git, this.lockManager, outputDir);
         this.committer = new ReplayCommitter(git, outputDir);
         this.fileOwnership = new FileOwnership(git);
@@ -363753,8 +363818,60 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
       async prepareReplay(options2) {
         this.warnings = [];
         this.detector.warnings.length = 0;
+        this.cleanseLegacyFernignoreEntries();
         return this.selectFlow(options2).prepare(options2);
       }
+      /**
+       * ADR 0002 migration step. Strips `.fernignore`-matched entries from
+       * `patch.files`, `patch.theirs_snapshot` keys, and `diff --git` sections
+       * in `patch.patch_content` for every patch in the lockfile. Patches that
+       * end up with no surviving files are removed entirely.
+       *
+       * Idempotent: a second run is a no-op because the first run already
+       * matches the contract. Per-patch try/catch ensures one bad patch does
+       * not block the rest. Each affected patch emits a warning naming the
+       * stripped paths. `patch_content` is left untouched if no parseable
+       * `diff --git` headers are found (fail-safe for exotic legacy formats).
+       */
+      cleanseLegacyFernignoreEntries() {
+        const patterns = this.readFernignorePatterns();
+        if (patterns.length === 0) return;
+        if (!this.lockManager.exists()) return;
+        this.lockManager.read();
+        let lockfileMutated = false;
+        const patches = this.lockManager.getPatches();
+        for (const patch5 of patches) {
+          try {
+            const result = computeLegacyFernignoreCleanse(
+              patch5,
+              patterns,
+              (content5) => this.detector.computeContentHash(content5)
+            );
+            if (result.unchanged) continue;
+            if (result.remove) {
+              this.lockManager.removePatch(patch5.id);
+              this.warnings.push(
+                `Cleansed legacy patch ${patch5.id}: all referenced files match .fernignore \u2014 patch removed. Customer's on-disk content for those files is preserved by .fernignore. (ADR 0002: .fernignore-protected files are not tracked by Replay.)`
+              );
+            } else {
+              this.lockManager.updatePatch(patch5.id, {
+                files: result.files,
+                patch_content: result.patch_content,
+                content_hash: result.content_hash,
+                ...result.theirs_snapshot !== void 0 ? { theirs_snapshot: result.theirs_snapshot } : {}
+              });
+              this.warnings.push(
+                `Cleansed legacy patch ${patch5.id}: stripped .fernignore-matched entries (${result.strippedPaths.join(", ")}). Customer's on-disk content for those files is preserved by .fernignore. (ADR 0002.)`
+              );
+            }
+            lockfileMutated = true;
+          } catch {
+          }
+        }
+        if (lockfileMutated) {
+          this.lockManager.save();
+        }
+      }
       /**
        * Phase 2 of the two-phase replay flow. Applies patches, rebases them against
        * the generation, saves the lockfile, and commits `[fern-replay]` (or stages
@@ -363886,7 +364003,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
               )
             );
             const hasProtectedFiles = patch5.files.some(
-              (file4) => file4 === ".fernignore" || fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch42.minimatch)(file4, p14))
+              (file4) => file4 === ".fernignore" || fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch52.minimatch)(file4, p14))
             );
             const allUserOwned = isUserOwnedPerFile.every(Boolean);
             if (allUserOwned && patch5.files.length > 0) {
@@ -364326,7 +364443,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
                 );
                 if (snapHasStaleMarkers) continue;
                 const isProtectedSnap = patch5.files.some(
-                  (file4) => file4 === ".fernignore" || fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch42.minimatch)(file4, p14))
+                  (file4) => file4 === ".fernignore" || fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch52.minimatch)(file4, p14))
                 );
                 if (isProtectedSnap) continue;
                 const snapHash = this.detector.computeContentHash(snapshotDiff);
@@ -364366,7 +364483,7 @@ Patches absorbed by generator (${buckets.absorbed.length}):`;
                 continue;
               }
               const isProtected = patch5.files.some(
-                (file4) => file4 === ".fernignore" || fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch42.minimatch)(file4, p14))
+                (file4) => file4 === ".fernignore" || fernignorePatterns.some((p14) => file4 === p14 || (0, import_minimatch52.minimatch)(file4, p14))
               );
               if (isProtected) {
                 continue;
@@ -364530,7 +364647,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
         if (files.length === 0) return;
         const fernignorePatterns = this.readFernignorePatterns();
         for (const file4 of files) {
-          if (fernignorePatterns.some((pattern) => (0, import_minimatch42.minimatch)(file4, pattern))) continue;
+          if (fernignorePatterns.some((pattern) => (0, import_minimatch52.minimatch)(file4, pattern))) continue;
           try {
             await this.git.exec(["checkout", "HEAD", "--", file4]);
           } catch {
@@ -364615,10 +364732,97 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
       }
       return { applied, unresolved, absorbed };
     }
+    function computeLegacyFernignoreCleanse(patch5, fernignorePatterns, computeContentHash2) {
+      const matchesFernignore = (filePath) => fernignorePatterns.some((p14) => {
+        if (filePath === p14) return true;
+        if ((0, import_minimatch52.minimatch)(filePath, p14)) return true;
+        if (!p14.includes("*") && !p14.includes("?") && filePath.startsWith(p14 + "/")) return true;
+        return false;
+      });
+      const strippedFromFiles = patch5.files.filter(matchesFernignore);
+      const survivingFiles = patch5.files.filter((f4) => !matchesFernignore(f4));
+      let survivingSnapshot = void 0;
+      let snapshotChanged = false;
+      if (patch5.theirs_snapshot) {
+        survivingSnapshot = {};
+        for (const [key2, value2] of Object.entries(patch5.theirs_snapshot)) {
+          if (matchesFernignore(key2)) {
+            snapshotChanged = true;
+          } else {
+            survivingSnapshot[key2] = value2;
+          }
+        }
+      }
+      const { stripped: patchContentStripped, content: newPatchContent, strippedSectionPaths } = stripFernignoreDiffSections(patch5.patch_content, matchesFernignore);
+      const unchanged = strippedFromFiles.length === 0 && !snapshotChanged && !patchContentStripped;
+      if (unchanged) {
+        return {
+          unchanged: true,
+          remove: false,
+          files: patch5.files,
+          patch_content: patch5.patch_content,
+          content_hash: patch5.content_hash,
+          theirs_snapshot: patch5.theirs_snapshot,
+          strippedPaths: []
+        };
+      }
+      const strippedPaths = Array.from(/* @__PURE__ */ new Set([...strippedFromFiles, ...strippedSectionPaths]));
+      if (survivingFiles.length === 0 || newPatchContent.trim() === "") {
+        return {
+          unchanged: false,
+          remove: true,
+          files: [],
+          patch_content: "",
+          content_hash: "",
+          strippedPaths
+        };
+      }
+      const newContentHash = patchContentStripped ? computeContentHash2(newPatchContent) : patch5.content_hash;
+      return {
+        unchanged: false,
+        remove: false,
+        files: survivingFiles,
+        patch_content: newPatchContent,
+        content_hash: newContentHash,
+        ...survivingSnapshot !== void 0 ? { theirs_snapshot: survivingSnapshot } : {},
+        strippedPaths
+      };
+    }
+    function stripFernignoreDiffSections(patchContent, matchesFernignore) {
+      const lines = patchContent.split("\n");
+      const sectionStarts = [];
+      for (let i9 = 0; i9 < lines.length; i9++) {
+        const line = lines[i9];
+        if (line.startsWith("diff --git ")) {
+          const match3 = line.match(/^diff --git a\/(.+?) b\/(.+?)$/);
+          const path115 = match3 ? match3[2] : null;
+          sectionStarts.push({ idx: i9, path: path115 });
+        }
+      }
+      if (sectionStarts.length === 0) {
+        return { stripped: false, content: patchContent, strippedSectionPaths: [] };
+      }
+      const preamble = lines.slice(0, sectionStarts[0].idx);
+      const newLines = [...preamble];
+      const strippedSectionPaths = [];
+      let stripped = false;
+      for (let i9 = 0; i9 < sectionStarts.length; i9++) {
+        const section = sectionStarts[i9];
+        const next2 = sectionStarts[i9 + 1];
+        const endIdx = next2 ? next2.idx : lines.length;
+        if (section.path !== null && matchesFernignore(section.path)) {
+          stripped = true;
+          strippedSectionPaths.push(section.path);
+          continue;
+        }
+        newLines.push(...lines.slice(section.idx, endIdx));
+      }
+      return { stripped, content: newLines.join("\n"), strippedSectionPaths };
+    }
     var import_node_crypto22 = require("crypto");
     var import_node_fs33 = require("fs");
     var import_node_path92 = require("path");
-    var import_minimatch52 = require_commonjs3();
+    var import_minimatch62 = require_commonjs3();
     var import_yaml22 = require_dist11();
     var FernignoreMigrator = class {
       git;
@@ -364650,7 +364854,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
         const commitsOnly = [];
         const syntheticPatches = [];
         for (const pattern of patterns) {
-          const matchingPatch = patches.find((p14) => p14.files.some((f4) => (0, import_minimatch52.minimatch)(f4, pattern) || f4 === pattern));
+          const matchingPatch = patches.find((p14) => p14.files.some((f4) => (0, import_minimatch62.minimatch)(f4, pattern) || f4 === pattern));
           if (matchingPatch) {
             trackedByBoth.push({
               file: pattern,
@@ -364723,7 +364927,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
           fernignoreOnly.push(...remainingFernignoreOnly);
         }
         for (const patch5 of patches) {
-          const hasUnprotectedFiles = patch5.files.some((f4) => !patterns.some((p14) => (0, import_minimatch52.minimatch)(f4, p14) || f4 === p14));
+          const hasUnprotectedFiles = patch5.files.some((f4) => !patterns.some((p14) => (0, import_minimatch62.minimatch)(f4, p14) || f4 === p14));
           if (hasUnprotectedFiles) {
             commitsOnly.push(patch5);
           }
@@ -364735,7 +364939,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
         const results = [];
         for (const pattern of patterns) {
           const matching = allFiles.filter(
-            (f4) => (0, import_minimatch52.minimatch)(f4, pattern) || f4 === pattern || f4.startsWith(pattern + "/")
+            (f4) => (0, import_minimatch62.minimatch)(f4, pattern) || f4 === pattern || f4.startsWith(pattern + "/")
           );
           results.push({ pattern, files: matching.length > 0 ? matching : [pattern] });
         }
@@ -365044,7 +365248,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
       const normalized = relevantLines.filter((line) => !line.startsWith("index ")).join("\n").replace(/\n-- \n[\d]+\.[\d]+[^\n]*\s*$/, "");
       return `sha256:${(0, import_node_crypto32.createHash)("sha256").update(normalized).digest("hex")}`;
     }
-    var import_minimatch62 = require_commonjs3();
+    var import_minimatch72 = require_commonjs3();
     function parseDiffStat(patchContent) {
       let additions = 0;
       let deletions = 0;
@@ -365074,7 +365278,7 @@ If you want to keep these lines, restore them in a follow-up commit and re-run r
     }
     function matchesPatch(patch5, pattern) {
       const fileMatch = patch5.files.some(
-        (file4) => file4 === pattern || (0, import_minimatch62.minimatch)(file4, pattern)
+        (file4) => file4 === pattern || (0, import_minimatch72.minimatch)(file4, pattern)
       );
       if (fileMatch) return true;
       return patch5.original_message.toLowerCase().includes(pattern.toLowerCase());
@@ -365935,11 +366139,11 @@ function removeNonChars2(variableName) {
   return variableName.replace(/(?:^\W+)|(?:(?<!\W)\W+$)/g, "").split(/,/);
 }
 function extractUrlVariableNames2(url3) {
-  const matches = url3.match(urlVariableRegex2);
-  if (!matches) {
+  const matches2 = url3.match(urlVariableRegex2);
+  if (!matches2) {
     return [];
   }
-  return matches.map(removeNonChars2).reduce((a3, b8) => a3.concat(b8), []);
+  return matches2.map(removeNonChars2).reduce((a3, b8) => a3.concat(b8), []);
 }
 function omit4(object23, keysToOmit) {
   const result = { __proto__: null };
@@ -366501,8 +366705,8 @@ async function fetchWrapper2(requestOptions) {
     data: ""
   };
   if ("deprecation" in responseHeaders) {
-    const matches = responseHeaders.link && responseHeaders.link.match(/<([^<>]+)>; rel="deprecation"/);
-    const deprecationLink = matches && matches.pop();
+    const matches2 = responseHeaders.link && responseHeaders.link.match(/<([^<>]+)>; rel="deprecation"/);
+    const deprecationLink = matches2 && matches2.pop();
     log4.warn(
       `[@octokit/request] "${requestOptions.method} ${requestOptions.url}" is deprecated. It is scheduled to be removed on ${responseHeaders.sunset}${deprecationLink ? `. See ${deprecationLink}` : ""}`
     );
@@ -373106,12 +373310,12 @@ var require_isMatchWith = __commonJS({
             continue;
           }
           const targetItem = target[j7];
-          let matches = false;
+          let matches2 = false;
           const isEqual3 = compare2(targetItem, sourceItem, i9, target, source2, stack);
           if (isEqual3) {
-            matches = true;
+            matches2 = true;
           }
-          if (matches) {
+          if (matches2) {
             countedIndex.add(j7);
             found = true;
             break;
@@ -373449,13 +373653,13 @@ var require_matches = __commonJS({
     Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });
     var isMatch = require_isMatch();
     var cloneDeep = require_cloneDeep();
-    function matches(source2) {
+    function matches2(source2) {
       source2 = cloneDeep.cloneDeep(source2);
       return (target) => {
         return isMatch.isMatch(target, source2);
       };
     }
-    exports2.matches = matches;
+    exports2.matches = matches2;
   }
 });
 
@@ -373640,7 +373844,7 @@ var require_iteratee = __commonJS({
     Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });
     var identity5 = require_identity3();
     var property24 = require_property2();
-    var matches = require_matches();
+    var matches2 = require_matches();
     var matchesProperty = require_matchesProperty();
     function iteratee(value2) {
       if (value2 == null) {
@@ -373654,7 +373858,7 @@ var require_iteratee = __commonJS({
           if (Array.isArray(value2) && value2.length === 2) {
             return matchesProperty.matchesProperty(value2[0], value2[1]);
           }
-          return matches.matches(value2);
+          return matches2.matches(value2);
         }
         case "string":
         case "symbol":
@@ -374051,7 +374255,7 @@ var require_dropRightWhile2 = __commonJS({
     var identity5 = require_identity3();
     var property24 = require_property2();
     var isArrayLike4 = require_isArrayLike2();
-    var matches = require_matches();
+    var matches2 = require_matches();
     var matchesProperty = require_matchesProperty();
     function dropRightWhile(arr, predicate = identity5.identity) {
       if (!isArrayLike4.isArrayLike(arr)) {
@@ -374070,7 +374274,7 @@ var require_dropRightWhile2 = __commonJS({
             const value2 = predicate[1];
             return dropRightWhile$1.dropRightWhile(arr, matchesProperty.matchesProperty(key2, value2));
           } else {
-            return dropRightWhile$1.dropRightWhile(arr, matches.matches(predicate));
+            return dropRightWhile$1.dropRightWhile(arr, matches2.matches(predicate));
           }
         }
         case "symbol":
@@ -374110,7 +374314,7 @@ var require_dropWhile2 = __commonJS({
     var toArray4 = require_toArray2();
     var property24 = require_property2();
     var isArrayLike4 = require_isArrayLike2();
-    var matches = require_matches();
+    var matches2 = require_matches();
     var matchesProperty = require_matchesProperty();
     function dropWhile(arr, predicate = identity5.identity) {
       if (!isArrayLike4.isArrayLike(arr)) {
@@ -374129,7 +374333,7 @@ var require_dropWhile2 = __commonJS({
             const value2 = predicate[1];
             return dropWhile$1.dropWhile(arr, matchesProperty.matchesProperty(key2, value2));
           } else {
-            return dropWhile$1.dropWhile(arr, matches.matches(predicate));
+            return dropWhile$1.dropWhile(arr, matches2.matches(predicate));
           }
         }
         case "number":
@@ -374252,7 +374456,7 @@ var require_every2 = __commonJS({
     var isIterateeCall2 = require_isIterateeCall();
     var property24 = require_property2();
     var isArrayLike4 = require_isArrayLike2();
-    var matches = require_matches();
+    var matches2 = require_matches();
     var matchesProperty = require_matchesProperty();
     function every(source2, doesMatch, guard) {
       if (!source2) {
@@ -374276,7 +374480,7 @@ var require_every2 = __commonJS({
             const value2 = doesMatch[1];
             predicate = matchesProperty.matchesProperty(key2, value2);
           } else {
-            predicate = matches.matches(doesMatch);
+            predicate = matches2.matches(doesMatch);
           }
           break;
         }
@@ -374458,7 +374662,7 @@ var require_findIndex2 = __commonJS({
     Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });
     var identity5 = require_identity4();
     var property24 = require_property2();
-    var matches = require_matches();
+    var matches2 = require_matches();
     var matchesProperty = require_matchesProperty();
     function findIndex(arr, doesMatch = identity5.identity, fromIndex = 0) {
       if (!arr) {
@@ -374480,7 +374684,7 @@ var require_findIndex2 = __commonJS({
             const value2 = doesMatch[1];
             index3 = subArray.findIndex(matchesProperty.matchesProperty(key2, value2));
           } else {
-            index3 = subArray.findIndex(matches.matches(doesMatch));
+            index3 = subArray.findIndex(matches2.matches(doesMatch));
           }
           break;
         }
@@ -374541,7 +374745,7 @@ var require_findLastIndex = __commonJS({
     var identity5 = require_identity3();
     var toArray4 = require_toArray2();
     var property24 = require_property2();
-    var matches = require_matches();
+    var matches2 = require_matches();
     var matchesProperty = require_matchesProperty();
     function findLastIndex(arr, doesMatch = identity5.identity, fromIndex = arr ? arr.length - 1 : 0) {
       if (!arr) {
@@ -374563,7 +374767,7 @@ var require_findLastIndex = __commonJS({
             const value2 = doesMatch[1];
             return subArray.findLastIndex(matchesProperty.matchesProperty(key2, value2));
           } else {
-            return subArray.findLastIndex(matches.matches(doesMatch));
+            return subArray.findLastIndex(matches2.matches(doesMatch));
           }
         }
         case "number":
@@ -376212,7 +376416,7 @@ var require_some = __commonJS({
     Object.defineProperty(exports2, Symbol.toStringTag, { value: "Module" });
     var identity5 = require_identity3();
     var property24 = require_property2();
-    var matches = require_matches();
+    var matches2 = require_matches();
     var matchesProperty = require_matchesProperty();
     function some(source2, predicate, guard) {
       if (!source2) {
@@ -376260,7 +376464,7 @@ var require_some = __commonJS({
             }
             return values2.some(matchFunc);
           } else {
-            const matchFunc = matches.matches(predicate);
+            const matchFunc = matches2.matches(predicate);
             if (Array.isArray(source2)) {
               for (let i9 = 0; i9 < source2.length; i9++) {
                 if (matchFunc(source2[i9])) {
@@ -382745,7 +382949,7 @@ var require_compat = __commonJS({
     var isTypedArray3 = require_isTypedArray2();
     var isWeakMap = require_isWeakMap2();
     var isWeakSet = require_isWeakSet2();
-    var matches = require_matches();
+    var matches2 = require_matches();
     var matchesProperty = require_matchesProperty();
     var capitalize2 = require_capitalize2();
     var bindAll = require_bindAll();
@@ -383041,7 +383245,7 @@ var require_compat = __commonJS({
     exports2.isTypedArray = isTypedArray3.isTypedArray;
     exports2.isWeakMap = isWeakMap.isWeakMap;
     exports2.isWeakSet = isWeakSet.isWeakSet;
-    exports2.matches = matches.matches;
+    exports2.matches = matches2.matches;
     exports2.matchesProperty = matchesProperty.matchesProperty;
     exports2.capitalize = capitalize2.capitalize;
     exports2.bindAll = bindAll.bindAll;
@@ -383357,7 +383561,7 @@ var require_compat2 = __commonJS({
     var isTypedArray3 = require_isTypedArray2();
     var isWeakMap = require_isWeakMap2();
     var isWeakSet = require_isWeakSet2();
-    var matches = require_matches();
+    var matches2 = require_matches();
     var matchesProperty = require_matchesProperty();
     var capitalize2 = require_capitalize2();
     var bindAll = require_bindAll();
@@ -383654,7 +383858,7 @@ var require_compat2 = __commonJS({
     exports2.isTypedArray = isTypedArray3.isTypedArray;
     exports2.isWeakMap = isWeakMap.isWeakMap;
     exports2.isWeakSet = isWeakSet.isWeakSet;
-    exports2.matches = matches.matches;
+    exports2.matches = matches2.matches;
     exports2.matchesProperty = matchesProperty.matchesProperty;
     exports2.capitalize = capitalize2.capitalize;
     exports2.bindAll = bindAll.bindAll;
@@ -392364,15 +392568,8 @@ var require_GitHub = __commonJS({
         if (fernignore === void 0) {
           return [];
         }
-        const fernignoreLines = fernignore.split("\n");
-        const fernignoreFiles = [];
-        for (const line of fernignoreLines) {
-          const trimmedLine = line.trim();
-          if (!trimmedLine.startsWith("#") && trimmedLine.length > 0 && await repository.fileExists({ relativeFilePath: trimmedLine })) {
-            fernignoreFiles.push(trimmedLine);
-          }
-        }
-        return fernignoreFiles;
+        const tracked = await repository.listTrackedFiles();
+        return (0, github_1.expandFernignorePatterns)(fernignore, tracked);
       }
       async restoreFiles(repository, files) {
         if (files.length === 0) {
@@ -459578,14 +459775,14 @@ var require_localHostOrDomainIs = __commonJS({
     function localHostOrDomainIs(host, hostdom) {
       const parts = host.split(".");
       const domparts = hostdom.split(".");
-      let matches = true;
+      let matches2 = true;
       for (let i9 = 0; i9 < parts.length; i9++) {
         if (parts[i9] !== domparts[i9]) {
-          matches = false;
+          matches2 = false;
           break;
         }
       }
-      return matches;
+      return matches2;
     }
     exports2.default = localHostOrDomainIs;
   }
@@ -502800,20 +502997,20 @@ function extractTraceparentData(traceparent) {
   if (!traceparent) {
     return void 0;
   }
-  const matches = traceparent.match(TRACEPARENT_REGEXP);
-  if (!matches) {
+  const matches2 = traceparent.match(TRACEPARENT_REGEXP);
+  if (!matches2) {
     return void 0;
   }
   let parentSampled;
-  if (matches[3] === "1") {
+  if (matches2[3] === "1") {
     parentSampled = true;
-  } else if (matches[3] === "0") {
+  } else if (matches2[3] === "0") {
     parentSampled = false;
   }
   return {
-    traceId: matches[1],
+    traceId: matches2[1],
     parentSampled,
-    parentSpanId: matches[2]
+    parentSpanId: matches2[2]
   };
 }
 function propagationContextFromHeaders(sentryTrace, baggage) {
@@ -520082,14 +520279,14 @@ var RequireInTheMiddleSingleton3 = class _RequireInTheMiddleSingleton {
       { internals: true },
       (exports2, name2, basedir) => {
         const normalizedModuleName = normalizePathSeparators3(name2);
-        const matches = this._moduleNameTrie.search(normalizedModuleName, {
+        const matches2 = this._moduleNameTrie.search(normalizedModuleName, {
           maintainInsertionOrder: true,
           // For core modules (e.g. `fs`), do not match on sub-paths (e.g. `fs/promises').
           // This matches the behavior of `require-in-the-middle`.
           // `basedir` is always `undefined` for core modules.
           fullOnly: basedir === void 0
         });
-        for (const { onRequire } of matches) {
+        for (const { onRequire } of matches2) {
           exports2 = onRequire(exports2, name2, basedir);
         }
         return exports2;
@@ -522610,11 +522807,11 @@ function assembleStyles() {
     },
     hexToRgb: {
       value(hex3) {
-        const matches = /[a-f\d]{6}|[a-f\d]{3}/i.exec(hex3.toString(16));
-        if (!matches) {
+        const matches2 = /[a-f\d]{6}|[a-f\d]{3}/i.exec(hex3.toString(16));
+        if (!matches2) {
           return [0, 0, 0];
         }
-        let [colorString] = matches;
+        let [colorString] = matches2;
         if (colorString.length === 3) {
           colorString = [...colorString].map((character) => character + character).join("");
         }
@@ -568069,9 +568266,9 @@ init_lodash();
 
 // ../api-importers/openapi/openapi-ir/lib/utils/replaceStartingNumber.js
 function replaceStartingNumber(input3) {
-  const matches = input3.match(NUMERIC_REGEX);
-  if (matches && matches[0] != null) {
-    const numericPart = matches[0];
+  const matches2 = input3.match(NUMERIC_REGEX);
+  if (matches2 && matches2[0] != null) {
+    const numericPart = matches2[0];
     const nonNumericPart = input3.substring(numericPart.length);
     const parsedNumber = parseFloat(numericPart);
     if (!isNaN(parsedNumber) && isFinite(parsedNumber)) {
@@ -579767,11 +579964,11 @@ var ExampleTypeFactory = class _ExampleTypeFactory {
       }
       return schema2.schemas[0];
     }
-    const matches = schema2.schemas.map((schema3) => ({
+    const matches2 = schema2.schemas.map((schema3) => ({
       schema: schema3,
       heuristic: this.calcExampleHeuristic(schema3, fullExample)
     }));
-    const sortedMatches = matches.sort((a3, b8) => b8.heuristic - a3.heuristic);
+    const sortedMatches = matches2.sort((a3, b8) => b8.heuristic - a3.heuristic);
     return sortedMatches[0]?.schema;
   }
   // this is not a perfect heuristic, but it's a start. algorithm is as follows:
@@ -579834,14 +580031,14 @@ var ExampleTypeFactory = class _ExampleTypeFactory {
         return this.calcExampleHeuristic(resolvedSchema, fullExample);
       }
       case "oneOf": {
-        const matches = Object.values(schema2.value.schemas).map((schema3) => this.calcExampleHeuristic(schema3, fullExample));
-        return matches.sort((a3, b8) => b8 - a3)[0] ?? 0;
+        const matches2 = Object.values(schema2.value.schemas).map((schema3) => this.calcExampleHeuristic(schema3, fullExample));
+        return matches2.sort((a3, b8) => b8 - a3)[0] ?? 0;
       }
       case "primitive": {
         if (fullExample == null) {
           return 0;
         }
-        const matches = schema2.schema._visit({
+        const matches2 = schema2.schema._visit({
           int: () => typeof fullExample === "number",
           int64: () => typeof fullExample === "number",
           uint: () => typeof fullExample === "number",
@@ -579856,7 +580053,7 @@ var ExampleTypeFactory = class _ExampleTypeFactory {
           boolean: () => typeof fullExample === "boolean",
           _other: () => true
         });
-        return matches ? 1 : -1;
+        return matches2 ? 1 : -1;
       }
       default:
         return 0;
@@ -597103,25 +597300,25 @@ async function findUpMultiple(name2, options2 = {}) {
     }
     return foundPath;
   };
-  const matches = [];
+  const matches2 = [];
   while (true) {
     const foundPath = await runMatcher({ ...options2, cwd: directory });
     if (foundPath === findUpStop) {
       break;
     }
     if (foundPath) {
-      matches.push(import_node_path8.default.resolve(directory, foundPath));
+      matches2.push(import_node_path8.default.resolve(directory, foundPath));
     }
-    if (directory === stopAt || matches.length >= limit) {
+    if (directory === stopAt || matches2.length >= limit) {
       break;
     }
     directory = import_node_path8.default.dirname(directory);
   }
-  return matches;
+  return matches2;
 }
 async function findUp(name2, options2 = {}) {
-  const matches = await findUpMultiple(name2, { ...options2, limit: 1 });
-  return matches[0];
+  const matches2 = await findUpMultiple(name2, { ...options2, limit: 1 });
+  return matches2[0];
 }
 
 // ../configuration-loader/lib/getFernDirectory.js
@@ -627231,10 +627428,10 @@ var forEachEntry = (obj, fn10) => {
   }
 };
 var matchAll = (regExp, str3) => {
-  let matches;
+  let matches2;
   const arr = [];
-  while ((matches = regExp.exec(str3)) !== null) {
-    arr.push(matches);
+  while ((matches2 = regExp.exec(str3)) !== null) {
+    arr.push(matches2);
   }
   return arr;
 };
@@ -667193,9 +667390,9 @@ var FeatureFlagsPoller = class {
     if ((condition.properties || []).length > 0) {
       for (const prop of condition.properties) {
         const propertyType = prop.type;
-        let matches = false;
-        matches = "cohort" === propertyType ? matchCohort(prop, properties7, this.cohorts, this.debugMode) : "flag" === propertyType ? await this.evaluateFlagDependency(prop, properties7, evaluationContext) : matchProperty(prop, properties7, warnFunction);
-        if (!matches) return false;
+        let matches2 = false;
+        matches2 = "cohort" === propertyType ? matchCohort(prop, properties7, this.cohorts, this.debugMode) : "flag" === propertyType ? await this.evaluateFlagDependency(prop, properties7, evaluationContext) : matchProperty(prop, properties7, warnFunction);
+        if (!matches2) return false;
       }
       if (void 0 == rolloutPercentage) return true;
     }
@@ -667522,10 +667719,10 @@ function matchPropertyGroup(propertyGroup, propertyValues, cohortProperties, deb
   let errorMatchingLocally = false;
   if ("values" in properties7[0]) {
     for (const prop of properties7) try {
-      const matches = matchPropertyGroup(prop, propertyValues, cohortProperties, debugMode);
+      const matches2 = matchPropertyGroup(prop, propertyValues, cohortProperties, debugMode);
       if ("AND" === propertyGroupType) {
-        if (!matches) return false;
-      } else if (matches) return true;
+        if (!matches2) return false;
+      } else if (matches2) return true;
     } catch (err) {
       if (err instanceof RequiresServerEvaluation) throw err;
       if (err instanceof InconclusiveMatchError) {
@@ -667537,19 +667734,19 @@ function matchPropertyGroup(propertyGroup, propertyValues, cohortProperties, deb
     return "AND" === propertyGroupType;
   }
   for (const prop of properties7) try {
-    let matches;
-    if ("cohort" === prop.type) matches = matchCohort(prop, propertyValues, cohortProperties, debugMode);
+    let matches2;
+    if ("cohort" === prop.type) matches2 = matchCohort(prop, propertyValues, cohortProperties, debugMode);
     else if ("flag" === prop.type) {
       if (debugMode) console.warn(`[FEATURE FLAGS] Flag dependency filters are not supported in local evaluation. Skipping condition with dependency on flag '${prop.key || "unknown"}'`);
       continue;
-    } else matches = matchProperty(prop, propertyValues);
+    } else matches2 = matchProperty(prop, propertyValues);
     const negation = prop.negation || false;
     if ("AND" === propertyGroupType) {
-      if (!matches && !negation) return false;
-      if (matches && negation) return false;
+      if (!matches2 && !negation) return false;
+      if (matches2 && negation) return false;
     } else {
-      if (matches && !negation) return true;
-      if (!matches && negation) return true;
+      if (matches2 && !negation) return true;
+      if (!matches2 && negation) return true;
     }
   } catch (err) {
     if (err instanceof RequiresServerEvaluation) throw err;
@@ -668568,7 +668765,7 @@ var AccessTokenPosthogManager = class {
         properties: {
           ...event,
           ...event.properties,
-          version: "5.23.3-214-g5b9a7373966",
+          version: "5.23.3-217-g91ea20d5077",
           usingAccessToken: true,
           ...getRunIdProperties()
         }
@@ -668632,7 +668829,7 @@ var UserPosthogManager = class {
       distinctId: this.userId ?? await this.getPersistedDistinctId(),
       event: "CLI",
       properties: {
-        version: "5.23.3-214-g5b9a7373966",
+        version: "5.23.3-217-g91ea20d5077",
         ...event,
         ...event.properties,
         usingAccessToken: false,
@@ -668992,11 +669189,11 @@ function assembleStyles2() {
     },
     hexToRgb: {
       value(hex3) {
-        const matches = /[a-f\d]{6}|[a-f\d]{3}/i.exec(hex3.toString(16));
-        if (!matches) {
+        const matches2 = /[a-f\d]{6}|[a-f\d]{3}/i.exec(hex3.toString(16));
+        if (!matches2) {
           return [0, 0, 0];
         }
-        let [colorString] = matches;
+        let [colorString] = matches2;
         if (colorString.length === 3) {
           colorString = [...colorString].map((character) => character + character).join("");
         }
@@ -831672,7 +831869,7 @@ function tokensToFunction(tokens, options2) {
   var _a12 = options2.encode, encode6 = _a12 === void 0 ? function(x5) {
     return x5;
   } : _a12, _b3 = options2.validate, validate3 = _b3 === void 0 ? true : _b3;
-  var matches = tokens.map(function(token) {
+  var matches2 = tokens.map(function(token) {
     if (typeof token === "object") {
       return new RegExp("^(?:".concat(token.pattern, ")$"), reFlags);
     }
@@ -831699,7 +831896,7 @@ function tokensToFunction(tokens, options2) {
         }
         for (var j7 = 0; j7 < value2.length; j7++) {
           var segment = encode6(value2[j7], token);
-          if (validate3 && !matches[i9].test(segment)) {
+          if (validate3 && !matches2[i9].test(segment)) {
             throw new TypeError('Expected all "'.concat(token.name, '" to match "').concat(token.pattern, '", but got "').concat(segment, '"'));
           }
           path115 += token.prefix + segment + token.suffix;
@@ -831708,7 +831905,7 @@ function tokensToFunction(tokens, options2) {
       }
       if (typeof value2 === "string" || typeof value2 === "number") {
         var segment = encode6(String(value2), token);
-        if (validate3 && !matches[i9].test(segment)) {
+        if (validate3 && !matches2[i9].test(segment)) {
           throw new TypeError('Expected "'.concat(token.name, '" to match "').concat(token.pattern, '", but got "').concat(segment, '"'));
         }
         path115 += token.prefix + segment + token.suffix;
@@ -860485,7 +860682,7 @@ var LOCAL_STORAGE_FOLDER4 = ".fern-dev";
 var LOGS_FOLDER_NAME = "logs";
 var MAX_LOGS_DIR_SIZE_BYTES = 100 * 1024 * 1024;
 function getCliSource() {
-  const version7 = "5.23.3-214-g5b9a7373966";
+  const version7 = "5.23.3-217-g91ea20d5077";
   return `cli@${version7}`;
 }
 var DebugLogger = class {
@@ -867857,8 +868054,8 @@ function extractLinksFromTypes(typeStrings, ctx, currentModulePath) {
     if (!typeStr) {
       continue;
     }
-    const matches = typeStr.match(QUALIFIED_PATH_REGEX) || [];
-    for (const path115 of matches) {
+    const matches2 = typeStr.match(QUALIFIED_PATH_REGEX) || [];
+    for (const path115 of matches2) {
       if (links[path115]) {
         continue;
       }
@@ -879357,7 +879554,7 @@ var LegacyDocsPublisher = class {
         previewId,
         disableTemplates: void 0,
         skipUpload,
-        cliVersion: "5.23.3-214-g5b9a7373966",
+        cliVersion: "5.23.3-217-g91ea20d5077",
         loginCommand: "fern auth login"
       });
       if (taskContext.getResult() === TaskResult.Failure) {
@@ -954097,7 +954294,7 @@ function getAutomationContextFromEnv() {
     config_branch: process.env.FERN_CONFIG_BRANCH,
     config_pr_number: process.env.FERN_CONFIG_PR_NUMBER,
     trigger: process.env.GITHUB_EVENT_NAME,
-    cli_version: "5.23.3-214-g5b9a7373966"
+    cli_version: "5.23.3-217-g91ea20d5077"
   };
 }
 function isAutomationMode() {
@@ -954923,7 +955120,7 @@ var CliContext = class _CliContext {
     if (false) {
       this.logger.error("CLI_VERSION is not defined");
     }
-    return "5.23.3-214-g5b9a7373966";
+    return "5.23.3-217-g91ea20d5077";
   }
   getCliName() {
     if (false) {
@@ -967250,7 +967447,7 @@ function findMatchingSpecPath(overridePath, specPaths) {
     if (specSegments.length !== overrideSegments.length) {
       continue;
     }
-    let matches = true;
+    let matches2 = true;
     for (let i9 = 0; i9 < specSegments.length; i9++) {
       const specSeg = specSegments[i9];
       const overrideSeg = overrideSegments[i9];
@@ -967263,10 +967460,10 @@ function findMatchingSpecPath(overridePath, specPaths) {
           continue;
         }
       }
-      matches = false;
+      matches2 = false;
       break;
     }
-    if (matches) {
+    if (matches2) {
       return specPath;
     }
   }