Skip to content

Beautiful, AI-native markdown IDE and LLM wiki

fix(open-knowledge): playwright flake burn-down, file-tree class first (#2600)

Nick Gomez50cf7d27e3d0
diff --git a/.changeset/file-watcher-new-folder-file-rescue.md b/.changeset/file-watcher-new-folder-file-rescue.md
new file mode 100644
index 000000000..7fa0286bd
--- /dev/null
+++ b/.changeset/file-watcher-new-folder-file-rescue.md
@@ -0,0 +1,5 @@
+---
+'@inkeep/open-knowledge': patch
+---
+
+Files written into a freshly created folder no longer go missing from page listings, search, and the collaboration layer when the watcher's per-directory subscription loses the race with the write (seen on Linux under load, e.g. `mkdir notes && cp draft.md notes/`). The new-folder rescan that already recovered dropped subfolders now recovers the files inside them too, replaying them through the normal change pipeline.
diff --git a/packages/app/tests/stress/reveal-on-activate.e2e.ts b/packages/app/tests/stress/reveal-on-activate.e2e.ts
index ac3e514f8..bc9a11ff9 100644
--- a/packages/app/tests/stress/reveal-on-activate.e2e.ts
+++ b/packages/app/tests/stress/reveal-on-activate.e2e.ts
@@ -51,6 +51,19 @@ const folderRow = (page: Page) =>
sidebar(page).getByRole('treeitem', { name: 'sidebar-folder', exact: true });
const selectedRow = (page: Page) => sidebar(page).locator('[aria-selected="true"]');
+/**
+ * Navigate and gate on the tree having rendered at all (same condition as
+ * file-tree-create's gotoRootAndAwaitSidebar) before callers wait on specific
+ * rows: the first refreshDocs that flips the sidebar out of loading can exceed
+ * the per-row budgets under 4-worker CI contention, and the per-row waits are
+ * meant to measure incremental reveal behavior, not the cold first render.
+ */
+async function gotoAndAwaitTree(page: Page, path: string): Promise<void> {
+ await page.goto(path);
+ await page.waitForLoadState('domcontentloaded');
+ await expect(sidebar(page).getByRole('treeitem').first()).toBeVisible({ timeout: 30_000 });
+}
+
async function expandFolder(page: Page) {
await folderRow(page).focus();
await folderRow(page).press('ArrowRight');
@@ -62,7 +75,7 @@ async function collapseFolder(page: Page) {
}
test('direct URL load reveals nested doc on first paint', async ({ page }) => {
- await page.goto(`/#/sidebar-folder/nested-doc`);
+ await gotoAndAwaitTree(page, `/#/sidebar-folder/nested-doc`);
await fileRow(page, 'nested-doc.md').waitFor({ state: 'visible', timeout: 15_000 });
await expect(folderRow(page)).toHaveAttribute('aria-expanded', 'true');
@@ -72,7 +85,7 @@ test('direct URL load reveals nested doc on first paint', async ({ page }) => {
});
test('hash navigation reveals nested doc (simulates graph/wikilink click)', async ({ page }) => {
- await page.goto('/');
+ await gotoAndAwaitTree(page, '/');
await fileRow(page, 'test-doc.md').click({ timeout: 10_000 });
await expect(folderRow(page)).toHaveAttribute('aria-expanded', 'false');
@@ -97,7 +110,7 @@ test('active-doc ancestor stays expanded despite chevron clicks (Model A ancesto
// derivation (`ancestors ∪ (userExpanded \ userCollapsed)`) re-adds the
// ancestor. This matches VS Code / Finder: active file's context is
// always visible.
- await page.goto(`/#/sidebar-folder/nested-doc`);
+ await gotoAndAwaitTree(page, `/#/sidebar-folder/nested-doc`);
await fileRow(page, 'nested-doc.md').waitFor({ state: 'visible', timeout: 15_000 });
await expect(folderRow(page)).toHaveAttribute('aria-expanded', 'true');
@@ -134,7 +147,7 @@ test('activation auto-expands prior-collapsed non-ancestor folder (D1)', async (
// non-ancestor folders. This test verifies: user collapses folder while
// it's NOT an active-doc ancestor, then navigates INTO the folder —
// activation wins, folder expands automatically.
- await page.goto(`/#/test-doc`);
+ await gotoAndAwaitTree(page, `/#/test-doc`);
await fileRow(page, 'test-doc.md').waitFor({ state: 'visible', timeout: 15_000 });
// While test-doc is active (sidebar-folder is NOT an ancestor), expand
@@ -156,7 +169,7 @@ test('activation auto-expands prior-collapsed non-ancestor folder (D1)', async (
});
test('user-expanded non-ancestor folder persists across navigation (D4)', async ({ page }) => {
- await page.goto(`/#/test-doc`);
+ await gotoAndAwaitTree(page, `/#/test-doc`);
await fileRow(page, 'test-doc.md').waitFor({ state: 'visible', timeout: 15_000 });
await expect(folderRow(page)).toHaveAttribute('aria-expanded', 'false');
@@ -176,7 +189,7 @@ test('user-expanded non-ancestor folder persists across navigation (D4)', async
});
test('exactly one selected row, matching activeDocName (D9)', async ({ page }) => {
- await page.goto(`/#/sidebar-folder/nested-doc`);
+ await gotoAndAwaitTree(page, `/#/sidebar-folder/nested-doc`);
await fileRow(page, 'nested-doc.md').waitFor({ state: 'visible', timeout: 15_000 });
await expect(selectedRow(page)).toHaveCount(1);
@@ -192,7 +205,7 @@ test('exactly one selected row, matching activeDocName (D9)', async ({ page }) =
});
test('activation does not steal focus from the editor', async ({ page }) => {
- await page.goto(`/#/test-doc`);
+ await gotoAndAwaitTree(page, `/#/test-doc`);
await fileRow(page, 'test-doc.md').waitFor({ state: 'visible', timeout: 15_000 });
await page.waitForSelector('.ProseMirror:not(.composer-prosemirror)', { timeout: 15_000 });
@@ -217,7 +230,7 @@ test('activation does not steal focus from the editor', async ({ page }) => {
test('hovering a sidebar row surfaces its full relative path as a title (VS Code parity)', async ({
page,
}) => {
- await page.goto(`/#/sidebar-folder/nested-doc`);
+ await gotoAndAwaitTree(page, `/#/sidebar-folder/nested-doc`);
await fileRow(page, 'nested-doc.md').waitFor({ state: 'visible', timeout: 15_000 });
await expect(folderRow(page)).toHaveAttribute('aria-expanded', 'true');
@@ -248,7 +261,7 @@ test('sidebar full-path title is eager (no hover needed) and reaches the floatin
// hovered row's path must also be mirrored onto the
// `[data-type=context-menu-anchor]` overlay. Both of these failed under the
// original lazy implementation.
- await page.goto(`/#/sidebar-folder/nested-doc`);
+ await gotoAndAwaitTree(page, `/#/sidebar-folder/nested-doc`);
await fileRow(page, 'nested-doc.md').waitFor({ state: 'visible', timeout: 15_000 });
await expect(folderRow(page)).toHaveAttribute('aria-expanded', 'true');
diff --git a/packages/app/tests/stress/show-ok-folders.e2e.ts b/packages/app/tests/stress/show-ok-folders.e2e.ts
index c0b93ce97..a4177a4dd 100644
--- a/packages/app/tests/stress/show-ok-folders.e2e.ts
+++ b/packages/app/tests/stress/show-ok-folders.e2e.ts
@@ -220,7 +220,17 @@ test('an activated .ok folder row never becomes a mutation target — create fal
// host, and a click alone doesn't guarantee it — focus the row explicitly
// (same pattern as file-tree-create's select-all helper). Escape cancels
// without deleting.
+ // The tree is virtualized with sticky ancestor headers: a folder row
+ // scrolled past the viewport top leaves the DOM entirely (its sticky
+ // stand-in renders as a button, not a treeitem), so re-locating a
+ // top-sorted folder row after interactions that scrolled the tree (the
+ // created-doc reveal above) requires parking the scroll back at the top
+ // first — same idiom as the post-toggle reveal earlier in this test.
+ await treeScroller(page).evaluate((el) => {
+ el.scrollTop = 0;
+ });
const controlRow = folderRow(page, controlFolder);
+ await controlRow.waitFor({ state: 'visible', timeout: 15_000 });
await controlRow.click();
await controlRow.focus();
await expect(controlRow).toBeFocused();
@@ -231,7 +241,13 @@ test('an activated .ok folder row never becomes a mutation target — create fal
// The same key on the selected-and-focused `.ok` row: no dialog opens, and
// the folder (with its probe file) stays on disk.
+ // Park the scroll again before re-locating `.ok` (top-sorted; the control
+ // row interactions above may have scrolled it out of the virtualized DOM).
+ await treeScroller(page).evaluate((el) => {
+ el.scrollTop = 0;
+ });
const okRow = folderRow(page, '.ok');
+ await okRow.waitFor({ state: 'visible', timeout: 15_000 });
await okRow.click();
await okRow.focus();
await expect(okRow).toBeFocused();
diff --git a/packages/core/src/bridge/bind-frontmatter-doc.ts b/packages/core/src/bridge/bind-frontmatter-doc.ts
index c014b1413..8f9d95287 100644
--- a/packages/core/src/bridge/bind-frontmatter-doc.ts
+++ b/packages/core/src/bridge/bind-frontmatter-doc.ts
@@ -1,3 +1,4 @@
+
import type * as Y from 'yjs';
import type { Err, Ok, Result } from '../config/result.ts';
import { type FrontmatterValidationError, toFrontmatterIssue } from '../frontmatter/errors.ts';
diff --git a/packages/core/src/bridge/bridge-invariant.ts b/packages/core/src/bridge/bridge-invariant.ts
index 005627195..8bfdb40cd 100644
--- a/packages/core/src/bridge/bridge-invariant.ts
+++ b/packages/core/src/bridge/bridge-invariant.ts
@@ -1,3 +1,4 @@
+
import { fnv1aDigest } from './hash-util.ts';
export type BridgeInvariantSite = 'observer-b' | 'persistence' | 'test-harness';
diff --git a/packages/core/src/bridge/doc-boundary-space.ts b/packages/core/src/bridge/doc-boundary-space.ts
index 8890f6739..c18c086d5 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';
const LEADING_BOUNDARY_RE = /^(?:\r?\n)+/;
diff --git a/packages/core/src/bridge/merge-three-way.ts b/packages/core/src/bridge/merge-three-way.ts
index b0a80fbd9..864bc7245 100644
--- a/packages/core/src/bridge/merge-three-way.ts
+++ b/packages/core/src/bridge/merge-three-way.ts
@@ -37,6 +37,7 @@ function mergeThreeWayImpl(baseline: string, userText: string, agentText: string
return parts.join('\n');
}
+
export type BridgeMergeContentLossSide = 'user' | 'agent';
export type BridgeMergeContentLossWhich = 'substring' | 'order';
diff --git a/packages/core/src/bridge/normalize.ts b/packages/core/src/bridge/normalize.ts
index e67f33b40..592f0b956 100644
--- a/packages/core/src/bridge/normalize.ts
+++ b/packages/core/src/bridge/normalize.ts
@@ -1,3 +1,4 @@
+
const COMMONMARK_ESCAPE_RE = /\\([!"#$%&'()*+,\-./:;<=>?@[\]^_`{|}~])/g;
const TABLE_ALIGN_ROW_RE = /^\s*\|?\s*:?-+:?\s*(\|\s*:?-+:?\s*)+\|?\s*$/;
diff --git a/packages/core/src/bridge/pm-structural-equivalence.ts b/packages/core/src/bridge/pm-structural-equivalence.ts
index 754dc5cc2..0be5203e4 100644
--- a/packages/core/src/bridge/pm-structural-equivalence.ts
+++ b/packages/core/src/bridge/pm-structural-equivalence.ts
@@ -32,6 +32,7 @@ const BR_SENTINEL: PmStructuralNode = { type: '__br__' };
const BR_LITERAL_RE = /^<br\s*\/?>$/i;
+
interface DegradeEntry {
readonly label: string;
readonly severity: ToleranceClassSeverity;
@@ -127,6 +128,7 @@ export interface ComparePmStructuralOptions {
ignoreAttrs?: (attrKey: string) => boolean;
}
+
/** Rebuild a node with `fn` applied to each child; identity when childless.
* Shared by the degrade canonicalizers so none re-implements the walk. */
function mapChildren(
@@ -248,6 +250,7 @@ function applyDegrades(tree: PmStructuralNode): {
return { normalized: current, fired };
}
+
export function comparePmStructural(
expected: PmStructuralNode,
actual: PmStructuralNode,
diff --git a/packages/core/src/bridge/subsequence.ts b/packages/core/src/bridge/subsequence.ts
index af20de1e2..dca644141 100644
--- a/packages/core/src/bridge/subsequence.ts
+++ b/packages/core/src/bridge/subsequence.ts
@@ -1,3 +1,4 @@
+
/** True when `needle` is a subsequence of `haystack` (two-pointer, O(n+m)):
* insertions in `haystack` are free; any dropped or substituted `needle` byte
* fails. */
diff --git a/packages/core/src/markdown/callout-transformer.ts b/packages/core/src/markdown/callout-transformer.ts
index 83d47404a..a363dfd54 100644
--- a/packages/core/src/markdown/callout-transformer.ts
+++ b/packages/core/src/markdown/callout-transformer.ts
@@ -1,3 +1,4 @@
+
import type { Blockquote, Paragraph, Root } from 'mdast';
import type { MdxJsxAttribute, MdxJsxFlowElement } from 'mdast-util-mdx';
import { visit } from 'unist-util-visit';
diff --git a/packages/core/src/markdown/comment-promoter.ts b/packages/core/src/markdown/comment-promoter.ts
index 193e286b0..47f0d07e4 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/dedent-block-jsx-close.ts b/packages/core/src/markdown/dedent-block-jsx-close.ts
index ece5c02a1..b6299a948 100644
--- a/packages/core/src/markdown/dedent-block-jsx-close.ts
+++ b/packages/core/src/markdown/dedent-block-jsx-close.ts
@@ -1,3 +1,4 @@
+
import { findFencedRegions, isInsideFence } from './fence-regions.ts';
const INDENTED_BLOCK_JSX_CLOSE_RE = /^([ ]{1,3})(<\/[A-Z][A-Za-z0-9_]*\s*>)([ \t]*)$/gm;
diff --git a/packages/core/src/markdown/details-accordion-promoter.ts b/packages/core/src/markdown/details-accordion-promoter.ts
index 54774764a..acd398aa6 100644
--- a/packages/core/src/markdown/details-accordion-promoter.ts
+++ b/packages/core/src/markdown/details-accordion-promoter.ts
@@ -1,3 +1,4 @@
+
import type { Nodes, Paragraph, Parent, Root, Text } from 'mdast';
import type { MdxJsxAttribute, MdxJsxFlowElement } from 'mdast-util-mdx';
import { visit } from 'unist-util-visit';
diff --git a/packages/core/src/markdown/fence-regions.ts b/packages/core/src/markdown/fence-regions.ts
index c7518d614..fb5ac8e8a 100644
--- a/packages/core/src/markdown/fence-regions.ts
+++ b/packages/core/src/markdown/fence-regions.ts
@@ -1,3 +1,4 @@
+
const FENCE_RE = /^(`{3,}|~{3,})/gm;
export function findFencedRegions(src: string): Array<[number, number]> {
diff --git a/packages/core/src/markdown/fixtures/index.ts b/packages/core/src/markdown/fixtures/index.ts
index 00f5771ee..6931623c7 100644
--- a/packages/core/src/markdown/fixtures/index.ts
+++ b/packages/core/src/markdown/fixtures/index.ts
@@ -1,3 +1,4 @@
+
import { readFileSync } from 'node:fs';
import { dirname, resolve } from 'node:path';
import { fileURLToPath } from 'node:url';
@@ -8,6 +9,7 @@ function fixturePath(...segments: string[]): string {
return resolve(FIXTURES_DIR, ...segments);
}
+
interface GfmExample {
section: string;
markdown: string;
@@ -17,6 +19,7 @@ export function loadGfmExamples(): GfmExample[] {
return JSON.parse(readFileSync(fixturePath('gfm', 'examples.json'), 'utf8')) as GfmExample[];
}
+
interface MdxCrashEntry {
id: string;
input: string;
@@ -68,6 +71,7 @@ export function loadLargeEmbedFixtures(): LargeEmbedFixture[] {
) as LargeEmbedFixture[];
}
+
export function loadPrd6955Before(): string {
return readFileSync(fixturePath('regression', 'prd-6955-before.md'), 'utf8');
}
@@ -76,6 +80,7 @@ export function loadPrd6955CorruptedTriplicated(): string {
return readFileSync(fixturePath('regression', 'prd-6955-corrupted-triplicated.md'), 'utf8');
}
+
export interface NgPinnedCase {
id: string;
name: string;
@@ -92,6 +97,7 @@ export function loadNgPinnedCases(): NgPinnedCase[] {
) as NgPinnedCase[];
}
+
export function loadLargeRealistic(): string {
return readFileSync(fixturePath('perf', 'large-realistic.md'), 'utf8');
}
diff --git a/packages/core/src/markdown/fixtures/perf/generate.ts b/packages/core/src/markdown/fixtures/perf/generate.ts
index 8b1eb8519..daa3ef82b 100644
--- a/packages/core/src/markdown/fixtures/perf/generate.ts
+++ b/packages/core/src/markdown/fixtures/perf/generate.ts
@@ -1,3 +1,4 @@
+
import { writeFileSync } from 'node:fs';
import { dirname, resolve } from 'node:path';
import { fileURLToPath } from 'node:url';
@@ -10,6 +11,7 @@ const BASELINE_ONLY_COUNTS = [500, 2500] as const;
const SEED = 0xf1de1117;
+
function mulberry32(seed: number): () => number {
let a = seed >>> 0;
return () => {
@@ -36,6 +38,7 @@ function pickWeighted<T>(rand: () => number, items: readonly [T, number][]): T {
return items[items.length - 1][0];
}
+
const WORDS = [
'lorem',
'ipsum',
@@ -153,6 +156,7 @@ function mdxBlock(rand: () => number): string {
return `<${name}>\n\n${sentence(rand)}\n\n</${name}>`;
}
+
type BlockKind = 'paragraph' | 'heading' | 'list' | 'code' | 'table' | 'mdx';
const MIX: readonly [BlockKind, number][] = [
@@ -191,6 +195,7 @@ function generateDocument(blockCount: number, seed: number): string {
return `${blocks.join('\n\n')}\n`;
}
+
function main(): void {
for (const count of [...BLOCK_COUNTS, ...BASELINE_ONLY_COUNTS]) {
const doc = generateDocument(count, SEED);
diff --git a/packages/core/src/markdown/guard-flanking-matrix.ts b/packages/core/src/markdown/guard-flanking-matrix.ts
index 420dc0fe5..32c055c5b 100644
--- a/packages/core/src/markdown/guard-flanking-matrix.ts
+++ b/packages/core/src/markdown/guard-flanking-matrix.ts
@@ -7,6 +7,7 @@ import {
import { BACKSLASH_GUARD_SUBSTITUTIONS, encodeBackslashEscapes } from './backslash-escape-guard.ts';
import { ENTITY_REF_GUARD_SUBSTITUTIONS, encodeEntityRefs } from './entity-ref-guard.ts';
+
export const ATTENTION_DELIMITERS = ['*', '_', '**', '~~', '=='] as const;
export type FlankClass = 'whitespace' | 'punctuation' | 'other';
diff --git a/packages/core/src/markdown/handler-shadow-audit.ts b/packages/core/src/markdown/handler-shadow-audit.ts
index 2653473da..283913255 100644
--- a/packages/core/src/markdown/handler-shadow-audit.ts
+++ b/packages/core/src/markdown/handler-shadow-audit.ts
@@ -1,3 +1,4 @@
+
export interface HandlerShadowWitness {
input: string;
expect: 'byte' | 'byte-and-reparse-type';
diff --git a/packages/core/src/markdown/highlight-promoter.ts b/packages/core/src/markdown/highlight-promoter.ts
index f758cf737..7a22e8016 100644
--- a/packages/core/src/markdown/highlight-promoter.ts
+++ b/packages/core/src/markdown/highlight-promoter.ts
@@ -1,3 +1,4 @@
+
import type { Nodes, Parent, PhrasingContent, Root, Text } from 'mdast';
import type { MdxJsxTextElement } from 'mdast-util-mdx';
import { SKIP, visit } from 'unist-util-visit';
diff --git a/packages/core/src/markdown/html-to-mdast.ts b/packages/core/src/markdown/html-to-mdast.ts
index 78fdfeb02..2f082e6d0 100644
--- a/packages/core/src/markdown/html-to-mdast.ts
+++ b/packages/core/src/markdown/html-to-mdast.ts
@@ -1,3 +1,4 @@
+
import type { Root as HastRoot } from 'hast';
import type { Root as MdastRoot } from 'mdast';
import rehypeParse from 'rehype-parse';
@@ -75,7 +76,8 @@ export function htmlToMdast(html: string, options?: HtmlToMdastOptions): MdastRo
throw new HtmlPayloadTooLargeError(html.length, maxBytes);
}
- const processor = unified().use(rehypeParse, { fragment: true });
+ const processor = unified()
+ .use(rehypeParse, { fragment: true });
for (const plugin of cleanupPlugins) {
processor.use(plugin);
diff --git a/packages/core/src/markdown/image-promoter.ts b/packages/core/src/markdown/image-promoter.ts
index 706fa9afb..994eb6917 100644
--- a/packages/core/src/markdown/image-promoter.ts
+++ b/packages/core/src/markdown/image-promoter.ts
@@ -1,3 +1,4 @@
+
import type { Image, Paragraph, Root } from 'mdast';
import type { MdxJsxAttribute, MdxJsxFlowElement } from 'mdast-util-mdx';
import { visit } from 'unist-util-visit';
diff --git a/packages/core/src/markdown/index.ts b/packages/core/src/markdown/index.ts
index 58be35302..c58d0847d 100644
--- a/packages/core/src/markdown/index.ts
+++ b/packages/core/src/markdown/index.ts
@@ -1,3 +1,4 @@
+
import {
type FromProseMirrorOptions,
fromPmMark,
@@ -196,6 +197,7 @@ export class MarkdownManager {
}
}
+
const registry = createRegistry();
function destructureAttrs(
@@ -244,6 +246,7 @@ function destructureAttrs(
return result;
}
+
function hasDirtyDescendant(node: PmNode): boolean {
let found = false;
node.descendants((child) => {
@@ -263,6 +266,7 @@ function effectiveDirty(node: PmNode, freshnessChecker?: StructuralFreshnessChec
return freshnessChecker ? freshnessChecker.isDiverged(node.toJSON()) : false;
}
+
function isEmptyMdastParagraph(node: MdastNodes): boolean {
if (node.type !== 'paragraph') return false;
const children = node.children ?? [];
@@ -331,6 +335,7 @@ function extractTextFromMdastNodes(nodes: MdastNodes[]): string {
return out;
}
+
import {
AUDIO_EXTENSIONS,
FILE_ATTACHMENT_EXTENSIONS,
@@ -580,6 +585,7 @@ function buildMdastToPmHandlers(
}));
}
+
if (m.emphasis) {
handlers.emphasis = toPmMark(m.emphasis, (node: Emphasis) => ({
sourceDelimiter: node.data?.sourceDelimiter ?? '*',
@@ -659,6 +665,7 @@ function buildMdastToPmHandlers(
}));
}
+
if (m.link) {
const sourceLiteralMark = m.sourceLiteral;
handlers.link = (node: Link, _parent: MdastParent, state: MdastToPmState) => {
@@ -937,6 +944,7 @@ function buildMdastToPmHandlers(
};
}
+
const blockUnknownHandler = (node: {
type: string;
position?: { start: { offset: number }; end: { offset: number } };
@@ -1062,6 +1070,7 @@ function buildMdastToPmHandlers(
return handlers as RemarkProseMirrorOptions['handlers'];
}
+
function buildPmToMdastHandlers(
schema: Schema,
freshness: FreshnessCheckerHolder,
diff --git a/packages/core/src/markdown/math-promoter.ts b/packages/core/src/markdown/math-promoter.ts
index a5b511f25..bd79424c7 100644
--- a/packages/core/src/markdown/math-promoter.ts
+++ b/packages/core/src/markdown/math-promoter.ts
@@ -1,3 +1,4 @@
+
import type { Code, Root } from 'mdast';
import type { Math as MdastMath } from 'mdast-util-math';
import type { MdxJsxAttribute, MdxJsxFlowElement } from 'mdast-util-mdx';
diff --git a/packages/core/src/markdown/mdast-to-hast-handlers.ts b/packages/core/src/markdown/mdast-to-hast-handlers.ts
index 679c72ef7..f84967798 100644
--- a/packages/core/src/markdown/mdast-to-hast-handlers.ts
+++ b/packages/core/src/markdown/mdast-to-hast-handlers.ts
@@ -1,3 +1,4 @@
+
import type { Comment, Element, ElementContent, Properties } from 'hast';
import type { FootnoteDefinition, FootnoteReference } from 'mdast';
import type { MdxJsxFlowElement, MdxJsxTextElement } from 'mdast-util-mdx';
diff --git a/packages/core/src/markdown/mdast-to-html.ts b/packages/core/src/markdown/mdast-to-html.ts
index 8ce2b2492..df788a80d 100644
--- a/packages/core/src/markdown/mdast-to-html.ts
+++ b/packages/core/src/markdown/mdast-to-html.ts
@@ -1,3 +1,4 @@
+
import type { Element, Root as HastRoot, Text as HastText } from 'hast';
import type { Root as MdastRoot, Text as MdastText } from 'mdast';
import type { Handler } from 'mdast-util-to-hast';
diff --git a/packages/core/src/markdown/merged-walker.ts b/packages/core/src/markdown/merged-walker.ts
index 35d74b85e..a58f8c720 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/mermaid-promoter.ts b/packages/core/src/markdown/mermaid-promoter.ts
index 1a897fca8..17ed2b829 100644
--- a/packages/core/src/markdown/mermaid-promoter.ts
+++ b/packages/core/src/markdown/mermaid-promoter.ts
@@ -1,3 +1,4 @@
+
import type { Code, Root } from 'mdast';
import type { MdxJsxAttribute, MdxJsxFlowElement } from 'mdast-util-mdx';
import { visit } from 'unist-util-visit';
diff --git a/packages/core/src/markdown/parse-with-fallback.ts b/packages/core/src/markdown/parse-with-fallback.ts
index 9864b3b60..7e4a9a48b 100644
--- a/packages/core/src/markdown/parse-with-fallback.ts
+++ b/packages/core/src/markdown/parse-with-fallback.ts
@@ -168,6 +168,7 @@ export function parseRecursive(
}
}
+
interface VFilePlace {
offset?: number;
start?: { offset?: number };
@@ -186,6 +187,7 @@ function extractErrorOffset(err: unknown): number | undefined {
return undefined;
}
+
interface Region {
start: number;
end: number;
@@ -209,6 +211,7 @@ function nearestBlankLineAfter(src: string, offset: number): number | null {
return null;
}
+
export interface TagEvent {
kind: 'open' | 'close' | 'self-close';
name: string;
@@ -355,6 +358,7 @@ function findFallbackRegion(src: string, errorOffset: number): Region {
return { start: blockStart, end: blockEnd };
}
+
interface SourceBlock {
src: string;
start: number;
@@ -452,6 +456,7 @@ function tryPerBlockFallback(
};
}
+
function wholeDocRawText(source: string): JSONContent {
return {
type: 'doc',
diff --git a/packages/core/src/markdown/parser-drop-closure.ts b/packages/core/src/markdown/parser-drop-closure.ts
index e6ab4fd57..43d420187 100644
--- a/packages/core/src/markdown/parser-drop-closure.ts
+++ b/packages/core/src/markdown/parser-drop-closure.ts
@@ -1,3 +1,4 @@
+
export type DroppedTokenAdjudication =
| {
kind: 'format-dof-axis';
diff --git a/packages/core/src/markdown/pipeline.ts b/packages/core/src/markdown/pipeline.ts
index 5d6db7aa8..5b9550e90 100644
--- a/packages/core/src/markdown/pipeline.ts
+++ b/packages/core/src/markdown/pipeline.ts
@@ -1,3 +1,4 @@
+
import {
type FromProseMirrorOptions,
fromProseMirror,
diff --git a/packages/core/src/markdown/position-aware-join.ts b/packages/core/src/markdown/position-aware-join.ts
index 248685cfe..4ac5731e7 100644
--- a/packages/core/src/markdown/position-aware-join.ts
+++ b/packages/core/src/markdown/position-aware-join.ts
@@ -1,3 +1,4 @@
+
import type { Join } from 'mdast-util-to-markdown';
import type { Position } from 'unist';
diff --git a/packages/core/src/markdown/position-slice.ts b/packages/core/src/markdown/position-slice.ts
index 50a193a16..240be90e6 100644
--- a/packages/core/src/markdown/position-slice.ts
+++ b/packages/core/src/markdown/position-slice.ts
@@ -1,3 +1,4 @@
+
import type { Nodes, Root } from 'mdast';
import { visit } from 'unist-util-visit';
import type { VFile } from 'vfile';
@@ -466,7 +467,8 @@ export function applyPositionSliceToNode(
const first = source[startOff];
if (first !== '[' && first !== '<' && !node.title) {
node.data.sourceStyle = 'gfm-autolink';
- } else if (first === '[') {
+ }
+ else if (first === '[') {
const slice = source.slice(startOff, endOff);
const closeBracketIdx = slice.lastIndexOf('](');
if (closeBracketIdx !== -1) {
diff --git a/packages/core/src/markdown/rehype-plugins/skip-notion-whitespace.ts b/packages/core/src/markdown/rehype-plugins/skip-notion-whitespace.ts
index db10fa54b..ca225ce9b 100644
--- a/packages/core/src/markdown/rehype-plugins/skip-notion-whitespace.ts
+++ b/packages/core/src/markdown/rehype-plugins/skip-notion-whitespace.ts
@@ -1,3 +1,4 @@
+
import type { Comment, Element, Root, Text } from 'hast';
import type { Plugin } from 'unified';
diff --git a/packages/core/src/markdown/rehype-plugins/strip-cocoa-meta.ts b/packages/core/src/markdown/rehype-plugins/strip-cocoa-meta.ts
index 34068d103..3a2524a9a 100644
--- a/packages/core/src/markdown/rehype-plugins/strip-cocoa-meta.ts
+++ b/packages/core/src/markdown/rehype-plugins/strip-cocoa-meta.ts
@@ -1,3 +1,4 @@
+
import type { Element, ElementContent, Root } from 'hast';
import type { Plugin } from 'unified';
diff --git a/packages/core/src/markdown/rehype-plugins/strip-gdocs-wrapper.ts b/packages/core/src/markdown/rehype-plugins/strip-gdocs-wrapper.ts
index 93151d43b..2279a0189 100644
--- a/packages/core/src/markdown/rehype-plugins/strip-gdocs-wrapper.ts
+++ b/packages/core/src/markdown/rehype-plugins/strip-gdocs-wrapper.ts
@@ -1,3 +1,4 @@
+
import type { Element, Root } from 'hast';
import type { Plugin } from 'unified';
diff --git a/packages/core/src/markdown/rehype-plugins/strip-github-hovercard.ts b/packages/core/src/markdown/rehype-plugins/strip-github-hovercard.ts
index 188f02d83..a0f467c42 100644
--- a/packages/core/src/markdown/rehype-plugins/strip-github-hovercard.ts
+++ b/packages/core/src/markdown/rehype-plugins/strip-github-hovercard.ts
@@ -1,3 +1,4 @@
+
import type { Element, Root } from 'hast';
import type { Plugin } from 'unified';
diff --git a/packages/core/src/markdown/rehype-plugins/strip-gmail-classes.ts b/packages/core/src/markdown/rehype-plugins/strip-gmail-classes.ts
index 4ba2c3418..4e8542a21 100644
--- a/packages/core/src/markdown/rehype-plugins/strip-gmail-classes.ts
+++ b/packages/core/src/markdown/rehype-plugins/strip-gmail-classes.ts
@@ -1,3 +1,4 @@
+
import type { Element, Root } from 'hast';
import type { Plugin } from 'unified';
diff --git a/packages/core/src/markdown/rehype-plugins/strip-gsheets-wrapper.ts b/packages/core/src/markdown/rehype-plugins/strip-gsheets-wrapper.ts
index 1a74b1272..a3c96b24a 100644
--- a/packages/core/src/markdown/rehype-plugins/strip-gsheets-wrapper.ts
+++ b/packages/core/src/markdown/rehype-plugins/strip-gsheets-wrapper.ts
@@ -1,3 +1,4 @@
+
import type { Element, ElementContent, Root } from 'hast';
import type { Plugin } from 'unified';
diff --git a/packages/core/src/markdown/rehype-plugins/strip-mso-styles.ts b/packages/core/src/markdown/rehype-plugins/strip-mso-styles.ts
index de35e7b79..e95cf43d6 100644
--- a/packages/core/src/markdown/rehype-plugins/strip-mso-styles.ts
+++ b/packages/core/src/markdown/rehype-plugins/strip-mso-styles.ts
@@ -1,3 +1,4 @@
+
import type { Comment, Element, ElementContent, Root } from 'hast';
import type { Plugin } from 'unified';
diff --git a/packages/core/src/markdown/rehype-plugins/strip-slack-classes.ts b/packages/core/src/markdown/rehype-plugins/strip-slack-classes.ts
index b4be1b2ea..ffdb4d5b5 100644
--- a/packages/core/src/markdown/rehype-plugins/strip-slack-classes.ts
+++ b/packages/core/src/markdown/rehype-plugins/strip-slack-classes.ts
@@ -1,3 +1,4 @@
+
import type { Element, ElementContent, Root } from 'hast';
import type { Plugin } from 'unified';
diff --git a/packages/core/src/markdown/rehype-plugins/strip-vscode-spans.ts b/packages/core/src/markdown/rehype-plugins/strip-vscode-spans.ts
index 3c8d88b7c..e2a96d1a7 100644
--- a/packages/core/src/markdown/rehype-plugins/strip-vscode-spans.ts
+++ b/packages/core/src/markdown/rehype-plugins/strip-vscode-spans.ts
@@ -1,3 +1,4 @@
+
import type { Element, Root } from 'hast';
import type { Plugin } from 'unified';
diff --git a/packages/core/src/markdown/resolve-image-url.ts b/packages/core/src/markdown/resolve-image-url.ts
index cf2c9da8e..0389575ac 100644
--- a/packages/core/src/markdown/resolve-image-url.ts
+++ b/packages/core/src/markdown/resolve-image-url.ts
@@ -1,3 +1,4 @@
+
import { isRelativeUrl } from './safe-url.ts';
function isDevDiagnosticContext(): boolean {
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/core/src/markdown/serialize-helpers.ts b/packages/core/src/markdown/serialize-helpers.ts
index 46cc6a074..542204403 100644
--- a/packages/core/src/markdown/serialize-helpers.ts
+++ b/packages/core/src/markdown/serialize-helpers.ts
@@ -1,3 +1,4 @@
+
import type { Node as PmNode } from '@tiptap/pm/model';
import type { MdxJsxAttribute, MdxJsxExpressionAttribute, MdxJsxFlowElement } from 'mdast-util-mdx';
import type { PropDef, SerializeContext } from '../registry/types.ts';
diff --git a/packages/core/src/markdown/single-dollar-math-promoter.ts b/packages/core/src/markdown/single-dollar-math-promoter.ts
index be97d4d62..fe73659e6 100644
--- a/packages/core/src/markdown/single-dollar-math-promoter.ts
+++ b/packages/core/src/markdown/single-dollar-math-promoter.ts
@@ -1,3 +1,4 @@
+
import type { PhrasingContent, Root, Text } from 'mdast';
import type { InlineMath } from 'mdast-util-math';
import { SKIP, visit } from 'unist-util-visit';
diff --git a/packages/core/src/markdown/to-markdown-handlers.ts b/packages/core/src/markdown/to-markdown-handlers.ts
index 1a2fb5d50..e1161455b 100644
--- a/packages/core/src/markdown/to-markdown-handlers.ts
+++ b/packages/core/src/markdown/to-markdown-handlers.ts
@@ -1,3 +1,4 @@
+
import type { Nodes, Parents } from 'mdast';
import type { MdxJsxAttribute, MdxJsxExpressionAttribute, MdxJsxFlowElement } from 'mdast-util-mdx';
import type { Handle, Info, State } from 'mdast-util-to-markdown';
diff --git a/packages/core/src/markdown/unknown-mdast-guard.ts b/packages/core/src/markdown/unknown-mdast-guard.ts
index cd245c38c..c5bfd2386 100644
--- a/packages/core/src/markdown/unknown-mdast-guard.ts
+++ b/packages/core/src/markdown/unknown-mdast-guard.ts
@@ -1,3 +1,4 @@
+
import type { Root as MdastRoot } from 'mdast';
import type { VFile } from 'vfile';
diff --git a/packages/core/src/markdown/whitespace-char-ref.ts b/packages/core/src/markdown/whitespace-char-ref.ts
index a100cad76..1b75ba564 100644
--- a/packages/core/src/markdown/whitespace-char-ref.ts
+++ b/packages/core/src/markdown/whitespace-char-ref.ts
@@ -1,3 +1,4 @@
+
const INLINE_WHITESPACE_BY_CODE: ReadonlyMap<number, string> = new Map([
[0x20, ' '],
[0x09, '\t'],
diff --git a/packages/core/src/markdown/wiki-link-micromark.ts b/packages/core/src/markdown/wiki-link-micromark.ts
index 6dad26200..afd9936fe 100644
--- a/packages/core/src/markdown/wiki-link-micromark.ts
+++ b/packages/core/src/markdown/wiki-link-micromark.ts
@@ -17,6 +17,7 @@ declare module 'micromark-util-types' {
}
}
+
const CODE_BANG = 33; // !
const CODE_LBRACKET = 91; // [
const CODE_RBRACKET = 93; // ]
@@ -260,6 +261,7 @@ export function wikiLinkSyntax(): Extension {
};
}
+
function enterWikiLink(this: CompileContext, token: Token) {
this.enter(
{
@@ -385,6 +387,7 @@ export const wikiLinkToMarkdown: {
unsafe: [{ character: '[', inConstruct: ['phrasing'] }],
};
+
const MICROMARK_EXT = wikiLinkSyntax();
export function remarkWikiLink(this: Processor) {
diff --git a/packages/server/src/file-watcher.test.ts b/packages/server/src/file-watcher.test.ts
index 773d54b12..c56e67805 100644
--- a/packages/server/src/file-watcher.test.ts
+++ b/packages/server/src/file-watcher.test.ts
@@ -1264,6 +1264,193 @@ describe('file-watcher ContentFilter refcount hooks', () => {
);
expect(nestedCreates).toHaveLength(1);
});
+
+ test('dropped file-create rescue: folder event alone surfaces a markdown file already inside', async () => {
+ // Same inotify registration race as the mkdir -p test, file flavor:
+ // `mkdir d && cp note.md d/` writes the file before the recursive
+ // subwatch registers, so the kernel only delivers the directory event.
+ // The rescan must re-inject the file as a synthetic create — otherwise
+ // /api/pages and the CRDT layer miss it until a manual rescan.
+ const fileIndex = new Map();
+ const folderIndex = new Map();
+ const collected: DiskEvent[] = [];
+ const scratchDir = resolve(contentDir, '.scratch-notes');
+ mkdirSync(scratchDir, { recursive: true });
+ writeFileSync(resolve(scratchDir, 'hidden-note.md'), '# Hidden note\n', 'utf-8');
+
+ await handleRawEvents(
+ [{ type: 'create', path: scratchDir }],
+ contentDir,
+ undefined,
+ fileIndex,
+ folderIndex,
+ async (e) => {
+ collected.push(e);
+ },
+ );
+
+ expect(folderIndex.has('.scratch-notes')).toBe(true);
+ expect(fileIndex.has('.scratch-notes/hidden-note')).toBe(true);
+ expect(collected).toContainEqual(
+ expect.objectContaining({
+ kind: 'create',
+ docName: '.scratch-notes/hidden-note',
+ content: '# Hidden note\n',
+ }),
+ );
+ });
+
+ test('dropped file-create rescue reaches files in rescued subfolders and non-markdown files', async () => {
+ const fileIndex = new Map();
+ const folderIndex = new Map();
+ const collected: DiskEvent[] = [];
+ const outerDir = resolve(contentDir, 'outer');
+ const innerDir = resolve(outerDir, 'inner');
+ mkdirSync(innerDir, { recursive: true });
+ writeFileSync(resolve(innerDir, 'deep-note.md'), '# Deep\n', 'utf-8');
+ writeFileSync(resolve(outerDir, 'data.json'), '{}', 'utf-8');
+
+ await handleRawEvents(
+ [{ type: 'create', path: outerDir }],
+ contentDir,
+ undefined,
+ fileIndex,
+ folderIndex,
+ async (e) => {
+ collected.push(e);
+ },
+ );
+
+ expect(fileIndex.has('outer/inner/deep-note')).toBe(true);
+ expect(collected).toContainEqual(
+ expect.objectContaining({ kind: 'create', docName: 'outer/inner/deep-note' }),
+ );
+ expect(fileIndex.get('outer/data.json')?.kind).toBe('file');
+ expect(collected).toContainEqual(
+ expect.objectContaining({ kind: 'file-create', relativePath: 'outer/data.json' }),
+ );
+ });
+
+ test('file rescue does not double-emit when the file event arrived in the same batch', async () => {
+ // macOS FSEvents coalesces mkdir+write into one batch, so both raw events
+ // are usually present — the rescue must dedupe against the batch.
+ const fileIndex = new Map();
+ const folderIndex = new Map();
+ const collected: DiskEvent[] = [];
+ const notesDir = resolve(contentDir, 'batch-notes');
+ const notePath = resolve(notesDir, 'note.md');
+ mkdirSync(notesDir, { recursive: true });
+ writeFileSync(notePath, '# Note\n', 'utf-8');
+
+ await handleRawEvents(
+ [
+ { type: 'create', path: notesDir },
+ { type: 'create', path: notePath },
+ ],
+ contentDir,
+ undefined,
+ fileIndex,
+ folderIndex,
+ async (e) => {
+ collected.push(e);
+ },
+ );
+
+ const creates = collected.filter(
+ (e) => e.kind === 'create' && e.docName === 'batch-notes/note',
+ );
+ expect(creates).toHaveLength(1);
+ });
+
+ test('file rescue respects self-write tracking: rescued own write is indexed but not dispatched', async () => {
+ const fileIndex = new Map();
+ const folderIndex = new Map();
+ const collected: DiskEvent[] = [];
+ const selfDir = resolve(contentDir, 'self-notes');
+ const selfPath = resolve(selfDir, 'own-write.md');
+ const content = '# Ours\n';
+ mkdirSync(selfDir, { recursive: true });
+ writeFileSync(selfPath, content, 'utf-8');
+ registerWrite(realpathSync(selfPath), contentHash(content));
+
+ await handleRawEvents(
+ [{ type: 'create', path: selfDir }],
+ contentDir,
+ undefined,
+ fileIndex,
+ folderIndex,
+ async (e) => {
+ collected.push(e);
+ },
+ );
+
+ expect(fileIndex.has('self-notes/own-write')).toBe(true);
+ expect(collected.filter((e) => e.kind === 'create')).toHaveLength(0);
+ });
+
+ test('file rescue suppresses files under a ContentFilter-excluded subfolder', async () => {
+ writeFileSync(resolve(tmpDir, '.gitignore'), 'vendor/\n');
+ const filter = createContentFilter({ projectDir: tmpDir, contentDir });
+ const fileIndex = new Map();
+ const folderIndex = new Map();
+ const collected: DiskEvent[] = [];
+ const packDir = resolve(contentDir, 'pack');
+ const vendorDir = resolve(packDir, 'vendor');
+ mkdirSync(vendorDir, { recursive: true });
+ writeFileSync(resolve(packDir, 'note.md'), '# Note\n', 'utf-8');
+ writeFileSync(resolve(vendorDir, 'data.json'), '{}', 'utf-8');
+ writeFileSync(resolve(vendorDir, 'hidden.md'), '# Hidden\n', 'utf-8');
+
+ await handleRawEvents(
+ [{ type: 'create', path: packDir }],
+ contentDir,
+ filter,
+ fileIndex,
+ folderIndex,
+ async (e) => {
+ collected.push(e);
+ },
+ );
+
+ expect(fileIndex.has('pack/note')).toBe(true);
+ expect(fileIndex.has('pack/vendor/data.json')).toBe(false);
+ expect(fileIndex.has('pack/vendor/hidden')).toBe(false);
+ expect(collected.some((e) => e.kind === 'file-create')).toBe(false);
+ expect(collected.filter((e) => e.kind === 'create').map((e) => e.docName)).toEqual([
+ 'pack/note',
+ ]);
+ });
+
+ test('file rescue skips symlinked files in a freshly created directory', async () => {
+ const fileIndex = new Map();
+ const folderIndex = new Map();
+ const collected: DiskEvent[] = [];
+ const targetPath = resolve(contentDir, 'link-target.md');
+ writeFileSync(targetPath, '# Target\n', 'utf-8');
+ const linkedDir = resolve(contentDir, 'linked');
+ mkdirSync(linkedDir, { recursive: true });
+ writeFileSync(resolve(linkedDir, 'real.md'), '# Real\n', 'utf-8');
+ symlinkSync(targetPath, resolve(linkedDir, 'alias.md'));
+
+ await handleRawEvents(
+ [{ type: 'create', path: linkedDir }],
+ contentDir,
+ undefined,
+ fileIndex,
+ folderIndex,
+ async (e) => {
+ collected.push(e);
+ },
+ );
+
+ // Only the regular file is rescued; the symlink waits for its own raw
+ // event, which carries the escape check + alias resolution.
+ expect(fileIndex.has('linked/real')).toBe(true);
+ expect(fileIndex.has('linked/alias')).toBe(false);
+ expect(collected.filter((e) => e.kind === 'create').map((e) => e.docName)).toEqual([
+ 'linked/real',
+ ]);
+ });
});
// ─── Symlink-aware watcher ──────────────────────────────────────────────────
diff --git a/packages/server/src/file-watcher.ts b/packages/server/src/file-watcher.ts
index 73b0564e5..6f7d91a85 100644
--- a/packages/server/src/file-watcher.ts
+++ b/packages/server/src/file-watcher.ts
@@ -1065,8 +1065,14 @@ function updateFolderIndexFromRawEvents(
contentDir: string,
contentFilter: ContentFilter | undefined,
folderIndex: Map<string, FolderIndexEntry>,
-): FolderDiskEvent[] {
+): { events: FolderDiskEvent[]; untrackedFiles: string[] } {
const events: FolderDiskEvent[] = [];
+ // Absolute paths of regular files discovered inside freshly-created folders
+ // during the rescan below — candidates whose own create events were dropped
+ // by the same inotify registration race (see the rescan comment). The
+ // caller re-injects them as synthetic raw creates after deduping against
+ // the batch and the known-file state.
+ const untrackedFiles: string[] = [];
for (const raw of rawEvents) {
const relativePath = contentRelativePath(contentDir, raw.path);
@@ -1119,12 +1125,24 @@ function updateFolderIndexFromRawEvents(
// can call inotify_add_watch on each new directory, so kernel events
// for the inner levels are emitted into watches that don't exist yet
// and are dropped. Without this rescan, /api/documents silently misses
- // `a/b` and `a/b/c` until a server restart.
- scanForUntrackedSubfolders(canonicalPath, contentDir, contentFilter, folderIndex, events);
+ // `a/b` and `a/b/c` until a server restart. Files inside the new
+ // levels lose their create events to the same race (`mkdir d && cp
+ // x.md d/` — the file write lands before the subwatch registers), so
+ // the rescan collects untracked regular files too; the caller
+ // re-injects them as synthetic creates so the file index, CRDT load,
+ // and CC1 push all fire exactly as if the kernel event had arrived.
+ scanForUntrackedSubfolders(
+ canonicalPath,
+ contentDir,
+ contentFilter,
+ folderIndex,
+ events,
+ untrackedFiles,
+ );
}
}
- return events;
+ return { events, untrackedFiles };
}
function scanForUntrackedSubfolders(
@@ -1133,6 +1151,7 @@ function scanForUntrackedSubfolders(
contentFilter: ContentFilter | undefined,
folderIndex: Map<string, FolderIndexEntry>,
events: FolderDiskEvent[],
+ untrackedFiles: string[],
): void {
// BFS so consumers see parent-before-child folder-create order, matching
// the natural creation order of `mkdir -p`.
@@ -1153,6 +1172,15 @@ function scanForUntrackedSubfolders(
}
for (const entry of entries) {
+ // Regular files inside a freshly-created directory are victims of the
+ // same dropped-event race as its subdirectories — collect them for the
+ // caller's synthetic-create re-injection. Symlinked files are skipped
+ // like symlinked dirs below: their own raw event carries the
+ // escape-check + alias resolution this scan doesn't replicate.
+ if (entry.isFile()) {
+ untrackedFiles.push(join(dir, entry.name));
+ continue;
+ }
// Dirent.isDirectory() returns false for symbolic links to directories;
// symlinks are handled explicitly when their own raw event arrives.
// Skipping them here keeps the rescan cycle-free without a visited set.
@@ -1215,8 +1243,48 @@ export async function handleRawEvents(
return false;
});
- const mdEvents = safeEvents.filter((e) => isSupportedDocFile(e.path));
- const assetEvents = safeEvents.filter((e) =>
+ const { events: folderEvents, untrackedFiles } = updateFolderIndexFromRawEvents(
+ safeEvents,
+ contentDir,
+ contentFilter,
+ folderIndex,
+ );
+
+ // Re-inject files the new-folder rescan found whose own create events were
+ // dropped by the inotify subwatch-registration race (`mkdir d && cp x.md d/`
+ // on Linux under load). Synthetic creates run the identical downstream
+ // pipeline — classification, self-write check, index update, onDiskEvent —
+ // so a rescued file is indistinguishable from one whose kernel event
+ // arrived. Dedupe against the batch (macOS FSEvents usually coalesces the
+ // mkdir+write into one batch, so both events are present) and against
+ // already-known files (md via lastKnownHash, others via indexed canonical
+ // paths); apply the same symlink-escape gate as the batch events.
+ let rescuedCreates: RawFileEvent[] = [];
+ if (untrackedFiles.length > 0) {
+ const batchPaths = new Set(safeEvents.map((e) => e.path));
+ const knownCanonicalPaths = new Set<string>();
+ for (const entry of fileIndex.values()) knownCanonicalPaths.add(entry.canonicalPath);
+ rescuedCreates = untrackedFiles
+ .filter(
+ (path) =>
+ !batchPaths.has(path) && !lastKnownHash.has(path) && !knownCanonicalPaths.has(path),
+ )
+ .filter((path) => !eventEscapesContentDir(path, contentDir))
+ .map((path) => ({ type: 'create' as const, path }));
+ if (rescuedCreates.length > 0) {
+ getLogger('file-watcher').debug(
+ {
+ count: rescuedCreates.length,
+ paths: rescuedCreates.map((e) => toPosix(relative(contentDir, e.path))),
+ },
+ '[file-watcher] re-injecting rescued file creates from new-folder rescan',
+ );
+ }
+ }
+ const fileEvents = rescuedCreates.length > 0 ? safeEvents.concat(rescuedCreates) : safeEvents;
+
+ const mdEvents = fileEvents.filter((e) => isSupportedDocFile(e.path));
+ const assetEvents = fileEvents.filter((e) =>
isSupportedAssetFile(e.path, LINKABLE_ASSET_EXTENSIONS),
);
// ANY non-markdown file (every extension, not just LINKABLE_ASSET_EXTENSIONS).
@@ -1224,13 +1292,7 @@ export async function handleRawEvents(
// maintain the in-memory fileIndex as `kind:'file'` for search /
// `/api/documents`. A `.png` create fires both events independently —
// different state, different consumers.
- const nonMdRawEvents = safeEvents.filter((e) => !isSupportedDocFile(e.path));
- const folderEvents = updateFolderIndexFromRawEvents(
- safeEvents,
- contentDir,
- contentFilter,
- folderIndex,
- );
+ const nonMdRawEvents = fileEvents.filter((e) => !isSupportedDocFile(e.path));
if (
mdEvents.length === 0 &&
assetEvents.length === 0 &&