Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

fix - undo works after accepting in merge conflict (#3621)

shagun-singh-inkeep6e9a651decf4
diff --git a/.changeset/merge-conflict-undo.md b/.changeset/merge-conflict-undo.md
new file mode 100644
index 000000000..d97a387be
--- /dev/null
+++ b/.changeset/merge-conflict-undo.md
@@ -0,0 +1,5 @@
+---
+'@inkeep/open-knowledge': patch
+---
+
+The Undo button now works after accepting a hunk while resolving a merge conflict. Previously it did nothing once you had used Accept — only Reject could be undone — so a mis-clicked Accept was unrecoverable without exiting the merge and starting the resolution over. Undo also no longer steps out of order: in a session mixing Reject and Accept, it walks back through your resolutions newest-first instead of skipping past the accepts and silently reverting an earlier reject you were no longer looking at.
diff --git a/packages/app/src/components/DiffView.tsx b/packages/app/src/components/DiffView.tsx
index 3e0cbec43..7835d7836 100644
--- a/packages/app/src/components/DiffView.tsx
+++ b/packages/app/src/components/DiffView.tsx
@@ -11,6 +11,7 @@ import { useEffect, useRef, useState } from 'react';
import { createPortal } from 'react-dom';
import { okCmTheme } from '@/editor/extensions/cm-theme';
import { useConflictFooterHeightVar } from '@/hooks/use-conflict-footer-height';
+import { mergeAcceptHistory } from './conflict-merge-history';
import { Button } from './ui/button';
const darkTheme = okCmTheme({
@@ -206,6 +207,7 @@ export function DiffView({
theme,
conflictMergeControlTheme,
EditorView.lineWrapping,
+ mergeAcceptHistory(),
unifiedMergeView({
original: oldContent,
highlightChanges: true,
@@ -336,7 +338,7 @@ export function DiffView({
size="sm"
onClick={handleUndo}
>
- Undo
+ <Trans>Undo</Trans>
</Button>
{onResolve && (
<Button
diff --git a/packages/app/src/components/conflict-merge-history.dom.test.ts b/packages/app/src/components/conflict-merge-history.dom.test.ts
new file mode 100644
index 000000000..59895c17d
--- /dev/null
+++ b/packages/app/src/components/conflict-merge-history.dom.test.ts
@@ -0,0 +1,146 @@
+/**
+ * Behavioral tests for `mergeAcceptHistory`.
+ *
+ * Accepting a hunk in `@codemirror/merge` is an effect-only transaction, so
+ * CodeMirror's history ignores it unless the effect opts in via
+ * `invertedEffects`. These tests pin both halves: that accept becomes undoable,
+ * and that a mixed reject-then-accept sequence undoes newest-first instead of
+ * skipping back to the older reject.
+ *
+ * The first test is a control that mounts WITHOUT the extension — it documents
+ * the underlying library behavior and fails loudly if a future upgrade makes
+ * this extension redundant.
+ */
+
+import { history, undo } from '@codemirror/commands';
+import {
+ acceptChunk,
+ getChunks,
+ getOriginalDoc,
+ rejectChunk,
+ unifiedMergeView,
+} from '@codemirror/merge';
+import { EditorState, type Extension } from '@codemirror/state';
+import { EditorView } from '@codemirror/view';
+import { afterEach, describe, expect, test } from 'vitest';
+import { mergeAcceptHistory } from './conflict-merge-history';
+
+const ORIGINAL = 'alpha\nbravo\ncharlie\ndelta\n';
+const CURRENT = 'alpha\nBRAVO\ncharlie\nDELTA\n';
+
+const views: EditorView[] = [];
+
+function mount(extra: Extension[] = []): EditorView {
+ const parent = document.createElement('div');
+ document.body.appendChild(parent);
+ const view = new EditorView({
+ state: EditorState.create({
+ doc: CURRENT,
+ extensions: [
+ history(),
+ ...extra,
+ unifiedMergeView({ original: ORIGINAL, mergeControls: false }),
+ ],
+ }),
+ parent,
+ });
+ views.push(view);
+ return view;
+}
+
+function chunkCount(view: EditorView): number {
+ return getChunks(view.state)?.chunks.length ?? -1;
+}
+
+function firstChunkPos(view: EditorView): number {
+ const chunks = getChunks(view.state)?.chunks ?? [];
+ if (chunks.length === 0) throw new Error('expected at least one chunk');
+ return chunks[0].fromB;
+}
+
+function lastChunkPos(view: EditorView): number {
+ const chunks = getChunks(view.state)?.chunks ?? [];
+ if (chunks.length === 0) throw new Error('expected at least one chunk');
+ return chunks[chunks.length - 1].fromB;
+}
+
+afterEach(() => {
+ while (views.length > 0) views.pop()?.destroy();
+ document.body.innerHTML = '';
+});
+
+describe('mergeAcceptHistory', () => {
+ test('control: without the extension, undo after accept is a no-op', () => {
+ const view = mount();
+ expect(chunkCount(view)).toBe(2);
+
+ acceptChunk(view, firstChunkPos(view));
+ expect(chunkCount(view)).toBe(1);
+
+ undo(view);
+
+ // The accept is invisible to history, so the hunk does not come back.
+ expect(chunkCount(view)).toBe(1);
+ });
+
+ test('undo after accept restores the hunk to unresolved', () => {
+ const view = mount([mergeAcceptHistory()]);
+ expect(chunkCount(view)).toBe(2);
+
+ acceptChunk(view, firstChunkPos(view));
+ expect(chunkCount(view)).toBe(1);
+
+ undo(view);
+
+ expect(chunkCount(view)).toBe(2);
+ expect(getOriginalDoc(view.state).toString()).toBe(ORIGINAL);
+ });
+
+ test('undo after reject still works', () => {
+ const view = mount([mergeAcceptHistory()]);
+
+ rejectChunk(view, firstChunkPos(view));
+ expect(view.state.doc.toString()).toContain('bravo');
+
+ undo(view);
+
+ expect(view.state.doc.toString()).toContain('BRAVO');
+ expect(chunkCount(view)).toBe(2);
+ });
+
+ test('accepting every hunk then undoing brings the last one back', () => {
+ const view = mount([mergeAcceptHistory()]);
+
+ acceptChunk(view, lastChunkPos(view));
+ acceptChunk(view, firstChunkPos(view));
+ expect(chunkCount(view)).toBe(0);
+
+ undo(view);
+
+ // Exactly one: the two accepts must be two undo steps, not collapsed into
+ // one by history's group-adjacent-edits window.
+ expect(chunkCount(view)).toBe(1);
+ // And it must be the LAST accept that came back, not an arbitrary one:
+ // the second accept (bravo) is undone while the first (delta) still holds.
+ const original = getOriginalDoc(view.state).toString();
+ expect(original).toContain('bravo');
+ expect(original).toContain('DELTA');
+ });
+
+ test('mixed reject-then-accept undoes the accept first, not the older reject', () => {
+ const view = mount([mergeAcceptHistory()]);
+
+ rejectChunk(view, firstChunkPos(view));
+ expect(view.state.doc.toString()).toContain('bravo');
+
+ acceptChunk(view, lastChunkPos(view));
+ expect(getOriginalDoc(view.state).toString()).toContain('DELTA');
+
+ undo(view);
+
+ // The accept is undone: the original side is restored...
+ expect(getOriginalDoc(view.state).toString()).toBe(ORIGINAL);
+ // ...and the older reject is still applied, i.e. undo did not skip past it.
+ expect(view.state.doc.toString()).toContain('bravo');
+ });
+});
diff --git a/packages/app/src/components/conflict-merge-history.ts b/packages/app/src/components/conflict-merge-history.ts
new file mode 100644
index 000000000..4003a92e2
--- /dev/null
+++ b/packages/app/src/components/conflict-merge-history.ts
@@ -0,0 +1,36 @@
+import { invertedEffects } from '@codemirror/commands';
+import { getOriginalDoc, updateOriginalDoc } from '@codemirror/merge';
+import type { ChangeSet, Extension } from '@codemirror/state';
+
+/**
+ * Makes `@codemirror/merge`'s "accept hunk" undoable.
+ *
+ * `acceptChunk` dispatches an EFFECT-ONLY transaction: it advances the merge
+ * view's ORIGINAL side via `updateOriginalDoc` and never touches the editor
+ * document. `rejectChunk` dispatches a real document change instead. CodeMirror's
+ * history only records document changes unless an effect opts in through
+ * `invertedEffects`, and the merge package registers none — so without this
+ * extension Undo is a no-op after Accept, and a mixed reject-then-accept
+ * sequence undoes the older reject out of order.
+ *
+ * The inverse restores the pre-transaction original document. Both payload
+ * fields are load-bearing: the `originalDoc` field reads `doc`, while the chunk
+ * field feeds `changes` to `Chunk.updateA` to recompute hunks incrementally, so
+ * an inverse carrying a stale changeset would desync the hunk list from the text.
+ */
+export function mergeAcceptHistory(): Extension {
+ return invertedEffects.of((tr) => {
+ // Compose rather than emit one inverse per effect: a single transaction
+ // carrying several original-doc updates must undo as one step, and the
+ // composed changeset is the only correct `changes` for that step.
+ let forward: ChangeSet | null = null;
+ for (const effect of tr.effects) {
+ if (!effect.is(updateOriginalDoc)) continue;
+ forward = forward === null ? effect.value.changes : forward.compose(effect.value.changes);
+ }
+ if (forward === null) return [];
+
+ const before = getOriginalDoc(tr.startState);
+ return [updateOriginalDoc.of({ doc: before, changes: forward.invert(before) })];
+ });
+}
diff --git a/packages/app/src/locales/ar/messages.po b/packages/app/src/locales/ar/messages.po
index 1faf84804..75c3aa9a3 100644
--- a/packages/app/src/locales/ar/messages.po
+++ b/packages/app/src/locales/ar/messages.po
@@ -13525,6 +13525,7 @@ msgstr "تم التراجع عن آخر تعديل في {docName}"
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
+#: src/components/DiffView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SharingSection.tsx
#: src/lib/native-menu-catalog.ts
diff --git a/packages/app/src/locales/bn/messages.po b/packages/app/src/locales/bn/messages.po
index e6042e27f..baa73dbb8 100644
--- a/packages/app/src/locales/bn/messages.po
+++ b/packages/app/src/locales/bn/messages.po
@@ -13521,6 +13521,7 @@ msgstr "{docName}-এর শেষ সম্পাদনাটি পূর্
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
+#: src/components/DiffView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SharingSection.tsx
#: src/lib/native-menu-catalog.ts
diff --git a/packages/app/src/locales/en/messages.po b/packages/app/src/locales/en/messages.po
index ca86bd52b..93baef021 100644
--- a/packages/app/src/locales/en/messages.po
+++ b/packages/app/src/locales/en/messages.po
@@ -13525,6 +13525,7 @@ msgstr "Undid the last edit on {docName}"
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
+#: src/components/DiffView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SharingSection.tsx
#: src/lib/native-menu-catalog.ts
diff --git a/packages/app/src/locales/es/messages.po b/packages/app/src/locales/es/messages.po
index 68634ee98..59253fd45 100644
--- a/packages/app/src/locales/es/messages.po
+++ b/packages/app/src/locales/es/messages.po
@@ -13525,6 +13525,7 @@ msgstr "Se deshizo la última edición en {docName}"
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
+#: src/components/DiffView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SharingSection.tsx
#: src/lib/native-menu-catalog.ts
diff --git a/packages/app/src/locales/fr/messages.po b/packages/app/src/locales/fr/messages.po
index 457d7b418..adf9c6dab 100644
--- a/packages/app/src/locales/fr/messages.po
+++ b/packages/app/src/locales/fr/messages.po
@@ -13525,6 +13525,7 @@ msgstr "Dernière modification annulée sur {docName}"
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
+#: src/components/DiffView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SharingSection.tsx
#: src/lib/native-menu-catalog.ts
diff --git a/packages/app/src/locales/hi/messages.po b/packages/app/src/locales/hi/messages.po
index c2f8c86bb..09919eec5 100644
--- a/packages/app/src/locales/hi/messages.po
+++ b/packages/app/src/locales/hi/messages.po
@@ -13521,6 +13521,7 @@ msgstr "{docName} पर आख़िरी संपादन पूर्व
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
+#: src/components/DiffView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SharingSection.tsx
#: src/lib/native-menu-catalog.ts
diff --git a/packages/app/src/locales/id/messages.po b/packages/app/src/locales/id/messages.po
index ba4ffd796..8016f6242 100644
--- a/packages/app/src/locales/id/messages.po
+++ b/packages/app/src/locales/id/messages.po
@@ -13521,6 +13521,7 @@ msgstr "Suntingan terakhir pada {docName} dibatalkan"
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
+#: src/components/DiffView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SharingSection.tsx
#: src/lib/native-menu-catalog.ts
diff --git a/packages/app/src/locales/ko/messages.po b/packages/app/src/locales/ko/messages.po
index 4de7e73a3..161fc3684 100644
--- a/packages/app/src/locales/ko/messages.po
+++ b/packages/app/src/locales/ko/messages.po
@@ -13525,6 +13525,7 @@ msgstr "{docName}에서 마지막 편집을 실행 취소했습니다."
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
+#: src/components/DiffView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SharingSection.tsx
#: src/lib/native-menu-catalog.ts
diff --git a/packages/app/src/locales/pseudo/messages.po b/packages/app/src/locales/pseudo/messages.po
index c820a42f9..d4c989154 100644
--- a/packages/app/src/locales/pseudo/messages.po
+++ b/packages/app/src/locales/pseudo/messages.po
@@ -13521,6 +13521,7 @@ msgstr ""
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
+#: src/components/DiffView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SharingSection.tsx
#: src/lib/native-menu-catalog.ts
diff --git a/packages/app/src/locales/pt-BR/messages.po b/packages/app/src/locales/pt-BR/messages.po
index 27959697b..34e66da64 100644
--- a/packages/app/src/locales/pt-BR/messages.po
+++ b/packages/app/src/locales/pt-BR/messages.po
@@ -13521,6 +13521,7 @@ msgstr "A última edição em {docName} foi desfeita"
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
+#: src/components/DiffView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SharingSection.tsx
#: src/lib/native-menu-catalog.ts
diff --git a/packages/app/src/locales/ur/messages.po b/packages/app/src/locales/ur/messages.po
index 8c6752d99..1643b51bd 100644
--- a/packages/app/src/locales/ur/messages.po
+++ b/packages/app/src/locales/ur/messages.po
@@ -13525,6 +13525,7 @@ msgstr "{docName} پر آخری ترمیم واپس لے لی گئی"
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
+#: src/components/DiffView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SharingSection.tsx
#: src/lib/native-menu-catalog.ts
diff --git a/packages/app/src/locales/zh-Hans/messages.po b/packages/app/src/locales/zh-Hans/messages.po
index 38218c73a..6b0aa0659 100644
--- a/packages/app/src/locales/zh-Hans/messages.po
+++ b/packages/app/src/locales/zh-Hans/messages.po
@@ -13525,6 +13525,7 @@ msgstr "已撤销 {docName} 上的最后一次编辑"
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
+#: src/components/DiffView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SharingSection.tsx
#: src/lib/native-menu-catalog.ts
diff --git a/packages/app/src/locales/zh-Hant/messages.po b/packages/app/src/locales/zh-Hant/messages.po
index 7614d8c13..a77f8b0f0 100644
--- a/packages/app/src/locales/zh-Hant/messages.po
+++ b/packages/app/src/locales/zh-Hant/messages.po
@@ -13525,6 +13525,7 @@ msgstr "已復原 {docName} 上的最後一次編輯"
#: src/components/ActivityPanelBurstRow.tsx
#: src/components/AppMenubar.tsx
+#: src/components/DiffView.tsx
#: src/components/settings/SavedThemesTiles.tsx
#: src/components/settings/SharingSection.tsx
#: src/lib/native-menu-catalog.ts