@fern-api/replay 0.8.1 → 0.9.1

package/dist/index.cjs

@@ -133,6 +133,14 @@ var init_GitClient = __esm({
           return false;
         }
       }
+      async treeExists(treeHash) {
+        try {
+          const type = await this.exec(["cat-file", "-t", treeHash]);
+          return type.trim() === "tree";
+        } catch {
+          return false;
+        }
+      }
       async getCommitBody(commitSha) {
         return this.exec(["log", "-1", "--format=%B", commitSha]);
       }
@@ -143,6 +151,255 @@ var init_GitClient = __esm({
   }
 });
 
+// src/HybridReconstruction.ts
+var HybridReconstruction_exports = {};
+__export(HybridReconstruction_exports, {
+  assembleHybrid: () => assembleHybrid,
+  locateHunksInOurs: () => locateHunksInOurs,
+  parseHunks: () => parseHunks,
+  reconstructFromGhostPatch: () => reconstructFromGhostPatch
+});
+function parseHunks(fileDiff) {
+  const lines = fileDiff.split("\n");
+  const hunks = [];
+  let currentHunk = null;
+  for (const line of lines) {
+    const headerMatch = line.match(
+      /^@@ -(\d+)(?:,(\d+))? \+(\d+)(?:,(\d+))? @@/
+    );
+    if (headerMatch) {
+      if (currentHunk) {
+        hunks.push(currentHunk);
+      }
+      currentHunk = {
+        oldStart: parseInt(headerMatch[1], 10),
+        oldCount: headerMatch[2] != null ? parseInt(headerMatch[2], 10) : 1,
+        newStart: parseInt(headerMatch[3], 10),
+        newCount: headerMatch[4] != null ? parseInt(headerMatch[4], 10) : 1,
+        lines: []
+      };
+      continue;
+    }
+    if (!currentHunk) continue;
+    if (line.startsWith("diff --git") || line.startsWith("index ") || line.startsWith("---") || line.startsWith("+++") || line.startsWith("old mode") || line.startsWith("new mode") || line.startsWith("similarity index") || line.startsWith("rename from") || line.startsWith("rename to") || line.startsWith("new file mode") || line.startsWith("deleted file mode")) {
+      continue;
+    }
+    if (line === "\") {
+      continue;
+    }
+    if (line.startsWith("-")) {
+      currentHunk.lines.push({ type: "remove", content: line.slice(1) });
+    } else if (line.startsWith("+")) {
+      currentHunk.lines.push({ type: "add", content: line.slice(1) });
+    } else if (line.startsWith(" ") || line === "") {
+      currentHunk.lines.push({
+        type: "context",
+        content: line.startsWith(" ") ? line.slice(1) : line
+      });
+    }
+  }
+  if (currentHunk) {
+    hunks.push(currentHunk);
+  }
+  return hunks;
+}
+function extractLeadingContext(hunk) {
+  const result = [];
+  for (const line of hunk.lines) {
+    if (line.type !== "context") break;
+    result.push(line.content);
+  }
+  return result;
+}
+function extractTrailingContext(hunk) {
+  const result = [];
+  for (let i = hunk.lines.length - 1; i >= 0; i--) {
+    if (hunk.lines[i].type !== "context") break;
+    result.unshift(hunk.lines[i].content);
+  }
+  return result;
+}
+function countOursLinesBeforeTrailing(hunk) {
+  let count = 0;
+  const trailingStart = findTrailingContextStart(hunk);
+  for (let i = 0; i < trailingStart; i++) {
+    if (hunk.lines[i].type === "context") count++;
+  }
+  return count;
+}
+function findTrailingContextStart(hunk) {
+  let i = hunk.lines.length - 1;
+  while (i >= 0 && hunk.lines[i].type === "context") {
+    i--;
+  }
+  return i + 1;
+}
+function matchesAt(needle, haystack, offset) {
+  for (let i = 0; i < needle.length; i++) {
+    if (haystack[offset + i] !== needle[i]) return false;
+  }
+  return true;
+}
+function findContextInOurs(contextLines, oursLines, minIndex, hint) {
+  const SEARCH_WINDOW = 200;
+  const maxStart = oursLines.length - contextLines.length;
+  const clampedHint = Math.max(minIndex, Math.min(hint, maxStart));
+  if (clampedHint >= minIndex && clampedHint <= maxStart) {
+    if (matchesAt(contextLines, oursLines, clampedHint)) {
+      return clampedHint;
+    }
+  }
+  for (let delta = 1; delta <= SEARCH_WINDOW; delta++) {
+    for (const sign of [1, -1]) {
+      const idx = clampedHint + delta * sign;
+      if (idx < minIndex || idx > maxStart) continue;
+      if (matchesAt(contextLines, oursLines, idx)) {
+        return idx;
+      }
+    }
+  }
+  return -1;
+}
+function computeOursSpan(hunk, oursLines, oursOffset) {
+  const leading = extractLeadingContext(hunk);
+  const trailing = extractTrailingContext(hunk);
+  if (trailing.length === 0) {
+    const contextCount2 = hunk.lines.filter(
+      (l) => l.type === "context"
+    ).length;
+    return Math.min(contextCount2, oursLines.length - oursOffset);
+  }
+  const searchStart = oursOffset + leading.length;
+  for (let i = searchStart; i <= oursLines.length - trailing.length; i++) {
+    if (matchesAt(trailing, oursLines, i)) {
+      return i + trailing.length - oursOffset;
+    }
+  }
+  const contextCount = hunk.lines.filter(
+    (l) => l.type === "context"
+  ).length;
+  return Math.min(contextCount, oursLines.length - oursOffset);
+}
+function locateHunksInOurs(hunks, oursLines) {
+  const located = [];
+  let minOursIndex = 0;
+  for (const hunk of hunks) {
+    const contextLines = extractLeadingContext(hunk);
+    let oursOffset;
+    if (contextLines.length > 0) {
+      const found = findContextInOurs(
+        contextLines,
+        oursLines,
+        minOursIndex,
+        hunk.newStart - 1
+      );
+      if (found === -1) {
+        const trailingContext = extractTrailingContext(hunk);
+        if (trailingContext.length > 0) {
+          const trailingFound = findContextInOurs(
+            trailingContext,
+            oursLines,
+            minOursIndex,
+            hunk.newStart - 1
+          );
+          if (trailingFound === -1) return null;
+          const nonTrailingCount = countOursLinesBeforeTrailing(hunk);
+          oursOffset = trailingFound - nonTrailingCount;
+          if (oursOffset < minOursIndex) return null;
+        } else {
+          return null;
+        }
+      } else {
+        oursOffset = found;
+      }
+    } else if (hunk.oldStart === 1 && hunk.oldCount === 0) {
+      oursOffset = 0;
+    } else {
+      oursOffset = Math.max(hunk.newStart - 1, minOursIndex);
+    }
+    const oursSpan = computeOursSpan(hunk, oursLines, oursOffset);
+    located.push({ hunk, oursOffset, oursSpan });
+    minOursIndex = oursOffset + oursSpan;
+  }
+  return located;
+}
+function assembleHybrid(locatedHunks, oursLines) {
+  const baseLines = [];
+  const theirsLines = [];
+  let oursCursor = 0;
+  for (const { hunk, oursOffset, oursSpan } of locatedHunks) {
+    if (oursOffset > oursCursor) {
+      const gapLines = oursLines.slice(oursCursor, oursOffset);
+      baseLines.push(...gapLines);
+      theirsLines.push(...gapLines);
+    }
+    for (const line of hunk.lines) {
+      switch (line.type) {
+        case "context":
+          baseLines.push(line.content);
+          theirsLines.push(line.content);
+          break;
+        case "remove":
+          baseLines.push(line.content);
+          break;
+        case "add":
+          theirsLines.push(line.content);
+          break;
+      }
+    }
+    oursCursor = oursOffset + oursSpan;
+  }
+  if (oursCursor < oursLines.length) {
+    const gapLines = oursLines.slice(oursCursor);
+    baseLines.push(...gapLines);
+    theirsLines.push(...gapLines);
+  }
+  return {
+    base: baseLines.join("\n"),
+    theirs: theirsLines.join("\n")
+  };
+}
+function reconstructFromGhostPatch(fileDiff, ours) {
+  const hunks = parseHunks(fileDiff);
+  if (hunks.length === 0) {
+    return null;
+  }
+  const isPureAddition = hunks.every(
+    (h) => h.oldCount === 0 && h.lines.every((l) => l.type !== "remove")
+  );
+  if (isPureAddition) {
+    return null;
+  }
+  const isPureDeletion = hunks.every(
+    (h) => h.newCount === 0 && h.lines.every((l) => l.type !== "add")
+  );
+  if (isPureDeletion) {
+    const baseLines = [];
+    for (const hunk of hunks) {
+      for (const line of hunk.lines) {
+        if (line.type === "context" || line.type === "remove") {
+          baseLines.push(line.content);
+        }
+      }
+    }
+    return {
+      base: baseLines.join("\n"),
+      theirs: ""
+    };
+  }
+  const oursLines = ours.split("\n");
+  const located = locateHunksInOurs(hunks, oursLines);
+  if (!located) {
+    return null;
+  }
+  return assembleHybrid(located, oursLines);
+}
+var init_HybridReconstruction = __esm({
+  "src/HybridReconstruction.ts"() {
+    "use strict";
+  }
+});
+
 // src/index.ts
 var index_exports = {};
 __export(index_exports, {
@@ -290,6 +547,15 @@ var LockfileManager = class {
     this.ensureLoaded();
     this.lock.patches = [];
   }
+  addForgottenHash(hash) {
+    this.ensureLoaded();
+    if (!this.lock.forgotten_hashes) {
+      this.lock.forgotten_hashes = [];
+    }
+    if (!this.lock.forgotten_hashes.includes(hash)) {
+      this.lock.forgotten_hashes.push(hash);
+    }
+  }
   getUnresolvedPatches() {
     this.ensureLoaded();
     return this.lock.patches.filter((p) => p.status === "unresolved");
@@ -386,6 +652,7 @@ var ReplayDetector = class {
     }
     const commits = this.parseGitLog(log);
     const newPatches = [];
+    const forgottenHashes = new Set(lock.forgotten_hashes ?? []);
     for (const commit of commits) {
       if (isGenerationCommit(commit)) {
         continue;
@@ -399,7 +666,7 @@ var ReplayDetector = class {
       }
       const patchContent = await this.git.formatPatch(commit.sha);
       const contentHash = this.computeContentHash(patchContent);
-      if (lock.patches.find((p) => p.content_hash === contentHash)) {
+      if (lock.patches.find((p) => p.content_hash === contentHash) || forgottenHashes.has(contentHash)) {
         continue;
       }
       const filesOutput = await this.git.exec(["diff-tree", "--no-commit-id", "--name-only", "-r", commit.sha]);
@@ -498,7 +765,7 @@ var ReplayDetector = class {
     if (!diff.trim()) return { patches: [], revertedPatchIds: [] };
     const contentHash = this.computeContentHash(diff);
     const lock = this.lockManager.read();
-    if (lock.patches.some((p) => p.content_hash === contentHash)) {
+    if (lock.patches.some((p) => p.content_hash === contentHash) || (lock.forgotten_hashes ?? []).includes(contentHash)) {
       return { patches: [], revertedPatchIds: [] };
     }
     const headSha = (await this.git.exec(["rev-parse", "HEAD"])).trim();
@@ -568,6 +835,36 @@ var import_promises = require("fs/promises");
 var import_node_os = require("os");
 var import_node_path2 = require("path");
 var import_minimatch = require("minimatch");
+
+// src/conflict-utils.ts
+function stripConflictMarkers(content) {
+  const lines = content.split("\n");
+  const result = [];
+  let inConflict = false;
+  let inOurs = false;
+  for (const line of lines) {
+    if (line.startsWith("<<<<<<< ")) {
+      inConflict = true;
+      inOurs = true;
+      continue;
+    }
+    if (inConflict && line === "=======") {
+      inOurs = false;
+      continue;
+    }
+    if (inConflict && line.startsWith(">>>>>>> ")) {
+      inConflict = false;
+      inOurs = false;
+      continue;
+    }
+    if (!inConflict || inOurs) {
+      result.push(line);
+    }
+  }
+  return result.join("\n");
+}
+
+// src/ReplayApplicator.ts
 var BINARY_EXTENSIONS = /* @__PURE__ */ new Set([
   ".png",
   ".jpg",
@@ -622,6 +919,7 @@ var ReplayApplicator = class {
   lockManager;
   outputDir;
   renameCache = /* @__PURE__ */ new Map();
+  treeExistsCache = /* @__PURE__ */ new Map();
   fileTheirsAccumulator = /* @__PURE__ */ new Map();
   constructor(git, lockManager, outputDir) {
     this.git = git;
@@ -639,7 +937,8 @@ var ReplayApplicator = class {
   async applyPatches(patches) {
     this.resetAccumulator();
     const results = [];
-    for (const patch of patches) {
+    for (let i = 0; i < patches.length; i++) {
+      const patch = patches[i];
       if (this.isExcluded(patch)) {
         results.push({
           patch,
@@ -650,6 +949,33 @@ var ReplayApplicator = class {
       }
       const result = await this.applyPatchWithFallback(patch);
       results.push(result);
+      if (result.status === "conflict" && result.fileResults) {
+        const laterFiles = /* @__PURE__ */ new Set();
+        for (let j = i + 1; j < patches.length; j++) {
+          for (const f of patches[j].files) {
+            laterFiles.add(f);
+          }
+        }
+        const resolvedToOriginal = /* @__PURE__ */ new Map();
+        if (result.resolvedFiles) {
+          for (const [orig, resolved] of Object.entries(result.resolvedFiles)) {
+            resolvedToOriginal.set(resolved, orig);
+          }
+        }
+        for (const fileResult of result.fileResults) {
+          if (fileResult.status !== "conflict") continue;
+          const originalPath = resolvedToOriginal.get(fileResult.file) ?? fileResult.file;
+          if (laterFiles.has(fileResult.file) || laterFiles.has(originalPath)) {
+            const filePath = (0, import_node_path2.join)(this.outputDir, fileResult.file);
+            try {
+              const content = await (0, import_promises.readFile)(filePath, "utf-8");
+              const stripped = stripConflictMarkers(content);
+              await (0, import_promises.writeFile)(filePath, stripped);
+            } catch {
+            }
+          }
+        }
+      }
     }
     return results;
   }
@@ -668,7 +994,7 @@ var ReplayApplicator = class {
         const resolvedPath = await this.resolveFilePath(filePath, baseGen.tree_hash, currentTreeHash);
         const base = await this.git.showFile(baseGen.tree_hash, filePath);
         const theirs = await this.applyPatchToContent(base, patch.patch_content, filePath, tempGit, tempDir);
-        if (theirs && base) {
+        if (theirs) {
           this.fileTheirsAccumulator.set(resolvedPath, {
             content: theirs,
             baseGeneration: patch.base_generation
@@ -790,17 +1116,36 @@ var ReplayApplicator = class {
       }
       const oursPath = (0, import_node_path2.join)(this.outputDir, resolvedPath);
       const ours = await (0, import_promises.readFile)(oursPath, "utf-8").catch(() => null);
-      let theirs = await this.applyPatchToContent(
-        base,
-        patch.patch_content,
-        filePath,
-        tempGit,
-        tempDir,
-        renameSourcePath
-      );
+      let ghostReconstructed = false;
+      let theirs = null;
+      if (!base && ours && !renameSourcePath) {
+        const treeReachable = await this.isTreeReachable(baseGen.tree_hash);
+        if (!treeReachable) {
+          const fileDiff = this.extractFileDiff(patch.patch_content, filePath);
+          if (fileDiff) {
+            const { reconstructFromGhostPatch: reconstructFromGhostPatch2 } = await Promise.resolve().then(() => (init_HybridReconstruction(), HybridReconstruction_exports));
+            const result = reconstructFromGhostPatch2(fileDiff, ours);
+            if (result) {
+              base = result.base;
+              theirs = result.theirs;
+              ghostReconstructed = true;
+            }
+          }
+        }
+      }
+      if (!ghostReconstructed) {
+        theirs = await this.applyPatchToContent(
+          base,
+          patch.patch_content,
+          filePath,
+          tempGit,
+          tempDir,
+          renameSourcePath
+        );
+      }
       let useAccumulatorAsMergeBase = false;
       const accumulatorEntry = this.fileTheirsAccumulator.get(resolvedPath);
-      if (!theirs && base && accumulatorEntry) {
+      if (!theirs && accumulatorEntry) {
         theirs = await this.applyPatchToContent(
           accumulatorEntry.content,
           patch.patch_content,
@@ -830,13 +1175,13 @@ var ReplayApplicator = class {
           baseMismatchSkipped = true;
         }
       }
-      if (!base && !ours && effective_theirs) {
+      if (base == null && !ours && effective_theirs) {
         const outDir2 = (0, import_node_path2.dirname)(oursPath);
         await (0, import_promises.mkdir)(outDir2, { recursive: true });
         await (0, import_promises.writeFile)(oursPath, effective_theirs);
         return { file: resolvedPath, status: "merged", reason: "new-file" };
       }
-      if (!base && ours && effective_theirs) {
+      if (base == null && ours && effective_theirs) {
         const merged2 = threeWayMerge("", ours, effective_theirs);
         const outDir2 = (0, import_node_path2.dirname)(oursPath);
         await (0, import_promises.mkdir)(outDir2, { recursive: true });
@@ -859,7 +1204,7 @@ var ReplayApplicator = class {
           reason: "missing-content"
         };
       }
-      if (!base || !ours) {
+      if (base == null && !useAccumulatorAsMergeBase || !ours) {
         return {
           file: resolvedPath,
           status: "skipped",
@@ -867,11 +1212,18 @@ var ReplayApplicator = class {
         };
       }
       const mergeBase = useAccumulatorAsMergeBase && accumulatorEntry ? accumulatorEntry.content : base;
+      if (mergeBase == null) {
+        return {
+          file: resolvedPath,
+          status: "skipped",
+          reason: "missing-content"
+        };
+      }
       const merged = threeWayMerge(mergeBase, ours, effective_theirs);
       const outDir = (0, import_node_path2.dirname)(oursPath);
       await (0, import_promises.mkdir)(outDir, { recursive: true });
       await (0, import_promises.writeFile)(oursPath, merged.content);
-      if (effective_theirs && base) {
+      if (effective_theirs) {
         this.fileTheirsAccumulator.set(resolvedPath, {
           content: effective_theirs,
           baseGeneration: patch.base_generation
@@ -895,6 +1247,14 @@ var ReplayApplicator = class {
       };
     }
   }
+  async isTreeReachable(treeHash) {
+    let result = this.treeExistsCache.get(treeHash);
+    if (result === void 0) {
+      result = await this.git.treeExists(treeHash);
+      this.treeExistsCache.set(treeHash, result);
+    }
+    return result;
+  }
   isExcluded(patch) {
     const config = this.lockManager.getCustomizationsConfig();
     if (!config.exclude) return false;
@@ -1114,36 +1474,6 @@ var import_node_fs2 = require("fs");
 var import_node_path3 = require("path");
 var import_minimatch2 = require("minimatch");
 init_GitClient();
-
-// src/conflict-utils.ts
-function stripConflictMarkers(content) {
-  const lines = content.split("\n");
-  const result = [];
-  let inConflict = false;
-  let inOurs = false;
-  for (const line of lines) {
-    if (line.startsWith("<<<<<<< ")) {
-      inConflict = true;
-      inOurs = true;
-      continue;
-    }
-    if (inConflict && line === "=======") {
-      inOurs = false;
-      continue;
-    }
-    if (inConflict && line.startsWith(">>>>>>> ")) {
-      inConflict = false;
-      inOurs = false;
-      continue;
-    }
-    if (!inConflict || inOurs) {
-      result.push(line);
-    }
-  }
-  return result.join("\n");
-}
-
-// src/ReplayService.ts
 var ReplayService = class {
   git;
   detector;
@@ -1999,6 +2329,7 @@ async function bootstrap(outputDir, options) {
   }
   lockManager.save();
   const fernignoreUpdated = ensureFernignoreEntries(outputDir);
+  ensureGitattributesEntries(outputDir);
   if (migrator.fernignoreExists() && fernignorePatterns.length > 0) {
     const action = options?.fernignoreAction ?? "skip";
     if (action === "migrate") {
@@ -2080,7 +2411,7 @@ function parseGitLog(log) {
     return { sha, authorName, authorEmail, message };
   });
 }
-var REPLAY_FERNIGNORE_ENTRIES = [".fern/replay.lock", ".fern/replay.yml"];
+var REPLAY_FERNIGNORE_ENTRIES = [".fern/replay.lock", ".fern/replay.yml", ".gitattributes"];
 function ensureFernignoreEntries(outputDir) {
   const fernignorePath = (0, import_node_path5.join)(outputDir, ".fernignore");
   let content = "";
@@ -2104,6 +2435,29 @@ function ensureFernignoreEntries(outputDir) {
   (0, import_node_fs4.writeFileSync)(fernignorePath, content, "utf-8");
   return true;
 }
+var GITATTRIBUTES_ENTRIES = [".fern/replay.lock linguist-generated=true"];
+function ensureGitattributesEntries(outputDir) {
+  const gitattributesPath = (0, import_node_path5.join)(outputDir, ".gitattributes");
+  let content = "";
+  if ((0, import_node_fs4.existsSync)(gitattributesPath)) {
+    content = (0, import_node_fs4.readFileSync)(gitattributesPath, "utf-8");
+  }
+  const lines = content.split("\n");
+  const toAdd = [];
+  for (const entry of GITATTRIBUTES_ENTRIES) {
+    if (!lines.some((line) => line.trim() === entry)) {
+      toAdd.push(entry);
+    }
+  }
+  if (toAdd.length === 0) {
+    return;
+  }
+  if (content && !content.endsWith("\n")) {
+    content += "\n";
+  }
+  content += toAdd.join("\n") + "\n";
+  (0, import_node_fs4.writeFileSync)(gitattributesPath, content, "utf-8");
+}
 function computeContentHash(patchContent) {
   const normalized = patchContent.split("\n").filter((line) => !line.startsWith("From ") && !line.startsWith("index ") && !line.startsWith("Date: ")).join("\n");
   return `sha256:${(0, import_node_crypto3.createHash)("sha256").update(normalized).digest("hex")}`;
@@ -2111,30 +2465,145 @@ function computeContentHash(patchContent) {
 
 // src/commands/forget.ts
 var import_minimatch4 = require("minimatch");
-function forget(outputDir, filePattern, options) {
+function parseDiffStat(patchContent) {
+  let additions = 0;
+  let deletions = 0;
+  let inDiffHunk = false;
+  for (const line of patchContent.split("\n")) {
+    if (line.startsWith("diff --git ")) {
+      inDiffHunk = true;
+      continue;
+    }
+    if (!inDiffHunk) continue;
+    if (line.startsWith("+") && !line.startsWith("+++")) {
+      additions++;
+    } else if (line.startsWith("-") && !line.startsWith("---")) {
+      deletions++;
+    }
+  }
+  return { additions, deletions };
+}
+function toMatchedPatch(patch) {
+  return {
+    id: patch.id,
+    message: patch.original_message,
+    files: patch.files,
+    diffstat: parseDiffStat(patch.patch_content),
+    ...patch.status ? { status: patch.status } : {}
+  };
+}
+function matchesPatch(patch, pattern) {
+  const fileMatch = patch.files.some(
+    (file) => file === pattern || (0, import_minimatch4.minimatch)(file, pattern)
+  );
+  if (fileMatch) return true;
+  return patch.original_message.toLowerCase().includes(pattern.toLowerCase());
+}
+function buildWarnings(patches) {
+  const warnings = [];
+  for (const patch of patches) {
+    if (patch.status === "resolving") {
+      warnings.push(
+        `patch ${patch.id} has conflict markers in these files: ${patch.files.join(", ")}. Run \`git checkout -- <files>\` to restore the generated versions.`
+      );
+    } else if (patch.status === "unresolved") {
+      warnings.push(
+        `patch ${patch.id} had unresolved conflicts (files: ${patch.files.join(", ")}).`
+      );
+    }
+  }
+  return warnings;
+}
+var EMPTY_RESULT = {
+  initialized: false,
+  removed: [],
+  remaining: 0,
+  notFound: false,
+  alreadyForgotten: [],
+  totalPatches: 0,
+  warnings: []
+};
+function forget(outputDir, options) {
   const lockManager = new LockfileManager(outputDir);
   if (!lockManager.exists()) {
-    return { removed: [], notFound: true };
+    return { ...EMPTY_RESULT };
   }
   const lock = lockManager.read();
-  const matchingPatches = lock.patches.filter(
-    (patch) => patch.files.some((file) => file === filePattern || (0, import_minimatch4.minimatch)(file, filePattern))
-  );
-  if (matchingPatches.length === 0) {
-    return { removed: [], notFound: true };
+  const totalPatches = lock.patches.length;
+  if (options?.all) {
+    const removed = lock.patches.map(toMatchedPatch);
+    const warnings = buildWarnings(lock.patches);
+    if (!options.dryRun) {
+      for (const patch of lock.patches) {
+        lockManager.addForgottenHash(patch.content_hash);
+      }
+      lockManager.clearPatches();
+      lockManager.save();
+    }
+    return {
+      initialized: true,
+      removed,
+      remaining: 0,
+      notFound: false,
+      alreadyForgotten: [],
+      totalPatches,
+      warnings
+    };
   }
-  const removed = matchingPatches.map((p) => ({
-    id: p.id,
-    message: p.original_message,
-    files: p.files
-  }));
-  if (!options?.dryRun) {
-    for (const patch of matchingPatches) {
-      lockManager.removePatch(patch.id);
+  if (options?.patchIds && options.patchIds.length > 0) {
+    const removed = [];
+    const alreadyForgotten = [];
+    const patchesToRemove = [];
+    for (const id of options.patchIds) {
+      const patch = lock.patches.find((p) => p.id === id);
+      if (patch) {
+        removed.push(toMatchedPatch(patch));
+        patchesToRemove.push(patch);
+      } else {
+        alreadyForgotten.push(id);
+      }
     }
-    lockManager.save();
+    const warnings = buildWarnings(patchesToRemove);
+    if (!options.dryRun) {
+      for (const patch of patchesToRemove) {
+        lockManager.addForgottenHash(patch.content_hash);
+        lockManager.removePatch(patch.id);
+      }
+      lockManager.save();
+    }
+    return {
+      initialized: true,
+      removed,
+      remaining: totalPatches - removed.length,
+      notFound: removed.length === 0 && alreadyForgotten.length > 0,
+      alreadyForgotten,
+      totalPatches,
+      warnings
+    };
+  }
+  if (options?.pattern) {
+    const matched = lock.patches.filter((p) => matchesPatch(p, options.pattern)).map(toMatchedPatch);
+    return {
+      initialized: true,
+      removed: [],
+      remaining: totalPatches,
+      notFound: matched.length === 0,
+      alreadyForgotten: [],
+      totalPatches,
+      warnings: [],
+      matched
+    };
   }
-  return { removed, notFound: false };
+  return {
+    initialized: true,
+    removed: [],
+    remaining: totalPatches,
+    notFound: totalPatches === 0,
+    alreadyForgotten: [],
+    totalPatches,
+    warnings: [],
+    matched: lock.patches.map(toMatchedPatch)
+  };
 }
 
 // src/commands/reset.ts
@@ -2256,24 +2725,49 @@ async function getChangedFiles(git, currentGen, files) {
 function status(outputDir) {
   const lockManager = new LockfileManager(outputDir);
   if (!lockManager.exists()) {
-    return { initialized: false, patches: [], lastGeneration: void 0 };
+    return {
+      initialized: false,
+      generationCount: 0,
+      lastGeneration: void 0,
+      patches: [],
+      unresolvedCount: 0,
+      excludePatterns: []
+    };
   }
   const lock = lockManager.read();
   const patches = lock.patches.map((patch) => ({
-    sha: patch.original_commit.slice(0, 7),
-    author: patch.original_author.split("<")[0]?.trim() ?? "unknown",
+    id: patch.id,
+    type: patch.patch_content.includes("new file mode") ? "added" : "modified",
     message: patch.original_message,
-    files: patch.files
+    author: patch.original_author.split("<")[0]?.trim() || "unknown",
+    sha: patch.original_commit.slice(0, 7),
+    files: patch.files,
+    fileCount: patch.files.length,
+    ...patch.status ? { status: patch.status } : {}
   }));
+  const unresolvedCount = lock.patches.filter(
+    (p) => p.status === "unresolved" || p.status === "resolving"
+  ).length;
   let lastGeneration;
   const lastGen = lock.generations.find((g) => g.commit_sha === lock.current_generation);
   if (lastGen) {
     lastGeneration = {
-      sha: lastGen.commit_sha,
-      timestamp: lastGen.timestamp
+      sha: lastGen.commit_sha.slice(0, 7),
+      timestamp: lastGen.timestamp,
+      cliVersion: lastGen.cli_version,
+      generatorVersions: lastGen.generator_versions
     };
   }
-  return { initialized: true, patches, lastGeneration };
+  const config = lockManager.getCustomizationsConfig();
+  const excludePatterns = config.exclude ?? [];
+  return {
+    initialized: true,
+    generationCount: lock.generations.length,
+    lastGeneration,
+    patches,
+    unresolvedCount,
+    excludePatterns
+  };
 }
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {