Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

Stop CRLF documents duplicating on edit (PRD-8491) (#5924)

Andrew Mikofalvy92192b1ff07e
diff --git a/.changeset/crlf-merge-no-duplication.md b/.changeset/crlf-merge-no-duplication.md
new file mode 100644
index 000000000..27403fea5
--- /dev/null
+++ b/.changeset/crlf-merge-no-duplication.md
@@ -0,0 +1,5 @@
+---
+"@inkeep/open-knowledge": patch
+---
+
+Editing a Markdown file that uses Windows (CRLF) line endings no longer duplicates the document or drops text.
diff --git a/packages/core/src/bridge/doc-boundary-space.ts b/packages/core/src/bridge/doc-boundary-space.ts
index 01ef76a9f..ffd8fce06 100644
--- a/packages/core/src/bridge/doc-boundary-space.ts
+++ b/packages/core/src/bridge/doc-boundary-space.ts
@@ -16,11 +16,25 @@ export interface MergeBoundarySpace {
export function createMergeBoundarySpace(fragmentBody: string): MergeBoundarySpace {
const carriesDocStartRun = fragmentCarriesDocStartRun(fragmentBody);
return {
- project: (text) => projectMergeBoundarySpace(text, carriesDocStartRun),
- unproject: (merged, raw) => unprojectMergeBoundarySpace(merged, raw, carriesDocStartRun),
+ project: (text) => projectMergeBoundarySpace(projectLineEndings(text), carriesDocStartRun),
+ unproject: (merged, raw) =>
+ restoreLineEndings(
+ unprojectMergeBoundarySpace(merged, projectLineEndings(raw), carriesDocStartRun),
+ raw,
+ ),
};
}
+function projectLineEndings(text: string): string {
+ return text.replaceAll('\r\n', '\n');
+}
+
+function restoreLineEndings(merged: string, raw: string): string {
+ const crlfCount = raw.split('\r\n').length - 1;
+ const lfCount = raw.split('\n').length - 1 - crlfCount;
+ return crlfCount > lfCount ? merged.replaceAll('\n', '\r\n') : merged;
+}
+
export interface DocBoundarySplit {
boundary: string;
text: string;
diff --git a/packages/server/src/server-observers.test.ts b/packages/server/src/server-observers.test.ts
index 8b5cf1309..7a275b112 100644
--- a/packages/server/src/server-observers.test.ts
+++ b/packages/server/src/server-observers.test.ts
@@ -1377,6 +1377,66 @@ describe('Observer A routing — Path B fires iff Y.Text holds unabsorbed change
cleanup();
});
+ test('residual merge on a CRLF doc applies the edit once and keeps CRLF instead of duplicating the body (PRD-8491)', () => {
+ __resetBridgeWatchdogForTests();
+ resetMetrics();
+
+ const crlfRaw = [
+ '# Mission',
+ '',
+ 'Notre __mission__ est simple.',
+ '',
+ '-\tobjectif un',
+ '-\tobjectif deux',
+ '',
+ 'Fin.',
+ '',
+ ].join('\r\n');
+ expect(normalizeBridge(canonicalOf(crlfRaw))).not.toBe(normalizeBridge(crlfRaw));
+
+ const { doc, xmlFragment, ytext, cleanup } = seedThenAttach(crlfRaw, 'routing-crlf-residual');
+ expect(ytext.toString()).toBe(crlfRaw);
+
+ populateFragment(doc, xmlFragment, serializeFragmentBody(xmlFragment).replace('Fin.', 'Fin.!'));
+ expect(getMetrics().observerAResidualMergeRuns).toBe(1);
+ expect(ytext.toString()).toBe(crlfRaw.replace('Fin.', 'Fin.!'));
+
+ populateFragment(
+ doc,
+ xmlFragment,
+ serializeFragmentBody(xmlFragment).replace('Fin.!', 'Fin.!?'),
+ );
+ expect(ytext.toString()).toBe(crlfRaw.replace('Fin.', 'Fin.!?'));
+
+ cleanup();
+ });
+
+ test('Path B on a diverged CRLF doc merges the source edit and the fragment edit once each and keeps CRLF (PRD-8491)', () => {
+ __resetBridgeWatchdogForTests();
+ resetMetrics();
+
+ const crlfRaw = '# Hello\r\n\r\nBody text stays.\r\n\r\nLast line.\r\n';
+ const { doc, xmlFragment, ytext, cleanup } = seedThenAttach(crlfRaw, 'routing-crlf-path-b');
+
+ const spaceAt = crlfRaw.indexOf('# Hello') + '# Hello'.length;
+ const editedBody = serializeFragmentBody(xmlFragment).replace(
+ 'Last line.',
+ 'Last line, edited.',
+ );
+ const firesBefore = totalPathBFires();
+ doc.transact(() => {
+ ytext.insert(spaceAt, ' world');
+ populateFragment(doc, xmlFragment, editedBody);
+ });
+
+ expect(totalPathBFires()).toBeGreaterThan(firesBefore);
+ expect(ytext.toString()).toBe(
+ '# Hello world\r\n\r\nBody text stays.\r\n\r\nLast line, edited.\r\n',
+ );
+
+ cleanup();
+ });
+
test('paired write on a beyond-tolerance doc clears coherence: the next in-sync fragment edit takes the Path-A fallback, not the residual merge', () => {
__resetBridgeWatchdogForTests();
resetMetrics();