@im-nobsidian/core 0.1.11 → 0.1.12

package/dist/index.js

@@ -1,6 +1,6 @@
 import { z } from 'zod';
 import { readFile, mkdir, writeFile, unlink, rename, stat, readdir } from 'fs/promises';
-import { join, dirname, relative } from 'path';
+import { join, dirname, relative, sep } from 'path';
 import Database from 'better-sqlite3';
 import { randomUUID, createHash } from 'crypto';
 import { Client, LogLevel } from '@notionhq/client';
@@ -49,10 +49,28 @@ var ConfigSchema = z.object({
     imageDownload: z.enum(["immediate", "lazy", "skip"]).default("immediate")
   }),
   advanced: z.object({
+    // Notion API 클라이언트 동시성/타임아웃
     concurrency: z.number().min(1).max(10).default(3),
-    maxRetries: z.number().min(0).max(10).default(5),
     timeoutMs: z.number().min(5e3).max(6e4).default(3e4),
-    batchSize: z.number().min(1).max(100).default(50)
+    // 페이지네이션/블록 배치 (Notion API children append 상한 = 100)
+    pageSize: z.number().min(1).max(100).default(100),
+    batchSize: z.number().min(1).max(100).default(100),
+    // Rate limit 게이트 (요청 간 최소 간격, ms)
+    rateLimitIntervalMs: z.number().min(0).max(5e3).default(350),
+    // API 재시도 (지수 백오프: retryBaseDelayMs * retryBackoffFactor^attempt)
+    maxRetries: z.number().min(0).max(10).default(5),
+    retryBaseDelayMs: z.number().min(100).max(1e4).default(1e3),
+    retryBackoffFactor: z.number().min(1).max(10).default(2),
+    // 오케스트레이터 단계 간 재시도 대기 (ms)
+    retryWaitMs: z.number().min(0).max(3e4).default(2e3),
+    // 미디어(이미지/파일) 다운로드 동시성/재시도
+    mediaConcurrency: z.number().min(1).max(10).default(3),
+    mediaMaxRetries: z.number().min(0).max(10).default(3),
+    mediaRetryBaseMs: z.number().min(100).max(1e4).default(1e3),
+    // 비마크다운 파일(첨부) 업로드/다운로드 동시성
+    fileConcurrency: z.number().min(1).max(10).default(2),
+    // 다운로드 파일 크기 상한 (bytes, 기본 100MB)
+    maxFileSizeBytes: z.number().min(1024).default(100 * 1024 * 1024)
   })
 });
 var DEFAULT_CONFIG = {
@@ -84,13 +102,37 @@ var DEFAULT_CONFIG = {
   },
   advanced: {
     concurrency: 3,
-    maxRetries: 5,
     timeoutMs: 3e4,
-    batchSize: 50
+    pageSize: 100,
+    batchSize: 100,
+    rateLimitIntervalMs: 350,
+    maxRetries: 5,
+    retryBaseDelayMs: 1e3,
+    retryBackoffFactor: 2,
+    retryWaitMs: 2e3,
+    mediaConcurrency: 3,
+    mediaMaxRetries: 3,
+    mediaRetryBaseMs: 1e3,
+    fileConcurrency: 2,
+    maxFileSizeBytes: 100 * 1024 * 1024
   }
 };
+
+// src/constants/paths.ts
+var INTERNAL_DIR = ".im-nobsidian";
 var CONFIG_FILE = "config.json";
-var IM_NOBSIDIAN_DIR = ".im-nobsidian";
+var STATE_DB_FILE = "sync.db";
+var DB_VIEWS_FILE = "db-views.json";
+var IGNORE_FILE = ".im-nobsidian-ignore";
+var GITIGNORE_ENTRY = `${INTERNAL_DIR}/`;
+var DB_VIEWS_PATH = `${INTERNAL_DIR}/${DB_VIEWS_FILE}`;
+var STATE_DB_PATH = `${INTERNAL_DIR}/${STATE_DB_FILE}`;
+var INTERNAL_DIR_GLOB = `**/${INTERNAL_DIR}/**`;
+function isInternalPath(path) {
+  return path === INTERNAL_DIR || path.startsWith(`${INTERNAL_DIR}/`);
+}
+
+// src/config/manager.ts
 var ConfigManager = class {
   constructor(vaultRoot) {
     this.vaultRoot = vaultRoot;
@@ -98,13 +140,13 @@ var ConfigManager = class {
   vaultRoot;
   config = null;
   get configDir() {
-    return join(this.vaultRoot, IM_NOBSIDIAN_DIR);
+    return join(this.vaultRoot, INTERNAL_DIR);
   }
   get configPath() {
     return join(this.configDir, CONFIG_FILE);
   }
   get dbPath() {
-    return join(this.configDir, "sync.db");
+    return join(this.configDir, STATE_DB_FILE);
   }
   async load() {
     try {
@@ -152,7 +194,7 @@ var ConfigManager = class {
   }
   async ensureGitignore() {
     const gitignorePath = join(this.vaultRoot, ".gitignore");
-    const entry = ".im-nobsidian/";
+    const entry = GITIGNORE_ENTRY;
     try {
       const content = await readFile(gitignorePath, "utf-8");
       if (!content.includes(entry)) {
@@ -432,6 +474,9 @@ var StateDB = class _StateDB {
       "UPDATE sync_state SET notion_parent_id = ?, updated_at = datetime('now') WHERE id = ?"
     ).run(parentId, id);
   }
+  updatePath(id, newPath) {
+    this.db.prepare("UPDATE sync_state SET obsidian_path = ?, updated_at = datetime('now') WHERE id = ?").run(newPath, id);
+  }
   delete(id) {
     this.db.prepare("DELETE FROM sync_state WHERE id = ?").run(id);
   }
@@ -454,6 +499,9 @@ var StateDB = class _StateDB {
         VALUES (?, ?, ?, ?, datetime('now'))`
     ).run(entry.obsidianPath, entry.notionPageId, entry.title, JSON.stringify(entry.aliases));
   }
+  deleteWikilink(obsidianPath) {
+    this.db.prepare("DELETE FROM wikilink_map WHERE obsidian_path = ?").run(obsidianPath);
+  }
   // --- sync_metadata ---
   getMeta(key) {
     const row = this.db.prepare("SELECT value FROM sync_metadata WHERE key = ?").get(key);
@@ -558,7 +606,7 @@ var StateDB = class _StateDB {
 };
 
 // src/notion/property-mapper.ts
-var DATE_REGEX = /^\d{4}-\d{2}-\d{2}(?:T\d{2}:\d{2})?/;
+var DATE_REGEX = /^\d{4}-\d{2}-\d{2}(?:T\d{2}:\d{2}(?::\d{2}(?:\.\d{1,3})?)?(?:Z|[+-]\d{2}:?\d{2})?)?$/;
 var WIKILINK_REGEX = /^\[\[(.+?)(?:\|.+?)?\]\]$/;
 var PropertyMapper = class {
   schema = /* @__PURE__ */ new Map();
@@ -606,13 +654,18 @@ var PropertyMapper = class {
     switch (type) {
       case "rich_text":
         return { rich_text: [{ text: { content: String(value) } }] };
-      case "number":
-        return { number: typeof value === "number" ? value : Number(value) };
-      case "select":
-        return { select: { name: String(value) } };
+      case "number": {
+        const num = typeof value === "number" ? value : Number(value);
+        return Number.isFinite(num) ? { number: num } : null;
+      }
+      case "select": {
+        const name = String(value);
+        return name.trim() ? { select: { name } } : null;
+      }
       case "multi_select": {
         const items = Array.isArray(value) ? value : String(value).split(",").map((s) => s.trim());
-        return { multi_select: items.map((name) => ({ name: String(name) })) };
+        const names = items.map((name) => String(name)).filter((name) => name.trim());
+        return { multi_select: names.map((name) => ({ name })) };
       }
       case "checkbox":
         return { checkbox: Boolean(value) };
@@ -633,8 +686,10 @@ var PropertyMapper = class {
         return { email: String(value) };
       case "phone_number":
         return { phone_number: String(value) };
-      case "status":
-        return { status: { name: String(value) } };
+      case "status": {
+        const name = String(value);
+        return name.trim() ? { status: { name } } : null;
+      }
       case "relation": {
         const items = Array.isArray(value) ? value : [value];
         const ids = [];
@@ -664,14 +719,14 @@ var PropertyMapper = class {
         const filesArr = fileList.map((f) => {
           if (typeof f === "object" && f !== null && "url" in f) {
             const obj = f;
-            return { type: "external", name: obj.name ?? "file", external: { url: obj.url } };
+            const url2 = String(obj.url ?? "");
+            if (!url2) return null;
+            return { type: "external", name: obj.name ?? "file", external: { url: url2 } };
           }
-          return {
-            type: "external",
-            name: String(f),
-            external: { url: String(f) }
-          };
-        });
+          const url = String(f);
+          if (!url) return null;
+          return { type: "external", name: url, external: { url } };
+        }).filter(Boolean);
         return { files: filesArr };
       }
       case "created_time":
@@ -754,10 +809,9 @@ var PropertyMapper = class {
       }
       case "files": {
         const files = prop.files;
-        return files?.map((f) => ({
-          name: f.name,
-          url: f.type === "file" ? f.file?.url : f.external?.url
-        })) ?? [];
+        const urls = (files ?? []).map((f) => f.type === "file" ? f.file?.url : f.external?.url).filter((u) => typeof u === "string" && u.length > 0);
+        if (urls.length === 0) return [];
+        return urls.length === 1 ? urls[0] : urls;
       }
       case "formula": {
         const formula = prop.formula;
@@ -804,6 +858,22 @@ var PropertyMapper = class {
   }
 };
 
+// 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/notion/client.ts
 var NotionClient = class _NotionClient {
   client;
@@ -811,6 +881,12 @@ var NotionClient = class _NotionClient {
   token;
   propertyMapper = new PropertyMapper();
   customFetch;
+  minRequestInterval;
+  maxRetries;
+  retryBaseDelayMs;
+  retryBackoffFactor;
+  defaultPageSize;
+  batchSize;
   constructor(options) {
     this.client = new Client({
       auth: options.token,
@@ -821,6 +897,28 @@ var NotionClient = class _NotionClient {
     this.token = options.token;
     this.customFetch = options.fetch;
     this.sema = new Sema(options.concurrency ?? 3);
+    this.minRequestInterval = options.rateLimitIntervalMs ?? 350;
+    this.maxRetries = options.maxRetries ?? 5;
+    this.retryBaseDelayMs = options.retryBaseDelayMs ?? 1e3;
+    this.retryBackoffFactor = options.retryBackoffFactor ?? 2;
+    this.defaultPageSize = options.pageSize ?? 100;
+    this.batchSize = options.batchSize ?? 100;
+  }
+  /** config.advanced 의 운영 튜닝값으로 클라이언트를 생성한다 (매직넘버 단일 진실원). */
+  static fromConfig(config, fetch2) {
+    const a = config.advanced;
+    return new _NotionClient({
+      token: config.notion.token,
+      concurrency: a.concurrency,
+      timeoutMs: a.timeoutMs,
+      rateLimitIntervalMs: a.rateLimitIntervalMs,
+      maxRetries: a.maxRetries,
+      retryBaseDelayMs: a.retryBaseDelayMs,
+      retryBackoffFactor: a.retryBackoffFactor,
+      pageSize: a.pageSize,
+      batchSize: a.batchSize,
+      ...fetch2 ? { fetch: fetch2 } : {}
+    });
   }
   getInternalClient() {
     return this.client;
@@ -979,7 +1077,7 @@ var NotionClient = class _NotionClient {
       () => this.client.dataSources.query({
         data_source_id: dsId,
         start_cursor: options?.startCursor,
-        page_size: options?.pageSize ?? 100,
+        page_size: options?.pageSize ?? this.defaultPageSize,
         filter: options?.filter
       })
     );
@@ -994,7 +1092,7 @@ var NotionClient = class _NotionClient {
     do {
       const response = await this.queryDatabase(databaseId, {
         startCursor: cursor,
-        pageSize: 100,
+        pageSize: this.defaultPageSize,
         filter
       });
       all.push(...response.results);
@@ -1035,7 +1133,7 @@ var NotionClient = class _NotionClient {
       () => this.client.blocks.children.list({
         block_id: blockId,
         start_cursor: options?.startCursor,
-        page_size: options?.pageSize ?? 100
+        page_size: options?.pageSize ?? this.defaultPageSize
       })
     );
     return {
@@ -1083,9 +1181,9 @@ var NotionClient = class _NotionClient {
     return allBlocks;
   }
   async appendChildren(blockId, children) {
-    const BATCH_SIZE = 100;
-    for (let i = 0; i < children.length; i += BATCH_SIZE) {
-      const batch = children.slice(i, i + BATCH_SIZE);
+    const batchSize = this.batchSize;
+    for (let i = 0; i < children.length; i += batchSize) {
+      const batch = children.slice(i, i + batchSize);
       await this.withRateLimit(
         () => this.client.blocks.children.append({
           block_id: blockId,
@@ -1124,7 +1222,7 @@ var NotionClient = class _NotionClient {
         query: params.query,
         filter: params.filter,
         start_cursor: params.startCursor,
-        page_size: params.pageSize ?? 100
+        page_size: params.pageSize ?? this.defaultPageSize
       })
     );
     return {
@@ -1142,7 +1240,7 @@ var NotionClient = class _NotionClient {
           filter: { property: "object", value: "page" },
           sort: { direction: "descending", timestamp: "last_edited_time" },
           start_cursor: cursor,
-          page_size: 100
+          page_size: this.defaultPageSize
         })
       );
       for (const page of response.results) {
@@ -1156,12 +1254,43 @@ var NotionClient = class _NotionClient {
     } while (cursor);
     return results;
   }
+  /**
+   * 통합이 접근 가능한 모든 페이지를 search API로 일괄 조회한다(요청당 최대 100건).
+   * 블록 트리를 페이지별로 재귀 순회하는 getChildPagesRecursive 대비 API 호출 수가
+   * 페이지 수의 수십분의 1로 줄어든다. search API는 휴지통(in_trash) 페이지를 반환하지 않는다.
+   * 반환 객체에는 parent 정보가 포함되어 호출 측에서 root subtree ancestry 필터링이 가능하다.
+   */
+  async searchAllPages() {
+    const results = [];
+    let cursor;
+    do {
+      const response = await this.withRateLimit(
+        () => this.client.search({
+          filter: { property: "object", value: "page" },
+          start_cursor: cursor,
+          page_size: this.defaultPageSize
+        })
+      );
+      for (const page of response.results) {
+        if ("properties" in page) {
+          results.push(page);
+        }
+      }
+      cursor = response.next_cursor ?? void 0;
+    } while (cursor);
+    return results;
+  }
   async getChildPages(parentId) {
     const blocks = await this.fetchAllChildrenDeep(parentId);
     const childPageBlocks = blocks.filter((b) => b.type === "child_page");
     if (childPageBlocks.length === 0) return [];
     const pages = await Promise.all(childPageBlocks.map((b) => this.getPage(b.id)));
-    return pages;
+    return pages.filter((p) => !_NotionClient.isTrashedOrArchived(p));
+  }
+  /** 페이지가 휴지통(in_trash)이거나 보관(archived) 상태인지 판정한다. */
+  static isTrashedOrArchived(page) {
+    const inTrash = page.in_trash === true;
+    return inTrash || page.archived === true;
   }
   async getChildDatabaseIds(parentId) {
     const children = await this.fetchAllChildren(parentId);
@@ -1173,7 +1302,15 @@ var NotionClient = class _NotionClient {
     while (currentLevel.length > 0) {
       const nextLevel = [];
       for (const id of currentLevel) {
-        const children = await this.getChildPages(id);
+        let children;
+        try {
+          children = await this.getChildPages(id);
+        } catch (error) {
+          getLogger().warn(
+            `[Im-Nobsidian] \uD558\uC704 \uD398\uC774\uC9C0 \uC2A4\uCE94 \uAC74\uB108\uB700 (${id}): ${error instanceof Error ? error.message : String(error)}`
+          );
+          continue;
+        }
         for (const child of children) {
           all.push(child);
           nextLevel.push(child.id);
@@ -1192,7 +1329,7 @@ var NotionClient = class _NotionClient {
         () => this.client.views.list({
           database_id: databaseId,
           start_cursor: cursor,
-          page_size: 100
+          page_size: this.defaultPageSize
         })
       );
       const viewRefs = response.results;
@@ -1269,7 +1406,6 @@ var NotionClient = class _NotionClient {
   }
   // ─── Internal ───
   lastRequestTime = 0;
-  minRequestInterval = 350;
   async withRateLimit(fn) {
     await this.sema.acquire();
     try {
@@ -1288,8 +1424,8 @@ var NotionClient = class _NotionClient {
     try {
       return await fn();
     } catch (error) {
-      if (isRetryable(error) && attempt < 5) {
-        const baseDelay = extractRetryAfter(error) ?? 1e3 * Math.pow(2, attempt);
+      if (isRetryable(error) && attempt < this.maxRetries) {
+        const baseDelay = extractRetryAfter(error) ?? this.retryBaseDelayMs * Math.pow(this.retryBackoffFactor, attempt);
         const jitter = baseDelay * (0.5 + Math.random() * 0.5);
         await sleep(jitter);
         return this.executeWithRetry(fn, attempt + 1);
@@ -1837,23 +1973,29 @@ var ChangeDetector = class {
   }
 };
 
-// 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;
+// src/constants/markers.ts
+var MARKER_BRAND = "im-nobsidian";
+var WIKILINK_PROTOCOL = `${MARKER_BRAND}://wikilink/`;
+var EMBED_PROTOCOL = `${MARKER_BRAND}://embed/`;
+function spacedMarker(body) {
+  return `%% ${MARKER_BRAND}:${body} %%`;
 }
-function getLogger() {
-  return currentLogger;
+var SPACED_END = spacedMarker("end");
+function compactMarker(body) {
+  return `%%${MARKER_BRAND}:${body}%%`;
 }
+var TOGGLE_START = compactMarker("toggle:start");
+var TOGGLE_END = compactMarker("toggle:end");
+var COLUMN_LIST_START = compactMarker("column-list:start");
+var COLUMN_LIST_END = compactMarker("column-list:end");
+var COLUMN_SEP = compactMarker("column");
+var TOC_MARKER = compactMarker("toc");
+var PROPERTIES_TAG = `# ${MARKER_BRAND}:properties`;
+var MARKER_BRAND_RE = MARKER_BRAND;
 
 // src/converter/pipeline.ts
+var INLINE_DB_PROBE = new RegExp(`%% ${MARKER_BRAND_RE}:inline-db`);
+var TOGGLE_HEADING_PROBE = new RegExp(`%% ${MARKER_BRAND_RE}:toggle-heading`);
 var ConversionPipeline = class {
   preProcessors = [];
   postProcessors = [];
@@ -1866,9 +2008,9 @@ var ConversionPipeline = class {
     this.postProcessors.sort((a, b) => a.order - b.order);
   }
   selectPath(content) {
-    const hasInlineDb = /%% im-nobsidian:inline-db/.test(content);
+    const hasInlineDb = INLINE_DB_PROBE.test(content);
     const hasColumnLayout = />\s*\[!col\]/.test(content);
-    const hasToggleHeading = /%% im-nobsidian:toggle-heading/.test(content);
+    const hasToggleHeading = TOGGLE_HEADING_PROBE.test(content);
     if (hasInlineDb || hasColumnLayout || hasToggleHeading) {
       return "block-api";
     }
@@ -1965,7 +2107,7 @@ var WikilinkResolver = class {
           startIndex: 0
         });
         const encodedTarget = encodeURIComponent(target);
-        return `[${label}](im-nobsidian://wikilink/${encodedTarget})`;
+        return `[${label}](${WIKILINK_PROTOCOL}${encodedTarget})`;
       }
     );
     return {
@@ -2012,8 +2154,8 @@ var CalloutTransformer = class {
         const emoji = CALLOUT_EMOJI_MAP[type.toLowerCase()] ?? "\u{1F4DD}";
         const titleText = title?.trim() || type;
         const foldMeta = foldable ? `
-%% im-nobsidian:callout:type=${type}&foldable=${foldable === "+" ? "open" : "closed"} %%` : `
-%% im-nobsidian:callout:type=${type} %%`;
+${spacedMarker(`callout:type=${type}&foldable=${foldable === "+" ? "open" : "closed"}`)}` : `
+${spacedMarker(`callout:type=${type}`)}`;
         return `> ${emoji} **${titleText}**${foldMeta}`;
       }
     );
@@ -2063,16 +2205,16 @@ var EmbedResolver = class {
         if (isPush && !isExternalUrl(target)) {
           const fileName = target.split("/").pop() ?? target;
           return `> \u{1F4CE} ${fileName}
-> %% im-nobsidian:local-image:${target} %%`;
+> ${spacedMarker(`local-image:${target}`)}`;
         }
         return `![${target}](${encodeURI(target)})`;
       }
       const encoded = encodeURIComponent(target);
-      return `[${target}](im-nobsidian://embed/${encoded})`;
+      return `[${target}](${EMBED_PROTOCOL}${encoded})`;
     });
     content = content.replace(MARKDOWN_IMAGE_REGEX, (_match, alt, url) => {
       if (isVideoUrl(url)) {
-        return `%% im-nobsidian:embed:type=video&url=${encodeURIComponent(url)} %%
+        return `${spacedMarker(`embed:type=video&url=${encodeURIComponent(url)}`)}
 [${alt || "Video"}](${url})`;
       }
       if (isExternalUrl(url)) {
@@ -2097,7 +2239,7 @@ function isExternalUrl(url) {
 }
 
 // src/converter/pre-processors/preserve-marker.ts
-var MARKER_REGEX = /%% im-nobsidian:(\w[\w-]*):([^\s]+?) %%/g;
+var MARKER_REGEX = new RegExp(`%% ${MARKER_BRAND_RE}:(\\w[\\w-]*):([^\\s]+?) %%`, "g");
 var PreserveMarkerCollector = class {
   name = "PreserveMarkerCollector";
   order = 70;
@@ -2167,7 +2309,7 @@ var PropertiesTableInjector = class {
     }
     const yamlStr = matter7.stringify("", filteredProps).trim();
     const yamlBody = yamlStr.slice(4, -3).trim();
-    const codeBlock = "```yaml\n# im-nobsidian:properties\n" + yamlBody + "\n```";
+    const codeBlock = "```yaml\n" + PROPERTIES_TAG + "\n" + yamlBody + "\n```";
     const content = codeBlock + "\n\n---\n\n" + input.content;
     return { content, metadata: input.metadata };
   }
@@ -2176,7 +2318,10 @@ var PropertiesTableInjector = class {
 // src/converter/pre-processors/html-annotation.ts
 var UNDERLINE_REGEX = /<u>([\s\S]*?)<\/u>/g;
 var COLOR_SPAN_REGEX = /<span class="notion-(\w+?)(?:-bg)?">([\s\S]*?)<\/span>/g;
-var IM_NOBSIDIAN_COLOR_REGEX = /%% im-nobsidian:color:(\w+(?:_background)?) %%([\s\S]*?)%% im-nobsidian:end %%/g;
+var IM_NOBSIDIAN_COLOR_REGEX = new RegExp(
+  `%% ${MARKER_BRAND_RE}:color:(\\w+(?:_background)?) %%([\\s\\S]*?)%% ${MARKER_BRAND_RE}:end %%`,
+  "g"
+);
 var HtmlAnnotationStripper = class {
   name = "HtmlAnnotationStripper";
   order = 5;
@@ -2194,8 +2339,8 @@ var HtmlAnnotationStripper = class {
 
 // src/converter/post-processors/mention-to-wikilink.ts
 var NOTION_LINK_REGEX = /\[([^\]]+)\]\((?:https:\/\/(?:www\.)?notion\.so\/|notion:\/\/)([a-f0-9-]+)\)/g;
-var WIKILINK_PRESERVE_REGEX = /\[([^\]]+)\]\(im-nobsidian:\/\/wikilink\/([^)]+)\)/g;
-var EMBED_PRESERVE_REGEX = /\[([^\]]+)\]\(im-nobsidian:\/\/embed\/([^)]+)\)/g;
+var WIKILINK_PRESERVE_REGEX = new RegExp(`\\[([^\\]]+)\\]\\(${WIKILINK_PROTOCOL}([^)]+)\\)`, "g");
+var EMBED_PRESERVE_REGEX = new RegExp(`\\[([^\\]]+)\\]\\(${EMBED_PROTOCOL}([^)]+)\\)`, "g");
 var MentionToWikilink = class {
   name = "MentionToWikilink";
   order = 10;
@@ -2244,7 +2389,7 @@ var PreserveMarkerInjector = class {
   }
   formatMarker(marker) {
     const params = Object.entries(marker.params).map(([k, v]) => `${k}=${encodeURIComponent(v)}`).join("&");
-    return `%% im-nobsidian:${marker.type}:${params} %%`;
+    return spacedMarker(`${marker.type}:${params}`);
   }
 };
 
@@ -2263,7 +2408,10 @@ var EMOJI_TYPE_MAP = {
   "\u{1F4CC}": "example",
   "\u{1F4AC}": "quote"
 };
-var CALLOUT_PRESERVE_REGEX = /%% im-nobsidian:callout:type=(\w+)(?:&foldable=(open|closed))? %%/g;
+var CALLOUT_PRESERVE_REGEX = new RegExp(
+  `%% ${MARKER_BRAND_RE}:callout:type=(\\w+)(?:&foldable=(open|closed))? %%`,
+  "g"
+);
 var CalloutRestorer = class {
   name = "CalloutRestorer";
   order = 20;
@@ -2296,7 +2444,10 @@ function escapeRegex(str) {
 }
 
 // src/converter/post-processors/color-annotator.ts
-var COLOR_MARKER_REGEX = /%% im-nobsidian:color:(\w+(?:_background)?) %%([\s\S]*?)%% im-nobsidian:end %%/g;
+var COLOR_MARKER_REGEX = new RegExp(
+  `%% ${MARKER_BRAND_RE}:color:(\\w+(?:_background)?) %%([\\s\\S]*?)%% ${MARKER_BRAND_RE}:end %%`,
+  "g"
+);
 var ColorAnnotator = class {
   name = "ColorAnnotator";
   order = 30;
@@ -2371,7 +2522,10 @@ function normalizeDate(dateStr) {
 }
 
 // src/converter/post-processors/local-image-restorer.ts
-var LOCAL_IMAGE_MARKER_REGEX = />\s*📎\s*[^\n]*\n>\s*%%\s*im-nobsidian:local-image:([^\s]+)\s*%%/g;
+var LOCAL_IMAGE_MARKER_REGEX = new RegExp(
+  `>\\s*\u{1F4CE}\\s*[^\\n]*\\n>\\s*%%\\s*${MARKER_BRAND_RE}:local-image:([^\\s]+)\\s*%%`,
+  "g"
+);
 var LocalImageRestorer = class {
   name = "LocalImageRestorer";
   order = 15;
@@ -2385,7 +2539,9 @@ var LocalImageRestorer = class {
     return { content, metadata: input.metadata };
   }
 };
-var YAML_PROPERTIES_REGEX = /```yaml\n# im-nobsidian:properties\n([\s\S]*?)```\n*(?:---\n*)?/;
+var YAML_PROPERTIES_REGEX = new RegExp(
+  "```yaml\\n# " + MARKER_BRAND_RE + ":properties\\n([\\s\\S]*?)```\\n*(?:---\\n*)?"
+);
 var LEGACY_TABLE_REGEX = /^\s*\| Property\s*\| Value\s*\|\n\s*\|\s*-{3,}\s*\|\s*-{3,}\s*\|\n((?:\|[^\n]+\|\n?)+)\n*---\n*/;
 var PropertiesTableRestorer = class {
   name = "PropertiesTableRestorer";
@@ -2502,11 +2658,6 @@ function createDefaultPipeline(options) {
 }
 var TRULY_UNSUPPORTED_BLOCK_TYPES = ["unsupported", "template"];
 var DIVIDER_PLACEHOLDER = "\u200B%%IM-NOBSIDIAN_DIVIDER%%\u200B";
-var TOGGLE_START = "%%im-nobsidian:toggle:start%%";
-var TOGGLE_END = "%%im-nobsidian:toggle:end%%";
-var COLUMN_LIST_START = "%%im-nobsidian:column-list:start%%";
-var COLUMN_SEP = "%%im-nobsidian:column%%";
-var COLUMN_LIST_END = "%%im-nobsidian:column-list:end%%";
 var VIDEO_URL_PATTERNS = [
   /^https?:\/\/(www\.)?youtube\.com\/watch/,
   /^https?:\/\/youtu\.be\//,
@@ -2552,7 +2703,7 @@ function richTextToMarkdown(richText) {
     if (t.href) text = `[${text}](${t.href})`;
     const color = a?.color;
     if (color && color !== "default") {
-      text = `%% im-nobsidian:color:${color} %%${text}%% im-nobsidian:end %%`;
+      text = `${spacedMarker(`color:${color}`)}${text}${SPACED_END}`;
     }
     return text;
   }).join("");
@@ -2588,9 +2739,9 @@ var BlockConverter = class {
       this.n2m.setCustomTransformer(blockType, (block) => {
         const id = block.id ?? "unknown";
         return Promise.resolve(
-          `> [!im-nobsidian-unsupported] Notion \uC804\uC6A9 \uBE14\uB85D
+          `> [!${MARKER_BRAND}-unsupported] Notion \uC804\uC6A9 \uBE14\uB85D
 > type: ${blockType}, id: ${id}
-> %%im-nobsidian:unsupported:type=${blockType}&id=${id}%%`
+> ${compactMarker(`unsupported:type=${blockType}&id=${id}`)}`
         );
       });
     }
@@ -2740,7 +2891,7 @@ ${COLUMN_LIST_END}`;
       const b = block;
       const title = b.child_database?.title ?? "Database";
       return `> [!database] ${title}
-> %%im-nobsidian:child-database:id=${b.id}&title=${encodeURIComponent(title)}%%`;
+> ${compactMarker(`child-database:id=${b.id}&title=${encodeURIComponent(title)}`)}`;
     });
   }
   registerLinkToPageTransformer() {
@@ -2766,7 +2917,7 @@ ${COLUMN_LIST_END}`;
   registerTocTransformer() {
     if (!this.n2m) return;
     this.n2m.setCustomTransformer("table_of_contents", async () => {
-      return `%%im-nobsidian:toc%%`;
+      return TOC_MARKER;
     });
   }
   registerBreadcrumbTransformer() {
@@ -3180,26 +3331,34 @@ var EXTENSION_TO_MIME = {
   ".tiff": "image/tiff"
 };
 var ImageHandler = class {
-  constructor(vaultFs, attachmentFolder = "attachments", notionClient, customFetch) {
+  constructor(vaultFs, attachmentFolder = "attachments", notionClient, customFetch, options) {
     this.vaultFs = vaultFs;
     this.attachmentFolder = attachmentFolder;
     this.notionClient = notionClient;
     this.customFetch = customFetch;
+    this.concurrency = options?.concurrency ?? 3;
+    this.maxRetries = options?.maxRetries ?? 3;
+    this.retryBaseMs = options?.retryBaseMs ?? 1e3;
+    this.maxFileSizeBytes = options?.maxFileSizeBytes ?? 100 * 1024 * 1024;
   }
   vaultFs;
   attachmentFolder;
   notionClient;
   customFetch;
+  concurrency;
+  maxRetries;
+  retryBaseMs;
+  maxFileSizeBytes;
   get fetchFn() {
     return this.customFetch ?? globalThis.fetch;
   }
   async downloadImage(url, pageTitle) {
-    const maxRetries = 3;
+    const maxRetries = this.maxRetries;
     let lastError = null;
     for (let attempt = 0; attempt < maxRetries; attempt++) {
       try {
         if (attempt > 0) {
-          await new Promise((r) => setTimeout(r, 1e3 * attempt));
+          await new Promise((r) => setTimeout(r, this.retryBaseMs * attempt));
           getLogger().info(
             `[Im-Nobsidian] \uC774\uBBF8\uC9C0 \uB2E4\uC6B4\uB85C\uB4DC \uC7AC\uC2DC\uB3C4 (${attempt + 1}/${maxRetries}): ${pageTitle}`
           );
@@ -3233,7 +3392,7 @@ var ImageHandler = class {
     if (notionMatches.length === 0 && internalMatches.length === 0) {
       return { content: markdown, downloads: [] };
     }
-    const sema = new Sema(3);
+    const sema = new Sema(this.concurrency);
     const downloads = [];
     let result = markdown;
     const httpResults = await Promise.allSettled(
@@ -3342,7 +3501,7 @@ var ImageHandler = class {
     if (totalMatches === 0) {
       return { content: markdown, downloads: [] };
     }
-    const sema = new Sema(3);
+    const sema = new Sema(this.concurrency);
     const downloads = [];
     let result = markdown;
     for (const match of notionHttpMatches) {
@@ -3437,12 +3596,12 @@ var ImageHandler = class {
     }
   }
   async downloadFile(url, _pageTitle, caption) {
-    const maxRetries = 3;
+    const maxRetries = this.maxRetries;
     let lastError = null;
     for (let attempt = 0; attempt < maxRetries; attempt++) {
       try {
         if (attempt > 0) {
-          await new Promise((r) => setTimeout(r, 1e3 * attempt));
+          await new Promise((r) => setTimeout(r, this.retryBaseMs * attempt));
           getLogger().info(
             `[Im-Nobsidian] \uD30C\uC77C \uB2E4\uC6B4\uB85C\uB4DC \uC7AC\uC2DC\uB3C4 (${attempt + 1}/${maxRetries}): ${caption}`
           );
@@ -3452,7 +3611,7 @@ var ImageHandler = class {
           throw new Error(`\uD30C\uC77C \uB2E4\uC6B4\uB85C\uB4DC \uC2E4\uD328: ${response.status} ${response.statusText}`);
         }
         const contentLength = response.headers.get("content-length");
-        const MAX_FILE_SIZE = 100 * 1024 * 1024;
+        const MAX_FILE_SIZE = this.maxFileSizeBytes;
         if (contentLength && parseInt(contentLength, 10) > MAX_FILE_SIZE) {
           const sizeMB = Math.round(parseInt(contentLength, 10) / 1024 / 1024);
           getLogger().debug(`[Im-Nobsidian] \uD30C\uC77C \uC2A4\uD0B5 \u2014 \uB108\uBB34 \uD07C (${sizeMB}MB): ${caption}`);
@@ -3601,15 +3760,16 @@ function getFolderPath(filePath) {
   return parts.length > 1 ? parts.slice(0, -1).join("/") : "";
 }
 var FileHandler = class {
-  constructor(vaultFs, notionClient, stateDb) {
+  constructor(vaultFs, notionClient, stateDb, concurrency = 2) {
     this.vaultFs = vaultFs;
     this.notionClient = notionClient;
     this.stateDb = stateDb;
+    this.sema = new Sema(concurrency);
   }
   vaultFs;
   notionClient;
   stateDb;
-  sema = new Sema(2);
+  sema;
   async pushFilesForFolder(folderPageId, folderPath) {
     const allFiles = await this.vaultFs.listNonMarkdownFiles();
     const folderFiles = allFiles.filter((f) => getFolderPath(f.path) === folderPath);
@@ -3764,6 +3924,43 @@ var FileHandler = class {
   }
 };
 
+// src/sync/conflict-detector.ts
+function resolvePullConflict(input) {
+  const { record, localContent, remoteContent, remoteChange, strategy } = input;
+  const localHash = computeHash(localContent);
+  const localModified = localHash !== record.contentHash;
+  if (!localModified) {
+    return { action: "write", localHash };
+  }
+  if (strategy === "remote-first") {
+    return { action: "write", localHash };
+  }
+  if (strategy === "local-first") {
+    return { action: "skip", localHash };
+  }
+  if (localContent === remoteContent) {
+    return { action: "write", localHash };
+  }
+  const baseContent = record.baseSnapshot?.toString("utf-8") ?? null;
+  if (baseContent !== null && remoteContent === baseContent) {
+    return { action: "skip", localHash };
+  }
+  const conflict = {
+    syncRecord: record,
+    localChange: {
+      path: record.obsidianPath,
+      type: "modified",
+      currentHash: localHash,
+      previousHash: record.contentHash
+    },
+    remoteChange,
+    baseContent,
+    localContent,
+    remoteContent
+  };
+  return { action: "conflict", conflict, localHash };
+}
+
 // src/utils/sanitize.ts
 var INVALID_CHARS = /[<>:"/\\|?*\x00-\x1f]/g;
 var TRAILING_DOTS = /\.+$/;
@@ -3825,12 +4022,13 @@ var BaseFileGenerator = class {
     this.writeFormulas(lines, options.viewsConfig.views);
     this.writePropertyDisplayNames(lines, options.schema);
     this.writeViews(lines, options.viewsConfig.views, options.schema);
-    return lines.join("\n");
+    return lines.join("\n") + "\n";
   }
   writeFilters(lines, folderPath) {
     lines.push("filters:");
     lines.push("  and:");
     lines.push(`    - file.inFolder("${folderPath}")`);
+    lines.push(`    - file.ext == "md"`);
     lines.push("");
   }
   needsContentCoverFormula(views) {
@@ -3869,25 +4067,25 @@ var BaseFileGenerator = class {
       if (view.order && view.order.length > 0) {
         lines.push("    order:");
         for (const col of view.order) {
-          lines.push(`      - ${col}`);
+          lines.push(`      - ${this.propRef(col)}`);
         }
       }
       if (view.sort && view.sort.length > 0) {
         lines.push("    sort:");
         for (const s of view.sort) {
-          lines.push(`      - column: ${s.column}`);
+          lines.push(`      - property: ${this.propRef(s.property)}`);
           lines.push(`        direction: ${s.direction}`);
         }
       }
       if (view.groupBy) {
         lines.push("    groupBy:");
-        lines.push(`      property: ${view.groupBy.property}`);
+        lines.push(`      property: ${this.propRef(view.groupBy.property)}`);
         if (view.groupBy.direction) {
           lines.push(`      direction: ${view.groupBy.direction}`);
         }
       }
       if (view.image) {
-        lines.push(`    image: ${view.image}`);
+        lines.push(`    image: ${this.propRef(view.image)}`);
       }
     }
   }
@@ -3901,7 +4099,9 @@ var BaseFileGenerator = class {
     if (view.properties && view.properties.length > 0) {
       const visible = view.properties.filter((p) => p.visible !== false).map((p) => {
         const name = p.propertyName ?? this.resolvePropertyName(p.propertyId, schema);
-        return name ? this.toNoteRef(name) : null;
+        if (!name) return null;
+        if (schema[name]?.type === "title") return null;
+        return this.toNoteRef(name);
       }).filter((name) => !!name);
       if (visible.length > 0) {
         result.order = ["file.name", ...visible];
@@ -3909,17 +4109,17 @@ var BaseFileGenerator = class {
     }
     if (view.sorts && view.sorts.length > 0) {
       result.sort = view.sorts.map((s) => {
-        let column;
+        let property;
         if (s.property) {
           const propName = this.resolvePropertyName(s.property, schema) ?? s.property;
-          column = this.toNoteRef(propName);
+          property = this.toNoteRef(propName);
         } else if (s.timestamp) {
-          column = s.timestamp === "created_time" ? "file.ctime" : "file.mtime";
+          property = s.timestamp === "created_time" ? "file.ctime" : "file.mtime";
         } else {
           return null;
         }
         return {
-          column,
+          property,
           direction: s.direction === "ascending" ? "ASC" : "DESC"
         };
       }).filter((s) => s !== null);
@@ -3948,12 +4148,29 @@ var BaseFileGenerator = class {
   toNoteRef(propertyName) {
     return propertyName;
   }
+  /**
+   * 속성 참조(order/sort/groupBy/image)를 YAML로 안전하게 출력한다.
+   * `file.name`·`formula.coverImage`·`note.cover` 같은 접두사 식별자와 공백 포함 일반 속성명은
+   * 평문 스칼라로 안전하므로 그대로 두고, 콜론·해시·따옴표 등 YAML 메타문자가 있을 때만 인용한다.
+   */
+  propRef(ref) {
+    if (/^[A-Za-z0-9_][A-Za-z0-9_. ]*$/.test(ref) && !ref.endsWith(" ")) return ref;
+    return `"${ref.replace(/\\/g, "\\\\").replace(/"/g, '\\"')}"`;
+  }
   resolvePropertyName(propertyId, schema) {
+    const target = this.decodeId(propertyId);
     for (const [name, prop] of Object.entries(schema)) {
-      if (prop.id === propertyId) return name;
+      if (this.decodeId(prop.id) === target) return name;
     }
     return void 0;
   }
+  decodeId(id) {
+    try {
+      return decodeURIComponent(id);
+    } catch {
+      return id;
+    }
+  }
   yamlKey(key) {
     if (/^[a-zA-Z_][a-zA-Z0-9_]*$/.test(key)) return key;
     return `"${key.replace(/"/g, '\\"')}"`;
@@ -3979,8 +4196,6 @@ var NOTION_PDF_RE = /[\t ]*<pdf src="([^"]*)">([\s\S]*?)<\/pdf>/g;
 var NOTION_FILE_RE = /[\t ]*<file src="([^"]*)">([\s\S]*?)<\/file>/g;
 var NOTION_TAB_RE = /<tab title="([^"]*)">([\s\S]*?)<\/tab>/g;
 var NOTION_UNDERLINE_RE = /<span underline="true">([\s\S]*?)<\/span>/g;
-var TOGGLE_START2 = "%%im-nobsidian:toggle:start%%";
-var TOGGLE_END2 = "%%im-nobsidian:toggle:end%%";
 function notionEnhancedToObsidian(enhanced) {
   let result = enhanced;
   result = convertSyncedBlockRef(result);
@@ -4004,9 +4219,13 @@ function notionEnhancedToObsidian(enhanced) {
   result = removeEmptyBlocks(result);
   result = unescapePipes(result);
   result = unescapeNotionChars(result);
+  result = unescapeWikilinkBrackets(result);
   result = ensureCalloutContinuity(result);
   return result;
 }
+function unescapeWikilinkBrackets(content) {
+  return content.replace(/\\\[\\\[([\s\S]*?)\\\]\\\]/g, "[[$1]]");
+}
 function obsidianToNotionEnhanced(obsidian) {
   let result = obsidian;
   result = convertTogglesToHtml(result);
@@ -4016,8 +4235,31 @@ function obsidianToNotionEnhanced(obsidian) {
   result = restoreUnknownBlocks(result);
   result = restoreColorSpans(result);
   result = restoreUnderlineSpans(result);
+  result = convertMentionPageIdToUrl(result);
+  result = restoreWikilinkPreserveLinks(result);
   return result;
 }
+var MENTION_PAGE_ID_RE = /<mention-page id="([^"]+)">[\s\S]*?<\/mention-page>/g;
+var WIKILINK_PRESERVE_LINK_RE = new RegExp(
+  `\\[([^\\]]+)\\]\\(${WIKILINK_PROTOCOL}([^)]+)\\)`,
+  "g"
+);
+function convertMentionPageIdToUrl(content) {
+  return content.replace(MENTION_PAGE_ID_RE, (_match, id) => {
+    const nohyph = id.replace(/-/g, "");
+    return `<mention-page url="https://www.notion.so/${nohyph}"/>`;
+  });
+}
+function restoreWikilinkPreserveLinks(content) {
+  return content.replace(WIKILINK_PRESERVE_LINK_RE, (_match, label, enc) => {
+    let target = enc;
+    try {
+      target = decodeURIComponent(enc);
+    } catch {
+    }
+    return target === label ? `[[${target}]]` : `[[${target}|${label}]]`;
+  });
+}
 function normalizeCodeBlockToggles(content) {
   return content.replace(
     /^- (.+)\n\t```(\w*)\n([\s\S]*?)\n\t```$/gm,
@@ -4088,12 +4330,14 @@ function preserveUnknownBlocks(content) {
     const typeMatch = /type="([^"]*)"/.exec(attrs);
     const altMatch = /alt="([^"]*)"/.exec(attrs);
     const blockType = altMatch?.[1] ?? typeMatch?.[1] ?? "unknown";
-    return `%%im-nobsidian:unknown:id=${id}&type=${blockType}%%`;
+    return compactMarker(`unknown:id=${id}&type=${blockType}`);
   });
   result = result.replace(NOTION_UNKNOWN_URL_RE, (_match, url, attrs) => {
     const altMatch = /alt="([^"]*)"/.exec(attrs);
     const blockType = altMatch?.[1] ?? "bookmark";
-    return `%%im-nobsidian:unknown:id=${encodeURIComponent(url)}&type=${blockType}%%`;
+    const marker = compactMarker(`unknown:id=${encodeURIComponent(url)}&type=${blockType}`);
+    const label = blockType === "embed" ? "\u{1F517} Embed" : blockType === "bookmark" ? "\u{1F516} Bookmark" : `\u{1F517} ${blockType}`;
+    return `[${label}](${url})${marker}`;
   });
   return result;
 }
@@ -4141,7 +4385,7 @@ ${indented}`;
 }
 function convertUnderlineSpans(content) {
   return content.replace(NOTION_UNDERLINE_RE, (_match, text) => {
-    return `%%im-nobsidian:underline%%${text}%%/underline%%`;
+    return `${compactMarker("underline")}${text}%%/underline%%`;
   });
 }
 function convertTogglesToHtml(content) {
@@ -4161,14 +4405,14 @@ ${bodyText}
 </details>`;
     });
   }
-  const startRe = new RegExp(escapeRegex3(TOGGLE_START2), "g");
-  const endRe = new RegExp(escapeRegex3(TOGGLE_END2), "g");
+  const startRe = new RegExp(escapeRegex3(TOGGLE_START), "g");
+  const endRe = new RegExp(escapeRegex3(TOGGLE_END), "g");
   safety = 0;
-  while (result.includes(TOGGLE_START2) && safety++ < 100) {
-    const startIdx = result.indexOf(TOGGLE_START2);
-    const endIdx = findMatchingEnd(result, startIdx + TOGGLE_START2.length);
+  while (result.includes(TOGGLE_START) && safety++ < 100) {
+    const startIdx = result.indexOf(TOGGLE_START);
+    const endIdx = findMatchingEnd(result, startIdx + TOGGLE_START.length);
     if (endIdx === -1) break;
-    const inner = result.slice(startIdx + TOGGLE_START2.length, endIdx).trim();
+    const inner = result.slice(startIdx + TOGGLE_START.length, endIdx).trim();
     const titleMatch = /^- (.+)$/m.exec(inner);
     const title = titleMatch ? titleMatch[1] : "";
     const body = inner.split("\n").slice(1).map((line) => line.replace(/^ {2}/, "")).join("\n").trim();
@@ -4178,7 +4422,7 @@ ${bodyText}
 ${body}
 
 </details>`;
-    result = result.slice(0, startIdx) + html + result.slice(endIdx + TOGGLE_END2.length);
+    result = result.slice(0, startIdx) + html + result.slice(endIdx + TOGGLE_END.length);
   }
   result = result.replace(startRe, "").replace(endRe, "");
   return result;
@@ -4187,16 +4431,16 @@ function findMatchingEnd(content, startFrom) {
   let depth = 1;
   let pos = startFrom;
   while (pos < content.length && depth > 0) {
-    const nextStart = content.indexOf(TOGGLE_START2, pos);
-    const nextEnd = content.indexOf(TOGGLE_END2, pos);
+    const nextStart = content.indexOf(TOGGLE_START, pos);
+    const nextEnd = content.indexOf(TOGGLE_END, pos);
     if (nextEnd === -1) return -1;
     if (nextStart !== -1 && nextStart < nextEnd) {
       depth++;
-      pos = nextStart + TOGGLE_START2.length;
+      pos = nextStart + TOGGLE_START.length;
     } else {
       depth--;
       if (depth === 0) return nextEnd;
-      pos = nextEnd + TOGGLE_END2.length;
+      pos = nextEnd + TOGGLE_END.length;
     }
   }
   return -1;
@@ -4269,7 +4513,7 @@ function convertPageLinks(content) {
 function convertColorSpans(content) {
   return content.replace(
     NOTION_COLOR_SPAN_RE,
-    (_match, color, text) => `%%im-nobsidian:color:${color}%%${text}%%/color%%`
+    (_match, color, text) => `${compactMarker(`color:${color}`)}${text}%%/color%%`
   );
 }
 function convertDatabaseBlocks(content) {
@@ -4370,7 +4614,10 @@ function restoreTabBlocks(content) {
     return `<tab title="${title}">${unquoted}</tab>`;
   });
 }
-var OBSIDIAN_UNKNOWN_RE = /%%im-nobsidian:unknown:id=([^&]+)&type=([^%]+)%%/g;
+var OBSIDIAN_UNKNOWN_RE = new RegExp(
+  `(?:\\[[^\\]]*\\]\\([^)]*\\))?%%${MARKER_BRAND_RE}:unknown:id=([^&]+)&type=([^%]+)%%`,
+  "g"
+);
 function restoreUnknownBlocks(content) {
   return content.replace(OBSIDIAN_UNKNOWN_RE, (_match, id, type) => {
     const decoded = decodeURIComponent(id);
@@ -4380,13 +4627,19 @@ function restoreUnknownBlocks(content) {
     return `<unknown id="${id}" type="${type}"/>`;
   });
 }
-var OBSIDIAN_COLOR_RE = /%%im-nobsidian:color:([^%]+)%%([\s\S]*?)%%\/color%%/g;
+var OBSIDIAN_COLOR_RE = new RegExp(
+  `%%${MARKER_BRAND_RE}:color:([^%]+)%%([\\s\\S]*?)%%\\/color%%`,
+  "g"
+);
 function restoreColorSpans(content) {
   return content.replace(OBSIDIAN_COLOR_RE, (_match, color, text) => {
     return `<span color="${color}">${text}</span>`;
   });
 }
-var OBSIDIAN_UNDERLINE_RE = /%%im-nobsidian:underline%%([\s\S]*?)%%\/underline%%/g;
+var OBSIDIAN_UNDERLINE_RE = new RegExp(
+  `%%${MARKER_BRAND_RE}:underline%%([\\s\\S]*?)%%\\/underline%%`,
+  "g"
+);
 function restoreUnderlineSpans(content) {
   return content.replace(OBSIDIAN_UNDERLINE_RE, (_match, text) => {
     return `<span underline="true">${text}</span>`;
@@ -4452,16 +4705,18 @@ var DatabaseSyncer = class {
   async pullAll() {
     const databases = this.config.notion.databases;
     if (!databases || databases.length === 0) {
-      return { created: 0, updated: 0, failed: [] };
+      return { created: 0, updated: 0, conflicts: [], failed: [] };
     }
     let created = 0;
     let updated = 0;
+    const conflicts = [];
     const failed = [];
     for (const dbConfig of databases) {
       try {
         const result = await this.pullDatabase(dbConfig);
         created += result.created;
         updated += result.updated;
+        conflicts.push(...result.conflicts);
         failed.push(...result.failed);
       } catch (error) {
         getLogger().warn(`[DB Sync] DB ${dbConfig.databaseId} pull \uC2E4\uD328:`, error);
@@ -4472,12 +4727,12 @@ var DatabaseSyncer = class {
         });
       }
     }
-    return { created, updated, failed };
+    return { created, updated, conflicts, failed };
   }
   async pushAll() {
     const databases = this.config.notion.databases;
     if (!databases || databases.length === 0) {
-      return { created: 0, updated: 0, failed: [] };
+      return { created: 0, updated: 0, conflicts: [], failed: [] };
     }
     let created = 0;
     let updated = 0;
@@ -4497,7 +4752,7 @@ var DatabaseSyncer = class {
         });
       }
     }
-    return { created, updated, failed };
+    return { created, updated, conflicts: [], failed };
   }
   async pullDatabase(dbConfig) {
     const schema = await this.notionClient.getDatabaseSchema(dbConfig.databaseId);
@@ -4511,14 +4766,19 @@ var DatabaseSyncer = class {
     );
     let created = 0;
     let updated = 0;
+    const conflicts = [];
     const failed = [];
     for (const page of pages) {
       try {
         const record = this.stateDb.getByNotionId(page.id);
         if (record) {
           if (page.last_edited_time === record.notionLastEdited) continue;
-          await this.pullDatabasePage(page, dbConfig);
-          updated++;
+          const outcome = await this.pullDatabasePage(page, dbConfig);
+          if (outcome.action === "written") {
+            updated++;
+          } else if (outcome.action === "conflict") {
+            conflicts.push(outcome.conflict);
+          }
         } else {
           await this.pullDatabasePage(page, dbConfig);
           created++;
@@ -4531,12 +4791,14 @@ var DatabaseSyncer = class {
         });
       }
     }
-    getLogger().debug(`[DB Sync] ${dbConfig.localFolder}: ${created} \uC0DD\uC131, ${updated} \uC5C5\uB370\uC774\uD2B8`);
-    return { created, updated, failed };
+    getLogger().debug(
+      `[DB Sync] ${dbConfig.localFolder}: ${created} \uC0DD\uC131, ${updated} \uC5C5\uB370\uC774\uD2B8, ${conflicts.length} \uCDA9\uB3CC`
+    );
+    return { created, updated, conflicts, failed };
   }
   async pullDatabaseViews(dbConfig, force = false) {
     try {
-      const configPath = ".im-nobsidian/db-views.json";
+      const configPath = DB_VIEWS_PATH;
       if (!force) {
         try {
           const existing = await this.vaultFs.readFile(configPath);
@@ -4546,7 +4808,7 @@ var DatabaseSyncer = class {
         }
       }
       const viewsConfig = await this.notionClient.getDatabaseViewsConfig(dbConfig.databaseId);
-      await this.vaultFs.ensureFolder(".im-nobsidian");
+      await this.vaultFs.ensureFolder(INTERNAL_DIR);
       let allViewsConfigs = {};
       try {
         const existing = await this.vaultFs.readFile(configPath);
@@ -4658,6 +4920,33 @@ var DatabaseSyncer = class {
       },
       { properties }
     );
+    if (existingRecord) {
+      let localContent = "";
+      try {
+        localContent = await this.vaultFs.readFile(filePath);
+      } catch {
+        localContent = "";
+      }
+      const resolution = resolvePullConflict({
+        record: existingRecord,
+        localContent,
+        remoteContent: finalContent,
+        remoteChange: {
+          pageId: page.id,
+          type: "modified",
+          lastEdited: page.last_edited_time,
+          previousEdited: existingRecord.notionLastEdited
+        },
+        strategy: this.config.sync.conflictStrategy
+      });
+      if (resolution.action === "skip") {
+        return { action: "skipped", path: filePath };
+      }
+      if (resolution.action === "conflict") {
+        this.stateDb.updateStatus(existingRecord.id, "conflict");
+        return { action: "conflict", path: filePath, conflict: resolution.conflict };
+      }
+    }
     await this.vaultFs.ensureFolder(dbConfig.localFolder);
     await this.vaultFs.writeFile(filePath, finalContent);
     const hash = computeHash(finalContent);
@@ -4681,7 +4970,7 @@ var DatabaseSyncer = class {
         aliases: extractAliases(properties)
       });
     });
-    return filePath;
+    return { action: "written", path: filePath };
   }
   async pushDatabase(dbConfig) {
     const schema = await this.notionClient.getDatabaseSchema(dbConfig.databaseId);
@@ -4689,6 +4978,8 @@ var DatabaseSyncer = class {
     const allFiles = await this.vaultFs.listMarkdownFiles();
     const prefix = dbConfig.localFolder.endsWith("/") ? dbConfig.localFolder : dbConfig.localFolder + "/";
     const dbFiles = allFiles.filter((f) => f.path.startsWith(prefix));
+    const livePaths = new Set(dbFiles.map((f) => f.path));
+    const orphanByHash = this.buildOrphanHashIndex(dbConfig.databaseId, livePaths);
     let created = 0;
     let updated = 0;
     const failed = [];
@@ -4706,19 +4997,50 @@ var DatabaseSyncer = class {
         const notionProps = this.propertyMapper.toNotionProperties(frontmatter, title);
         const enhanced = obsidianToNotionEnhanced(body.trim());
         if (record?.notionPageId) {
-          await this.notionClient.updatePageProperties(record.notionPageId, notionProps);
           try {
+            await this.notionClient.updatePageProperties(record.notionPageId, notionProps);
             await this.notionClient.replacePageMarkdown(record.notionPageId, enhanced);
-          } catch {
+          } catch (error) {
+            this.stateDb.updateStatus(record.id, "error");
+            failed.push({
+              path: file.path,
+              operation: "update",
+              error: error instanceof Error ? error.message : String(error)
+            });
+            continue;
           }
           const updatedPage = await this.notionClient.getPage(record.notionPageId);
           this.stateDb.transaction(() => {
             this.stateDb.updateHash(record.id, hash, Buffer.from(content, "utf-8"));
             this.stateDb.updateStatus(record.id, "synced");
             this.stateDb.setNotionLastEdited(record.id, updatedPage.last_edited_time);
+            this.stateDb.upsertWikilink({
+              obsidianPath: file.path,
+              notionPageId: record.notionPageId,
+              title,
+              aliases: extractAliases(frontmatter)
+            });
           });
           updated++;
         } else {
+          const renamed = orphanByHash.get(hash);
+          if (renamed?.notionPageId) {
+            const movedPageId = renamed.notionPageId;
+            orphanByHash.delete(hash);
+            this.stateDb.transaction(() => {
+              this.stateDb.updatePath(renamed.id, file.path);
+              this.stateDb.updateHash(renamed.id, hash, Buffer.from(content, "utf-8"));
+              this.stateDb.updateStatus(renamed.id, "synced");
+              this.stateDb.upsertWikilink({
+                obsidianPath: file.path,
+                notionPageId: movedPageId,
+                title,
+                aliases: extractAliases(frontmatter)
+              });
+            });
+            updated++;
+            continue;
+          }
           const page = await this.notionClient.createPageWithMarkdown({
             parentId: dbConfig.databaseId,
             parentType: "database",
@@ -4757,7 +5079,21 @@ var DatabaseSyncer = class {
       }
     }
     getLogger().debug(`[DB Sync] ${dbConfig.localFolder}: ${created} \uC0DD\uC131, ${updated} \uC5C5\uB370\uC774\uD2B8`);
-    return { created, updated, failed };
+    return { created, updated, conflicts: [], failed };
+  }
+  /**
+   * rename 감지를 위한 고아 레코드 인덱스(내용 해시 → 레코드)를 만든다.
+   * 고아 = 해당 DB 소속 db-row 레코드 중 로컬 파일이 더 이상 존재하지 않는(livePaths 에 없는) 것.
+   * 같은 해시가 여러 고아에 걸리면 첫 항목을 유지한다(희박한 케이스).
+   */
+  buildOrphanHashIndex(databaseId, livePaths) {
+    const index = /* @__PURE__ */ new Map();
+    for (const record of this.stateDb.getAll()) {
+      if (record.fileType === "db-row" && record.notionParentId === databaseId && record.notionPageId && !livePaths.has(record.obsidianPath) && !index.has(record.contentHash)) {
+        index.set(record.contentHash, record);
+      }
+    }
+    return index;
   }
 };
 function extractAliases(properties) {
@@ -4774,6 +5110,26 @@ function extractTitleFromPath(filePath) {
   return filename.replace(/\.md$/, "");
 }
 
+// src/utils/pool.ts
+async function runPool(items, worker, options) {
+  const total = items.length;
+  if (total === 0) return;
+  const workerCount = Math.max(1, Math.min(Math.floor(options.concurrency) || 1, total));
+  let cursor = 0;
+  const runWorker = async () => {
+    for (; ; ) {
+      if (options.signal?.aborted) return;
+      const index = cursor++;
+      if (index >= total) return;
+      try {
+        await worker(items[index], index);
+      } catch {
+      }
+    }
+  };
+  await Promise.all(Array.from({ length: workerCount }, () => runWorker()));
+}
+
 // src/sync/orchestrator.ts
 var SyncOrchestrator = class {
   constructor(config, stateDb, notionClient, vaultFs, customFetch) {
@@ -4790,9 +5146,20 @@ var SyncOrchestrator = class {
       vaultFs,
       config.paths.attachments,
       notionClient,
-      customFetch
+      customFetch,
+      {
+        concurrency: config.advanced.mediaConcurrency,
+        maxRetries: config.advanced.mediaMaxRetries,
+        retryBaseMs: config.advanced.mediaRetryBaseMs,
+        maxFileSizeBytes: config.advanced.maxFileSizeBytes
+      }
+    );
+    this.fileHandler = new FileHandler(
+      vaultFs,
+      notionClient,
+      stateDb,
+      config.advanced.fileConcurrency
     );
-    this.fileHandler = new FileHandler(vaultFs, notionClient, stateDb);
     this.propertyMapper = new PropertyMapper();
     this.databaseSyncer = new DatabaseSyncer(
       config,
@@ -4822,6 +5189,11 @@ var SyncOrchestrator = class {
   dbSchemaLoaded = false;
   _pullImageCount = 0;
   _pullFileCount = 0;
+  // pull 중 각 페이지 markdown(<database url=.../>)에서 추출한 인라인 DB 참조.
+  // key: 하이픈 제거 databaseId, value: 그 DB가 박힌 부모 페이지 id.
+  // 블록 트리 재귀 없이 markdown 신호만으로 컬럼/synced_block 등 깊이 중첩된
+  // child_database 까지 발견해 폴더+.base 동기화 대상으로 등록한다.
+  _inlineDbRefs = /* @__PURE__ */ new Map();
   async push(options) {
     const startTime = Date.now();
     if (this.config.sync.direction === "pull") {
@@ -4880,87 +5252,68 @@ var SyncOrchestrator = class {
     for (const folderPath of sortedFolders) {
       await this.ensureFolderPage(folderPath);
     }
-    const sema = new Sema(this.config.advanced.concurrency);
-    let created = 0;
-    let updated = 0;
-    let deleted = 0;
+    const counts = { created: 0, updated: 0, deleted: 0 };
     const failed = [];
     let completed = 0;
     const total = filtered.length;
-    const tasks = filtered.map((change) => async () => {
-      await sema.acquire();
-      try {
-        if (options?.signal?.aborted) return;
-        const op = change.type === "created" ? "create" : change.type === "deleted" ? "delete" : "update";
-        options?.onProgress?.(++completed, total, { path: change.path, operation: op });
-        switch (change.type) {
-          case "created":
-            await this.pushCreate(change.path);
-            created++;
-            break;
-          case "modified":
-            await this.pushUpdate(change.path);
-            updated++;
-            break;
-          case "moved":
-            await this.pushMove(change.path);
-            updated++;
-            break;
-          case "deleted":
-            await this.pushDelete(change.path);
-            deleted++;
-            break;
-        }
-      } catch (error) {
-        failed.push({
-          path: change.path,
-          operation: change.type === "created" ? "create" : change.type === "deleted" ? "delete" : "update",
-          error: error instanceof Error ? error.message : String(error)
-        });
-      } finally {
-        sema.release();
+    const opOf = (change) => change.type === "created" ? "create" : change.type === "deleted" ? "delete" : "update";
+    const applyPushChange = async (change) => {
+      switch (change.type) {
+        case "created":
+          await this.pushCreate(change.path);
+          counts.created++;
+          break;
+        case "modified":
+          await this.pushUpdate(change.path);
+          counts.updated++;
+          break;
+        case "moved":
+          await this.pushMove(change.path);
+          counts.updated++;
+          break;
+        case "deleted":
+          await this.pushDelete(change.path);
+          counts.deleted++;
+          break;
       }
-    });
-    await Promise.all(tasks.map((t) => t()));
-    if (failed.length > 0) {
-      const retryTargets = failed.splice(0, failed.length);
-      getLogger().info(`[Im-Nobsidian] Push ${retryTargets.length}\uAC74 \uC7AC\uC2DC\uB3C4 (2\uCD08 \uD6C4)`);
-      await new Promise((r) => setTimeout(r, 2e3));
-      for (const target of retryTargets) {
-        const change = filtered.find((c) => c.path === target.path);
-        if (!change) {
-          failed.push(target);
-          continue;
-        }
+    };
+    const retryQueue = [];
+    await runPool(
+      filtered,
+      async (change) => {
+        if (options?.signal?.aborted) return;
+        options?.onProgress?.(++completed, total, { path: change.path, operation: opOf(change) });
         try {
-          switch (change.type) {
-            case "created":
-              await this.pushCreate(change.path);
-              created++;
-              break;
-            case "modified":
-              await this.pushUpdate(change.path);
-              updated++;
-              break;
-            case "moved":
-              await this.pushMove(change.path);
-              updated++;
-              break;
-            case "deleted":
-              await this.pushDelete(change.path);
-              deleted++;
-              break;
-          }
-          getLogger().info(`[Im-Nobsidian] \uC7AC\uC2DC\uB3C4 \uC131\uACF5: ${change.path}`);
-        } catch (error) {
-          failed.push({
-            path: change.path,
-            operation: target.operation,
-            error: error instanceof Error ? error.message : String(error)
-          });
-          getLogger().warn(`[Im-Nobsidian] \uC7AC\uC2DC\uB3C4 \uC2E4\uD328: ${change.path}`);
+          await applyPushChange(change);
+        } catch {
+          retryQueue.push(change);
         }
-      }
+      },
+      { concurrency: this.config.advanced.concurrency, signal: options?.signal }
+    );
+    if (retryQueue.length > 0) {
+      const retryWaitMs = this.config.advanced.retryWaitMs;
+      getLogger().info(
+        `[Im-Nobsidian] Push ${retryQueue.length}\uAC74 \uC7AC\uC2DC\uB3C4 (${retryWaitMs / 1e3}\uCD08 \uD6C4)`
+      );
+      await new Promise((r) => setTimeout(r, retryWaitMs));
+      await runPool(
+        retryQueue,
+        async (change) => {
+          try {
+            await applyPushChange(change);
+            getLogger().info(`[Im-Nobsidian] \uC7AC\uC2DC\uB3C4 \uC131\uACF5: ${change.path}`);
+          } catch (error) {
+            failed.push({
+              path: change.path,
+              operation: opOf(change),
+              error: error instanceof Error ? error.message : String(error)
+            });
+            getLogger().warn(`[Im-Nobsidian] \uC7AC\uC2DC\uB3C4 \uC2E4\uD328: ${change.path}`);
+          }
+        },
+        { concurrency: this.config.advanced.concurrency, signal: options?.signal }
+      );
     }
     if (this.config.sync.syncFiles !== false) {
       try {
@@ -4975,8 +5328,8 @@ var SyncOrchestrator = class {
     if ((this.config.notion.databases?.length ?? 0) > 0) {
       try {
         const dbResult = await this.databaseSyncer.pushAll();
-        created += dbResult.created;
-        updated += dbResult.updated;
+        counts.created += dbResult.created;
+        counts.updated += dbResult.updated;
         failed.push(...dbResult.failed);
       } catch (error) {
         getLogger().warn("[Im-Nobsidian] DB Push \uC911 \uC624\uB958:", error);
@@ -4985,7 +5338,13 @@ var SyncOrchestrator = class {
     this.stateDb.setMeta("last_push_at", (/* @__PURE__ */ new Date()).toISOString());
     this.stateDb.setMeta("last_sync_at", (/* @__PURE__ */ new Date()).toISOString());
     this.stateDb.setMeta("push_in_progress", "");
-    return { created, updated, deleted, failed, duration: Date.now() - startTime };
+    return {
+      created: counts.created,
+      updated: counts.updated,
+      deleted: counts.deleted,
+      failed,
+      duration: Date.now() - startTime
+    };
   }
   async pull(options) {
     const startTime = Date.now();
@@ -5005,11 +5364,10 @@ var SyncOrchestrator = class {
       return emptyResult;
     }
     this.cleanupInterruptedSync();
-    let created = 0;
-    let updated = 0;
-    let deleted = 0;
+    const counts = { created: 0, updated: 0, deleted: 0 };
     this._pullImageCount = 0;
     this._pullFileCount = 0;
+    this._inlineDbRefs.clear();
     const conflicts = [];
     const writtenPaths = [];
     const failed = [];
@@ -5021,7 +5379,7 @@ var SyncOrchestrator = class {
       return record && options.paths.some((p) => record.obsidianPath.startsWith(p));
     }) : remoteChanges;
     if (filtered.length === 0 && (this.config.notion.databases?.length ?? 0) === 0) {
-      const hasDbResults = await this.pullDiscoveredDatabases(writtenPaths, failed);
+      const hasDbResults = await this.pullDiscoveredDatabases(writtenPaths, failed, conflicts);
       if (!hasDbResults.created && !hasDbResults.updated) {
         this.stateDb.setMeta("last_pull_at", (/* @__PURE__ */ new Date()).toISOString());
         this.stateDb.setMeta("last_sync_at", (/* @__PURE__ */ new Date()).toISOString());
@@ -5035,7 +5393,7 @@ var SyncOrchestrator = class {
         created: hasDbResults.created,
         updated: hasDbResults.updated,
         deleted: 0,
-        conflicts: [],
+        conflicts,
         writtenPaths,
         failed,
         duration: Date.now() - startTime,
@@ -5073,113 +5431,94 @@ var SyncOrchestrator = class {
       };
     }
     this.stateDb.setMeta("pull_in_progress", "true");
-    const sema = new Sema(this.config.advanced.concurrency);
-    let pullCompleted = 0;
     const pullTotal = filtered.length;
-    const tasks = filtered.map((change) => async () => {
-      await sema.acquire();
-      try {
-        if (options?.signal?.aborted) return;
-        let resultPath;
-        switch (change.type) {
-          case "created": {
-            const path = await this.pullCreate(change.pageId);
-            writtenPaths.push(path);
-            created++;
-            resultPath = path;
-            break;
-          }
-          case "modified": {
-            const result = await this.pullUpdate(change);
-            if (result.conflict) {
-              conflicts.push(result.conflict);
-            } else if (result.path) {
-              writtenPaths.push(result.path);
-              updated++;
-            }
-            resultPath = result.path;
-            break;
+    let pullCompleted = 0;
+    const toFailure = (change, error) => {
+      const record = this.stateDb.getByNotionId(change.pageId);
+      return {
+        path: record?.obsidianPath ?? change.pageId,
+        operation: change.type === "created" ? "create" : change.type === "deleted" ? "delete" : "update",
+        error: error instanceof Error ? error.message : String(error)
+      };
+    };
+    const applyChange = async (change) => {
+      switch (change.type) {
+        case "created": {
+          const path = await this.pullCreate(change.pageId);
+          writtenPaths.push(path);
+          counts.created++;
+          return path;
+        }
+        case "modified": {
+          const result = await this.pullUpdate(change);
+          if (result.conflict) {
+            conflicts.push(result.conflict);
+          } else if (result.path) {
+            writtenPaths.push(result.path);
+            counts.updated++;
           }
-          case "deleted": {
-            const record2 = this.stateDb.getByNotionId(change.pageId);
-            resultPath = record2?.obsidianPath;
-            const path = await this.pullDelete(change.pageId);
-            if (path) {
-              deleted++;
-              resultPath = path;
-            }
-            break;
+          return result.path;
+        }
+        case "deleted": {
+          const record = this.stateDb.getByNotionId(change.pageId);
+          const path = await this.pullDelete(change.pageId);
+          if (path) {
+            counts.deleted++;
+            return path;
           }
+          return record?.obsidianPath;
         }
-        const record = this.stateDb.getByNotionId(change.pageId);
-        const displayPath = resultPath ?? record?.obsidianPath ?? change.pageId;
-        const op = change.type === "created" ? "create" : change.type === "deleted" ? "delete" : "update";
-        options?.onProgress?.(++pullCompleted, pullTotal, { path: displayPath, operation: op });
-      } catch (error) {
-        const record = this.stateDb.getByNotionId(change.pageId);
-        failed.push({
-          path: record?.obsidianPath ?? change.pageId,
-          operation: change.type === "created" ? "create" : change.type === "deleted" ? "delete" : "update",
-          error: error instanceof Error ? error.message : String(error)
-        });
-      } finally {
-        sema.release();
+        default:
+          return void 0;
       }
-    });
-    await Promise.all(tasks.map((t) => t()));
-    if (failed.length > 0) {
-      const retryTargets = failed.splice(0, failed.length);
-      getLogger().info(`[Im-Nobsidian] Pull ${retryTargets.length}\uAC74 \uC7AC\uC2DC\uB3C4 (2\uCD08 \uD6C4)`);
-      await new Promise((r) => setTimeout(r, 2e3));
-      for (const target of retryTargets) {
-        const change = filtered.find((c) => {
-          const record = this.stateDb.getByNotionId(c.pageId);
-          return (record?.obsidianPath ?? c.pageId) === target.path;
-        });
-        if (!change) {
-          failed.push(target);
-          continue;
-        }
+    };
+    const retryQueue = [];
+    await runPool(
+      filtered,
+      async (change) => {
+        if (options?.signal?.aborted) return;
         try {
-          switch (change.type) {
-            case "created": {
-              const path = await this.pullCreate(change.pageId);
-              writtenPaths.push(path);
-              created++;
-              break;
-            }
-            case "modified": {
-              const result = await this.pullUpdate(change);
-              if (result.conflict) {
-                conflicts.push(result.conflict);
-              } else if (result.path) {
-                writtenPaths.push(result.path);
-                updated++;
-              }
-              break;
-            }
-            case "deleted": {
-              const path = await this.pullDelete(change.pageId);
-              if (path) deleted++;
-              break;
-            }
-          }
-          getLogger().info(`[Im-Nobsidian] \uC7AC\uC2DC\uB3C4 \uC131\uACF5: ${target.path}`);
-        } catch (error) {
-          failed.push({
-            path: target.path,
-            operation: target.operation,
-            error: error instanceof Error ? error.message : String(error)
-          });
-          getLogger().warn(`[Im-Nobsidian] \uC7AC\uC2DC\uB3C4 \uC2E4\uD328: ${target.path}`);
+          const resultPath = await applyChange(change);
+          const record = this.stateDb.getByNotionId(change.pageId);
+          const displayPath = resultPath ?? record?.obsidianPath ?? change.pageId;
+          const op = change.type === "created" ? "create" : change.type === "deleted" ? "delete" : "update";
+          options?.onProgress?.(++pullCompleted, pullTotal, { path: displayPath, operation: op });
+        } catch {
+          retryQueue.push(change);
         }
-      }
+      },
+      { concurrency: this.config.advanced.concurrency, signal: options?.signal }
+    );
+    if (retryQueue.length > 0) {
+      const retryWaitMs = this.config.advanced.retryWaitMs;
+      getLogger().info(
+        `[Im-Nobsidian] Pull ${retryQueue.length}\uAC74 \uC7AC\uC2DC\uB3C4 (${retryWaitMs / 1e3}\uCD08 \uD6C4)`
+      );
+      await new Promise((r) => setTimeout(r, retryWaitMs));
+      await runPool(
+        retryQueue,
+        async (change) => {
+          try {
+            await applyChange(change);
+            const record = this.stateDb.getByNotionId(change.pageId);
+            getLogger().info(
+              `[Im-Nobsidian] \uC7AC\uC2DC\uB3C4 \uC131\uACF5: ${record?.obsidianPath ?? change.pageId}`
+            );
+          } catch (error) {
+            const failure = toFailure(change, error);
+            failed.push(failure);
+            getLogger().warn(`[Im-Nobsidian] \uC7AC\uC2DC\uB3C4 \uC2E4\uD328: ${failure.path}`);
+          }
+        },
+        { concurrency: this.config.advanced.concurrency, signal: options?.signal }
+      );
     }
     if ((this.config.notion.databases?.length ?? 0) > 0) {
       try {
         const dbResult = await this.databaseSyncer.pullAll();
-        created += dbResult.created;
-        updated += dbResult.updated;
+        counts.created += dbResult.created;
+        counts.updated += dbResult.updated;
+        conflicts.push(...dbResult.conflicts);
         failed.push(...dbResult.failed);
         if (dbResult.created + dbResult.updated > 0) {
           const dbPaths = this.stateDb.getByStatus("synced").filter((r) => r.fileType === "db-row").map((r) => r.obsidianPath);
@@ -5190,9 +5529,9 @@ var SyncOrchestrator = class {
       }
     }
     {
-      const dbDiscovery = await this.pullDiscoveredDatabases(writtenPaths, failed);
-      created += dbDiscovery.created;
-      updated += dbDiscovery.updated;
+      const dbDiscovery = await this.pullDiscoveredDatabases(writtenPaths, failed, conflicts);
+      counts.created += dbDiscovery.created;
+      counts.updated += dbDiscovery.updated;
     }
     const linkTargetPaths = writtenPaths.length > 0 ? writtenPaths : [];
     const linkCount = linkTargetPaths.length > 0 ? await this.resolveNotionLinks(linkTargetPaths) : 0;
@@ -5200,9 +5539,9 @@ var SyncOrchestrator = class {
     this.stateDb.setMeta("last_sync_at", (/* @__PURE__ */ new Date()).toISOString());
     this.stateDb.setMeta("pull_in_progress", "");
     return {
-      created,
-      updated,
-      deleted,
+      created: counts.created,
+      updated: counts.updated,
+      deleted: counts.deleted,
       conflicts,
       writtenPaths,
       failed,
@@ -5334,7 +5673,48 @@ var SyncOrchestrator = class {
     }
     return allDbs;
   }
-  async pullDiscoveredDatabases(writtenPaths, failed) {
+  /**
+   * 자동 발견된 child_database 1개를 DatabaseSyncer 설정으로 변환한다.
+   * 블록 스캔/markdown 양쪽 발견 경로에서 공통으로 사용한다.
+   * - localFolder: 부모 페이지의 obsidianPath 기준으로 폴더를 잡아 원본 중첩 구조를 보존
+   *   (예: 부모 "AI Engineer (1).md" + DB "Minirecord Project" → "AI Engineer (1)/Minirecord-Project")
+   * - 제목 취득 실패 시 부모 폴더명 기반 안전 이름으로 폴백
+   */
+  async buildDiscoveredDbConfig(dbId, parentPageId) {
+    try {
+      const dbTitle = await this.notionClient.getDatabaseTitle(dbId);
+      const parentEntry = parentPageId ? this.stateDb.getByNotionId(parentPageId) : null;
+      let parentFolder = "";
+      if (parentEntry?.obsidianPath) {
+        const obsPath = parentEntry.obsidianPath;
+        if (obsPath.endsWith(".md")) {
+          const parts = obsPath.split("/");
+          parts.pop();
+          parentFolder = parts.length > 0 ? parts.join("/") : obsPath.replace(/\.md$/, "");
+        } else {
+          parentFolder = obsPath;
+        }
+      }
+      let safeName;
+      if (dbTitle) {
+        safeName = dbTitle.replace(/[^a-zA-Z0-9가-힣\s_-]/g, "").replace(/\s+/g, "-");
+      } else {
+        const parentName = parentFolder.split("/").pop() || "";
+        safeName = parentName ? `${parentName}-DB` : `db-${dbId.replace(/-/g, "").slice(0, 8)}`;
+      }
+      if (!safeName) safeName = `db-${dbId.replace(/-/g, "").slice(0, 8)}`;
+      if (!parentFolder) parentFolder = "databases";
+      return {
+        databaseId: dbId,
+        localFolder: `${parentFolder}/${safeName}`,
+        titleProperty: "Name"
+      };
+    } catch (error) {
+      getLogger().warn(`[Im-Nobsidian] \uC790\uB3D9 \uBC1C\uACAC DB ${dbId} \uC124\uC815 \uC0DD\uC131 \uC2E4\uD328:`, error);
+      return null;
+    }
+  }
+  async pullDiscoveredDatabases(writtenPaths, failed, conflicts) {
     if (this.isDatabaseMode) return { created: 0, updated: 0 };
     let created = 0;
     let updated = 0;
@@ -5348,53 +5728,45 @@ var SyncOrchestrator = class {
           dbConfigs = [];
         }
       }
+      const configuredIds = new Set(
+        (this.config.notion.databases ?? []).map((d) => d.databaseId.replace(/-/g, ""))
+      );
+      const knownIds = /* @__PURE__ */ new Set([
+        ...configuredIds,
+        ...dbConfigs.map((c) => c.databaseId.replace(/-/g, ""))
+      ]);
+      let changed = false;
       if (dbConfigs.length === 0) {
-        const discoveredDbs = await this.discoverChildDatabases();
-        const configuredIds = new Set(
-          (this.config.notion.databases ?? []).map((d) => d.databaseId.replace(/-/g, ""))
-        );
-        const newDbs = discoveredDbs.filter((db) => !configuredIds.has(db.dbId.replace(/-/g, "")));
-        for (const { dbId, parentPageId } of newDbs) {
-          try {
-            const dbTitle = await this.notionClient.getDatabaseTitle(dbId);
-            const parentEntry = parentPageId ? this.stateDb.getByNotionId(parentPageId) : null;
-            let parentFolder = "";
-            if (parentEntry?.obsidianPath) {
-              const obsPath = parentEntry.obsidianPath;
-              if (obsPath.endsWith(".md")) {
-                const parts = obsPath.split("/");
-                parts.pop();
-                parentFolder = parts.length > 0 ? parts.join("/") : obsPath.replace(/\.md$/, "");
-              } else {
-                parentFolder = obsPath;
-              }
-            }
-            let safeName;
-            if (dbTitle) {
-              safeName = dbTitle.replace(/[^a-zA-Z0-9가-힣\s_-]/g, "").replace(/\s+/g, "-");
-            } else {
-              const parentName = parentFolder.split("/").pop() || "";
-              safeName = parentName ? `${parentName}-DB` : `db-${dbId.slice(0, 8)}`;
-            }
-            if (!parentFolder) parentFolder = "databases";
-            dbConfigs.push({
-              databaseId: dbId,
-              localFolder: `${parentFolder}/${safeName}`,
-              titleProperty: "Name"
-            });
-          } catch (error) {
-            getLogger().warn(`[Im-Nobsidian] \uC790\uB3D9 \uBC1C\uACAC DB ${dbId} \uB3D9\uAE30\uD654 \uC2E4\uD328:`, error);
+        const discovered = await this.discoverChildDatabases();
+        for (const { dbId, parentPageId } of discovered) {
+          const nohyph = dbId.replace(/-/g, "");
+          if (knownIds.has(nohyph)) continue;
+          const cfg = await this.buildDiscoveredDbConfig(dbId, parentPageId);
+          if (cfg) {
+            dbConfigs.push(cfg);
+            knownIds.add(nohyph);
+            changed = true;
           }
         }
-        if (dbConfigs.length > 0) {
-          this.stateDb.setMeta("discovered_dbs", JSON.stringify(dbConfigs));
+      }
+      for (const [nohyph, parentPageId] of this._inlineDbRefs) {
+        if (knownIds.has(nohyph)) continue;
+        const cfg = await this.buildDiscoveredDbConfig(normalizeNotionId(nohyph), parentPageId);
+        if (cfg) {
+          dbConfigs.push(cfg);
+          knownIds.add(nohyph);
+          changed = true;
         }
       }
+      if (changed && dbConfigs.length > 0) {
+        this.stateDb.setMeta("discovered_dbs", JSON.stringify(dbConfigs));
+      }
       for (const dbConfig of dbConfigs) {
         try {
           const dbResult = await this.databaseSyncer.pullDatabase(dbConfig);
           created += dbResult.created;
           updated += dbResult.updated;
+          conflicts.push(...dbResult.conflicts);
           failed.push(...dbResult.failed);
           if (dbResult.created + dbResult.updated > 0) {
             const dbPaths = this.stateDb.getByStatus("synced").filter((r) => r.fileType === "db-row").map((r) => r.obsidianPath);
@@ -5438,7 +5810,7 @@ var SyncOrchestrator = class {
         });
         content = resolved;
         const resolved2 = content.replace(
-          /\[([^\]]+)\]\(\/([a-f0-9]{32})\?pvs=\d+\)/g,
+          /\[([^\]]+)\]\(\/(?:p\/)?([a-f0-9]{32})(?:\?[^)]*)?\)/g,
           (_match, text, id) => {
             const title = idToTitle.get(id);
             if (title) {
@@ -5465,6 +5837,11 @@ var SyncOrchestrator = class {
     this.dbSchemaLoaded = true;
   }
   async pushCreate(path) {
+    const existingRecord = this.stateDb.getByPath(path);
+    if (existingRecord?.notionPageId) {
+      await this.pushUpdate(path);
+      return;
+    }
     const content = await this.vaultFs.readFile(path);
     const title = extractTitle(path);
     const parentId = await this.resolveNotionParent(path);
@@ -5499,6 +5876,20 @@ var SyncOrchestrator = class {
       conversionResult.content,
       effectiveProperties
     );
+    this.stateDb.upsert({
+      obsidianPath: path,
+      notionPageId: page.id,
+      notionParentId: parentId,
+      contentHash: "",
+      notionLastEdited: page.last_edited_time,
+      localLastModified: (/* @__PURE__ */ new Date()).toISOString(),
+      syncDirection: "both",
+      fileType: this.isFolderNote(path) ? "folder-note" : "file",
+      status: "pending",
+      baseSnapshot: null,
+      localMtime: null,
+      localFileSize: null
+    });
     await this.imageHandler.uploadAndAppendImages(page.id, conversionResult.images);
     const hash = computeHash(content);
     const fileStat = await this.vaultFs.getFileStat(path);
@@ -5596,7 +5987,10 @@ var SyncOrchestrator = class {
           throw error;
         }
       }
-      this.stateDb.delete(record.id);
+      this.stateDb.transaction(() => {
+        this.stateDb.delete(record.id);
+        this.stateDb.deleteWikilink(record.obsidianPath);
+      });
     } else {
       this.stateDb.updateStatus(record.id, "pending");
     }
@@ -5639,7 +6033,9 @@ var SyncOrchestrator = class {
       } while (cursor);
       remotePages = allPages;
     } else {
-      remotePages = await this.notionClient.getChildPagesRecursive(this.config.notion.rootPageId);
+      const allAccessible = await this.notionClient.searchAllPages();
+      const underRoot = await this.filterPagesUnderRoot(allAccessible);
+      remotePages = underRoot.map((p) => ({ id: p.id, last_edited_time: p.last_edited_time }));
     }
     for (const page of remotePages) {
       const record = this.stateDb.getByNotionId(page.id);
@@ -5711,12 +6107,84 @@ var SyncOrchestrator = class {
     if (notionIdsEqual(parentId, this.config.notion.rootPageId)) return true;
     return !!this.stateDb.getByNotionId(parentId);
   }
+  /**
+   * search API로 받은 전체 접근 가능 페이지 중 rootPageId 하위(자손)만 남긴다.
+   * 각 페이지의 parent 체인을 root에 닿을 때까지 거슬러 올라가며 판정한다.
+   * - 부모가 이미 받은 페이지면 추가 API 호출 없이 메모리에서 해석(공통 경로)
+   * - 부모가 검색 결과에 없으면(데이터베이스·미공유 조상 등) getPage로 1회 조회 후 캐시
+   * - 조회 불가/순환/깊이 초과 시 보수적으로 root 하위가 아님으로 판정
+   * 판정 결과는 체인 전체에 메모이즈해 형제 페이지 처리 시 재사용한다.
+   */
+  async filterPagesUnderRoot(allPages) {
+    const root = normalizeNotionId(this.config.notion.rootPageId);
+    const byId = /* @__PURE__ */ new Map();
+    for (const p of allPages) byId.set(normalizeNotionId(p.id), p);
+    const verdict = /* @__PURE__ */ new Map();
+    const isUnderRoot = async (start) => {
+      const chain = [];
+      let current = start;
+      let result = false;
+      while (current) {
+        const id = normalizeNotionId(current.id);
+        if (id === root) {
+          result = true;
+          break;
+        }
+        const memo = verdict.get(id);
+        if (memo !== void 0) {
+          result = memo;
+          break;
+        }
+        if (chain.includes(id)) {
+          result = false;
+          break;
+        }
+        chain.push(id);
+        const parentId = await this.extractParentId(current);
+        if (!parentId) {
+          result = false;
+          break;
+        }
+        const pid = normalizeNotionId(parentId);
+        if (pid === root) {
+          result = true;
+          break;
+        }
+        const memoParent = verdict.get(pid);
+        if (memoParent !== void 0) {
+          result = memoParent;
+          break;
+        }
+        let parentPage = byId.get(pid) ?? null;
+        if (!parentPage) {
+          try {
+            parentPage = await this.notionClient.getPage(parentId);
+            byId.set(pid, parentPage);
+          } catch {
+            result = false;
+            break;
+          }
+        }
+        current = parentPage;
+      }
+      for (const id of chain) verdict.set(id, result);
+      return result;
+    };
+    const out = [];
+    for (const p of allPages) {
+      if (normalizeNotionId(p.id) === root) continue;
+      if (await isUnderRoot(p)) out.push(p);
+    }
+    return out;
+  }
   async pullCreate(pageId) {
     const page = await this.notionClient.getPage(pageId);
     const title = this.notionClient.extractTitle(page);
     const safeName = sanitizeFileName(title);
     const parentPath = await this.resolveParentPath(page);
-    const firstChildren = await this.notionClient.listChildren(pageId, { pageSize: 100 });
+    const firstChildren = await this.notionClient.listChildren(pageId, {
+      pageSize: this.config.advanced.pageSize
+    });
     const hasChildPages = firstChildren.results.some((b) => "type" in b && b.type === "child_page");
     const markdown = await this.fetchPageMarkdown(pageId);
     const hasContent = markdown.trim().length > 0;
@@ -5836,46 +6304,45 @@ var SyncOrchestrator = class {
     } catch {
       localContent = "";
     }
-    const localHash = computeHash(localContent);
-    const localModified = localHash !== record.contentHash;
-    if (localModified) {
-      const strategy = this.config.sync.conflictStrategy;
-      if (strategy === "remote-first") ; else if (strategy === "local-first") {
-        return { path: record.obsidianPath };
-      } else {
-        const conflict = {
-          syncRecord: record,
-          localChange: {
-            path: record.obsidianPath,
-            type: "modified",
-            currentHash: localHash,
-            previousHash: record.contentHash
-          },
-          remoteChange: change,
-          baseContent: record.baseSnapshot?.toString("utf-8") ?? null,
-          localContent,
-          remoteContent
-        };
-        this.stateDb.updateStatus(record.id, "conflict");
-        return { conflict };
-      }
+    const resolution = resolvePullConflict({
+      record,
+      localContent,
+      remoteContent,
+      remoteChange: change,
+      strategy: this.config.sync.conflictStrategy
+    });
+    if (resolution.action === "skip") {
+      return { path: record.obsidianPath };
+    }
+    if (resolution.action === "conflict") {
+      this.stateDb.updateStatus(record.id, "conflict");
+      return { conflict: resolution.conflict };
     }
     await this.vaultFs.writeFile(record.obsidianPath, remoteContent);
     const updateStat = await this.vaultFs.getFileStat(record.obsidianPath);
     const newHash = computeHash(remoteContent);
-    this.stateDb.upsert({
-      obsidianPath: record.obsidianPath,
-      notionPageId: change.pageId,
-      notionParentId: record.notionParentId,
-      contentHash: newHash,
-      notionLastEdited: page.last_edited_time,
-      localLastModified: (/* @__PURE__ */ new Date()).toISOString(),
-      syncDirection: record.syncDirection,
-      fileType: record.fileType,
-      status: "synced",
-      baseSnapshot: Buffer.from(remoteContent, "utf-8"),
-      localMtime: updateStat?.mtime ?? null,
-      localFileSize: updateStat?.size ?? null
+    this.stateDb.transaction(() => {
+      this.stateDb.upsert({
+        obsidianPath: record.obsidianPath,
+        notionPageId: change.pageId,
+        notionParentId: record.notionParentId,
+        contentHash: newHash,
+        notionLastEdited: page.last_edited_time,
+        localLastModified: (/* @__PURE__ */ new Date()).toISOString(),
+        syncDirection: record.syncDirection,
+        fileType: record.fileType,
+        status: "synced",
+        baseSnapshot: Buffer.from(remoteContent, "utf-8"),
+        localMtime: updateStat?.mtime ?? null,
+        localFileSize: updateStat?.size ?? null
+      });
+      const aliases = extractAliases2(properties);
+      this.stateDb.upsertWikilink({
+        obsidianPath: record.obsidianPath,
+        notionPageId: change.pageId,
+        title,
+        aliases
+      });
     });
     return { path: record.obsidianPath };
   }
@@ -5888,7 +6355,10 @@ var SyncOrchestrator = class {
       } catch {
       }
     }
-    this.stateDb.delete(record.id);
+    this.stateDb.transaction(() => {
+      this.stateDb.delete(record.id);
+      this.stateDb.deleteWikilink(record.obsidianPath);
+    });
     return record.obsidianPath;
   }
   async ensureFolderPage(folderPath) {
@@ -5896,7 +6366,12 @@ var SyncOrchestrator = class {
     const folderNoteRecord = this.stateDb.getByPath(folderNotePath);
     if (folderNoteRecord?.notionPageId) {
       const existing2 = this.stateDb.getByPath(folderPath);
-      if (existing2) this.stateDb.delete(existing2.id);
+      if (existing2) {
+        this.stateDb.transaction(() => {
+          this.stateDb.delete(existing2.id);
+          this.stateDb.deleteWikilink(existing2.obsidianPath);
+        });
+      }
       return;
     }
     const existing = this.stateDb.getByPath(folderPath);
@@ -5955,7 +6430,10 @@ var SyncOrchestrator = class {
       const folderNotePath = `${folder.obsidianPath}/${folderName}.md`;
       const noteRecord = this.stateDb.getByPath(folderNotePath);
       if (noteRecord?.notionPageId) {
-        this.stateDb.delete(folder.id);
+        this.stateDb.transaction(() => {
+          this.stateDb.delete(folder.id);
+          this.stateDb.deleteWikilink(folder.obsidianPath);
+        });
       }
     }
   }
@@ -6041,12 +6519,38 @@ var SyncOrchestrator = class {
     if (this.config.conversion.preferMarkdownApi !== false) {
       try {
         const result = await this.notionClient.getPageMarkdown(pageId);
-        return notionEnhancedToObsidian(result.markdown);
+        this.collectInlineDbRefs(pageId, result.markdown);
+        return this.resolveNotionIdWikilinks(notionEnhancedToObsidian(result.markdown));
       } catch {
       }
     }
     return this.blockConverter.notionBlocksToMarkdown(pageId);
   }
+  // Markdown API는 인라인 데이터베이스를 다음처럼 렌더한다(컬럼/synced_block 내부 포함):
+  //   <database url="https://www.notion.so/<id-nohyph>" inline="true"
+  //             data-source-url="collection://<ds-id>">Title</database>
+  // url 안의 32자리 hex 가 databaseId 이므로, 별도 블록 트리 재귀 없이 이 태그만 파싱해
+  // 깊이 중첩된 child_database 까지 폴더+.base 동기화 대상으로 등록한다.
+  collectInlineDbRefs(parentPageId, rawMarkdown) {
+    const re = /<database\b[^>]*\burl="https:\/\/www\.notion\.so\/([a-f0-9]{32})"[^>]*>/g;
+    let m;
+    while ((m = re.exec(rawMarkdown)) !== null) {
+      const dbId = m[1];
+      if (dbId) this._inlineDbRefs.set(dbId, parentPageId);
+    }
+  }
+  // pull 시 url 기반 page mention 은 `[[notion:<id>]]` 로 1차 변환된다(notionEnhancedToObsidian).
+  // 이를 state DB 역조회로 원래 `[[제목]]` 위키링크로 복원해 push↔pull 라운드트립을 수렴시킨다.
+  // 볼트 밖/미추적 페이지면 `[[notion:<id>]]` 를 그대로 두어 정보 손실을 막는다.
+  resolveNotionIdWikilinks(markdown) {
+    return markdown.replace(/\[\[notion:([a-f0-9]{32})\]\]/g, (match, id) => {
+      const record = this.stateDb.getByNotionId(normalizeNotionId(id));
+      if (!record?.obsidianPath) return match;
+      const base = record.obsidianPath.split("/").pop() ?? record.obsidianPath;
+      const title = base.replace(/\.md$/, "");
+      return `[[${title}]]`;
+    });
+  }
   async extractParentId(page) {
     const parent = page.parent;
     if (parent.type === "page_id") return parent.page_id ?? null;
@@ -6123,7 +6627,7 @@ var NodeVaultFS = class {
   excludePatterns;
   loadImNobsidianIgnore() {
     try {
-      const ignorePath = join(this.rootPath, ".im-nobsidian-ignore");
+      const ignorePath = join(this.rootPath, IGNORE_FILE);
       const content = readFileSync(ignorePath, "utf-8");
       return content.split("\n").map((line) => line.trim()).filter((line) => line && !line.startsWith("#"));
     } catch {
@@ -6276,8 +6780,8 @@ var NodeVaultFS = class {
 };
 
 // src/converter/pre-processors/inline-db.ts
-var INLINE_DB_START = /%% im-nobsidian:inline-db:([^\s]+) %%/g;
-var INLINE_DB_END = /%% im-nobsidian:end %%/g;
+var INLINE_DB_START = new RegExp(`%% ${MARKER_BRAND_RE}:inline-db:([^\\s]+) %%`, "g");
+var INLINE_DB_END = new RegExp(`%% ${MARKER_BRAND_RE}:end %%`, "g");
 var InlineDBParser = class {
   name = "InlineDBParser";
   order = 40;
@@ -6327,82 +6831,126 @@ function threeWayMerge(base, local, remote) {
   const baseLines = base.split("\n");
   const localLines = local.split("\n");
   const remoteLines = remote.split("\n");
-  const localDiff = computeDiff(baseLines, localLines);
-  const remoteDiff = computeDiff(baseLines, remoteLines);
+  const hunks = [
+    ...computeHunks(baseLines, localLines, 0),
+    ...computeHunks(baseLines, remoteLines, 2)
+  ];
+  hunks.sort((a, b) => a.baseStart - b.baseStart || a.side - b.side);
   const merged = [];
   const conflicts = [];
-  let success = true;
-  let baseIdx = 0;
-  while (baseIdx < baseLines.length || localDiff.length > 0 || remoteDiff.length > 0) {
-    const localChange = localDiff.find((d) => d.baseStart === baseIdx);
-    const remoteChange = remoteDiff.find((d) => d.baseStart === baseIdx);
-    if (localChange && remoteChange) {
-      if (arraysEqual(localChange.newLines, remoteChange.newLines)) {
-        merged.push(...localChange.newLines);
-      } else {
-        success = false;
-        conflicts.push({
-          localLines: localChange.newLines,
-          remoteLines: remoteChange.newLines
-        });
-        merged.push("<<<<<<< LOCAL");
-        merged.push(...localChange.newLines);
-        merged.push("=======");
-        merged.push(...remoteChange.newLines);
-        merged.push(">>>>>>> REMOTE");
-      }
-      baseIdx = Math.max(localChange.baseEnd, remoteChange.baseEnd);
-      localDiff.splice(localDiff.indexOf(localChange), 1);
-      remoteDiff.splice(remoteDiff.indexOf(remoteChange), 1);
-    } else if (localChange) {
-      merged.push(...localChange.newLines);
-      baseIdx = localChange.baseEnd;
-      localDiff.splice(localDiff.indexOf(localChange), 1);
-    } else if (remoteChange) {
-      merged.push(...remoteChange.newLines);
-      baseIdx = remoteChange.baseEnd;
-      remoteDiff.splice(remoteDiff.indexOf(remoteChange), 1);
+  let cursor = 0;
+  let i = 0;
+  while (i < hunks.length) {
+    const first = hunks[i];
+    if (first.baseStart > cursor) {
+      merged.push(...baseLines.slice(cursor, first.baseStart));
+    }
+    const regionStart = first.baseStart;
+    let regionEnd = first.baseEnd;
+    const group = [first];
+    i++;
+    while (i < hunks.length) {
+      const next = hunks[i];
+      const overlaps = next.baseStart < regionEnd || regionEnd === regionStart && next.baseStart === regionStart;
+      if (!overlaps) break;
+      regionEnd = Math.max(regionEnd, next.baseEnd);
+      group.push(next);
+      i++;
+    }
+    const baseRegion = baseLines.slice(regionStart, regionEnd);
+    const localRegion = applyHunks(baseLines, group, 0, regionStart, regionEnd);
+    const remoteRegion = applyHunks(baseLines, group, 2, regionStart, regionEnd);
+    if (arraysEqual(localRegion, baseRegion)) {
+      merged.push(...remoteRegion);
+    } else if (arraysEqual(remoteRegion, baseRegion)) {
+      merged.push(...localRegion);
+    } else if (arraysEqual(localRegion, remoteRegion)) {
+      merged.push(...localRegion);
     } else {
-      if (baseIdx < baseLines.length) {
-        merged.push(baseLines[baseIdx]);
-      }
-      baseIdx++;
+      conflicts.push({ localLines: localRegion, remoteLines: remoteRegion });
+      merged.push("<<<<<<< LOCAL");
+      merged.push(...localRegion);
+      merged.push("=======");
+      merged.push(...remoteRegion);
+      merged.push(">>>>>>> REMOTE");
     }
+    cursor = regionEnd;
+  }
+  if (cursor < baseLines.length) {
+    merged.push(...baseLines.slice(cursor));
   }
   return {
-    success,
+    success: conflicts.length === 0,
     merged: merged.join("\n"),
     conflicts
   };
 }
-function computeDiff(base, modified) {
+function computeHunks(base, modified, side) {
+  const matches = lcsMatches(base, modified);
   const hunks = [];
-  let baseIdx = 0;
-  let modIdx = 0;
-  while (baseIdx < base.length && modIdx < modified.length) {
-    if (base[baseIdx] === modified[modIdx]) {
-      baseIdx++;
-      modIdx++;
-    } else {
-      const hunkStart = baseIdx;
-      const newLines = [];
-      while (modIdx < modified.length && base[baseIdx] !== modified[modIdx]) {
-        newLines.push(modified[modIdx]);
-        modIdx++;
-      }
-      baseIdx++;
-      hunks.push({ baseStart: hunkStart, baseEnd: baseIdx, newLines });
+  let prevBase = -1;
+  let prevMod = -1;
+  const emitGap = (curBase, curMod) => {
+    const baseLen = curBase - (prevBase + 1);
+    const modLen = curMod - (prevMod + 1);
+    if (baseLen > 0 || modLen > 0) {
+      hunks.push({
+        baseStart: prevBase + 1,
+        baseEnd: curBase,
+        content: modified.slice(prevMod + 1, curMod),
+        side
+      });
     }
+  };
+  for (const [b, m] of matches) {
+    emitGap(b, m);
+    prevBase = b;
+    prevMod = m;
   }
-  if (modIdx < modified.length) {
-    hunks.push({
-      baseStart: baseIdx,
-      baseEnd: base.length,
-      newLines: modified.slice(modIdx)
-    });
-  }
+  emitGap(base.length, modified.length);
   return hunks;
 }
+function applyHunks(baseLines, group, side, regionStart, regionEnd) {
+  const out = [];
+  let b = regionStart;
+  for (const hunk of group) {
+    if (hunk.side !== side) continue;
+    if (hunk.baseStart > b) out.push(...baseLines.slice(b, hunk.baseStart));
+    out.push(...hunk.content);
+    b = hunk.baseEnd;
+  }
+  if (b < regionEnd) out.push(...baseLines.slice(b, regionEnd));
+  return out;
+}
+function lcsMatches(a, b) {
+  const n = a.length;
+  const m = b.length;
+  const dp = new Array(n + 1);
+  for (let i2 = 0; i2 <= n; i2++) dp[i2] = new Uint32Array(m + 1);
+  for (let i2 = n - 1; i2 >= 0; i2--) {
+    const row = dp[i2];
+    const next = dp[i2 + 1];
+    const ai = a[i2];
+    for (let j2 = m - 1; j2 >= 0; j2--) {
+      row[j2] = ai === b[j2] ? next[j2 + 1] + 1 : Math.max(next[j2], row[j2 + 1]);
+    }
+  }
+  const matches = [];
+  let i = 0;
+  let j = 0;
+  while (i < n && j < m) {
+    if (a[i] === b[j]) {
+      matches.push([i, j]);
+      i++;
+      j++;
+    } else if (dp[i + 1][j] >= dp[i][j + 1]) {
+      i++;
+    } else {
+      j++;
+    }
+  }
+  return matches;
+}
 function arraysEqual(a, b) {
   if (a.length !== b.length) return false;
   return a.every((val, idx) => val === b[idx]);
@@ -6621,7 +7169,12 @@ var FileWatcher = class {
   watcher = null;
   start() {
     this.watcher = watch(this.rootPath, {
-      ignored: [/(^|[/\\])\./, "**/node_modules/**", "**/.im-nobsidian/**"],
+      // 이벤트 경로를 rootPath 기준 "볼트 상대경로"로 방출한다. 동기화 엔진의 변경
+      // 감지·paths 필터는 모두 볼트 상대경로(listMarkdownFileStats 기준)를 쓰므로,
+      // 절대경로를 그대로 넘기면 push 의 startsWith 스코프 필터에서 누락돼 변경 파일이
+      // 실제로 동기화되지 않는다(증분 watch 의 핵심 버그).
+      cwd: this.rootPath,
+      ignored: [/(^|[/\\])\./, "**/node_modules/**", INTERNAL_DIR_GLOB],
       persistent: true,
       ignoreInitial: true,
       awaitWriteFinish: {
@@ -6629,9 +7182,13 @@ var FileWatcher = class {
         pollInterval: 100
       }
     });
-    this.watcher.on("add", (path) => this.callback("add", path));
-    this.watcher.on("change", (path) => this.callback("change", path));
-    this.watcher.on("unlink", (path) => this.callback("unlink", path));
+    this.watcher.on("add", (path) => this.callback("add", this.toVaultPath(path)));
+    this.watcher.on("change", (path) => this.callback("change", this.toVaultPath(path)));
+    this.watcher.on("unlink", (path) => this.callback("unlink", this.toVaultPath(path)));
+  }
+  // 볼트 경로는 항상 "/" 구분자를 사용한다. Windows 백슬래시를 정규화.
+  toVaultPath(path) {
+    return sep === "/" ? path : path.split(sep).join("/");
   }
   async stop() {
     if (this.watcher) {
@@ -6711,16 +7268,19 @@ var WatchSyncService = class {
       this.syncQueued = true;
       return;
     }
+    this.clearDebounce();
+    if (this.pendingChanges.size === 0) return;
     this.syncing = true;
-    const changedPaths = [...this.pendingChanges.keys()];
+    const batch = new Map(this.pendingChanges);
     this.pendingChanges.clear();
     try {
       this.options.onSyncStart?.();
-      const result = await this.orchestrator.sync({
-        paths: changedPaths.length > 0 ? changedPaths : void 0
-      });
+      const result = await this.orchestrator.sync({ paths: [...batch.keys()] });
       this.options.onSyncComplete?.(result);
     } catch (error) {
+      for (const [path, event] of batch) {
+        if (!this.pendingChanges.has(path)) this.pendingChanges.set(path, event);
+      }
       const err = error instanceof Error ? error : new Error(String(error));
       this.options.onSyncError?.(err);
     } finally {
@@ -6728,6 +7288,8 @@ var WatchSyncService = class {
       if (this.syncQueued) {
         this.syncQueued = false;
         void this.executeSync();
+      } else if (this.pendingChanges.size > 0) {
+        this.scheduleSync();
       }
     }
   }
@@ -6898,7 +7460,6 @@ function parseDate(value) {
   const match = /^(\d{4}-\d{2}-\d{2})/.exec(value);
   return match?.[1] ?? null;
 }
-var DB_VIEWS_PATH = ".im-nobsidian/db-views.json";
 var ViewDataProvider = class {
   constructor(vaultFs) {
     this.vaultFs = vaultFs;
@@ -7105,6 +7666,6 @@ ${lines.join("\n")}
 }`;
 }
 
-export { BaseFileGenerator, BlockConverter, CalloutRestorer, CalloutTransformer, ChangeDetector, ColorAnnotator, ConfigManager, ConfigSchema, ConflictResolver, ConversionPipeline, DEFAULT_CONFIG, DatabaseSyncer, EmbedResolver, EntryEditor, FileHandler, FileWatcher, FrontmatterExtractor, FrontmatterGenerator, HtmlAnnotationStripper, ImageHandler, InlineDBParser, LocalImageRestorer, MathNormalizer, MentionToWikilink, NodeVaultFS, NotionBlockBuilder, NotionClient, PreserveMarkerCollector, PreserveMarkerInjector, PropertiesTableInjector, PropertiesTableRestorer, PropertyMapper, StateDB, SyncOrchestrator, TreeMapper, UnsupportedBlockStripper, ViewDataProvider, WatchSyncService, WikilinkResolver, computeBufferHash, computeHash, createDefaultPipeline, extractCalendarEntries, filterByMonth, filterEntries, generateColorCSS, generateId, getLogger, getNotionBgColor, getNotionColor, getVisibleProperties, groupEntries, normalizeNotionId, notionIdsEqual, sanitizeFileName, setLogger, sortEntries, threeWayMerge };
+export { BaseFileGenerator, BlockConverter, CONFIG_FILE, CalloutRestorer, CalloutTransformer, ChangeDetector, ColorAnnotator, ConfigManager, ConfigSchema, ConflictResolver, ConversionPipeline, DB_VIEWS_FILE, DB_VIEWS_PATH, DEFAULT_CONFIG, DatabaseSyncer, EmbedResolver, EntryEditor, FileHandler, FileWatcher, FrontmatterExtractor, FrontmatterGenerator, GITIGNORE_ENTRY, HtmlAnnotationStripper, IGNORE_FILE, INTERNAL_DIR, INTERNAL_DIR_GLOB, ImageHandler, InlineDBParser, LocalImageRestorer, MARKER_BRAND, MathNormalizer, MentionToWikilink, NodeVaultFS, NotionBlockBuilder, NotionClient, PreserveMarkerCollector, PreserveMarkerInjector, PropertiesTableInjector, PropertiesTableRestorer, PropertyMapper, STATE_DB_FILE, STATE_DB_PATH, StateDB, SyncOrchestrator, TreeMapper, UnsupportedBlockStripper, ViewDataProvider, WatchSyncService, WikilinkResolver, computeBufferHash, computeHash, createDefaultPipeline, extractCalendarEntries, filterByMonth, filterEntries, generateColorCSS, generateId, getLogger, getNotionBgColor, getNotionColor, getVisibleProperties, groupEntries, isInternalPath, normalizeNotionId, notionIdsEqual, sanitizeFileName, setLogger, sortEntries, threeWayMerge };
 //# sourceMappingURL=index.js.map
 //# sourceMappingURL=index.js.map