A 10-agent red-team pass on the two-way Docmost<->git sync surfaced 16 ranked findings (9 others triaged out as already-defended). Wrote a reproduction test per finding (each asserts the CORRECT behavior, so it fails on the bug), then fixed the production code so every repro goes green. All confirmed bugs: Round-trip data loss (markdown-converter.ts + docmost-schema.ts mirror): - #1 editor-ext node types silently dropped on export — ported the 8 missing canon nodes (footnoteReference/footnotesList/footnoteDefinition, htmlEmbed, status, pageEmbed, transclusionSource/Reference) into the git-sync schema mirror and added converter cases that emit their schema-matching HTML instead of flattening unknown nodes to '' (this was the critical data-loss flagged in review #1679: footnotes/htmlEmbed lost on sync). Snapshot surface updated. - #2 top-level image lost width/height/align/attachmentId — now emits an HTML <img> (like video/diagrams) when it carries layout attrs; bare images stay . Image node parses width/height as strings so they re-import. - #3 code block containing a ``` fence corrupted on round-trip — outer fence is now widened to (longest-inner-backtick-run + 1). - #16 deep nesting threw RangeError (page never synced) — added a depth guard (MAX_NODE_DEPTH=400) so the converter never overflows the stack. Push/layout/cycle (engine): - #4 disambiguation ' ~slugId' suffix corrupted Docmost titles + order-dependent layout — deterministic, order-independent sibling disambiguation; suffix is stripped from a path-derived title ONLY when the new name is exactly the old title plus the suffix (never a genuine retitle ending in ' ~token'). - #6 retry-adopt by (parent,title) clobbered the wrong duplicate-title sibling — ambiguous (parent,title) is no longer adopted (falls back to fresh create). - #12 a new child under a new parent was created at ROOT — creates are ordered parent-before-child with an in-memory created-id map for parent resolution. - #13 git conflict markers could reach Docmost — bodies are scanned and the marker lines stripped (a '=======' line is only treated as a conflict separator inside a <<<<<<< ... >>>>>>> block, so setext headings are safe). - #15 a divergent `docmost` mirror was escalated by runPush but dropped by runCycle — RunCycleResult now forwards divergentDocmost to the orchestrator. Server (merge / lock / provenance): - #9 3-way merge lost a human's block edit when git inserted an adjacent block — finer-grained diff3 region merge (via lcs) preserves non-overlapping human edits; genuine same-block conflicts still resolve git-wins. - #10 single-writer race — module-static liveLocks closes the same-process TOCTOU window, and a heartbeat refresh that cannot confirm the lock now aborts the cycle at its next write checkpoint (cooperative AbortSignal threaded through runCycle). Cross-process fencing tokens remain a follow-up. - #14 sticky-agent provenance overrode an explicit actor='git-sync' write, blinding the listener loop-guard — resolveSource now lets an explicit actor win over the sticky-agent fallback (explicit agent still wins). Verified: git-sync vitest 617 pass (+1 expected-fail), server unit jest 1541 pass, server tsc clean. A review pass over the fixes caught and corrected a title-suffix over-strip, an inert abort signal, a document-wide conflict-marker strip, and two leaf-atom content-holes. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>
90 lines
3.8 KiB
TypeScript
90 lines
3.8 KiB
TypeScript
import { describe, expect, it } from 'vitest';
|
|
// Import the converter DIRECTLY from src (NOT the docmost-client barrel, which
|
|
// pulls in collaboration.ts and mutates the global DOM at import time), matching
|
|
// the other converter unit tests. markdownToProseMirror is imported for the
|
|
// round-trip cases; loading it mutates the global DOM via jsdom (required for
|
|
// @tiptap/html's generateJSON under Node) — this is expected.
|
|
import { convertProseMirrorToMarkdown } from '../src/lib/markdown-converter.js';
|
|
import { markdownToProseMirror } from '../src/lib/markdown-to-prosemirror.js';
|
|
|
|
const doc = (...nodes: any[]) => ({ type: 'doc', content: nodes });
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// #1 editor-ext atoms dropped: the `default` branch (markdown-converter.ts
|
|
// ~584-586) collapses unknown atoms to "" by mapping their (empty) children.
|
|
// ---------------------------------------------------------------------------
|
|
describe('#1 editor-ext atoms dropped', () => {
|
|
it('preserves an inline status atom text', () => {
|
|
const d = doc({
|
|
type: 'paragraph',
|
|
content: [{ type: 'status', attrs: { text: 'Done' } }],
|
|
});
|
|
expect(convertProseMirrorToMarkdown(d)).toContain('Done');
|
|
});
|
|
|
|
it('preserves a block htmlEmbed atom', () => {
|
|
const d = doc({ type: 'htmlEmbed', attrs: { source: '<b>hi</b>' } });
|
|
expect(convertProseMirrorToMarkdown(d)).not.toBe('');
|
|
});
|
|
|
|
it('preserves a footnoteReference atom', () => {
|
|
const d = doc({
|
|
type: 'paragraph',
|
|
content: [{ type: 'footnoteReference', attrs: { id: 'fn1', referenceNumber: 1 } }],
|
|
});
|
|
expect(convertProseMirrorToMarkdown(d)).not.toBe('');
|
|
});
|
|
});
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// #2 top-level image attrs lost: a top-level image emits markdown ,
|
|
// which carries no width/height/align/attachmentId.
|
|
// ---------------------------------------------------------------------------
|
|
describe('#2 top-level image attrs lost', () => {
|
|
it('keeps width through export and re-import', async () => {
|
|
const d = doc({
|
|
type: 'image',
|
|
attrs: { src: '/files/x.png', width: '320', height: '200', align: 'right', attachmentId: 'a1' },
|
|
});
|
|
const md = convertProseMirrorToMarkdown(d);
|
|
expect(md).toContain('320');
|
|
const back = await markdownToProseMirror(md);
|
|
expect(back.content[0].attrs.width).toBe('320');
|
|
});
|
|
});
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// #3 code-fence corruption: a code block whose TEXT contains a ``` fence must
|
|
// be emitted with a wider outer fence so the inner fence survives.
|
|
// ---------------------------------------------------------------------------
|
|
describe('#3 code-fence corruption', () => {
|
|
it('round-trips a code block containing an inner fence', async () => {
|
|
const code = '```js\nfoo()\n```';
|
|
const d = doc({
|
|
type: 'codeBlock',
|
|
attrs: { language: '' },
|
|
content: [{ type: 'text', text: code }],
|
|
});
|
|
const md1 = convertProseMirrorToMarkdown(d);
|
|
const back = await markdownToProseMirror(md1);
|
|
const md2 = convertProseMirrorToMarkdown(back);
|
|
expect(md2).toBe(md1);
|
|
});
|
|
});
|
|
|
|
// ---------------------------------------------------------------------------
|
|
// #16 depth guard: deep recursion in processNode overflows the stack (today a
|
|
// RangeError) instead of being guarded.
|
|
// ---------------------------------------------------------------------------
|
|
describe('#16 depth guard', () => {
|
|
it('does not throw on a deeply nested blockquote doc', () => {
|
|
const DEPTH = 50000;
|
|
let node: any = { type: 'paragraph', content: [{ type: 'text', text: 'x' }] };
|
|
for (let i = 0; i < DEPTH; i++) {
|
|
node = { type: 'blockquote', content: [node] };
|
|
}
|
|
const d = doc(node);
|
|
expect(() => convertProseMirrorToMarkdown(d)).not.toThrow();
|
|
});
|
|
});
|