@im-nobsidian/core 0.9.1 → 0.10.0

package/dist/index.js

@@ -1,7 +1,7 @@
 import { z } from 'zod';
 import { LogLevel, Client } from '@notionhq/client';
 import { readFile, mkdir, writeFile, unlink, rename, stat, readdir } from 'fs/promises';
-import { join, dirname, relative, sep } from 'path';
+import { join, dirname, sep, relative } from 'path';
 import { mkdirSync, unlinkSync, utimesSync, openSync, writeSync, closeSync, readFileSync, statSync, existsSync, readlinkSync } from 'fs';
 import Database from 'better-sqlite3';
 import { randomUUID, createHash } from 'crypto';
@@ -455,6 +455,22 @@ function compactNotionId(id) {
   return id.replace(/-/g, "").toLowerCase();
 }
 
+// src/utils/logger.ts
+var consoleLogger = {
+  warn: (msg, ...args) => console.warn(msg, ...args),
+  error: (msg, ...args) => console.error(msg, ...args),
+  info: (msg, ...args) => console.info(msg, ...args),
+  debug: () => {
+  }
+};
+var currentLogger = consoleLogger;
+function setLogger(logger) {
+  currentLogger = logger;
+}
+function getLogger() {
+  return currentLogger;
+}
+
 // src/state/migrations/001-initial.ts
 var INITIAL_MIGRATION = `
 CREATE TABLE IF NOT EXISTS sync_state (
@@ -649,24 +665,6 @@ function wikilinkLookupsIn(parentIds) {
     }
   ];
 }
-
-// src/utils/logger.ts
-var consoleLogger = {
-  warn: (msg, ...args) => console.warn(msg, ...args),
-  error: (msg, ...args) => console.error(msg, ...args),
-  info: (msg, ...args) => console.info(msg, ...args),
-  debug: () => {
-  }
-};
-var currentLogger = consoleLogger;
-function setLogger(logger) {
-  currentLogger = logger;
-}
-function getLogger() {
-  return currentLogger;
-}
-
-// src/state/state-lock.ts
 var STATE_LOCK_HEARTBEAT_MS = 3e4;
 var STATE_LOCK_STALE_MS = STATE_LOCK_HEARTBEAT_MS * 4;
 function stateDbLockPath(dbPath) {
@@ -903,7 +901,8 @@ var StateDB = class _StateDB {
     }
   }
   static openLocked(dbPath, lock) {
-    const savedBytes = existsSync(dbPath) ? statSync(dbPath).size : null;
+    const saved = existsSync(dbPath) ? statSync(dbPath) : null;
+    const savedBytes = saved?.isFile() ? saved.size : null;
     if (savedBytes === 0) throw SavedStateDbError.noTables(0);
     const db = new Database(dbPath);
     try {
@@ -912,6 +911,7 @@ var StateDB = class _StateDB {
       }
       const stateDb = new _StateDB(db, lock);
       stateDb.migrate();
+      if (process.platform === "win32") stateDb.normalizePathSeparators();
       return stateDb;
     } catch (error) {
       db.close();
@@ -925,6 +925,57 @@ var StateDB = class _StateDB {
       if (version < migration.version) this.db.exec(migration.sql);
     }
   }
+  /**
+   * `\` 로 이은 경로를 `/` 로 고쳐 적는다 — Windows 에서만 부른다(이슈 #8). 0.9.1 까지의 CLI 는 Windows 에서
+   * 볼트 경로를 `relative()` 그대로(`00 Me\a.md`) 적었다. 이제 목록은 `/` 로 이으므로 그대로 두면 그
+   * 노트들이 「볼트에서 지움」 과 「새 노트」 로 보인다.
+   *
+   * 같은 노트가 이미 `/` 경로로도 추적되고 있으면(pull 이 `/` 로 적은 노트를 `\` 목록이 새 노트로 보고 또
+   * 올렸다) `\` 쪽 기록을 버린다 — 그 기록의 Notion 페이지는 그때 생긴 사본이다. 지우지 않고 추적만 놓는다.
+   * Linux · macOS 에서는 `\` 가 파일 이름의 글자일 수 있어 부르지 않는다.
+   *
+   * @returns 고쳐 적은 경로 수와 버린 사본 기록 수
+   */
+  normalizePathSeparators() {
+    let renamed = 0;
+    let dropped = 0;
+    const fix = (path) => path.replace(/\\/g, "/");
+    this.db.transaction(() => {
+      const unique = (table, column, key) => {
+        const rows = this.db.prepare(
+          `SELECT ${key} AS k, ${column} AS p FROM ${table} WHERE instr(${column}, '\\') > 0`
+        ).all();
+        for (const row of rows) {
+          const taken = this.db.prepare(`SELECT 1 FROM ${table} WHERE ${column} = ?`).get(fix(row.p));
+          if (taken) {
+            this.db.prepare(`DELETE FROM ${table} WHERE ${key} = ?`).run(row.k);
+            if (table === "sync_state") dropped++;
+          } else {
+            this.db.prepare(`UPDATE ${table} SET ${column} = ? WHERE ${key} = ?`).run(fix(row.p), row.k);
+            if (table === "sync_state") renamed++;
+          }
+        }
+      };
+      unique("sync_state", "obsidian_path", "id");
+      unique("wikilink_map", "obsidian_path", "obsidian_path");
+      unique("file_registry", "local_path", "id");
+      this.db.prepare("UPDATE image_registry SET local_path = replace(local_path, '\\', '/')").run();
+      const markers = this.db.prepare(
+        "SELECT key FROM sync_metadata WHERE key LIKE 'preserve_markers:%' AND instr(key, '\\') > 0"
+      ).all();
+      for (const { key } of markers) {
+        const taken = this.db.prepare("SELECT 1 FROM sync_metadata WHERE key = ?").get(fix(key));
+        if (taken) this.db.prepare("DELETE FROM sync_metadata WHERE key = ?").run(key);
+        else this.db.prepare("UPDATE sync_metadata SET key = ? WHERE key = ?").run(fix(key), key);
+      }
+    })();
+    if (renamed + dropped > 0) {
+      getLogger().warn(
+        `[Im-Nobsidian] Windows \uACBD\uB85C ${renamed}\uAC1C\uB97C / \uB85C \uACE0\uCCD0 \uC801\uC74C` + (dropped > 0 ? ` \xB7 \uAC19\uC740 \uB178\uD2B8\uB97C \uB610 \uC62C\uB9B0 \uC0AC\uBCF8 \uAE30\uB85D ${dropped}\uAC1C\uB294 \uCD94\uC801\uC744 \uB193\uC74C(Notion \uD398\uC774\uC9C0\uB294 \uB0A8\uC74C)` : "")
+      );
+    }
+    return { renamed, dropped };
+  }
   getSchemaVersion() {
     try {
       const row = this.db.prepare("SELECT value FROM sync_metadata WHERE key = 'schema_version'").get();
@@ -4605,6 +4656,15 @@ function folderNoteOf(folder) {
 function isFolderRecord(record) {
   return (record.fileType === "folder-note" || record.fileType === "folder-only") && !isMarkdownPath(record.obsidianPath);
 }
+function childFolderOf(record, lookup) {
+  if (isFolderRecord(record) && !lookup.databaseAt(record.obsidianPath)) {
+    return record.obsidianPath;
+  }
+  if (record.fileType === "folder-note" || record.fileType === "folder-only") {
+    return parentFolderOf(record.obsidianPath);
+  }
+  return stripMarkdownExtension(record.obsidianPath);
+}
 function parentFolderOf(path) {
   const slash = path.lastIndexOf("/");
   return slash < 0 ? "" : path.slice(0, slash);
@@ -4835,10 +4895,16 @@ function hasRemotePage(record) {
   return record !== null && Boolean(record.notionPageId);
 }
 var ChangeDetector = class {
-  constructor(stateDb) {
+  /**
+   * @param excludes 설정이 동기화에서 뺀 경로(이슈 #8) — 목록에 없어도 지운 것이 아니다. 예전에는 뺀 폴더의
+   *   추적 노트를 「삭제」 로 보고, deleteSync 면 Notion 페이지를 지울 수 있었다.
+   */
+  constructor(stateDb, excludes = () => false) {
     this.stateDb = stateDb;
+    this.excludes = excludes;
   }
   stateDb;
+  excludes;
   async detectLocalChangesFast(stats, readFile3, options) {
     return (await this.scanLocalChangesFast(stats, readFile3, options)).changes;
   }
@@ -4914,7 +4980,7 @@ var ChangeDetector = class {
     }
     const missing = this.stateDb.getByStatus("synced").filter(
       (record) => hasRemotePage(record) && !existing.has(record.obsidianPath) && // 폴더 페이지는 파일이 아니다 — 폴더가 사라진 것은 파일 목록으로 알 수 없다.
-      !isFolderRecord(record)
+      !isFolderRecord(record) && !this.excludes(record.obsidianPath)
     );
     const pairs = pairLocalMoves(
       missing.map((record) => ({
@@ -5160,6 +5226,7 @@ var FrontmatterExtractor = class {
 };
 
 // src/utils/md-regions.ts
+var LIST_MARKER_SOURCE = String.raw`(?:[-*+]|\d{1,9}[.)])`;
 var BLANK_LINE_RE = /\n[ \t]*\n/;
 function computeAnchor(content, idx) {
   const before = content.slice(Math.max(0, idx - 32), idx);
@@ -5198,7 +5265,9 @@ function closingFence(line, open) {
   }
   return { lead: m[1], bar: m[2] };
 }
-var QUOTED_FENCE_OPEN_RE = /^((?:[\t ]*>)*)([\t ]*)((?:[-*+]|\d{1,9}[.)])[\t ]+)?(`{3,}|~{3,})(.*)\r?$/;
+var QUOTED_FENCE_OPEN_RE = new RegExp(
+  String.raw`^((?:[\t ]*>)*)([\t ]*)(${LIST_MARKER_SOURCE}[\t ]+)?(\`{3,}|~{3,})(.*)\r?$`
+);
 var QUOTE_MARK_RE = /^[\t ]*>/;
 var LEADING_SPACE_RE = /^[\t ]*/;
 function stripQuoteMarks(line, depth2) {
@@ -5295,7 +5364,7 @@ function codeLineMask(content) {
   }
   return inCode;
 }
-var TOP_LIST_ITEM_RE = /^ {0,3}(?:[-*+]|\d{1,9}[.)])(?:[\t ]|$)/;
+var TOP_LIST_ITEM_RE = new RegExp(String.raw`^ {0,3}${LIST_MARKER_SOURCE}(?:[\t ]|$)`);
 var INDENTED_CODE_WIDTH = 4;
 function indentedCodeLineMask(content) {
   const lines = content.split("\n");
@@ -5626,7 +5695,9 @@ function withoutPrefix(line, prefix) {
   return null;
 }
 var DOUBLE_DOLLAR_RE = /(?<![\\$])\$\$(?!\$)/g;
-var OWN_LINE_DOLLARS_RE = /^(?:[ \t]*>)*[ \t]*(?:\[![^\]]*\][+-]?[ \t]*|(?:[-*+]|\d+[.)])[ \t]+)?\$\$[ \t]*$/;
+var OWN_LINE_DOLLARS_RE = new RegExp(
+  String.raw`^(?:[ \t]*>)*[ \t]*(?:\[![^\]]*\][+-]?[ \t]*|${LIST_MARKER_SOURCE}[ \t]+)?\$\$[ \t]*$`
+);
 function settleDollars(content, final) {
   return mapOutsideCode(
     content,
@@ -6151,7 +6222,7 @@ function widenAmbiguousFences(lines, blocks) {
   }
   return widened;
 }
-var LIST_ITEM_LINE_RE = /^[\t ]*(?:[-*+]|\d{1,9}[.)])(?:[\t ]|$)/;
+var LIST_ITEM_LINE_RE = new RegExp(String.raw`^[\t ]*${LIST_MARKER_SOURCE}(?:[\t ]|$)`);
 function alignNestedCodeBodies(text) {
   const lines = text.split("\n");
   const blocks = scanContainerBlocks(lines);
@@ -7995,7 +8066,7 @@ function clampCalloutIndent(content) {
   }
   return out.join("\n");
 }
-var BODY_INDENT_RE = /^\t+(?![ \t]*(?:[-*+]|\d+[.)])(?:\s|$))/;
+var BODY_INDENT_RE = new RegExp(String.raw`^\t+(?![ \t]*${LIST_MARKER_SOURCE}(?:\s|$))`);
 function clampBodyIndent(line) {
   return line.replace(BODY_INDENT_RE, CLAMPED_INDENT);
 }
@@ -8196,10 +8267,10 @@ function stripQuotes(s) {
 
 // src/converter/lazy-continuation.ts
 var QUOTE_PREFIX_RE2 = /^[\t >]*>/;
-var LIST_ITEM_RE = /^(?:[-*+]|\d+[.)])(?:[\t ]|$)/;
+var LIST_ITEM_RE = new RegExp(String.raw`^${LIST_MARKER_SOURCE}(?:[\t ]|$)`);
 var NOT_LAZY_RE = /^(?:#{1,6}(?:[\t ]|$)|>|\[!|(?:[-*_][\t ]*){3,}$|\||<br\s*\/?>[\t ]*$|%%)/;
 var NOT_PARAGRAPH_RE = /^(?:#{1,6}(?:[\t ]|$)|(?:[-*_][\t ]*){3,}$|\||<br\s*\/?>[\t ]*$|\$\$|%%)/;
-var LIST_PARAGRAPH_RE = /^(?:[-*+]|\d+[.)])[\t ]+\S/;
+var LIST_PARAGRAPH_RE = new RegExp(String.raw`^${LIST_MARKER_SOURCE}[\t ]+\S`);
 var FENCE_LINE_RE2 = /^(?:`{3,}|~{3,})/;
 function continuesListParagraph(previous, line) {
   const prev = splitQuoted(previous);
@@ -8270,7 +8341,7 @@ var BlockSpacer = class {
     };
   }
 };
-var LIST_ITEM_RE2 = /^[ \t]*(?:[-*+]|\d+[.)])(?:\s|$)/;
+var LIST_ITEM_RE2 = new RegExp(String.raw`^[ \t]*${LIST_MARKER_SOURCE}(?:\s|$)`);
 var QUOTE_RE = /^[ \t]*>/;
 var CALLOUT_START_RE = /^[ \t]*>\s*\[![^\]]*\]/;
 var TABLE_ROW_RE = /^[ \t]*\|/;
@@ -8645,7 +8716,7 @@ var RENDER_LINE_RULES = [
 var SEPARATOR_BODY = "[ \\t:|-]*-{3,}";
 var SEPARATOR_RE = new RegExp(`^[\\t ]*>?[\\t ]*\\|${SEPARATOR_BODY}[ \\t:|-]*\\|`);
 var DEEP_FENCE_RE = /^ {4,}```/;
-var LIST_ITEM_RE3 = /^([\t ]*)([-*+]|\d{1,9}[.)])(?:[\t ]|$)/;
+var LIST_ITEM_RE3 = new RegExp(String.raw`^([\t ]*)(${LIST_MARKER_SOURCE})(?:[\t ]|$)`);
 var CODE_INDENT = 4;
 var FOOTNOTE_CONTENT_WIDTH = 4;
 var ATX_HEADING_RE = /^ {0,3}#{1,6}(?:[\t ]|$)/;
@@ -10152,7 +10223,7 @@ function pipeTablesToNfmTables(content) {
 // src/converter/empty-block.ts
 var EMPTY_BLOCK_LINE_RE = new RegExp(`^(${CONTAINER_PREFIX_SOURCE})<empty-block\\/>[\\t ]*$`);
 var BREAK_LINE_RE = new RegExp(`^(${CONTAINER_PREFIX_SOURCE})<br\\s*\\/?>[\\t ]*$`);
-var LIST_ITEM_RE4 = /^(?:[-*+]|\d+[.)])(?:\s|$)/;
+var LIST_ITEM_RE4 = new RegExp(String.raw`^${LIST_MARKER_SOURCE}(?:\s|$)`);
 function mapProseLines(content, map) {
   const lines = content.split("\n");
   const kinds = classifyContainerLines(lines.map((line) => splitContainerPrefix(line).body));
@@ -11131,6 +11202,32 @@ function unquoteCode(lines, bodies) {
   return out;
 }
 
+// src/converter/literal-angles.ts
+function unescapeAngleBrackets(content) {
+  if (!content.includes("\\<") && !content.includes("\\>")) return content;
+  return mapOutsideCodeFences(
+    content,
+    (segment) => segment.split("\n").map(unescapeLine).join("\n")
+  );
+}
+var BLOCK_PREFIX_RE = new RegExp(String.raw`^[ \t]*(?:(?:>|${LIST_MARKER_SOURCE})[ \t]*)*$`);
+var TAG_START_RE = /[A-Za-z/!?]/;
+function unescapeLine(line) {
+  if (!line.includes("\\<") && !line.includes("\\>")) return line;
+  const code = inlineCodeRanges(line);
+  return line.replace(
+    /(\\+)([<>])/g,
+    (match, slashes, char, at) => {
+      if (slashes.length % 2 === 0) return match;
+      if (code.some(([start, end]) => at >= start && at < end)) return match;
+      const escape = at + slashes.length - 1;
+      if (char === ">" && BLOCK_PREFIX_RE.test(line.slice(0, escape))) return match;
+      if (char === "<" && TAG_START_RE.test(line[at + match.length] ?? "")) return match;
+      return `${slashes.slice(1)}${char}`;
+    }
+  );
+}
+
 // src/converter/enhanced-md-converter.ts
 var NOTION_CALLOUT_RE = /^::: callout\n([\s\S]*?)\n:::/gm;
 var NOTION_PAGE_MENTION_RE = /<mention-page id="([^"]+)">([\s\S]*?)<\/mention-page>/g;
@@ -11167,6 +11264,7 @@ function notionEnhancedToObsidian(enhanced, options) {
   result = emptyBlocksToBreaks(result);
   result = unescapePipes(result);
   result = unescapeNotionChars(result);
+  result = unescapeAngleBrackets(result);
   result = unescapeBrackets(result);
   result = receiveWikilinkText(result);
   result = receiveLiteralBackslashes(result);
@@ -15125,16 +15223,16 @@ var PageDecorations = class {
    *
    * @param baseName 내려받은 파일 이름의 앞부분 — 보통 노트 이름
    */
-  async pulled(page, baseName2, download) {
+  async pulled(page, baseName3, download) {
     const out = {};
     const cover = this.notionClient.extractCover(page);
     if (cover) {
-      const local = download ? await this.imageHandler.localizeNotionFileUrl(cover.url, `${baseName2}-cover`) : null;
+      const local = download ? await this.imageHandler.localizeNotionFileUrl(cover.url, `${baseName3}-cover`) : null;
       out.cover = local ? `[[${local}]]` : cover.url;
     }
     const icon = this.notionClient.extractIcon(page);
     if (icon) {
-      const local = download && icon.type === "file" ? await this.imageHandler.localizeNotionFileUrl(icon.value, `${baseName2}-icon`) : null;
+      const local = download && icon.type === "file" ? await this.imageHandler.localizeNotionFileUrl(icon.value, `${baseName3}-icon`) : null;
       out.icon = local ? `[[${local}]]` : icon.value;
     }
     return out;
@@ -15579,6 +15677,8 @@ var DatabaseSyncer = class {
     if (!wholeDbInScope && !scope.some((path) => matchesPathScope(path, dbConfig.localFolder))) {
       return { kind: "out-of-scope" };
     }
+    if (this.vaultFs.excludesPath?.(dbConfig.localFolder, "folder"))
+      return { kind: "out-of-scope" };
     const meta = await this.notionClient.getDatabaseMeta(dbConfig.databaseId);
     const pages = await this.notionClient.queryAllDatabasePages(
       dbConfig.databaseId,
@@ -15615,6 +15715,7 @@ var DatabaseSyncer = class {
    */
   async rowAction(dbConfig, page, record, wholeDbInScope, scope) {
     if (!wholeDbInScope && !(record && inAnyPathScope(record.obsidianPath, scope))) return "skip";
+    if (record && this.vaultFs.excludesPath?.(record.obsidianPath)) return "skip";
     if (!record) return "pull";
     const misplaced = !isDirectDbRowPath(dbConfig.localFolder, record.obsidianPath);
     const changed = misplaced || this.remoteVerdict(record, page) !== "unchanged";
@@ -15678,7 +15779,7 @@ var DatabaseSyncer = class {
   unlistedRows(dbConfig, pages, paths) {
     const listed = new Set(pages.map((page) => normalizeNotionId(page.id)));
     return this.stateDb.getAll().filter(
-      (record) => record.fileType === "db-row" && record.notionPageId !== null && record.notionParentId !== null && notionIdsEqual(record.notionParentId, dbConfig.databaseId) && !listed.has(normalizeNotionId(record.notionPageId)) && inAnyPathScope(record.obsidianPath, paths)
+      (record) => record.fileType === "db-row" && record.notionPageId !== null && record.notionParentId !== null && notionIdsEqual(record.notionParentId, dbConfig.databaseId) && !listed.has(normalizeNotionId(record.notionPageId)) && inAnyPathScope(record.obsidianPath, paths) && !(this.vaultFs.excludesPath?.(record.obsidianPath) ?? false)
     );
   }
   /**
@@ -16631,6 +16732,14 @@ var ScopedVaultFS = class {
     const joined = normalizeVaultPath(this.folder === "" ? path : `${this.folder}/${path}`);
     return joined !== null && matchesPathScope(joined, this.folder) && connectionFolderOf(joined, this.nested) === null;
   }
+  holdsOtherConnection(folder) {
+    const joined = normalizeVaultPath(this.folder === "" ? folder : `${this.folder}/${folder}`);
+    return joined !== null && this.nested.some((c) => matchesPathScope(c, joined));
+  }
+  excludesPath(path, kind) {
+    const joined = normalizeVaultPath(this.folder === "" ? path : `${this.folder}/${path}`);
+    return joined !== null && (this.base.excludesPath?.(joined, kind) ?? false);
+  }
   /** 이 연결의 경로 → 볼트 경로. */
   toBase(path, write) {
     const joined = normalizeVaultPath(this.folder === "" ? path : `${this.folder}/${path}`);
@@ -18496,6 +18605,199 @@ var LocalPlanner = class {
   }
 };
 
+// src/sync/remote-moves.ts
+var MOVABLE_TYPES = /* @__PURE__ */ new Set([
+  "file",
+  "folder-note",
+  "folder-only"
+]);
+function movedInNotion(record, parentId) {
+  return MOVABLE_TYPES.has(record.fileType) && record.notionParentId !== null && !notionIdsEqual(record.notionParentId, parentId);
+}
+var RemoteMoveFollower = class {
+  constructor(config, stateDb, vaultFs, folderLookup) {
+    this.config = config;
+    this.stateDb = stateDb;
+    this.vaultFs = vaultFs;
+    this.folderLookup = folderLookup;
+  }
+  config;
+  stateDb;
+  vaultFs;
+  folderLookup;
+  /**
+   * @param moved 페이지 id → Notion 의 새 부모 페이지 id.
+   * @param options.dryRun 옮길 자리만 정하고 쓰지 않는다.
+   */
+  async follow(moved, options = {}) {
+    const result = { moved: [], skipped: [] };
+    for (const [pageId, parentId] of moved) {
+      const record = this.stateDb.getByNotionId(pageId);
+      if (!record || !movedInNotion(record, parentId)) continue;
+      if (this.vaultFs.excludesPath?.(record.obsidianPath)) continue;
+      let outcome;
+      try {
+        outcome = await this.followOne(record, parentId, options.dryRun === true);
+      } catch (error) {
+        outcome = {
+          path: record.obsidianPath,
+          reason: `\uC62E\uAE30\uC9C0 \uBABB\uD568: ${error instanceof Error ? error.message : String(error)}`
+        };
+      }
+      if ("reason" in outcome) {
+        result.skipped.push(outcome);
+        getLogger().warn(
+          `[Im-Nobsidian] Notion \uC5D0\uC11C \uC62E\uAE34 \uD398\uC774\uC9C0\uB97C \uBCFC\uD2B8\uC5D0\uC11C \uC62E\uAE30\uC9C0 \uC54A\uC74C (${outcome.path}): ${outcome.reason}`
+        );
+      } else if (outcome.moves.length > 0) {
+        result.moved.push(...outcome.moves);
+      }
+    }
+    return result;
+  }
+  async followOne(record, parentId, dryRun) {
+    const skip = (reason) => ({ path: record.obsidianPath, reason });
+    if (this.stateDb.getIncompleteOpByState(record.id, "move")) {
+      return skip(
+        "\uBCFC\uD2B8\uC5D0\uC11C \uC62E\uAE34 \uAC83\uC744 \uC544\uC9C1 \uC62C\uB9AC\uC9C0 \uC54A\uC558\uB2E4 \u2014 \uB2E4\uC74C push \uAC00 Notion \uC744 \uBCFC\uD2B8\uC758 \uC790\uB9AC\uB85C \uC62E\uAE34\uB2E4"
+      );
+    }
+    const folder = this.parentFolder(parentId);
+    if (folder === null) return skip("Notion \uC758 \uC0C8 \uBD80\uBAA8\uAC00 \uBCFC\uD2B8\uC5D0 \uC5C6\uB2E4");
+    const units = this.unitsOf(record);
+    const moves = units.map((from) => ({ from, to: joinPath(folder, baseName2(from)) }));
+    if (moves.every((move) => move.from === move.to)) {
+      if (!dryRun) this.stateDb.setNotionParentId(record.id, parentId);
+      return { moves: [] };
+    }
+    for (const move of moves) {
+      const blocked = await this.blocked(move);
+      if (blocked) return skip(blocked);
+    }
+    if (dryRun) return { moves };
+    const done = [];
+    try {
+      for (const move of moves) {
+        await this.vaultFs.moveFile(move.from, move.to);
+        done.push(move);
+      }
+    } catch (error) {
+      for (const move of done.reverse())
+        await this.vaultFs.moveFile(move.to, move.from).catch(() => {
+        });
+      throw error;
+    }
+    this.stateDb.transaction(() => {
+      for (const move of moves) this.rewritePaths(move);
+      this.stateDb.setNotionParentId(record.id, parentId);
+    });
+    for (const move of moves) {
+      getLogger().info(
+        `[Im-Nobsidian] Notion \uC5D0\uC11C \uC62E\uAE34 \uD398\uC774\uC9C0\uB97C \uBCFC\uD2B8\uC5D0\uC11C \uC62E\uAE40: ${move.from} \u2192 ${move.to}`
+      );
+    }
+    return { moves };
+  }
+  /** 새 부모 아래의 자식이 놓일 폴더 — 새 페이지를 받을 때와 같은 규칙. 루트면 `""`, 볼트에 없는 부모면 null. */
+  parentFolder(parentId) {
+    if (notionIdsEqual(parentId, this.config.notion.rootPageId)) return "";
+    const parent = this.stateDb.getByNotionId(parentId);
+    return parent ? childFolderOf(parent, this.folderLookup()) : null;
+  }
+  /**
+   * 함께 옮길 것 — 폴더로 추적하는 페이지는 그 폴더, 폴더 노트(`X/X.md`)는 든 폴더, 노트는 그 파일과 옆의 자식
+   * 폴더(`X/`, 있으면).
+   */
+  unitsOf(record) {
+    if (isFolderRecord(record)) return [record.obsidianPath];
+    if (record.fileType !== "file") return [parentFolderOf(record.obsidianPath)];
+    const children = stripMarkdownExtension(record.obsidianPath);
+    const hasChildren = this.stateDb.getAll().some((r) => within(r.obsidianPath, children));
+    return hasChildren ? [record.obsidianPath, children] : [record.obsidianPath];
+  }
+  /** 옮기지 못할 까닭 — 없으면 null. */
+  async blocked(move) {
+    if (within(move.to, move.from)) return "\uC81C \uC548\uC73C\uB85C \uC62E\uAE38 \uC218 \uC5C6\uB2E4";
+    if (!await this.vaultFs.exists(move.from)) return "\uBCFC\uD2B8\uC5D0 \uB178\uD2B8\uAC00 \uC5C6\uB2E4";
+    if (await this.vaultFs.exists(move.to) || this.stateDb.getAll().some((r) => within(r.obsidianPath, move.to))) {
+      return `\uC62E\uAE38 \uC790\uB9AC(${move.to})\uC5D0 \uAC19\uC740 \uC774\uB984\uC774 \uC788\uB2E4`;
+    }
+    const isFolder = !isMarkdownPath(move.from);
+    if (this.vaultFs.excludesPath?.(move.to, isFolder ? "folder" : "file")) {
+      return `\uC62E\uAE38 \uC790\uB9AC(${move.to})\uAC00 \uB3D9\uAE30\uD654\uC5D0\uC11C \uBE60\uC9C4\uB2E4(paths \xB7 .im-nobsidian-ignore)`;
+    }
+    if (isFolder && this.holdsDatabaseOrConnection(move.from)) {
+      return "\uD3F4\uB354 \uC548\uC5D0 DB \uB098 \uB2E4\uB978 \uC5F0\uACB0\uC774 \uC788\uB2E4 \u2014 DB \uBCF4\uAE30(.base)\uAC00 \uD3F4\uB354 \uACBD\uB85C\uB97C \uD488\uB294\uB2E4. Obsidian \uC5D0\uC11C \uC62E\uAE30\uBA74 \uB2E4\uC74C push \uAC00 Notion \uC744 \uB9DE\uCD98\uB2E4";
+    }
+    return null;
+  }
+  holdsDatabaseOrConnection(folder) {
+    const databases = parseDiscoveredDbs(this.stateDb.getMeta(DISCOVERED_DBS_META_KEY));
+    if (databases.some((db) => within(db.localFolder.replace(/\/+$/, ""), folder))) return true;
+    const baseFiles = this.stateDb.getMeta(DB_BASE_FILES_META_KEY);
+    if (baseFiles) {
+      try {
+        const entries = Object.values(
+          JSON.parse(baseFiles)
+        );
+        if (entries.some((entry) => entry.basePath && within(entry.basePath, folder))) return true;
+      } catch {
+      }
+    }
+    if (this.stateDb.getAll().some((r) => r.fileType === "db-row" && within(r.obsidianPath, folder))) {
+      return true;
+    }
+    return this.vaultFs.holdsOtherConnection?.(folder) ?? false;
+  }
+  /** 옮긴 것 아래의 레코드 · 위키링크 · 보존 마커 · 첨부 기록을 새 경로로 옮겨 적는다. */
+  rewritePaths(move) {
+    for (const record of this.stateDb.getAll()) {
+      if (!within(record.obsidianPath, move.from)) continue;
+      const from = record.obsidianPath;
+      const to = move.to + from.slice(move.from.length);
+      this.stateDb.updatePath(record.id, to);
+      const entry = record.notionPageId ? this.stateDb.resolvePageId(record.notionPageId) : null;
+      if (entry && entry.obsidianPath === from) {
+        this.stateDb.deleteWikilink(from);
+        this.stateDb.upsertWikilink({
+          obsidianPath: to,
+          notionPageId: entry.notionPageId,
+          title: wikilinkTitleFromPath(to),
+          aliases: entry.aliases
+        });
+      }
+      const markers = this.stateDb.getPreserveMarkers(from);
+      if (markers.length > 0) {
+        this.stateDb.storePreserveMarkers(to, markers);
+        this.stateDb.storePreserveMarkers(from, []);
+      }
+      if (record.notionPageId) {
+        for (const file of this.stateDb.getFilesByPageId(record.notionPageId)) {
+          if (!within(file.localPath, move.from)) continue;
+          this.stateDb.registerFile({
+            localPath: move.to + file.localPath.slice(move.from.length),
+            notionPageId: file.notionPageId,
+            fileUploadId: file.fileUploadId,
+            fileType: file.fileType,
+            fileHash: file.fileHash,
+            fileSize: file.fileSize
+          });
+          this.stateDb.deleteFileRegistry(file.localPath);
+        }
+      }
+    }
+  }
+};
+function within(path, unit) {
+  return path === unit || path.startsWith(`${unit}/`);
+}
+function baseName2(path) {
+  return path.slice(path.lastIndexOf("/") + 1);
+}
+function joinPath(folder, name) {
+  return folder === "" ? name : `${folder}/${name}`;
+}
+
 // src/sync/change-inspector.ts
 var ChangeInspector = class {
   constructor(stateDb, vaultFs, notionClient, planner, puller) {
@@ -21569,17 +21871,7 @@ var PagePuller = class {
     const parentId = await extractParentId(this.notionClient, page);
     if (!parentId || notionIdsEqual(parentId, this.config.notion.rootPageId)) return "";
     const parentRecord = this.stateDb.getByNotionId(parentId);
-    if (parentRecord) {
-      if (isFolderRecord(parentRecord) && !this.placement.folderLookup().databaseAt(parentRecord.obsidianPath)) {
-        return parentRecord.obsidianPath;
-      }
-      if (parentRecord.fileType === "folder-note" || parentRecord.fileType === "folder-only") {
-        const pathParts = parentRecord.obsidianPath.split("/");
-        pathParts.pop();
-        return pathParts.join("/");
-      }
-      return stripMarkdownExtension(parentRecord.obsidianPath);
-    }
+    if (parentRecord) return childFolderOf(parentRecord, this.placement.folderLookup());
     try {
       const parentPage = await this.notionClient.getPage(parentId);
       const parentTitle = this.notionClient.extractTitle(parentPage);
@@ -21957,6 +22249,9 @@ var RemoteDetector = class _RemoteDetector {
   // 감지가 빠뜨린 자식을 {@link takeUndiscoveredChildren} 가 둘의 차로 고른다.
   _bodyChildren = /* @__PURE__ */ new Map();
   _queued = /* @__PURE__ */ new Set();
+  // Notion 에서 부모가 바뀐 추적 페이지(정규화 id → 새 부모 페이지 id) — pull 이 볼트에서도 옮긴다(ADR-039).
+  // 옮겨도 수정 시각이 바뀌지 않아(실측) 변경으로는 보이지 않는다. 감지마다 다시 채운다.
+  _moved = /* @__PURE__ */ new Map();
   /** 이번 감지에서 자식 페이지를 가진 것으로 본 페이지인가 — 폴더노트 판정의 1차 근거. */
   hasChildPages(pageId) {
     return this._childParentIds.has(normalizeNotionId(pageId));
@@ -22018,6 +22313,16 @@ var RemoteDetector = class _RemoteDetector {
     }
     return changes;
   }
+  /** 이번 감지가 본, Notion 에서 옮긴 추적 페이지 — 페이지 id → 새 부모 페이지 id. */
+  get movedPages() {
+    return this._moved;
+  }
+  /** 받은 부모가 상태 DB 의 것과 다르면 옮긴 페이지로 적는다. */
+  noteParent(pageId, parentId) {
+    const record = this.stateDb.getByNotionId(pageId);
+    if (record && movedInNotion(record, parentId))
+      this._moved.set(normalizeNotionId(pageId), parentId);
+  }
   /** 새 감지를 시작한다 — 지난 실행의 본문 자식과 받기로 한 페이지를 비우고 이번 변경을 적는다. */
   beginDetection(changes) {
     this._bodyChildren.clear();
@@ -22064,6 +22369,7 @@ var RemoteDetector = class _RemoteDetector {
     const changes = [];
     this._childParentIds.clear();
     this._pages.clear();
+    this._moved.clear();
     const lastPull = this.stateDb.getMeta(LAST_PULL_META_KEY);
     const syncedRecords = this.stateDb.getAll();
     const trackedPageIds = new Set(
@@ -22121,7 +22427,10 @@ var RemoteDetector = class _RemoteDetector {
       for (const page of underRoot) {
         throwIfAborted(signal);
         const parentId = await extractParentId(this.notionClient, page);
-        if (parentId) this._childParentIds.add(normalizeNotionId(parentId));
+        if (parentId) {
+          this._childParentIds.add(normalizeNotionId(parentId));
+          this.noteParent(page.id, parentId);
+        }
       }
       for (const page of underRoot) {
         titles.set(normalizeNotionId(page.id), this.notionClient.extractTitle(page));
@@ -22206,6 +22515,7 @@ var RemoteDetector = class _RemoteDetector {
     const databaseIds = /* @__PURE__ */ new Set();
     this._childParentIds.clear();
     this._pages.clear();
+    this._moved.clear();
     const searchSince = incrementalSearchSince(since);
     const recentPages = await this.notionClient.searchRecentPages(searchSince, options.signal);
     const untracked = [];
@@ -22228,6 +22538,7 @@ var RemoteDetector = class _RemoteDetector {
         }
         continue;
       }
+      if (page.parent.type === "page_id") this.noteParent(page.id, page.parent.page_id);
       const modified = this.observation.modification(record, page);
       const rowDatabase = page.parentDatabaseId ?? (record.fileType === "db-row" ? record.notionParentId : null);
       if (modified && rowDatabase) databaseIds.add(compactNotionId(rowDatabase));
@@ -22348,7 +22659,7 @@ var RemoteDetector = class _RemoteDetector {
 // src/sync/rerender-targets.ts
 function rerenderTargets(stateDb, scope) {
   return stateDb.getAll().filter(
-    (record) => isRerenderable(record) && record.notionPageId !== null && !scope.queued.has(record.notionPageId) && !scope.adopting.has(record.id) && !(scope.localChangedPaths?.has(record.obsidianPath) ?? false) && inAnyPathScope(record.obsidianPath, scope.paths)
+    (record) => isRerenderable(record) && record.notionPageId !== null && !scope.queued.has(record.notionPageId) && !scope.adopting.has(record.id) && !(scope.localChangedPaths?.has(record.obsidianPath) ?? false) && inAnyPathScope(record.obsidianPath, scope.paths) && !(scope.excludes?.(record.obsidianPath) ?? false)
   ).map((record) => ({
     pageId: record.notionPageId,
     type: "modified",
@@ -22376,7 +22687,8 @@ async function detectMissingLocalFiles(config, stateDb, vaultFs, paths) {
       // 존재 확인을 넣어 이 제외가 비로소 근거를 갖는다(tests/sync/db-row-restore-deleted).
       // push 가 만든 폴더 페이지(폴더 레코드)도 실체가 폴더다 — 안의 노트를 되살리면 폴더도
       // 생긴다. 예전에는 폴더 경로에 확장자 없는 파일을 썼다(S-17).
-      (r.fileType === "file" || r.fileType === "folder-note") && !isFolderRecord(r) && r.notionPageId !== null && inAnyPathScope(r.obsidianPath, paths)
+      (r.fileType === "file" || r.fileType === "folder-note") && !isFolderRecord(r) && r.notionPageId !== null && inAnyPathScope(r.obsidianPath, paths) && // 설정이 뺀 노트는 목록에 없을 뿐 지운 것이 아니다 — 되살리지 않는다(이슈 #8).
+      !(vaultFs.excludesPath?.(r.obsidianPath) ?? false)
     )
   );
   if (scoped.length === 0) return [];
@@ -22705,7 +23017,10 @@ var SyncOrchestrator = class {
     this.observation = new RunObservation(stateDb, notionClient);
     this.recovery = new InterruptedSyncRecovery(stateDb, notionClient);
     this.detector = new RemoteDetector(config, stateDb, notionClient, this.observation);
-    const changeDetector = new ChangeDetector(stateDb);
+    const changeDetector = new ChangeDetector(
+      stateDb,
+      (path) => vaultFs.excludesPath?.(path) ?? false
+    );
     const pipeline = createDefaultPipeline({
       wikilinkResolver: (text) => stateDb.resolveWikilink(text)
     });
@@ -22793,6 +23108,12 @@ var SyncOrchestrator = class {
     );
     this.placement.useDatabaseCreator(this.databaseCreator);
     this.planner = new LocalPlanner(config, stateDb, vaultFs, changeDetector, this.placement);
+    this.remoteMoves = new RemoteMoveFollower(
+      config,
+      stateDb,
+      vaultFs,
+      () => this.placement.folderLookup()
+    );
     this.puller = new PagePuller(
       config,
       stateDb,
@@ -22860,6 +23181,7 @@ var SyncOrchestrator = class {
   databaseCreator;
   // 이번 실행의 로컬 변경 — 옮긴 노트 · 폴더를 짝짓고 상태 DB 에 옮겨 적는다(S-11).
   planner;
+  remoteMoves;
   // 원격에서 바뀐 것 — 전체 대조 · 증분 감지(ADR-027).
   detector;
   // 지난번에 본 뒤로 원격이 바뀌었나(N-05) — 덮어쓰기 · 지우기 전에, 변경을 보이기 전에 본다.
@@ -23204,6 +23526,17 @@ var SyncOrchestrator = class {
   async pull(options) {
     return this.gate.run("pull", () => this.executePull(options));
   }
+  /** 감지가 본, Notion 에서 옮긴 페이지를 볼트에서 옮긴다 — 경로를 좁힌 pull 은 그 범위의 것만. */
+  async followRemoteMoves(options) {
+    const moved = new Map(
+      [...this.detector.movedPages].filter(([pageId]) => {
+        const record = this.stateDb.getByNotionId(pageId);
+        return !!record && (!options?.paths || inAnyPathScope(record.obsidianPath, options.paths));
+      })
+    );
+    if (moved.size === 0) return { moved: [], skipped: [] };
+    return await this.remoteMoves.follow(moved, { dryRun: options?.dryRun });
+  }
   async executePull(options) {
     const startTime = Date.now();
     this.assertConnectionScope();
@@ -23263,6 +23596,7 @@ var SyncOrchestrator = class {
     }
     const remoteChanges = detection.changes;
     detected = remoteChanges;
+    const remoteMoves = await this.followRemoteMoves(options);
     const pendingDatabases = parsePendingDatabases(
       this.stateDb.getMeta(PENDING_DATABASES_META_KEY)
     );
@@ -23312,13 +23646,17 @@ var SyncOrchestrator = class {
             this.config.sync.deleteSync
           ),
           skippedDatabases: ledger.skipped
-        }
+        },
+        moved: remoteMoves.moved,
+        moveSkipped: remoteMoves.skipped
       };
     };
-    const filtered = options?.paths ? remoteChanges.filter((c) => {
+    const excludes = (path) => this.vaultFs.excludesPath?.(path) ?? false;
+    const filtered = remoteChanges.filter((c) => {
       const record = this.stateDb.getByNotionId(c.pageId);
-      return !!record && inAnyPathScope(record.obsidianPath, options.paths);
-    }) : remoteChanges;
+      if (record && excludes(record.obsidianPath)) return false;
+      return !options?.paths || !!record && inAnyPathScope(record.obsidianPath, options.paths);
+    });
     const queuedIds = new Set(filtered.map((c) => c.pageId));
     const missingLocal = localPlan ? await detectMissingLocalFiles(this.config, this.stateDb, this.vaultFs, options?.paths) : [];
     const restoreChanges = missingLocal.filter(
@@ -23336,11 +23674,12 @@ var SyncOrchestrator = class {
       localChangedPaths: localPlan ? new Set(localPlan.scan.changes.map((change) => change.path)) : null,
       queued: /* @__PURE__ */ new Set([...queuedIds, ...restoreIds]),
       adopting,
-      paths: options.paths
+      paths: options.paths,
+      excludes
     }) : [];
     const workItems = [...filtered, ...restoreChanges, ...rerenderChanges];
     if (options?.dryRun) {
-      return this.pullPlanner.planPull(
+      const plan = await this.pullPlanner.planPull(
         filtered,
         restoreChanges,
         restoreIds,
@@ -23350,6 +23689,7 @@ var SyncOrchestrator = class {
         scan,
         ledger
       );
+      return { ...plan, moved: remoteMoves.moved, moveSkipped: remoteMoves.skipped };
     }
     let pullTotal = workItems.length;
     let pullCompleted = 0;
@@ -23766,17 +24106,104 @@ function pushOperationOf(change) {
       return "update";
   }
 }
+
+// src/utils/path-filter.ts
+var PathFilter = class {
+  include;
+  exclude;
+  constructor(include, exclude) {
+    this.include = compileAll(include);
+    this.exclude = compileAll(exclude);
+  }
+  /** 동기화하지 않는 노트 · 첨부 — 포함 패턴 어느 것에도 맞지 않거나 제외 패턴에 맞는다. */
+  excludesFile(path) {
+    if (this.include.length > 0 && !this.include.some((p) => matchesWithin(path, p))) return true;
+    return this.excludesFolder(path);
+  }
+  /**
+   * 걷지 않을 폴더 — 제외 패턴만 본다. 포함 패턴은 안의 파일이 정한다: `00 Me/**\/*.md` 는 폴더
+   * `00 Me` 에 맞지 않지만 그 안의 노트에 맞는다.
+   */
+  excludesFolder(path) {
+    return this.exclude.some((p) => matchesWithin(path, p));
+  }
+};
+function toVaultPath(relativePath, separator) {
+  return separator === "/" ? relativePath : relativePath.split(separator).join("/");
+}
+function compileAll(patterns) {
+  return patterns.flatMap((raw) => {
+    const pattern = normalizePattern(raw);
+    return pattern === null ? [] : [compile(pattern)];
+  });
+}
+function normalizePattern(raw) {
+  const pattern = raw.trim().replace(/\\/g, "/").replace(/^(?:\.\/|\/)+/, "").replace(/\/+$/, "");
+  return pattern === "" ? null : pattern;
+}
+function compile(pattern) {
+  if (pattern === "**" || pattern === "**/*") return { kind: "all" };
+  if (!/[*?]/.test(pattern)) return { kind: "prefix", prefix: pattern };
+  if (pattern.endsWith("/**") && !/[*?]/.test(pattern.slice(0, -3))) {
+    return { kind: "prefix", prefix: pattern.slice(0, -3) };
+  }
+  const re = globToRegExp(pattern);
+  return pattern.includes("/") ? { kind: "anchored", re } : { kind: "segment", re };
+}
+function globToRegExp(pattern) {
+  let source = "";
+  for (let i = 0; i < pattern.length; i++) {
+    const char = pattern[i];
+    if (char === "*" && pattern[i + 1] === "*") {
+      const segmentStart = i === 0 || pattern[i - 1] === "/";
+      if (segmentStart && pattern[i + 2] === "/") {
+        source += "(?:.*/)?";
+        i += 2;
+      } else {
+        source += ".*";
+        i += 1;
+      }
+    } else if (char === "*") {
+      source += "[^/]*";
+    } else if (char === "?") {
+      source += "[^/]";
+    } else {
+      source += char.replace(/[.+^${}()|[\]\\]/g, "\\$&");
+    }
+  }
+  return new RegExp(`^${source}$`);
+}
+function matchesWithin(path, pattern) {
+  switch (pattern.kind) {
+    case "all":
+      return true;
+    case "prefix":
+      return path === pattern.prefix || path.startsWith(`${pattern.prefix}/`);
+    case "segment":
+      return path.split("/").some((segment) => pattern.re.test(segment));
+    case "anchored": {
+      const segments = path.split("/");
+      for (let depth2 = 1; depth2 <= segments.length; depth2++) {
+        if (pattern.re.test(segments.slice(0, depth2).join("/"))) return true;
+      }
+      return false;
+    }
+  }
+}
+
+// src/sync/node-vault-fs.ts
 var NodeVaultFS = class {
   constructor(rootPath, pathConfig) {
     this.rootPath = rootPath;
-    this.includePatterns = pathConfig?.include ?? [];
     const configExclude = pathConfig?.exclude ?? [];
     const ignorePatterns = this.loadImNobsidianIgnore();
-    this.excludePatterns = [...configExclude, ...ignorePatterns];
+    this.filter = new PathFilter(pathConfig?.include ?? [], [...configExclude, ...ignorePatterns]);
   }
   rootPath;
-  includePatterns;
-  excludePatterns;
+  filter;
+  excludesPath(path, kind = "file") {
+    return kind === "folder" ? this.filter.excludesFolder(path) : this.filter.excludesFile(path);
+  }
   loadImNobsidianIgnore() {
     try {
       const ignorePath = join(this.rootPath, IGNORE_FILE);
@@ -23850,38 +24277,20 @@ var NodeVaultFS = class {
     await this.walkDirNonMd(this.rootPath, files);
     return files;
   }
-  matchesPattern(relativePath, pattern) {
-    if (pattern === "**/*" || pattern === "**") return true;
-    if (pattern.endsWith("/**")) {
-      const dir = pattern.slice(0, -3);
-      return relativePath.startsWith(dir + "/") || relativePath === dir;
-    } else if (pattern.startsWith("*.")) {
-      const ext = pattern.slice(1);
-      return relativePath.endsWith(ext);
-    } else if (pattern.includes("*")) {
-      const regexStr = pattern.replace(/\./g, "\\.").replace(/\*\*/g, "{{GLOBSTAR}}").replace(/\*/g, "[^/]*").replace(/\{\{GLOBSTAR\}\}/g, ".*");
-      return new RegExp("^" + regexStr + "$").test(relativePath);
-    } else {
-      return relativePath === pattern || relativePath.startsWith(pattern + "/");
-    }
-  }
-  isExcluded(relativePath) {
-    if (this.includePatterns.length > 0) {
-      const included = this.includePatterns.some((p) => this.matchesPattern(relativePath, p));
-      if (!included) return true;
-    }
-    return this.excludePatterns.some((p) => this.matchesPattern(relativePath, p));
+  /** 볼트 경로 — Windows 의 `relative()` 는 `\` 로 잇는다. 상태 DB · 패턴 · Notion 경로는 모두 `/` 다. */
+  vaultPath(fullPath) {
+    return toVaultPath(relative(this.rootPath, fullPath), sep);
   }
   async walkDirNonMd(dir, result) {
     const entries = await readdir(dir, { withFileTypes: true });
     for (const entry of entries) {
       const fullPath = join(dir, entry.name);
       if (entry.name.startsWith(".")) continue;
-      const relativePath = relative(this.rootPath, fullPath);
-      if (this.isExcluded(relativePath)) continue;
+      const relativePath = this.vaultPath(fullPath);
       if (entry.isDirectory()) {
+        if (this.filter.excludesFolder(relativePath)) continue;
         await this.walkDirNonMd(fullPath, result);
-      } else if (entry.isFile() && !isMarkdownPath(entry.name)) {
+      } else if (entry.isFile() && !isMarkdownPath(entry.name) && !this.filter.excludesFile(relativePath)) {
         const fileStat = await stat(fullPath);
         result.push({
           path: relativePath,
@@ -23896,11 +24305,11 @@ var NodeVaultFS = class {
     for (const entry of entries) {
       const fullPath = join(dir, entry.name);
       if (entry.name.startsWith(".")) continue;
-      const relativePath = relative(this.rootPath, fullPath);
-      if (this.isExcluded(relativePath)) continue;
+      const relativePath = this.vaultPath(fullPath);
       if (entry.isDirectory()) {
+        if (this.filter.excludesFolder(relativePath)) continue;
         await this.walkDirStats(fullPath, result);
-      } else if (entry.isFile() && isMarkdownPath(entry.name)) {
+      } else if (entry.isFile() && isMarkdownPath(entry.name) && !this.filter.excludesFile(relativePath)) {
         const fileStat = await stat(fullPath);
         result.push({
           path: relativePath,
@@ -23915,11 +24324,11 @@ var NodeVaultFS = class {
     for (const entry of entries) {
       const fullPath = join(dir, entry.name);
       if (entry.name.startsWith(".")) continue;
-      const relativePath = relative(this.rootPath, fullPath);
-      if (this.isExcluded(relativePath)) continue;
+      const relativePath = this.vaultPath(fullPath);
       if (entry.isDirectory()) {
+        if (this.filter.excludesFolder(relativePath)) continue;
         await this.walkDir(fullPath, result);
-      } else if (entry.isFile() && isMarkdownPath(entry.name)) {
+      } else if (entry.isFile() && isMarkdownPath(entry.name) && !this.filter.excludesFile(relativePath)) {
         const content = await readFile(fullPath, "utf-8");
         const fileStat = await stat(fullPath);
         result.push({
@@ -24934,9 +25343,9 @@ function readColumnLayout(lines) {
       close(i);
       return;
     }
-    const sep2 = SEP_RE.exec(line);
-    if (sep2) {
-      const ratio = sep2[1] === void 0 ? void 0 : Number(sep2[1]);
+    const sep3 = SEP_RE.exec(line);
+    if (sep3) {
+      const ratio = sep3[1] === void 0 ? void 0 : Number(sep3[1]);
       open.columns.push({ line: i, ...Number.isFinite(ratio) ? { ratio } : {} });
     }
   });
@@ -24951,6 +25360,6 @@ function formatRatio(ratio) {
   return String(Math.round(ratio * 100) / 100);
 }
 
-export { BaseFileGenerator, BlankLineCollapser, CONFIG_FILE, CalloutRestorer, CalloutTransformer, ChangeDetector, ColorAnnotator, ConfigManager, ConfigSchema, ConflictResolver, ConnectionBoundaryError, ConnectionScopeError, ConversionPipeline, DB_VIEWS_FILE, DB_VIEWS_PATH, DEFAULT_CONFIG, DEFAULT_TITLE_PROPERTY, DEFAULT_WATCH_DEBOUNCE_MS, DIFF_SIGN, DatabaseSyncer, EmbedResolver, EntryEditor, FileHandler, FileWatcher, FrontmatterExtractor, FrontmatterGenerator, GITIGNORE_ENTRY, IGNORE_FILE, INTERNAL_DIR, INTERNAL_DIR_GLOB, ImageHandler, InlineAnnotationPreserver, InlineDBParser, LocalImageRestorer, MARKER_BRAND, MathNormalizer, MentionToWikilink, NOTION_COLOR_NAMES, NOTION_TOKEN_PREFIX, NOTION_TO_BASES_VIEW, NodeVaultFS, NotionBlockBuilder, NotionClient, OBSIDIAN_CONFIG_DIR, PendingWalError, PreserveMarkerCollector, PreserveMarkerInjector, PropertiesTableInjector, PropertiesTableRestorer, PropertyMapper, RENDER_LINE_RULES, SAVED_STATE_TABLES_QUERY, SEPARATOR_BODY, STATE_DB_FILE, STATE_DB_MIGRATIONS, STATE_DB_PATH, SavedStateDbError, ScopedVaultFS, SidecarGenerator, StateDB, StateDbLockedError, StateDbUnavailableError, StateLock, SyncBusyError, SyncOrchestrator, TreeMapper, UnsupportedBlockStripper, ViewDataProvider, WIKILINK_LOOKUPS, WatchSyncService, WikilinkResolver, applicableChoices, assertNoPendingWal, basesViewMappingOf, basesViewTypeOf, choiceForStrategy, classifyBodyFidelity, columnLabel, compactNotionId, computeBufferHash, computeHash, configDirFrom, connectionFolderOf, createDefaultPipeline, extractCalendarEntries, filterByMonth, filterEntries, findConnectionFolders, formatUnifiedDiff, generateColorCSS, generateId, getLogger, getNotionBgColor, getNotionColor, getVisibleProperties, groupEntries, hasColumnLayout, hasDesignMarker, inAnyPathScope, isInternalPath, isMarkdownPath, isRemoteDeletion, lineDiff, lintRenderedMarkdown, matchesPathScope, normalizeNotionId, normalizeVaultPath, noteNameFromPath, notionIdFromInput, notionIdsEqual, operationLabel, parseDesignColor, pendingWalBytes, readColumnLayout, readDesignLine, resolvePropertyName, sanitizeFileName, setLogger, sortEntries, stateDbLockPath, stateDbWalPath, stripMarkdownExtension, summarizeFidelity, systemTimeZone, threeWayMerge, translateNotionFilter, verifyDatabaseCompleteness, verifyPageCompleteness, wikilinkLookupsIn };
+export { BaseFileGenerator, BlankLineCollapser, CONFIG_FILE, CalloutRestorer, CalloutTransformer, ChangeDetector, ColorAnnotator, ConfigManager, ConfigSchema, ConflictResolver, ConnectionBoundaryError, ConnectionScopeError, ConversionPipeline, DB_VIEWS_FILE, DB_VIEWS_PATH, DEFAULT_CONFIG, DEFAULT_TITLE_PROPERTY, DEFAULT_WATCH_DEBOUNCE_MS, DIFF_SIGN, DatabaseSyncer, EmbedResolver, EntryEditor, FileHandler, FileWatcher, FrontmatterExtractor, FrontmatterGenerator, GITIGNORE_ENTRY, IGNORE_FILE, INTERNAL_DIR, INTERNAL_DIR_GLOB, ImageHandler, InlineAnnotationPreserver, InlineDBParser, LocalImageRestorer, MARKER_BRAND, MathNormalizer, MentionToWikilink, NOTION_COLOR_NAMES, NOTION_TOKEN_PREFIX, NOTION_TO_BASES_VIEW, NodeVaultFS, NotionBlockBuilder, NotionClient, OBSIDIAN_CONFIG_DIR, PathFilter, PendingWalError, PreserveMarkerCollector, PreserveMarkerInjector, PropertiesTableInjector, PropertiesTableRestorer, PropertyMapper, RENDER_LINE_RULES, SAVED_STATE_TABLES_QUERY, SEPARATOR_BODY, STATE_DB_FILE, STATE_DB_MIGRATIONS, STATE_DB_PATH, SavedStateDbError, ScopedVaultFS, SidecarGenerator, StateDB, StateDbLockedError, StateDbUnavailableError, StateLock, SyncBusyError, SyncOrchestrator, TreeMapper, UnsupportedBlockStripper, ViewDataProvider, WIKILINK_LOOKUPS, WatchSyncService, WikilinkResolver, applicableChoices, assertNoPendingWal, basesViewMappingOf, basesViewTypeOf, choiceForStrategy, classifyBodyFidelity, columnLabel, compactNotionId, computeBufferHash, computeHash, configDirFrom, connectionFolderOf, createDefaultPipeline, extractCalendarEntries, filterByMonth, filterEntries, findConnectionFolders, formatUnifiedDiff, generateColorCSS, generateId, getLogger, getNotionBgColor, getNotionColor, getVisibleProperties, groupEntries, hasColumnLayout, hasDesignMarker, inAnyPathScope, isInternalPath, isMarkdownPath, isRemoteDeletion, lineDiff, lintRenderedMarkdown, matchesPathScope, normalizeNotionId, normalizeVaultPath, noteNameFromPath, notionIdFromInput, notionIdsEqual, operationLabel, parseDesignColor, pendingWalBytes, readColumnLayout, readDesignLine, resolvePropertyName, sanitizeFileName, setLogger, sortEntries, stateDbLockPath, stateDbWalPath, stripMarkdownExtension, summarizeFidelity, systemTimeZone, threeWayMerge, toVaultPath, translateNotionFilter, verifyDatabaseCompleteness, verifyPageCompleteness, wikilinkLookupsIn };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map