Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

Fix empty bullet deletion rollback in residual merge (PRD-8672) (#5579)

Dimitri POSTOLOV13716cf34681
diff --git a/.changeset/empty-bullet-deletion.md b/.changeset/empty-bullet-deletion.md
new file mode 100644
index 000000000..d27d31272
--- /dev/null
+++ b/.changeset/empty-bullet-deletion.md
@@ -0,0 +1,5 @@
+---
+"@inkeep/open-knowledge": patch
+---
+
+Deleting an empty bullet in unusually indented Markdown no longer brings the bullet back.
diff --git a/knip.config.ts b/knip.config.ts
index 65f0e8807..d3638888e 100644
--- a/knip.config.ts
+++ b/knip.config.ts
@@ -147,11 +147,15 @@ export default {
'packages/server': {
entry: ['src/**/*.test.ts', 'src/parse-worker.ts'],
project: 'src/**',
- ignoreDependencies: ['@types/shell-quote'],
+ ignoreDependencies: [
+ '@types/shell-quote',
+ ],
},
'packages/cli': {
entry: ['src/**/*.test.ts', 'scripts/*.ts', 'tests/**/*.ts', 'src/parse-worker.ts'],
- ignoreDependencies: ['yjs'],
+ ignoreDependencies: [
+ 'yjs',
+ ],
},
'packages/desktop': {
entry: [
diff --git a/packages/app/package.json b/packages/app/package.json
index 760085094..1a8d59cc5 100644
--- a/packages/app/package.json
+++ b/packages/app/package.json
@@ -39,7 +39,7 @@
"measure:stress": "bash scripts/measure-stress.sh",
"measure:sweep": "bash scripts/measure-sweep.sh",
"perf:compare": "bash scripts/perf-compare.sh",
- "test:e2e": "playwright test tests/stress/list-item-drag.e2e.ts tests/stress/ux-interactions.e2e.ts tests/stress/file-tree-create.e2e.ts tests/stress/file-tree-drag-to-root.e2e.ts tests/stress/file-tree-deselect-to-root.e2e.ts tests/stress/file-tree-collapse-spaced-folder.e2e.ts tests/stress/sidebar-file-list-fills.e2e.ts tests/stress/file-tree-sticky-collapse.e2e.ts tests/stress/file-tree-collapse-persistence.e2e.ts tests/stress/file-tree-fractional-zoom.e2e.ts tests/stress/create-then-rename-editable.e2e.ts tests/stress/find-replace.e2e.ts tests/stress/external-link-cue.e2e.ts tests/stress/editor-tabs.e2e.ts tests/stress/crdt-stress.e2e.ts tests/stress/slash-command.e2e.ts tests/stress/paste-fidelity.e2e.ts tests/stress/fr-7a-disconnect-source-mode.e2e.ts tests/stress/docs-open.e2e.ts tests/stress/frozen-table-headers.e2e.ts tests/stress/asset-embed.e2e.ts tests/stress/asset-embed-advanced.e2e.ts tests/stress/asset-click-dispatch.e2e.ts tests/stress/handoff.e2e.ts tests/stress/multi-agent-presence.e2e.ts tests/stress/editor-mode-persistence.e2e.ts tests/stress/lint-config-toggle.e2e.ts tests/stress/plugin-enable-notice.e2e.ts tests/stress/schema-edit-fields-view.e2e.ts tests/stress/sidebar-search-pill.e2e.ts tests/stress/navigation-history.e2e.ts tests/stress/command-palette-semantic.e2e.ts tests/stress/agent-activity-panel.e2e.ts tests/stress/drop-pipeline-auto-open.e2e.ts tests/stress/command-palette-flicker.e2e.ts tests/stress/cm6-list-hanging-indent.e2e.ts tests/stress/ng7-rapid-nav-coherence.e2e.ts tests/stress/reveal-on-activate.e2e.ts tests/stress/selection-indicator.e2e.ts tests/stress/new-file-cross-doc-bleed.e2e.ts tests/stress/new-item-shortcut-fast-path.e2e.ts tests/stress/editor-mode-flip-cross-doc-bleed.e2e.ts tests/stress/editor-area-viewport-resize.e2e.ts tests/stress/qa-sidebar-responsive.e2e.ts tests/stress/prd-6955-reassertion-repro.e2e.ts tests/stress/prd-6955-reassertion-wedge.e2e.ts tests/stress/prd-6914-repro.e2e.ts tests/stress/showall-lazy-tree.e2e.ts tests/stress/tabs-component-strip.e2e.ts tests/stress/source-find-scroll.e2e.ts tests/stress/harness-app-warmth.e2e.ts tests/stress/qa-canary-authoring-both-modes.e2e.ts tests/stress/qa-canary-live-typing.e2e.ts tests/stress/keystroke-cadence-danger-space.e2e.ts tests/stress/jsx-unregistered-backspace-delete.e2e.ts tests/stress/jsx-unregistered-ime-concurrent.e2e.ts tests/stress/jsx-backspace-delete.e2e.ts tests/stress/link-authoring-bytes.e2e.ts tests/stress/link-authoring-apex.e2e.ts tests/stress/qa019-suffix-precedence.e2e.ts tests/stress/command-palette-parity.e2e.ts tests/stress/settings-search.e2e.ts tests/stress/okf-generated-index-settings.e2e.ts tests/stress/okf-recommended-skill-install.e2e.ts tests/stress/chip-popover-positioning.e2e.ts tests/stress/docs-open-scroll-restore.e2e.ts tests/stress/file-tree-decoration-chip-strip-repro.e2e.ts tests/stress/grip-click-nodeselect.e2e.ts tests/stress/jsx-halo-semantics.e2e.ts tests/stress/jsx-image-body-click.e2e.ts tests/stress/jsx-prop-panel-placeholder.e2e.ts tests/stress/jsx-range-encompass-halo.e2e.ts tests/stress/jsx-wildcard-convert.e2e.ts tests/stress/markdown-lint.e2e.ts tests/stress/frontmatter-schema-badge.e2e.ts tests/stress/frontmatter-glob-picker.e2e.ts tests/stress/unified-problems.e2e.ts tests/stress/mid-type-recovery.e2e.ts tests/stress/observer-a-multi-client.e2e.ts tests/stress/outline-toolbar-occlusion.e2e.ts tests/stress/selection-surface-pane-clip.e2e.ts tests/stress/quiet-tree-hidden-doc.e2e.ts tests/stress/raw-mdx-fallback-onblur-upgrade.e2e.ts tests/stress/rename-noext-probe.e2e.ts tests/stress/show-ok-folders.e2e.ts tests/stress/source-polish.e2e.ts tests/stress/warm-skeleton-scroll-restore.e2e.ts tests/stress/props-toggle-scroll-preserve.e2e.ts tests/stress/yjs-no-dual-import.e2e.ts tests/stress/graph-panel-surfaces.e2e.ts tests/stress/asset-embed-real-fidelity.e2e.ts tests/stress/image-invalid-placeholder.e2e.ts tests/stress/local-target-audit.e2e.ts tests/stress/rename-content-preservation.e2e.ts tests/stress/rename-consolidation.e2e.ts tests/stress/outline-active-heading.e2e.ts tests/stress/outline-navigation.e2e.ts tests/stress/prd-7627-default-swatch.e2e.ts tests/stress/clipboard-dollar-math-source-fallback.e2e.ts tests/stress/source-mode-undo-keymap.e2e.ts tests/stress/source-undo-mode-flip.e2e.ts tests/stress/timeline-recovered-restore.e2e.ts tests/stress/blank-line-preservation.e2e.ts tests/stress/landing-helpers.e2e.ts tests/stress/agent-follow-scroll.e2e.ts tests/stress/mode-switch-landing.e2e.ts tests/stress/mode-switch-ordinal-divergence.e2e.ts tests/stress/comment-annotation-visibility.e2e.ts tests/stress/comment-opens-in-panel.e2e.ts tests/stress/qa-miles-edge-blanks.e2e.ts tests/stress/prop-upload.e2e.ts tests/stress/slash-command-auto-open.e2e.ts tests/stress/clipboard-relative-url-source-fallback.e2e.ts tests/stress/editor-split-view.e2e.ts tests/stress/language-load-failure.e2e.ts tests/stress/language-first-paint.e2e.ts tests/stress/user-text-direction.e2e.ts tests/stress/pseudolocale.e2e.ts tests/stress/language-picker.e2e.ts tests/stress/zh-hans-coverage-sweep.e2e.ts tests/stress/preview-tab-promotion.e2e.ts tests/stress/cv-paint-lock-click.e2e.ts tests/stress/cv-auto-paint-lock-click.e2e.ts tests/stress/harness-port-ownership.e2e.ts tests/stress/history-traversal-preview-tab.e2e.ts tests/stress/tab-close-scroll-restore.e2e.ts tests/stress/skills-sidebar-open.e2e.ts tests/stress/trailing-affordance.e2e.ts tests/stress/text-doc-composer-inset.e2e.ts tests/stress/composer-control-alignment.e2e.ts tests/stress/agents-settings-accessible-names.e2e.ts tests/stress/composer-growth-eof-reveal.e2e.ts tests/stress/theme-fade.e2e.ts tests/stress/theme-color-conversion.e2e.ts tests/stress/composer-open-caret-reveal.e2e.ts tests/stress/spellcheck-browser-absence.e2e.ts tests/stress/agents-panel-reload-visibility.e2e.ts tests/stress/rail-flex-distribution-law.e2e.ts tests/stress/audit-409-console-record.e2e.ts tests/stress/pagelist-refresh-lifetime.e2e.ts tests/stress/list-keymap.e2e.ts tests/stress/okignore-settings.e2e.ts",
+ "test:e2e": "playwright test tests/stress/empty-bullet-before-link.e2e.ts tests/stress/list-item-drag.e2e.ts tests/stress/ux-interactions.e2e.ts tests/stress/file-tree-create.e2e.ts tests/stress/file-tree-drag-to-root.e2e.ts tests/stress/file-tree-deselect-to-root.e2e.ts tests/stress/file-tree-collapse-spaced-folder.e2e.ts tests/stress/sidebar-file-list-fills.e2e.ts tests/stress/file-tree-sticky-collapse.e2e.ts tests/stress/file-tree-collapse-persistence.e2e.ts tests/stress/file-tree-fractional-zoom.e2e.ts tests/stress/create-then-rename-editable.e2e.ts tests/stress/find-replace.e2e.ts tests/stress/external-link-cue.e2e.ts tests/stress/editor-tabs.e2e.ts tests/stress/crdt-stress.e2e.ts tests/stress/slash-command.e2e.ts tests/stress/paste-fidelity.e2e.ts tests/stress/fr-7a-disconnect-source-mode.e2e.ts tests/stress/docs-open.e2e.ts tests/stress/frozen-table-headers.e2e.ts tests/stress/asset-embed.e2e.ts tests/stress/asset-embed-advanced.e2e.ts tests/stress/asset-click-dispatch.e2e.ts tests/stress/handoff.e2e.ts tests/stress/multi-agent-presence.e2e.ts tests/stress/editor-mode-persistence.e2e.ts tests/stress/lint-config-toggle.e2e.ts tests/stress/plugin-enable-notice.e2e.ts tests/stress/schema-edit-fields-view.e2e.ts tests/stress/sidebar-search-pill.e2e.ts tests/stress/navigation-history.e2e.ts tests/stress/command-palette-semantic.e2e.ts tests/stress/agent-activity-panel.e2e.ts tests/stress/drop-pipeline-auto-open.e2e.ts tests/stress/command-palette-flicker.e2e.ts tests/stress/cm6-list-hanging-indent.e2e.ts tests/stress/ng7-rapid-nav-coherence.e2e.ts tests/stress/reveal-on-activate.e2e.ts tests/stress/selection-indicator.e2e.ts tests/stress/new-file-cross-doc-bleed.e2e.ts tests/stress/new-item-shortcut-fast-path.e2e.ts tests/stress/editor-mode-flip-cross-doc-bleed.e2e.ts tests/stress/editor-area-viewport-resize.e2e.ts tests/stress/qa-sidebar-responsive.e2e.ts tests/stress/prd-6955-reassertion-repro.e2e.ts tests/stress/prd-6955-reassertion-wedge.e2e.ts tests/stress/prd-6914-repro.e2e.ts tests/stress/showall-lazy-tree.e2e.ts tests/stress/tabs-component-strip.e2e.ts tests/stress/source-find-scroll.e2e.ts tests/stress/harness-app-warmth.e2e.ts tests/stress/qa-canary-authoring-both-modes.e2e.ts tests/stress/qa-canary-live-typing.e2e.ts tests/stress/keystroke-cadence-danger-space.e2e.ts tests/stress/jsx-unregistered-backspace-delete.e2e.ts tests/stress/jsx-unregistered-ime-concurrent.e2e.ts tests/stress/jsx-backspace-delete.e2e.ts tests/stress/link-authoring-bytes.e2e.ts tests/stress/link-authoring-apex.e2e.ts tests/stress/qa019-suffix-precedence.e2e.ts tests/stress/command-palette-parity.e2e.ts tests/stress/settings-search.e2e.ts tests/stress/okf-generated-index-settings.e2e.ts tests/stress/okf-recommended-skill-install.e2e.ts tests/stress/chip-popover-positioning.e2e.ts tests/stress/docs-open-scroll-restore.e2e.ts tests/stress/file-tree-decoration-chip-strip-repro.e2e.ts tests/stress/grip-click-nodeselect.e2e.ts tests/stress/jsx-halo-semantics.e2e.ts tests/stress/jsx-image-body-click.e2e.ts tests/stress/jsx-prop-panel-placeholder.e2e.ts tests/stress/jsx-range-encompass-halo.e2e.ts tests/stress/jsx-wildcard-convert.e2e.ts tests/stress/markdown-lint.e2e.ts tests/stress/frontmatter-schema-badge.e2e.ts tests/stress/frontmatter-glob-picker.e2e.ts tests/stress/unified-problems.e2e.ts tests/stress/mid-type-recovery.e2e.ts tests/stress/observer-a-multi-client.e2e.ts tests/stress/outline-toolbar-occlusion.e2e.ts tests/stress/selection-surface-pane-clip.e2e.ts tests/stress/quiet-tree-hidden-doc.e2e.ts tests/stress/raw-mdx-fallback-onblur-upgrade.e2e.ts tests/stress/rename-noext-probe.e2e.ts tests/stress/show-ok-folders.e2e.ts tests/stress/source-polish.e2e.ts tests/stress/warm-skeleton-scroll-restore.e2e.ts tests/stress/props-toggle-scroll-preserve.e2e.ts tests/stress/yjs-no-dual-import.e2e.ts tests/stress/graph-panel-surfaces.e2e.ts tests/stress/asset-embed-real-fidelity.e2e.ts tests/stress/image-invalid-placeholder.e2e.ts tests/stress/local-target-audit.e2e.ts tests/stress/rename-content-preservation.e2e.ts tests/stress/rename-consolidation.e2e.ts tests/stress/outline-active-heading.e2e.ts tests/stress/outline-navigation.e2e.ts tests/stress/prd-7627-default-swatch.e2e.ts tests/stress/clipboard-dollar-math-source-fallback.e2e.ts tests/stress/source-mode-undo-keymap.e2e.ts tests/stress/source-undo-mode-flip.e2e.ts tests/stress/timeline-recovered-restore.e2e.ts tests/stress/blank-line-preservation.e2e.ts tests/stress/landing-helpers.e2e.ts tests/stress/agent-follow-scroll.e2e.ts tests/stress/mode-switch-landing.e2e.ts tests/stress/mode-switch-ordinal-divergence.e2e.ts tests/stress/comment-annotation-visibility.e2e.ts tests/stress/comment-opens-in-panel.e2e.ts tests/stress/qa-miles-edge-blanks.e2e.ts tests/stress/prop-upload.e2e.ts tests/stress/slash-command-auto-open.e2e.ts tests/stress/clipboard-relative-url-source-fallback.e2e.ts tests/stress/editor-split-view.e2e.ts tests/stress/language-load-failure.e2e.ts tests/stress/language-first-paint.e2e.ts tests/stress/user-text-direction.e2e.ts tests/stress/pseudolocale.e2e.ts tests/stress/language-picker.e2e.ts tests/stress/zh-hans-coverage-sweep.e2e.ts tests/stress/preview-tab-promotion.e2e.ts tests/stress/cv-paint-lock-click.e2e.ts tests/stress/cv-auto-paint-lock-click.e2e.ts tests/stress/harness-port-ownership.e2e.ts tests/stress/history-traversal-preview-tab.e2e.ts tests/stress/tab-close-scroll-restore.e2e.ts tests/stress/skills-sidebar-open.e2e.ts tests/stress/trailing-affordance.e2e.ts tests/stress/text-doc-composer-inset.e2e.ts tests/stress/composer-control-alignment.e2e.ts tests/stress/agents-settings-accessible-names.e2e.ts tests/stress/composer-growth-eof-reveal.e2e.ts tests/stress/theme-fade.e2e.ts tests/stress/theme-color-conversion.e2e.ts tests/stress/composer-open-caret-reveal.e2e.ts tests/stress/spellcheck-browser-absence.e2e.ts tests/stress/agents-panel-reload-visibility.e2e.ts tests/stress/rail-flex-distribution-law.e2e.ts tests/stress/audit-409-console-record.e2e.ts tests/stress/pagelist-refresh-lifetime.e2e.ts tests/stress/list-keymap.e2e.ts tests/stress/okignore-settings.e2e.ts",
"test:e2e:install-browsers": "playwright install chromium webkit firefox",
"test:visual": "playwright test --config playwright.visual.config.ts",
"test:visual:update": "playwright test --config playwright.visual.config.ts --update-snapshots",
diff --git a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts b/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
index a50b00123..4549c74b3 100644
--- a/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
+++ b/packages/app/tests/integration/bug3-source-mode-writeback.test.ts
@@ -1,3 +1,4 @@
+
import { readFileSync } from 'node:fs';
import { join } from 'node:path';
import { setTimeout as wait } from 'node:timers/promises';
diff --git a/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts b/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
index 6fcdc23f2..4fc2c11f9 100644
--- a/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
+++ b/packages/app/tests/integration/indented-jsx-byte-sacred.test.ts
@@ -1,3 +1,4 @@
+
import { setTimeout as wait } from 'node:timers/promises';
import { normalizeBridge } from '@inkeep/open-knowledge-core';
import { updateYFragment } from '@tiptap/y-tiptap';
diff --git a/packages/app/tests/integration/interior-edit-freshness.test.ts b/packages/app/tests/integration/interior-edit-freshness.test.ts
index 40b5cdfd6..9f2f6feb6 100644
--- a/packages/app/tests/integration/interior-edit-freshness.test.ts
+++ b/packages/app/tests/integration/interior-edit-freshness.test.ts
@@ -1,3 +1,4 @@
+
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts b/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
index 93666af70..2a085742b 100644
--- a/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
+++ b/packages/app/tests/integration/keystroke-cadence-danger-space.test.ts
@@ -1,3 +1,4 @@
+
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/producer-guard-wiring.test.ts b/packages/app/tests/integration/producer-guard-wiring.test.ts
index 867598d34..878d5196b 100644
--- a/packages/app/tests/integration/producer-guard-wiring.test.ts
+++ b/packages/app/tests/integration/producer-guard-wiring.test.ts
@@ -1,3 +1,4 @@
+
import { setTimeout as wait } from 'node:timers/promises';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
diff --git a/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts b/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
index 0970ac12f..4ada3cf26 100644
--- a/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
+++ b/packages/app/tests/integration/qa-039-reconciliation-counters-http.test.ts
@@ -1,3 +1,4 @@
+
import { randomUUID } from 'node:crypto';
import { afterEach, describe, expect, test } from 'vitest';
import { agentWriteMd, createTestServer, type TestServer } from './test-harness';
diff --git a/packages/app/tests/integration/qa-045-restore-after-gc.test.ts b/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
index b632185e1..cbe2b705f 100644
--- a/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
+++ b/packages/app/tests/integration/qa-045-restore-after-gc.test.ts
@@ -1,3 +1,4 @@
+
import { execFileSync } from 'node:child_process';
import { randomUUID } from 'node:crypto';
import { join } from 'node:path';
diff --git a/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts b/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
index c530ce4ba..89bc9b4d9 100644
--- a/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
+++ b/packages/app/tests/integration/qa-050-rollback-undo-shipped-path.test.ts
@@ -1,3 +1,4 @@
+
import { randomUUID } from 'node:crypto';
import { afterAll, afterEach, beforeAll, describe, expect, test } from 'vitest';
import type * as Y from 'yjs';
diff --git a/packages/app/tests/integration/undo-after-rollback.test.ts b/packages/app/tests/integration/undo-after-rollback.test.ts
index d3767adc9..a78aeb0e4 100644
--- a/packages/app/tests/integration/undo-after-rollback.test.ts
+++ b/packages/app/tests/integration/undo-after-rollback.test.ts
@@ -1,3 +1,4 @@
+
import { ROLLBACK_ORIGIN } from '@inkeep/open-knowledge-server';
import { afterAll, beforeAll, describe, expect, test } from 'vitest';
import * as Y from 'yjs';
diff --git a/packages/app/tests/integration/undo-recycle-reset.test.ts b/packages/app/tests/integration/undo-recycle-reset.test.ts
index b076f955c..e7cc69c3f 100644
--- a/packages/app/tests/integration/undo-recycle-reset.test.ts
+++ b/packages/app/tests/integration/undo-recycle-reset.test.ts
@@ -1,3 +1,4 @@
+
import { writeFileSync } from 'node:fs';
import { join } from 'node:path';
import { setTimeout as wait } from 'node:timers/promises';
diff --git a/packages/app/tests/integration/undo-rederive-survival.test.ts b/packages/app/tests/integration/undo-rederive-survival.test.ts
index 7935e35f8..9ddcd0730 100644
--- a/packages/app/tests/integration/undo-rederive-survival.test.ts
+++ b/packages/app/tests/integration/undo-rederive-survival.test.ts
@@ -1,3 +1,4 @@
+
import { prependFrontmatter } from '@inkeep/open-knowledge-core';
import { Plugin, PluginKey } from '@tiptap/pm/state';
import { updateYFragment, yXmlFragmentToProseMirrorRootNode } from '@tiptap/y-tiptap';
diff --git a/packages/app/tests/stress/bridge-convergence.fuzz.test.ts b/packages/app/tests/stress/bridge-convergence.fuzz.test.ts
index cbb762cc4..ce1a0ec8b 100644
--- a/packages/app/tests/stress/bridge-convergence.fuzz.test.ts
+++ b/packages/app/tests/stress/bridge-convergence.fuzz.test.ts
@@ -573,12 +573,17 @@ describe('bridge-convergence fuzzer (FR-17)', () => {
}
const convergence = await driveToConvergence(clients, 60000);
- if (convergence.outcome === 'stalled') {
- const states = snapshotClients(clients);
- throw new Error(
- `Convergence failed after 60s (${convergence.detail}).\n${states.map((s, i) => ` Client ${i}: ytext=${s.ytext.length}ch frag=${s.fragmentMd.length}ch`).join('\n')}`,
- );
- }
+ expect(
+ convergence.outcome,
+ convergence.outcome === 'stalled'
+ ? `Convergence failed after 60s (${convergence.detail}).\n${snapshotClients(clients)
+ .map(
+ (s, i) =>
+ ` Client ${i}: ytext=${s.ytext.length}ch frag=${s.fragmentMd.length}ch`,
+ )
+ .join('\n')}`
+ : undefined,
+ ).not.toBe('stalled');
if (convergence.outcome === 'converged-late') {
fuzzConvergedLate.push(seed);
console.log(`[fuzz] converged-late seed=${seed} (final state within tolerance)`);
diff --git a/packages/app/tests/stress/empty-bullet-before-link.e2e.ts b/packages/app/tests/stress/empty-bullet-before-link.e2e.ts
new file mode 100644
index 000000000..d6a457962
--- /dev/null
+++ b/packages/app/tests/stress/empty-bullet-before-link.e2e.ts
@@ -0,0 +1,104 @@
+import { randomUUID } from 'node:crypto';
+import { readFileSync } from 'node:fs';
+import { join } from 'node:path';
+import {
+ expect,
+ filterCriticalErrors,
+ type LogEntry,
+ test,
+ waitForActiveProviderSynced,
+ waitForPmSelectionInNode,
+} from './_helpers';
+
+const MINIMAL_SOURCE =
+ 'x\n\n -\n\n - [a](b)\n\nWrapped\n continuation line\n\n01. a\n02. b\n';
+const EDITOR = '.ProseMirror:not(.composer-prosemirror):visible';
+
+interface ResidualFallbackCounters {
+ observerAResidualMergeSpliceLanded: number;
+ observerAResidualMergeSpliceBlockedLossy: number;
+ observerAResidualMergeSpliceUnavailable: Record<string, number>;
+}
+
+async function readFallbackCounters(baseURL: string): Promise<ResidualFallbackCounters> {
+ const res = await fetch(`${baseURL}/api/metrics/reconciliation`);
+ expect(res.status).toBe(200);
+ return (await res.json()) as ResidualFallbackCounters;
+}
+
+test('deleting an empty item before a link survives peer sync, persistence, and reload', async ({
+ browser,
+ api,
+ baseURL,
+ workerServer,
+}) => {
+ const docName = `empty-bullet-link-${randomUUID()}`;
+ await api.createPage(`${docName}.md`);
+ await api.replaceDoc(docName, MINIMAL_SOURCE);
+ const firstContext = await browser.newContext({ baseURL });
+ const secondContext = await browser.newContext({ baseURL });
+ const first = await firstContext.newPage();
+ const second = await secondContext.newPage();
+
+ const errors = [first, second].map((page) => {
+ const entries: LogEntry[] = [];
+ page.on('console', (message) => {
+ if (message.type() === 'error') {
+ entries.push({ type: 'error', text: message.text(), url: message.location().url });
+ }
+ });
+ page.on('pageerror', (error) => {
+ entries.push({ type: 'uncaught', text: error.message, url: page.url() });
+ });
+ return entries;
+ });
+
+ try {
+ await Promise.all([first.goto(`/#/${docName}`), second.goto(`/#/${docName}`)]);
+ await Promise.all([waitForActiveProviderSynced(first), waitForActiveProviderSynced(second)]);
+ await expect(first.locator(`${EDITOR} li`)).toHaveCount(4);
+ await expect(second.locator(`${EDITOR} li`)).toHaveCount(4);
+ const before = await readFallbackCounters(workerServer.baseURL);
+
+ await first.locator(`${EDITOR} li p`).first().click();
+ await waitForPmSelectionInNode(first, 'listItem');
+ await first.keyboard.press('Backspace');
+
+ await expect(first.locator(`${EDITOR} li`)).toHaveCount(3);
+ await expect(second.locator(`${EDITOR} li`)).toHaveCount(3);
+ await expect(second.locator(`${EDITOR} li`).first()).toHaveText('a');
+ const readSource = () =>
+ first.evaluate(() => window.__activeProvider?.document.getText('source').toString() ?? '');
+ await expect.poll(readSource).not.toMatch(/\n[ \t]*-[ \t]*\n/);
+ const source = await readSource();
+ expect(source).toMatch(/\[a\]\(<?b>?\)/);
+ expect(source).toContain('\n\nWrapped\n continuation line\n\n01. a\n02. b\n');
+ await expect
+ .poll(() => readFileSync(join(workerServer.contentDir, `${docName}.md`), 'utf8'))
+ .toBe(source);
+
+ const after = await readFallbackCounters(workerServer.baseURL);
+ expect(
+ after.observerAResidualMergeSpliceLanded - before.observerAResidualMergeSpliceLanded,
+ ).toBe(1);
+ expect(
+ after.observerAResidualMergeSpliceBlockedLossy -
+ before.observerAResidualMergeSpliceBlockedLossy,
+ ).toBe(0);
+ expect(after.observerAResidualMergeSpliceUnavailable).toEqual(
+ before.observerAResidualMergeSpliceUnavailable,
+ );
+
+ await first.reload();
+ await waitForActiveProviderSynced(first);
+ await expect(first.locator(`${EDITOR} li`)).toHaveCount(3);
+ expect(
+ await first.evaluate(() => window.__activeProvider?.document.getText('source').toString()),
+ ).toBe(source);
+ for (const [index, entries] of errors.entries()) {
+ expect(filterCriticalErrors(entries), `Editor ${index + 1} errors`).toEqual([]);
+ }
+ } finally {
+ await Promise.all([firstContext.close(), secondContext.close()]);
+ }
+});
diff --git a/packages/core/src/bridge/compose.ts b/packages/core/src/bridge/compose.ts
index f4cc8a286..2a597ec3d 100644
--- a/packages/core/src/bridge/compose.ts
+++ b/packages/core/src/bridge/compose.ts
@@ -1,3 +1,4 @@
+
import { prependFrontmatter, stripFrontmatter } from '../extensions/frontmatter.ts';
export type ComposeAdjustment = 'none' | 'body' | 'frontmatter' | 'unresolved';
diff --git a/packages/core/src/bridge/doc-boundary-space.ts b/packages/core/src/bridge/doc-boundary-space.ts
index 8fb428b90..01ef76a9f 100644
--- a/packages/core/src/bridge/doc-boundary-space.ts
+++ b/packages/core/src/bridge/doc-boundary-space.ts
@@ -1,3 +1,4 @@
+
import { FRONTMATTER_RE, stripFrontmatter } from '../extensions/frontmatter.ts';
import { carriedEdgeEmpties, type DocEdgeEmpties } from '../markdown/doc-edge-blank-runs.ts';
diff --git a/packages/core/src/bridge/index.ts b/packages/core/src/bridge/index.ts
index 14bd777aa..f5f91826b 100644
--- a/packages/core/src/bridge/index.ts
+++ b/packages/core/src/bridge/index.ts
@@ -79,6 +79,7 @@ export {
type BridgeMergeContentLossSide,
type BridgeMergeContentLossWhich,
findDroppedContent,
+ findDroppedSourceContentInRange,
mergeThreeWay,
tryLineLevelCombine,
} from './merge-three-way.ts';
diff --git a/packages/core/src/bridge/merge-three-way.ts b/packages/core/src/bridge/merge-three-way.ts
index 50203ba9a..dfe3966bc 100644
--- a/packages/core/src/bridge/merge-three-way.ts
+++ b/packages/core/src/bridge/merge-three-way.ts
@@ -249,6 +249,49 @@ export function findDroppedContent(candidate: string, baseline: string, applied:
return atRisk.filter((seg) => !applied.includes(seg));
}
+function withoutWhitespace(text: string): { chars: string; offsets: number[] } {
+ let chars = '';
+ const offsets: number[] = [];
+ for (let i = 0; i < text.length; i++) {
+ if (/\s/.test(text[i])) continue;
+ chars += text[i];
+ offsets.push(i);
+ }
+ return { chars, offsets };
+}
+
+export function findDroppedSourceContentInRange(
+ canonical: string,
+ source: string,
+ range: { start: number; end: number },
+ replacement: string,
+): string[] {
+ const stripped = withoutWhitespace(source);
+ const diffs = dmp.diff_main(withoutWhitespace(canonical).chars, stripped.chars);
+ dmp.diff_cleanupSemantic(diffs);
+ const replacementChars = withoutWhitespace(replacement).chars;
+ const dropped: string[] = [];
+ let cursor = 0;
+ for (const [op, data] of diffs) {
+ if (op === -1) continue;
+ if (op === 1) {
+ let run = '';
+ for (let i = 0; i < data.length; i++) {
+ const offset = stripped.offsets[cursor + i];
+ if (offset >= range.start && offset < range.end) {
+ run += data[i];
+ } else if (run !== '') {
+ dropped.push(run);
+ run = '';
+ }
+ }
+ if (run !== '') dropped.push(run);
+ }
+ cursor += data.length;
+ }
+ return dropped.filter((run) => !replacementChars.includes(run));
+}
+
function mergeConflictRegion(base: string, user: string, agent: string): string {
if (user === '') return agent;
if (agent === '') return user;
diff --git a/packages/core/src/index.ts b/packages/core/src/index.ts
index d28ff1984..ac5f500c3 100644
--- a/packages/core/src/index.ts
+++ b/packages/core/src/index.ts
@@ -67,6 +67,7 @@ export {
type FrontmatterDocProvider,
type FrontmatterSnapshot,
findDroppedContent,
+ findDroppedSourceContentInRange,
findFirstDivergenceIndex,
fnv1aDigest,
fragmentHoldsPendingContent,
diff --git a/packages/core/src/markdown/comment-promoter.ts b/packages/core/src/markdown/comment-promoter.ts
index fc267cbea..fb0ba5a7c 100644
--- a/packages/core/src/markdown/comment-promoter.ts
+++ b/packages/core/src/markdown/comment-promoter.ts
@@ -1,3 +1,4 @@
+
import type { Nodes, Paragraph, PhrasingContent, Root, RootContent, Text } from 'mdast';
import { SKIP, visit } from 'unist-util-visit';
import type { VFile } from 'vfile';
diff --git a/packages/core/src/markdown/merged-walker.ts b/packages/core/src/markdown/merged-walker.ts
index bfd7e3109..fa3cfcd86 100644
--- a/packages/core/src/markdown/merged-walker.ts
+++ b/packages/core/src/markdown/merged-walker.ts
@@ -1,3 +1,4 @@
+
import type { Nodes, Parent, Root } from 'mdast';
import { SKIP, visit } from 'unist-util-visit';
import type { VFile } from 'vfile';
diff --git a/packages/core/src/markdown/safe-url.ts b/packages/core/src/markdown/safe-url.ts
index 4d3250d3a..8be632ba4 100644
--- a/packages/core/src/markdown/safe-url.ts
+++ b/packages/core/src/markdown/safe-url.ts
@@ -1,3 +1,4 @@
+
export const SAFE_URL_SCHEMES = ['https', 'http', 'mailto', 'tel', 'ftp', 'sms'] as const;
const SCHEME_ALT = SAFE_URL_SCHEMES.map((s) => `${s}:`).join('|');
diff --git a/packages/server/src/metrics.test.ts b/packages/server/src/metrics.test.ts
index dd6e05db0..2cb851ea0 100644
--- a/packages/server/src/metrics.test.ts
+++ b/packages/server/src/metrics.test.ts
@@ -160,7 +160,8 @@ describe('reconciliation metrics', () => {
key === 'cc1LastSeq' ||
key === 'bridgeToleranceApplied' ||
key === 'mapDrivenSpliceFallback' ||
- key === 'mapDrivenSpliceMemoSkips'
+ key === 'mapDrivenSpliceMemoSkips' ||
+ key === 'observerAResidualMergeSpliceUnavailable'
) {
expect(value).toEqual({});
} else {
diff --git a/packages/server/src/metrics.ts b/packages/server/src/metrics.ts
index 246464c5e..014a5c903 100644
--- a/packages/server/src/metrics.ts
+++ b/packages/server/src/metrics.ts
@@ -6,6 +6,12 @@ export type MapDrivenSpliceFallbackReason =
| 'parse-error'
| 'missing-position';
+export type ResidualMergeSpliceUnavailableReason =
+ | MapDrivenSpliceFallbackReason
+ | 'composition-adjusted'
+ | 'doc-edge-runs'
+ | 'not-settled';
+
export type MapDrivenSpliceMemoSkipReason =
| 'narrowed'
| 'empty-children'
@@ -74,6 +80,11 @@ export interface ReconciliationMetrics {
mapDrivenSpliceMemoHits: number;
mapDrivenSpliceMemoSkips: Partial<Record<MapDrivenSpliceMemoSkipReason, number>>;
observerAResidualMergeRuns: number;
+ observerAResidualMergeSpliceLanded: number;
+ observerAResidualMergeSpliceBlockedLossy: number;
+ observerAResidualMergeSpliceUnavailable: Partial<
+ Record<ResidualMergeSpliceUnavailableReason, number>
+ >;
/**
* Count of Observer A duplication-gate recoveries: a substantive body line materialized more times
* in the fragment than clean Y.Text justified, provenance-confirmed as a server-versus-client
@@ -189,6 +200,9 @@ const counters: ReconciliationMetrics = {
mapDrivenSpliceMemoSkips: {},
mapDrivenSpliceFallback: {},
observerAResidualMergeRuns: 0,
+ observerAResidualMergeSpliceLanded: 0,
+ observerAResidualMergeSpliceBlockedLossy: 0,
+ observerAResidualMergeSpliceUnavailable: {},
observerADuplicationRederives: 0,
observerADuplicationCheckpointCreated: 0,
observerAApplyLoss: 0,
@@ -428,6 +442,21 @@ export function incrementObserverAResidualMergeRuns(): void {
counters.observerAResidualMergeRuns++;
}
+export function incrementObserverAResidualMergeSpliceLanded(): void {
+ counters.observerAResidualMergeSpliceLanded++;
+}
+
+export function incrementObserverAResidualMergeSpliceBlockedLossy(): void {
+ counters.observerAResidualMergeSpliceBlockedLossy++;
+}
+
+export function incrementObserverAResidualMergeSpliceUnavailable(
+ reason: ResidualMergeSpliceUnavailableReason,
+): void {
+ counters.observerAResidualMergeSpliceUnavailable[reason] =
+ (counters.observerAResidualMergeSpliceUnavailable[reason] ?? 0) + 1;
+}
+
export function incrementObserverADuplicationRederives(): void {
counters.observerADuplicationRederives++;
}
@@ -652,6 +681,9 @@ export function getMetrics(): ReconciliationMetrics {
bridgeToleranceApplied: { ...counters.bridgeToleranceApplied },
mapDrivenSpliceFallback: { ...counters.mapDrivenSpliceFallback },
mapDrivenSpliceMemoSkips: { ...counters.mapDrivenSpliceMemoSkips },
+ observerAResidualMergeSpliceUnavailable: {
+ ...counters.observerAResidualMergeSpliceUnavailable,
+ },
};
}
@@ -716,6 +748,9 @@ export function resetMetrics(): void {
counters.mapDrivenSpliceMemoHits = 0;
counters.mapDrivenSpliceMemoSkips = {};
counters.observerAResidualMergeRuns = 0;
+ counters.observerAResidualMergeSpliceLanded = 0;
+ counters.observerAResidualMergeSpliceBlockedLossy = 0;
+ counters.observerAResidualMergeSpliceUnavailable = {};
counters.observerADuplicationRederives = 0;
counters.observerADuplicationCheckpointCreated = 0;
counters.observerAApplyLoss = 0;
diff --git a/packages/server/src/server-observers.ts b/packages/server/src/server-observers.ts
index 3cc444364..b301f311c 100644
--- a/packages/server/src/server-observers.ts
+++ b/packages/server/src/server-observers.ts
@@ -22,6 +22,7 @@ import {
createMergeBoundarySpace,
DUPLICATION_GATE_MIN_LINE_LENGTH,
docEdgeRunsDiffer,
+ findDroppedSourceContentInRange,
fnv1aDigest,
fragmentHoldsPendingContent,
isParseEquivalentBridge,
@@ -79,12 +80,17 @@ import {
incrementObserverADuplicationRederives,
incrementObserverAPathBFires,
incrementObserverAResidualMergeRuns,
+ incrementObserverAResidualMergeSpliceBlockedLossy,
+ incrementObserverAResidualMergeSpliceLanded,
+ incrementObserverAResidualMergeSpliceUnavailable,
incrementProducerGuardCheckpointCreated,
incrementProducerGuardFires,
incrementProducerGuardFiresSuppressed,
incrementReDeriveBackstopTripped,
incrementServerObserverError,
incrementServerObserverFire,
+ type MapDrivenSpliceFallbackReason,
+ type ResidualMergeSpliceUnavailableReason,
} from './metrics.ts';
import {
type PreDrainController,
@@ -198,6 +204,7 @@ interface TryComputeMapDrivenSpliceArgs {
readonly docName: string | undefined;
readonly mdastMemo: EditorMdastMemo;
readonly serializedNewPm: SerializedEditorBody;
+ readonly onResidualFallback?: (reason: MapDrivenSpliceFallbackReason) => void;
}
let mapDrivenParseErrorWarned = false;
@@ -233,14 +240,27 @@ function warnOnceMemoComposeFailure(docName: string | undefined, err: unknown):
function tryComputeMapDrivenSplice(
args: TryComputeMapDrivenSpliceArgs,
): YTextMapDrivenSplice | null {
- const { currentText, lastSyncedXmlMd, mdManager, docName, mdastMemo, serializedNewPm } = args;
+ const {
+ currentText,
+ lastSyncedXmlMd,
+ mdManager,
+ docName,
+ mdastMemo,
+ serializedNewPm,
+ onResidualFallback,
+ } = args;
+ const countsSpliceMetrics = onResidualFallback === undefined;
+ const countFallback = (reason: MapDrivenSpliceFallbackReason): void => {
+ if (onResidualFallback) onResidualFallback(reason);
+ else incrementMapDrivenSpliceFallback(reason);
+ };
const newPmJson = serializedNewPm.json;
if (currentText !== lastSyncedXmlMd) {
- incrementMapDrivenSpliceFallback('text-mismatch');
+ countFallback('text-mismatch');
return null;
}
if (docName !== undefined && (isSystemDoc(docName) || isConfigDoc(docName))) {
- incrementMapDrivenSpliceFallback('synthetic-doc');
+ countFallback('synthetic-doc');
return null;
}
@@ -248,12 +268,14 @@ function tryComputeMapDrivenSplice(
const bodyOffset = currentText.length - oldBody.length;
const splice = computeMapDrivenBodySplice(oldBody, newPmJson, mdManager, {
onFallback: (reason, err) => {
- incrementMapDrivenSpliceFallback(reason);
+ countFallback(reason);
if (reason === 'parse-error') warnOnceMapDrivenParseError(docName, err);
},
- onMemoHit: incrementMapDrivenSpliceMemoHit,
+ onMemoHit: () => {
+ if (countsSpliceMetrics) incrementMapDrivenSpliceMemoHit();
+ },
onMemoSkip: (reason, err) => {
- incrementMapDrivenSpliceMemoSkip(reason);
+ if (countsSpliceMetrics) incrementMapDrivenSpliceMemoSkip(reason);
if (reason === 'compose-failed') warnOnceMemoComposeFailure(docName, err);
},
memo: mdastMemo,
@@ -1109,20 +1131,67 @@ export function setupServerObservers(opts: SetupServerObserversOpts): () => void
});
const pathBState: { mergedText: string | null } = { mergedText: null };
- const spliceComputeStart = performance.now();
- const mapDrivenSplice =
- (ytextInSync && residualMergeEligible) ||
- composition.adjusted !== 'none' ||
- docEdgeRunsDiffer(currentText, md)
- ? null
- : tryComputeMapDrivenSplice({
+ const computeSplice = (
+ onResidualFallback?: (reason: ResidualMergeSpliceUnavailableReason) => void,
+ ): YTextMapDrivenSplice | null => {
+ if (composition.adjusted !== 'none') {
+ onResidualFallback?.('composition-adjusted');
+ return null;
+ }
+ if (docEdgeRunsDiffer(currentText, md)) {
+ onResidualFallback?.('doc-edge-runs');
+ return null;
+ }
+ return tryComputeMapDrivenSplice({
+ currentText,
+ lastSyncedXmlMd: lastSyncedYTextBytes,
+ mdManager,
+ docName: opts.docName,
+ mdastMemo,
+ serializedNewPm,
+ onResidualFallback,
+ });
+ };
+ const landResidualMerge = (merged: string): string => {
+ if (!residualMergeEligible || !settlesSplitBrainChecked(merged, md, normMd)) return merged;
+ let unavailable: ResidualMergeSpliceUnavailableReason = 'not-settled';
+ const splice = computeSplice((reason) => {
+ unavailable = reason;
+ });
+ if (splice !== null) {
+ const spliced =
+ currentText.slice(0, splice.spliceStart) +
+ splice.newSlice +
+ currentText.slice(splice.spliceEnd);
+ if (!settlesSplitBrainChecked(spliced, md, normMd)) {
+ const droppedSourceContent = findDroppedSourceContentInRange(
+ lastSyncedCanonicalMd,
currentText,
- lastSyncedXmlMd: lastSyncedYTextBytes,
- mdManager,
- docName: opts.docName,
- mdastMemo,
- serializedNewPm,
- });
+ { start: splice.spliceStart, end: splice.spliceEnd },
+ splice.newSlice,
+ );
+ if (droppedSourceContent.length > 0) {
+ incrementObserverAResidualMergeSpliceBlockedLossy();
+ setActiveSpanAttributes({
+ 'observer.a.residual_merge_fallback': 'splice-blocked-lossy',
+ });
+ return merged;
+ }
+ incrementObserverAResidualMergeSpliceLanded();
+ setActiveSpanAttributes({ 'observer.a.residual_merge_fallback': 'map-driven-splice' });
+ return spliced;
+ }
+ }
+ incrementObserverAResidualMergeSpliceUnavailable(unavailable);
+ setActiveSpanAttributes({
+ 'observer.a.residual_merge_fallback': 'splice-unavailable',
+ 'observer.a.residual_merge_fallback_reason': unavailable,
+ });
+ return merged;
+ };
+
+ const spliceComputeStart = performance.now();
+ const mapDrivenSplice = residualMergeEligible ? null : computeSplice();
if (mapDrivenSplice) {
setActiveSpanAttributes({
'observer.a.path': 'map-driven-splice',
@@ -1142,11 +1211,13 @@ export function setupServerObservers(opts: SetupServerObserversOpts): () => void
boundarySpace.unproject(merged, currentText);
const mergeThreeWayFn = opts.mergeThreeWay ?? mergeThreeWay;
try {
- const mergedText = projectMerged(
- mergeThreeWayFn(
- boundarySpace.project(mergeBase),
- boundarySpace.project(md),
- boundarySpace.project(currentText),
+ const mergedText = landResidualMerge(
+ projectMerged(
+ mergeThreeWayFn(
+ boundarySpace.project(mergeBase),
+ boundarySpace.project(md),
+ boundarySpace.project(currentText),
+ ),
),
);
applyFastDiff(ytext, currentText, mergedText);