@fresh-editor/fresh-editor 0.2.22 → 0.2.24

package/plugins/search_replace.i18n.json

@@ -36,7 +36,9 @@
     "panel.replace_all_btn": "Replace All (Alt+Ret)",
     "panel.type_pattern": "Type a search pattern above",
     "panel.matches_count": "Matches (%{count} in %{files} files)",
-    "panel.matches_title": "Matches"
+    "panel.matches_title": "Matches",
+    "prompt.confirm_replace": "Replace %{count} match(es) in %{files} file(s)? Undo only covers files still open in this session. Press Enter to confirm, Esc to cancel.",
+    "status.replace_cancelled": "Replacement cancelled"
   },
   "cs": {
     "cmd.search_replace": "Hledat a nahradit v projektu",
@@ -75,7 +77,9 @@
     "panel.replace_all_btn": "Nahradit vše (Alt+Ret)",
     "panel.type_pattern": "Zadejte vyhledávací vzor",
     "panel.matches_count": "Shody (%{count} v %{files} souborech)",
-    "panel.matches_title": "Shody"
+    "panel.matches_title": "Shody",
+    "prompt.confirm_replace": "Nahradit %{count} výskyt(ů) v %{files} souboru(ech)? Vrátit zpět lze jen soubory otevřené v této relaci. Enter potvrdí, Esc zruší.",
+    "status.replace_cancelled": "Nahrazení zrušeno"
   },
   "de": {
     "cmd.search_replace": "Suchen und Ersetzen im Projekt",
@@ -114,7 +118,9 @@
     "panel.replace_all_btn": "Alle ersetzen (Alt+Ret)",
     "panel.type_pattern": "Suchmuster oben eingeben",
     "panel.matches_count": "Treffer (%{count} in %{files} Dateien)",
-    "panel.matches_title": "Treffer"
+    "panel.matches_title": "Treffer",
+    "prompt.confirm_replace": "%{count} Treffer in %{files} Datei(en) ersetzen? Rückgängig wirkt nur auf Dateien, die in dieser Sitzung geöffnet sind. Enter bestätigt, Esc bricht ab.",
+    "status.replace_cancelled": "Ersetzen abgebrochen"
   },
   "es": {
     "cmd.search_replace": "Buscar y Reemplazar en Proyecto",
@@ -153,7 +159,9 @@
     "panel.replace_all_btn": "Reemplazar todo (Alt+Ret)",
     "panel.type_pattern": "Escriba un patrón de búsqueda",
     "panel.matches_count": "Coincidencias (%{count} en %{files} archivos)",
-    "panel.matches_title": "Coincidencias"
+    "panel.matches_title": "Coincidencias",
+    "prompt.confirm_replace": "¿Reemplazar %{count} coincidencia(s) en %{files} archivo(s)? Deshacer solo cubre los archivos abiertos en esta sesión. Intro confirma, Esc cancela.",
+    "status.replace_cancelled": "Reemplazo cancelado"
   },
   "fr": {
     "cmd.search_replace": "Rechercher et Remplacer dans le Projet",
@@ -192,7 +200,9 @@
     "panel.replace_all_btn": "Tout remplacer (Alt+Ret)",
     "panel.type_pattern": "Saisissez un motif de recherche",
     "panel.matches_count": "Correspondances (%{count} dans %{files} fichiers)",
-    "panel.matches_title": "Correspondances"
+    "panel.matches_title": "Correspondances",
+    "prompt.confirm_replace": "Remplacer %{count} correspondance(s) dans %{files} fichier(s) ? L'annulation ne concerne que les fichiers ouverts dans cette session. Entrée confirme, Échap annule.",
+    "status.replace_cancelled": "Remplacement annulé"
   },
   "it": {
     "cmd.search_replace": "Cerca e sostituisci nel progetto",
@@ -231,7 +241,9 @@
     "panel.replace_all_btn": "Sostituisci tutto (Alt+Ret)",
     "panel.type_pattern": "Digita un modello di ricerca",
     "panel.matches_count": "Corrispondenze (%{count} in %{files} file)",
-    "panel.matches_title": "Corrispondenze"
+    "panel.matches_title": "Corrispondenze",
+    "prompt.confirm_replace": "Sostituire %{count} corrispondenza/e in %{files} file? L'annulla copre solo i file aperti in questa sessione. Invio conferma, Esc annulla.",
+    "status.replace_cancelled": "Sostituzione annullata"
   },
   "ja": {
     "cmd.search_replace": "プロジェクト内で検索と置換",
@@ -270,7 +282,9 @@
     "panel.replace_all_btn": "すべて置換 (Alt+Ret)",
     "panel.type_pattern": "検索パターンを入力してください",
     "panel.matches_count": "一致 (%{files}ファイル中%{count}件)",
-    "panel.matches_title": "一致"
+    "panel.matches_title": "一致",
+    "prompt.confirm_replace": "%{files} 個のファイルで %{count} 件の一致を置換しますか？元に戻せるのはこのセッションで開いているファイルのみです。Enterで確認、Escでキャンセル。",
+    "status.replace_cancelled": "置換がキャンセルされました"
   },
   "ko": {
     "cmd.search_replace": "프로젝트에서 검색 및 바꾸기",
@@ -309,7 +323,9 @@
     "panel.replace_all_btn": "모두 바꾸기 (Alt+Ret)",
     "panel.type_pattern": "검색 패턴을 입력하세요",
     "panel.matches_count": "일치 (%{files}개 파일에서 %{count}개)",
-    "panel.matches_title": "일치"
+    "panel.matches_title": "일치",
+    "prompt.confirm_replace": "%{files}개 파일에서 %{count}개 일치를 바꾸시겠습니까? 실행 취소는 이 세션에서 열려 있는 파일에만 적용됩니다. Enter 확인, Esc 취소.",
+    "status.replace_cancelled": "바꾸기가 취소됨"
   },
   "pt-BR": {
     "cmd.search_replace": "Pesquisar e Substituir no Projeto",
@@ -348,7 +364,9 @@
     "panel.replace_all_btn": "Substituir tudo (Alt+Ret)",
     "panel.type_pattern": "Digite um padrão de pesquisa",
     "panel.matches_count": "Correspondências (%{count} em %{files} arquivos)",
-    "panel.matches_title": "Correspondências"
+    "panel.matches_title": "Correspondências",
+    "prompt.confirm_replace": "Substituir %{count} ocorrência(s) em %{files} arquivo(s)? Desfazer só cobre arquivos abertos nesta sessão. Enter confirma, Esc cancela.",
+    "status.replace_cancelled": "Substituição cancelada"
   },
   "ru": {
     "cmd.search_replace": "Поиск и замена в проекте",
@@ -387,7 +405,9 @@
     "panel.replace_all_btn": "Заменить все (Alt+Ret)",
     "panel.type_pattern": "Введите шаблон поиска",
     "panel.matches_count": "Совпадения (%{count} в %{files} файлах)",
-    "panel.matches_title": "Совпадения"
+    "panel.matches_title": "Совпадения",
+    "prompt.confirm_replace": "Заменить %{count} совпадений в %{files} файлах? Отмена применяется только к файлам, открытым в этом сеансе. Enter — подтвердить, Esc — отменить.",
+    "status.replace_cancelled": "Замена отменена"
   },
   "th": {
     "cmd.search_replace": "ค้นหาและแทนที่ในโปรเจกต์",
@@ -426,7 +446,9 @@
     "panel.replace_all_btn": "แทนที่ทั้งหมด (Alt+Ret)",
     "panel.type_pattern": "พิมพ์รูปแบบการค้นหา",
     "panel.matches_count": "รายการที่ตรงกัน (%{count} ใน %{files} ไฟล์)",
-    "panel.matches_title": "รายการที่ตรงกัน"
+    "panel.matches_title": "รายการที่ตรงกัน",
+    "prompt.confirm_replace": "แทนที่ %{count} รายการใน %{files} ไฟล์? เลิกทำครอบคลุมเฉพาะไฟล์ที่เปิดอยู่ในเซสชันนี้เท่านั้น กด Enter เพื่อยืนยัน, Esc เพื่อยกเลิก",
+    "status.replace_cancelled": "ยกเลิกการแทนที่"
   },
   "uk": {
     "cmd.search_replace": "Пошук та заміна в проекті",
@@ -465,7 +487,9 @@
     "panel.replace_all_btn": "Замінити все (Alt+Ret)",
     "panel.type_pattern": "Введіть шаблон пошуку",
     "panel.matches_count": "Збіги (%{count} у %{files} файлах)",
-    "panel.matches_title": "Збіги"
+    "panel.matches_title": "Збіги",
+    "prompt.confirm_replace": "Замінити %{count} збіг(ів) у %{files} файл(ах)? Скасування охоплює лише файли, відкриті в цьому сеансі. Enter — підтвердити, Esc — скасувати.",
+    "status.replace_cancelled": "Заміну скасовано"
   },
   "vi": {
     "cmd.search_replace": "Tìm và Thay thế trong Dự án",
@@ -504,7 +528,9 @@
     "panel.replace_all_btn": "Thay thế tất cả (Alt+Ret)",
     "panel.type_pattern": "Nhập mẫu tìm kiếm",
     "panel.matches_count": "Kết quả (%{count} trong %{files} tệp)",
-    "panel.matches_title": "Kết quả"
+    "panel.matches_title": "Kết quả",
+    "prompt.confirm_replace": "Thay thế %{count} kết quả trong %{files} tệp? Hoàn tác chỉ áp dụng cho các tệp đang mở trong phiên này. Enter để xác nhận, Esc để hủy.",
+    "status.replace_cancelled": "Đã hủy thay thế"
   },
   "zh-CN": {
     "cmd.search_replace": "在项目中搜索和替换",
@@ -543,6 +569,8 @@
     "panel.replace_all_btn": "全部替换 (Alt+Ret)",
     "panel.type_pattern": "请输入搜索模式",
     "panel.matches_count": "匹配 (%{files} 个文件中 %{count} 个)",
-    "panel.matches_title": "匹配"
+    "panel.matches_title": "匹配",
+    "prompt.confirm_replace": "在 %{files} 个文件中替换 %{count} 处匹配？撤销仅适用于本次会话中打开的文件。按 Enter 确认，Esc 取消。",
+    "status.replace_cancelled": "替换已取消"
   }
 }

package/plugins/search_replace.ts

@@ -428,115 +428,106 @@ function buildPanelEntries(): TextPropertyEntry[] {
   });
 
   // ── Matches tree (virtual-scrolled) ──
-  // Build all tree lines first, then show only a viewport-sized slice.
-  // The control bar above (query + options + separator) is always visible.
-  const allTreeLines: TextPropertyEntry[] = [];
-  let selectedLineIdx = -1;
+  const flatItems = buildFlatItems();
+  const fixedRows = 5;
+  const treeVisibleRows = Math.max(3, getViewportHeight() - fixedRows);
 
   if (searchPattern && totalMatches === 0) {
-    allTreeLines.push({
+    entries.push({
       text: padStr("  " + editor.t("panel.no_matches"), W) + "\n",
       properties: { type: "empty" },
       style: { fg: C.dim },
     });
   } else if (!searchPattern) {
-    allTreeLines.push({
+    entries.push({
       text: padStr("  " + editor.t("panel.type_pattern"), W) + "\n",
       properties: { type: "empty" },
       style: { fg: C.dim },
     });
   } else {
-    let flatIdx = 0;
-    for (let fi = 0; fi < fileGroups.length; fi++) {
-      const group = fileGroups[fi];
-      const isFileSelected = focusPanel === "matches" && panel.matchIndex === flatIdx;
-      if (isFileSelected) selectedLineIdx = allTreeLines.length;
-      const expandIcon = group.expanded ? "v" : ">";
-      const badge = getFileExtBadge(group.relPath);
-      const matchCount = group.matches.length;
-      const selectedInFile = group.matches.filter(m => m.selected).length;
-      const fileLineText = ` ${expandIcon} ${badge} ${group.relPath} (${selectedInFile}/${matchCount})`;
-
-      const fileOverlays: InlineOverlay[] = [];
-      const eiStart = byteLen(" ");
-      const eiEnd = eiStart + byteLen(expandIcon);
-      fileOverlays.push({ start: eiStart, end: eiEnd, style: { fg: C.expandIcon } });
-      const bgStart = eiEnd + byteLen(" ");
-      const bgEnd = bgStart + byteLen(badge);
-      fileOverlays.push({ start: bgStart, end: bgEnd, style: { fg: C.fileIcon, bold: true } });
-      const fpStart = bgEnd + byteLen(" ");
-      const fpEnd = fpStart + byteLen(group.relPath);
-      fileOverlays.push({ start: fpStart, end: fpEnd, style: { fg: C.filePath } });
-
-      allTreeLines.push({
-        text: padStr(fileLineText, W) + "\n",
-        properties: { type: "file-row", fileIndex: fi },
-        style: isFileSelected ? { bg: C.selectedBg } : undefined,
-        inlineOverlays: fileOverlays,
-      });
-      flatIdx++;
-
-      if (group.expanded) {
-        for (let mi = 0; mi < group.matches.length; mi++) {
-          const result = group.matches[mi];
-          const isMatchSelected = focusPanel === "matches" && panel.matchIndex === flatIdx;
-          if (isMatchSelected) selectedLineIdx = allTreeLines.length;
-          const checkbox = result.selected ? "[v]" : "[ ]";
-          const location = `${group.relPath}:${result.match.line}`;
-          const context = result.match.context.trim();
-          const prefixText = `   ${isMatchSelected ? ">" : " "} ${checkbox} `;
-          const maxCtx = W - charLen(prefixText) - charLen(location) - 3;
-          const displayCtx = truncate(context, Math.max(10, maxCtx));
-          const matchLineText = `${prefixText}${location} - ${displayCtx}`;
-
-          const inlines: InlineOverlay[] = [];
-          const cbStart = byteLen(`   ${isMatchSelected ? ">" : " "} `);
-          const cbEnd = cbStart + byteLen(checkbox);
-          inlines.push({ start: cbStart, end: cbEnd, style: { fg: result.selected ? C.checkOn : C.checkOff } });
-          const locStart = cbEnd + byteLen(" ");
-          const locEnd = locStart + byteLen(location);
-          inlines.push({ start: locStart, end: locEnd, style: { fg: C.lineNum } });
-
-          if (panel.searchPattern) {
-            const ctxStart = locEnd + byteLen(" - ");
-            highlightMatches(displayCtx, panel.searchPattern, ctxStart, panel.useRegex, panel.caseSensitive, inlines);
-          }
+    let selectedLineIdx = focusPanel === "matches" ? panel.matchIndex : -1;
 
-          allTreeLines.push({
-            text: padStr(matchLineText, W) + "\n",
-            properties: { type: "match-row", fileIndex: fi, matchIndex: mi },
-            style: isMatchSelected ? { bg: C.selectedBg } : undefined,
-            inlineOverlays: inlines.length > 0 ? inlines : undefined,
-          });
-          flatIdx++;
-        }
+    // Adjust scroll offset to keep selected line visible
+    if (selectedLineIdx >= 0) {
+      if (selectedLineIdx < panel.scrollOffset) {
+        panel.scrollOffset = selectedLineIdx;
+      }
+      if (selectedLineIdx >= panel.scrollOffset + treeVisibleRows) {
+        panel.scrollOffset = selectedLineIdx - treeVisibleRows + 1;
       }
     }
-  }
-
-  // Virtual scroll: fixed rows = query(1) + options(1) + separator(1) + help(1) + tab bar(1) = 5
-  const fixedRows = 5;
-  const treeVisibleRows = Math.max(3, getViewportHeight() - fixedRows);
+    const maxOffset = Math.max(0, flatItems.length - treeVisibleRows);
+    if (panel.scrollOffset > maxOffset) panel.scrollOffset = maxOffset;
+    if (panel.scrollOffset < 0) panel.scrollOffset = 0;
+
+    // ONLY loop through the items that are literally on the screen right now
+    for (let i = panel.scrollOffset; i < panel.scrollOffset + treeVisibleRows; i++) {
+      if (i >= flatItems.length) break;
+      const item = flatItems[i];
+      const isSelected = focusPanel === "matches" && panel.matchIndex === i;
+
+      if (item.type === "file") {
+        const group = fileGroups[item.fileIndex];
+        const expandIcon = group.expanded ? "v" : ">";
+        const badge = getFileExtBadge(group.relPath);
+        const matchCount = group.matches.length;
+        const selectedInFile = group.matches.filter(m => m.selected).length;
+        const fileLineText = ` ${expandIcon} ${badge} ${group.relPath} (${selectedInFile}/${matchCount})`;
+
+        const fileOverlays: InlineOverlay[] = [];
+        const eiStart = byteLen(" ");
+        const eiEnd = eiStart + byteLen(expandIcon);
+        fileOverlays.push({ start: eiStart, end: eiEnd, style: { fg: C.expandIcon } });
+        const bgStart = eiEnd + byteLen(" ");
+        const bgEnd = bgStart + byteLen(badge);
+        fileOverlays.push({ start: bgStart, end: bgEnd, style: { fg: C.fileIcon, bold: true } });
+        const fpStart = bgEnd + byteLen(" ");
+        const fpEnd = fpStart + byteLen(group.relPath);
+        fileOverlays.push({ start: fpStart, end: fpEnd, style: { fg: C.filePath } });
+
+        entries.push({
+          text: padStr(fileLineText, W) + "\n",
+          properties: { type: "file-row", fileIndex: item.fileIndex },
+          style: isSelected ? { bg: C.selectedBg } : undefined,
+          inlineOverlays: fileOverlays,
+        });
+      } else {
+        const group = fileGroups[item.fileIndex];
+        const result = group.matches[item.matchIndex!];
+        const checkbox = result.selected ? "[v]" : "[ ]";
+        const location = `${group.relPath}:${result.match.line}`;
+        const context = result.match.context.trim();
+        const prefixText = `   ${isSelected ? ">" : " "} ${checkbox} `;
+        const maxCtx = W - charLen(prefixText) - charLen(location) - 3;
+        const displayCtx = truncate(context, Math.max(10, maxCtx));
+        const matchLineText = `${prefixText}${location} - ${displayCtx}`;
+
+        const inlines: InlineOverlay[] = [];
+        const cbStart = byteLen(`   ${isSelected ? ">" : " "} `);
+        const cbEnd = cbStart + byteLen(checkbox);
+        inlines.push({ start: cbStart, end: cbEnd, style: { fg: result.selected ? C.checkOn : C.checkOff } });
+        const locStart = cbEnd + byteLen(" ");
+        const locEnd = locStart + byteLen(location);
+        inlines.push({ start: locStart, end: locEnd, style: { fg: C.lineNum } });
+
+        if (panel.searchPattern) {
+          const ctxStart = locEnd + byteLen(" - ");
+          highlightMatches(displayCtx, panel.searchPattern, ctxStart, panel.useRegex, panel.caseSensitive, inlines);
+        }
 
-  // Adjust scroll offset to keep selected line visible
-  if (selectedLineIdx >= 0) {
-    if (selectedLineIdx < panel.scrollOffset) {
-      panel.scrollOffset = selectedLineIdx;
-    }
-    if (selectedLineIdx >= panel.scrollOffset + treeVisibleRows) {
-      panel.scrollOffset = selectedLineIdx - treeVisibleRows + 1;
+        entries.push({
+          text: padStr(matchLineText, W) + "\n",
+          properties: { type: "match-row", fileIndex: item.fileIndex, matchIndex: item.matchIndex },
+          style: isSelected ? { bg: C.selectedBg } : undefined,
+          inlineOverlays: inlines.length > 0 ? inlines : undefined,
+        });
+      }
     }
   }
-  const maxOffset = Math.max(0, allTreeLines.length - treeVisibleRows);
-  if (panel.scrollOffset > maxOffset) panel.scrollOffset = maxOffset;
-  if (panel.scrollOffset < 0) panel.scrollOffset = 0;
-
-  const visibleLines = allTreeLines.slice(panel.scrollOffset, panel.scrollOffset + treeVisibleRows);
-  for (const line of visibleLines) entries.push(line);
 
   // Scroll indicators
   const canScrollUp = panel.scrollOffset > 0;
-  const canScrollDown = panel.scrollOffset + treeVisibleRows < allTreeLines.length;
+  const canScrollDown = panel.scrollOffset + treeVisibleRows < flatItems.length;
   const scrollHint = canScrollUp || canScrollDown
     ? "  " + (canScrollUp ? "↑" : " ") + (canScrollDown ? "↓" : " ")
     : "";
@@ -635,6 +626,8 @@ async function performSearch(pattern: string, silent?: boolean): Promise<SearchR
   if (!panel) return [];
 
   const generation = ++currentSearchGeneration;
+  let lastUiUpdate = Date.now();
+  const UI_UPDATE_INTERVAL_MS = 100; // Force maximum 10 UI updates per second
 
   try {
     const fixedString = !panel.useRegex;
@@ -649,17 +642,24 @@ async function performSearch(pattern: string, silent?: boolean): Promise<SearchR
         maxResults: MAX_RESULTS,
         wholeWords: panel.wholeWords,
       },
-      (matches: GrepMatch[], _done: boolean) => {
+      (matches: GrepMatch[], done: boolean) => {
         // Discard if a newer search has started
         if (generation !== currentSearchGeneration || !panel) return;
 
-        const newResults: SearchResult[] = matches.map(m => ({ match: m, selected: true }));
-
-        if (newResults.length > 0) {
-          allResults = allResults.concat(newResults);
+        if (matches.length > 0) {
+          // Use push loop instead of allResults.concat() to save massive memory allocations
+          for (const m of matches) {
+            allResults.push({ match: m, selected: true });
+          }
           panel.searchResults = allResults;
+        }
+
+        const now = Date.now();
+        // Only trigger the expensive UI rebuild if enough time passed or stream finished
+        if (done || now - lastUiUpdate > UI_UPDATE_INTERVAL_MS) {
           panel.fileGroups = buildFileGroups(allResults);
           updatePanelContent();
+          lastUiUpdate = now;
         }
       }
     );
@@ -1091,7 +1091,7 @@ function search_replace_enter(): void {
           if (panel) {
             panel.focusPanel = "matches";
             panel.matchIndex = 0;
-  panel.scrollOffset = 0;
+            panel.scrollOffset = 0;
             updatePanelContent();
           }
         });
@@ -1157,12 +1157,33 @@ async function doReplaceAll(): Promise<void> {
     editor.setStatus(editor.t("status.no_items_selected"));
     return;
   }
+  // Confirm before applying.  Replacements write to disk immediately; Undo
+  // only covers files that remain open in this session (see bug #1 report).
+  const fileCount = new Set(selected.map(r => r.match.file)).size;
+  const confirmed = await editor.prompt(
+    editor.t("prompt.confirm_replace", {
+      count: String(selected.length),
+      files: String(fileCount),
+    }),
+    "",
+  );
+  if (confirmed === null) {
+    editor.setStatus(editor.t("status.replace_cancelled"));
+    return;
+  }
   panel.busy = true;
   editor.setStatus(editor.t("status.replacing", { count: String(selected.length) }));
   const statusMsg = await executeReplacements(selected);
   editor.setStatus(statusMsg);
-  await rerunSearchQuiet();
+  // Clear stale results before re-searching: the byte offsets in
+  // `panel.searchResults` now point at positions in the pre-replacement
+  // file and must never be re-used (see bug #4 — a second Alt+Enter would
+  // otherwise corrupt files by writing into moved offsets).  We also drop
+  // `busy` so rerunSearchQuiet doesn't bail out on its own guard.
+  panel.searchResults = [];
+  panel.fileGroups = [];
   panel.busy = false;
+  await rerunSearchQuiet();
   updatePanelContent();
 }
 
@@ -1185,12 +1206,28 @@ async function doReplaceScoped(): Promise<void> {
     return;
   }
 
+  const fileCount = new Set(toReplace.map(r => r.match.file)).size;
+  const confirmed = await editor.prompt(
+    editor.t("prompt.confirm_replace", {
+      count: String(toReplace.length),
+      files: String(fileCount),
+    }),
+    "",
+  );
+  if (confirmed === null) {
+    editor.setStatus(editor.t("status.replace_cancelled"));
+    return;
+  }
+
   panel.busy = true;
   editor.setStatus(editor.t("status.replacing", { count: String(toReplace.length) }));
   const statusMsg = await executeReplacements(toReplace);
   editor.setStatus(statusMsg);
-  await rerunSearchQuiet();
+  // See doReplaceAll — clear stale offsets and drop busy before re-searching.
+  panel.searchResults = [];
+  panel.fileGroups = [];
   panel.busy = false;
+  await rerunSearchQuiet();
   updatePanelContent();
 }
 
@@ -1242,6 +1279,19 @@ function onSearchReplacePromptCancelled(args: { prompt_type: string }): boolean
 registerHandler("onSearchReplacePromptCancelled", onSearchReplacePromptCancelled);
 editor.on("prompt_cancelled", "onSearchReplacePromptCancelled");
 
+// If the panel's virtual buffer is closed externally (via the × button,
+// the Close Buffer/Close Tab commands, or anything else), reset the
+// plugin's internal state so the next invocation of `openPanel` creates
+// a fresh buffer/split instead of trying to update a buffer that no
+// longer exists (which silently no-ops and leaves the user with no UI).
+function onSearchReplaceBufferClosed(args: { buffer_id: number }): void {
+  if (panel && args.buffer_id === panel.resultsBufferId) {
+    panel = null;
+  }
+}
+registerHandler("onSearchReplaceBufferClosed", onSearchReplaceBufferClosed);
+editor.on("buffer_closed", "onSearchReplaceBufferClosed");
+
 editor.registerCommand(
   "%cmd.search_replace",
   "%cmd.search_replace_desc",